Merge pull request oasis-tcs#228 from robander/rngpubid

Add pubid tokens to RNG to match oasis-tcs/dita#755
dita-ot · Apr 5, 2023 · 954861f · 954861f
2 parents d2f8db9 + edf3344
commit 954861f
Show file tree

Hide file tree

Showing 36 changed files with 354 additions and 354 deletions.
diff --git a/doctypes/rng/bookmap/bookmap.rng b/doctypes/rng/bookmap/bookmap.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="urn:oasis:names:tc:dita:rng:checkShell.sch" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<?xml-model href="urn:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
+<?xml-model href="urn:pubid:oasis:names:tc:dita:rng:checkShell.sch" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-model href="urn:pubid:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
                          schematypens="http://relaxng.org/ns/structure/1.0"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          xmlns:dita="http://dita.oasis-open.org/architecture/2005/"
@@ -51,7 +51,7 @@ PUBLIC "-//OASIS//DTD DITA 2.0 BookMap//EN"
          <moduleShortName>bookmap</moduleShortName>
          <shellPublicIds>
             <dtdShell>-//OASIS//DTD DITA<var presep=" " name="ditaver"/> BookMap//EN</dtdShell>
-            <rngShell>urn:oasis:names:tc:dita:rng:bookmap.rng<var presep=":" name="ditaver"/></rngShell>
+            <rngShell>urn:pubid:oasis:names:tc:dita:rng:bookmap.rng<var presep=":" name="ditaver"/></rngShell>
          </shellPublicIds>
       </moduleMetadata>
   </moduleDesc>
@@ -80,28 +80,28 @@ PUBLIC "-//OASIS//DTD DITA 2.0 BookMap//EN"
       <a:documentation>MODULE INCLUSIONS</a:documentation>    
       <!-- Do not remove references to the map group or DITAVALref       -->
       <!-- domains. The bookmap specialization requires these domains.   -->
-     <include href="urn:oasis:names:tc:dita:rng:mapMod.rng:2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:mapGroupMod.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:mapMod.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:mapGroupMod.rng:2.0"/>
      <include href="bookmapMod.rng"/>
      <include href="../technicalContent/abbreviateDomain.rng"/>
-     <include href="urn:oasis:names:tc:dita:rng:alternativeTitlesDomain.rng:2.0" dita:since="2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:audienceAttDomain.rng:2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:deliveryTargetAttDomain.rng:2.0" dita:since="1.3"/>
-     <include href="urn:oasis:names:tc:dita:rng:platformAttDomain.rng:2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:productAttDomain.rng:2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:otherpropsAttDomain.rng:2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:ditavalrefDomain.rng:2.0" dita:since="1.3"/>
-     <include href="urn:oasis:names:tc:dita:rng:emphasisDomain.rng:2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:hazardDomain.rng:2.0"/>
-     <include href="urn:oasis:names:tc:dita:rng:highlightDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:alternativeTitlesDomain.rng:2.0" dita:since="2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:audienceAttDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:deliveryTargetAttDomain.rng:2.0" dita:since="1.3"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:platformAttDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:productAttDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:otherpropsAttDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:ditavalrefDomain.rng:2.0" dita:since="1.3"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:emphasisDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:hazardDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:highlightDomain.rng:2.0"/>
      <include href="../technicalContent/hwDomain.rng" dita:since="2.0"/>
      <include href="../technicalContent/markupDomain.rng" dita:since="1.3"/>
      <include href="../technicalContent/programmingDomain.rng"/>
      <include href="../technicalContent/releaseManagementDomain.rng" dita:since="1.3"/>
      <include href="../technicalContent/softwareDomain.rng"/>
      <include href="../technicalContent/syntaxdiagramDomain.rng" dita:since="2.0"/>
      <include href="../technicalContent/uiDomain.rng"/>
-     <include href="urn:oasis:names:tc:dita:rng:utilitiesDomain.rng:2.0"/>
+     <include href="urn:pubid:oasis:names:tc:dita:rng:utilitiesDomain.rng:2.0"/>
      <include href="../xnal/xnalDomain.rng"/>
      <include href="../technicalContent/xmlDomain.rng" dita:since="1.3"/>
   </div>

diff --git a/doctypes/rng/bookmap/bookmapMod.rng b/doctypes/rng/bookmap/bookmapMod.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="urn:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
+<?xml-model href="urn:pubid:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
                          schematypens="http://relaxng.org/ns/structure/1.0"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:dita="http://dita.oasis-open.org/architecture/2005/" xmlns="http://relaxng.org/ns/structure/1.0"
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
@@ -41,7 +41,7 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 BookMap//EN"
       <modulePublicIds>
         <dtdMod>-//OASIS//ELEMENTS DITA<var presep=" " name="ditaver"/> BookMap//EN</dtdMod>
         <dtdEnt>-//OASIS//ENTITIES DITA<var presep=" " name="ditaver"/> BookMap//EN</dtdEnt>
