Merge pull request oasis-tcs#110 from robander/cleanup397

Add keyref to xml, markup elements oasis-tcs/dita#397
dita-ot · Jun 2, 2021 · e38c974 · e38c974
2 parents fbe0e5b + 280f6b7
commit e38c974
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 9 deletions.
diff --git a/doctypes/dtd/technicalContent/markupDomain.mod b/doctypes/dtd/technicalContent/markupDomain.mod
@@ -28,7 +28,10 @@
                          %text;)*"
 >
 <!ENTITY % markupname.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  markupname %markupname.content;>
 <!ATTLIST  markupname %markupname.attributes;>

diff --git a/doctypes/dtd/technicalContent/xmlDomain.mod b/doctypes/dtd/technicalContent/xmlDomain.mod
@@ -35,7 +35,10 @@
                          %text;)*"
 >
 <!ENTITY % numcharref.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  numcharref %numcharref.content;>
 <!ATTLIST  numcharref %numcharref.attributes;>
@@ -49,7 +52,10 @@
                          %text;)*"
 >
 <!ENTITY % parameterentity.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  parameterentity %parameterentity.content;>
 <!ATTLIST  parameterentity %parameterentity.attributes;>
@@ -63,7 +69,10 @@
                          %text;)*"
 >
 <!ENTITY % textentity.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  textentity %textentity.content;>
 <!ATTLIST  textentity %textentity.attributes;>
@@ -77,7 +86,10 @@
                          %text;)*"
 >
 <!ENTITY % xmlatt.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  xmlatt %xmlatt.content;>
 <!ATTLIST  xmlatt %xmlatt.attributes;>
@@ -91,7 +103,10 @@
                          %text;)*"
 >
 <!ENTITY % xmlelement.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  xmlelement %xmlelement.content;>
 <!ATTLIST  xmlelement %xmlelement.attributes;>
@@ -105,7 +120,10 @@
                          %text;)*"
 >
 <!ENTITY % xmlnsname.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  xmlnsname %xmlnsname.content;>
 <!ATTLIST  xmlnsname %xmlnsname.attributes;>
@@ -119,7 +137,10 @@
                          %text;)*"
 >
 <!ENTITY % xmlpi.attributes
-              "%univ-atts;"
+              "keyref
+                          CDATA
+                                    #IMPLIED
+               %univ-atts;"
 >
 <!ELEMENT  xmlpi %xmlpi.content;>
 <!ATTLIST  xmlpi %xmlpi.attributes;>

diff --git a/doctypes/rng/technicalContent/markupDomain.rng b/doctypes/rng/technicalContent/markupDomain.rng
@@ -62,6 +62,9 @@
         </zeroOrMore>
       </define>
       <define name="markupname.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="markupname.element">

diff --git a/doctypes/rng/technicalContent/xmlDomain.rng b/doctypes/rng/technicalContent/xmlDomain.rng
@@ -60,6 +60,9 @@
         </zeroOrMore>
       </define>
       <define name="numcharref.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="numcharref.element">
@@ -85,6 +88,9 @@
         </zeroOrMore>
       </define>
       <define name="parameterentity.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="parameterentity.element">
@@ -111,6 +117,9 @@
         </zeroOrMore>
       </define>
       <define name="textentity.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="textentity.element">
@@ -138,6 +147,9 @@
         </zeroOrMore>
       </define>
       <define name="xmlatt.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="xmlatt.element">
@@ -164,6 +176,9 @@
         </zeroOrMore>
       </define>
       <define name="xmlelement.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="xmlelement.element">
@@ -190,6 +205,9 @@
         </zeroOrMore>
       </define>
       <define name="xmlnsname.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="xmlnsname.element">
@@ -217,6 +235,9 @@
         </zeroOrMore>
       </define>
       <define name="xmlpi.attributes">
+        <optional>
+          <attribute name="keyref"/>
+        </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="xmlpi.element">

diff --git a/specification/baseSpec b/specification/baseSpec
+0 −2		doctypes/dtd/base/commonElements.ent
+7 −50		doctypes/dtd/base/commonElements.mod
+8 −2		doctypes/dtd/base/emphasisDomain.mod
+32 −8		doctypes/dtd/base/highlightDomain.mod
+0 −75		doctypes/rng/base/commonElementsMod.rng
+6 −0		doctypes/rng/base/emphasisDomain.rng
+24 −0		doctypes/rng/base/highlightDomain.rng
+7 −3		specification/archSpec/base/processing-keyref-for-text.dita
+1 −1		specification/common/reuse-w-lwdita/reuse-b.dita
+1 −1		specification/common/reuse-w-lwdita/reuse-i.dita
+1 −1		specification/common/reuse-w-lwdita/reuse-sub.dita
+1 −1		specification/common/reuse-w-lwdita/reuse-sup.dita
+1 −1		specification/common/reuse-w-lwdita/reuse-u.dita
+2 −2		specification/langRef/base/em.dita
+3 −4		specification/langRef/base/harvested-content-base.dita
+1 −1		specification/langRef/base/line-through.dita
+0 −41		specification/langRef/base/longquoteref.dita
+1 −12		specification/langRef/base/lq.dita
+1 −1		specification/langRef/base/overline.dita
+2 −2		specification/langRef/base/strong.dita
+1 −1		specification/langRef/base/tt.dita
+0 −1		specification/langRef/body-elements.ditamap
+0 −1		specification/langRef/key-definitions-body-elements.ditamap
+0 −1		specification/langRef/quick-reference/base-elements-a-to-z.dita