Add keyref to highlight, emphasis elements oasis-tcs#397

robander · Jun 1, 2021 · f83950d · f83950d
1 parent 55e5e6b
commit f83950d
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 10 deletions.
diff --git a/doctypes/dtd/base/emphasisDomain.mod b/doctypes/dtd/base/emphasisDomain.mod
@@ -47,7 +47,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % strong.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  strong %strong.content;>
 <!ATTLIST  strong %strong.attributes;>
@@ -63,7 +66,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % em.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  em %em.content;>
 <!ATTLIST  em %em.attributes;>

diff --git a/doctypes/dtd/base/highlightDomain.mod b/doctypes/dtd/base/highlightDomain.mod
@@ -54,7 +54,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % b.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  b %b.content;>
 <!ATTLIST  b %b.attributes;>
@@ -70,7 +73,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % u.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  u %u.content;>
 <!ATTLIST  u %u.attributes;>
@@ -86,7 +92,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % i.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  i %i.content;>
 <!ATTLIST  i %i.attributes;>
@@ -102,7 +111,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % line-through.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  line-through %line-through.content;>
 <!ATTLIST  line-through %line-through.attributes;>
@@ -118,7 +130,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % overline.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  overline %overline.content;>
 <!ATTLIST  overline %overline.attributes;>
@@ -134,7 +149,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % tt.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  tt %tt.content;>
 <!ATTLIST  tt %tt.attributes;>
@@ -150,7 +168,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % sup.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  sup %sup.content;>
 <!ATTLIST  sup %sup.attributes;>
@@ -166,7 +187,10 @@
                          %required-cleanup;)*"
 >
 <!ENTITY % sub.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  sub %sub.content;>
 <!ATTLIST  sub %sub.attributes;>

diff --git a/doctypes/rng/base/emphasisDomain.rng b/doctypes/rng/base/emphasisDomain.rng
@@ -87,6 +87,9 @@
         </zeroOrMore>
       </define>
       <define name="strong.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="strong.element"> 
@@ -117,6 +120,9 @@
         </zeroOrMore>
       </define>
       <define name="em.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="em.element">

diff --git a/doctypes/rng/base/highlightDomain.rng b/doctypes/rng/base/highlightDomain.rng
@@ -111,6 +111,9 @@
         </zeroOrMore>
       </define>
       <define name="b.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="b.element">
@@ -141,6 +144,9 @@
         </zeroOrMore>
       </define>
       <define name="u.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="u.element">
@@ -169,6 +175,9 @@
         </zeroOrMore>
       </define>
       <define name="i.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="i.element">
@@ -198,6 +207,9 @@
         </zeroOrMore>
       </define>
       <define name="line-through.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="line-through.element">
@@ -226,6 +238,9 @@
         </zeroOrMore>
       </define>
       <define name="overline.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="overline.element">
@@ -254,6 +269,9 @@
         </zeroOrMore>
       </define>
       <define name="tt.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="tt.element">
@@ -282,6 +300,9 @@
         </zeroOrMore>
       </define>
       <define name="sup.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="sup.element">
@@ -312,6 +333,9 @@
         </zeroOrMore>
       </define>
       <define name="sub.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="sub.element">