-        <rngMod>urn:oasis:names:tc:dita:rng:bookmapMod.rng<var presep=":" name="ditaver"/></rngMod>
+        <rngMod>urn:pubid:oasis:names:tc:dita:rng:bookmapMod.rng<var presep=":" name="ditaver"/></rngMod>
       </modulePublicIds>
     </moduleMetadata>
   </moduleDesc>

diff --git a/doctypes/rng/bookmap/catalog.xml b/doctypes/rng/bookmap/catalog.xml
@@ -2,25 +2,25 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 <!--DITA Book Map Shell-->
    <group><!-- System ID (URL) catalog entries -->
-      <system systemId="urn:oasis:names:tc:dita:rng:bookmap.rng:2.0"
+      <system systemId="urn:pubid:oasis:names:tc:dita:rng:bookmap.rng:2.0"
               uri="bookmap.rng"/>
-      <system systemId="urn:oasis:names:tc:dita:rng:bookmap.rng:2.x"
+      <system systemId="urn:pubid:oasis:names:tc:dita:rng:bookmap.rng:2.x"
               uri="bookmap.rng"/>
-      <system systemId="urn:oasis:names:tc:dita:rng:bookmapMod.rng:2.0"
+      <system systemId="urn:pubid:oasis:names:tc:dita:rng:bookmapMod.rng:2.0"
               uri="bookmapMod.rng"/>
-      <system systemId="urn:oasis:names:tc:dita:rng:bookmapMod.rng:2.x"
+      <system systemId="urn:pubid:oasis:names:tc:dita:rng:bookmapMod.rng:2.x"
               uri="bookmapMod.rng"/>
    </group>
    <group><!-- Public ID (URN) catalog entries -->
-      <uri name="urn:oasis:names:tc:dita:rng:bookmap.rng:2.0"
+      <uri name="urn:pubid:oasis:names:tc:dita:rng:bookmap.rng:2.0"
            uri="bookmap.rng"/>
-      <uri name="urn:oasis:names:tc:dita:rng:bookmap.rng:2.x"
+      <uri name="urn:pubid:oasis:names:tc:dita:rng:bookmap.rng:2.x"
            uri="bookmap.rng"/>
-      <uri name="urn:oasis:names:tc:dita:rng:bookmapMod.rng:2.0"
+      <uri name="urn:pubid:oasis:names:tc:dita:rng:bookmapMod.rng:2.0"
            uri="bookmapMod.rng"/>
-      <uri name="urn:oasis:names:tc:dita:rng:bookmapMod.rng:2.x"
+      <uri name="urn:pubid:oasis:names:tc:dita:rng:bookmapMod.rng:2.x"
            uri="bookmapMod.rng"/>
-      <uri name="urn:oasis:names:tc:dita:rng:bookmapMod.rng"
+      <uri name="urn:pubid:oasis:names:tc:dita:rng:bookmapMod.rng"
            uri="bookmapMod.rng"/>
    </group>
 </catalog>
diff --git a/doctypes/rng/classificationMap/catalog.xml b/doctypes/rng/classificationMap/catalog.xml
@@ -2,15 +2,15 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 <!--DITA Classification map (tech comm map with classification domain) -->
    <group><!-- System ID (URL) catalog entries -->
-      <system systemId="urn:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.0"
+      <system systemId="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.0"
               uri="classifyMap.rng"/>
-      <system systemId="urn:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.x"
+      <system systemId="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.x"
               uri="classifyMap.rng"/>
    </group>
    <group><!-- Public ID (URN) catalog entries -->
-      <uri name="urn:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.0"
+      <uri name="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.0"
            uri="classifyMap.rng"/>
-      <uri name="urn:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.x"
+      <uri name="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyMap.rng:2.x"
            uri="classifyMap.rng"/>
    </group>
 </catalog>
diff --git a/doctypes/rng/classificationMap/classifyMap.rng b/doctypes/rng/classificationMap/classifyMap.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="urn:oasis:names:tc:dita:rng:checkShell.sch" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<?xml-model href="urn:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
+<?xml-model href="urn:pubid:oasis:names:tc:dita:rng:checkShell.sch" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<?xml-model href="urn:pubid:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
                          schematypens="http://relaxng.org/ns/structure/1.0"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          xmlns:dita="http://dita.oasis-open.org/architecture/2005/"
