Properly tag descriptor autolinks in the descriptor index with the at…

…-rule they belong to, so they don't cause unfixable link errors.
speced · Jan 23, 2020 · 71e151f · 71e151f
1 parent 20a4b94
commit 71e151f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/bikeshed/boilerplate.py b/bikeshed/boilerplate.py
@@ -509,10 +509,13 @@ def extractKeyValFromRow(tr, table):
     for desc in atRules.values():
         desc.sort(key=lambda x:x["Name"])
 
-    def createRow(prop, linkType):
+    def createRow(prop, linkType, for_=None):
+        attrs = {"data-link-type":linkType}
+        if for_:
+            attrs["data-link-for"] = for_
         return E.tr(
             E.th({"scope":"row"},
-                 E.a({"data-link-type":linkType}, prop['Name'])),
+                 E.a(attrs, prop['Name'])),
             *[E.td(prop.get(column,"")) for column in columns[1:]])
     if len(props):
         # Set up the initial table columns for properties
@@ -559,18 +562,23 @@ def formatColumnName(name):
                 allKeys |= set(desc.keys())
             columns.extend(sorted(allKeys - set(columns)))
             id = config.simplifyText(atRuleName) + "-descriptor-table"
-            appendChild(html,
-                        E.h3({"class":"no-num no-ref", "id":safeID(doc, id)},
-                             E.a({"data-link-type":"at-rule"}, atRuleName),
-                             " Descriptors"))
+            if atRuleName:
+                appendChild(html,
+                            E.h3({"class":"no-num no-ref", "id":safeID(doc, id)},
+                                 E.a({"data-link-type":"at-rule"}, atRuleName),
+                                 " Descriptors"))
+            else:
+                appendChild(html,
+                            E.h3({"class":"no-num no-ref", "id":safeID(doc, id)},
+                                 "Miscellaneous Descriptors"))
             appendChild(html,
                         E.div({"class":"big-element-wrapper"},
                               E.table({"class":"index"},
-                                      E.thead(
+                                E.thead(
                                   E.tr(
                                       *[E.th({"scope":"col"}, column) for column in columns])),
-                                      E.tbody(
-                                  *[createRow(desc, "descriptor") for desc in descs]))))
+                                E.tbody(
+                                  *[createRow(desc, "descriptor", for_=atRuleName) for desc in descs]))))
 
 
 def addIDLSection(doc):

diff --git a/tests/github/w3c/csswg-drafts/css-color-4/Overview.html b/tests/github/w3c/csswg-drafts/css-color-4/Overview.html
@@ -5350,7 +5350,7 @@ <h3 class="no-num no-ref heading settled" id="color-profile-descriptor-table"><s
       <td>relative-colorimetric | absolute-colorimetric | perceptual | saturation
       <td>relative-colorimetric
      <tr>
-      <th scope="row"><a class="css" data-link-type="descriptor">src</a>
+      <th scope="row"><a class="css" data-link-type="descriptor" href="#descdef-color-profile-src" id="ref-for-descdef-color-profile-src①">src</a>
       <td>&lt;url>
       <td>n/a
    </table>

diff --git a/tests/github/w3c/csswg-drafts/css-fonts-4/Overview.html b/tests/github/w3c/csswg-drafts/css-fonts-4/Overview.html
@@ -7625,7 +7625,7 @@ <h3 class="no-num no-ref heading settled" id="font-feature-values-descriptor-tab
       <th scope="col">Initial
     <tbody>
      <tr>
-      <th scope="row"><a class="css" data-link-type="descriptor" href="#descdef-font-face-font-display" id="ref-for-descdef-font-face-font-display⑧">font-display</a>
+      <th scope="row"><a class="css" data-link-type="descriptor" href="#descdef-font-feature-values-font-display" id="ref-for-descdef-font-feature-values-font-display②">font-display</a>
       <td>auto | block | swap | fallback | optional
       <td>auto
    </table>
@@ -7644,7 +7644,7 @@ <h3 class="no-num no-ref heading settled" id="font-palette-values-descriptor-tab
       <td>&lt;integer> | &lt;string>
       <td>N/A
      <tr>
-      <th scope="row"><a class="css" data-link-type="descriptor" href="#descdef-font-face-font-family" id="ref-for-descdef-font-face-font-family③">font-family</a>
+      <th scope="row"><a class="css" data-link-type="descriptor" href="#descdef-font-palette-values-font-family" id="ref-for-descdef-font-palette-values-font-family①">font-family</a>
       <td>&lt;'font-family'>
       <td>N/A
      <tr>