@@ -75,30 +75,30 @@ PUBLIC "-//OASIS//DTD DITA 2.0 Classification Map//EN"
   </div>
   <div>
       <a:documentation>MODULE INCLUSIONS</a:documentation>
-      <include href="urn:oasis:names:tc:dita:rng:mapMod.rng:2.0"/>
-      <include href="urn:oasis:names:tc:dita:rng:mapGroupMod.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:mapMod.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:mapGroupMod.rng:2.0"/>
 
-      <include href="urn:oasis:names:tc:dita:spec:classification:rng:classifyDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:spec:classification:rng:classifyDomain.rng:2.0"/>
       <include href="../technicalContent/abbreviateDomain.rng"/>
-      <include href="urn:oasis:names:tc:dita:rng:alternativeTitlesDomain.rng:2.0" dita:since="2.0"/>
-      <include href="urn:oasis:names:tc:dita:rng:audienceAttDomain.rng:2.0"/>
-      <include href="urn:oasis:names:tc:dita:rng:deliveryTargetAttDomain.rng:2.0" dita:since="1.3"/>
-      <include href="urn:oasis:names:tc:dita:rng:platformAttDomain.rng:2.0"/>
-      <include href="urn:oasis:names:tc:dita:rng:productAttDomain.rng:2.0"/>
-      <include href="urn:oasis:names:tc:dita:rng:otherpropsAttDomain.rng:2.0"/>
-      <include href="urn:oasis:names:tc:dita:rng:ditavalrefDomain.rng:2.0" dita:since="1.3"/>
-      <include href="urn:oasis:names:tc:dita:rng:emphasisDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:alternativeTitlesDomain.rng:2.0" dita:since="2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:audienceAttDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:deliveryTargetAttDomain.rng:2.0" dita:since="1.3"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:platformAttDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:productAttDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:otherpropsAttDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:ditavalrefDomain.rng:2.0" dita:since="1.3"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:emphasisDomain.rng:2.0"/>
       <include href="../technicalContent/glossrefDomain.rng"/>
-      <include href="urn:oasis:names:tc:dita:rng:hazardDomain.rng:2.0"/>
-      <include href="urn:oasis:names:tc:dita:rng:highlightDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:hazardDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:highlightDomain.rng:2.0"/>
       <include href="../technicalContent/markupDomain.rng" dita:since="1.3"/>
       <include href="../technicalContent/programmingDomain.rng"/>
       <include href="../technicalContent/releaseManagementDomain.rng"
                dita:since="1.3"/>
       <include href="../technicalContent/softwareDomain.rng"/>
       <include href="../technicalContent/syntaxdiagramDomain.rng" dita:since="2.0"/>
       <include href="../technicalContent/uiDomain.rng"/>
-      <include href="urn:oasis:names:tc:dita:rng:utilitiesDomain.rng:2.0"/>
+      <include href="urn:pubid:oasis:names:tc:dita:rng:utilitiesDomain.rng:2.0"/>
       <include href="../technicalContent/xmlDomain.rng" dita:since="1.3"/>    </div>
   <div>
       <a:documentation>ID-DEFINING-ELEMENT OVERRIDES</a:documentation>

diff --git a/doctypes/rng/technicalContent/abbreviateDomain.rng b/doctypes/rng/technicalContent/abbreviateDomain.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="urn:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
+<?xml-model href="urn:pubid:oasis:names:tc:dita:rng:vocabularyModuleDesc.rng"
                          schematypens="http://relaxng.org/ns/structure/1.0"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:dita="http://dita.oasis-open.org/architecture/2005/" xmlns="http://relaxng.org/ns/structure/1.0">
   <moduleDesc xmlns="http://dita.oasis-open.org/architecture/2005/">
@@ -38,7 +38,7 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Abbreviated Form Domain//EN"
       <modulePublicIds>
         <dtdMod>-//OASIS//ELEMENTS DITA<var presep=" " name="ditaver"/> Abbreviated Form Domain//EN</dtdMod>
         <dtdEnt>-//OASIS//ENTITIES DITA<var presep=" " name="ditaver"/> Abbreviated Form Domain//EN</dtdEnt>
-        <rngMod>urn:oasis:names:tc:dita:rng:abbreviateDomain.rng<var presep=":" name="ditaver"/></rngMod>
+        <rngMod>urn:pubid:oasis:names:tc:dita:rng:abbreviateDomain.rng<var presep=":" name="ditaver"/></rngMod>
       </modulePublicIds>
     </moduleMetadata>
   </moduleDesc>