Added XML Catalog; updated public identifiers in catalog

diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
new file mode 100644 (file)
index 0000000..22dbe2a
--- /dev/null
+++ b/docbook/xml/catalog.xml
@@ -0,0 +1,113 @@
+<?xml version='1.0'?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+<!-- ...................................................................... -->
+<!-- XML Catalog data for DocBook XML V4.2b0 ................................ -->
+<!-- File catalog.xml ..................................................... -->
+
+<!-- Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/.
+<!-->
+
+<!-- This is the catalog data file for DocBook XML V4.2b0. It is provided as
+     a convenience in building your own catalog files. You need not use
+     the filenames listed here, and need not use the filename method of
+     identifying storage objects at all.  See the documentation for
+     detailed information on the files associated with the DocBook DTD.
+     See XML Catalogs at http://www.oasis-open.org/committees/entity/ for
+     detailed information on supplying and using catalog data.
+<!-->
+
+<!-- ...................................................................... -->
+<!-- DocBook driver file .................................................. -->
+
+<public publicId="-//OASIS//DTD DocBook XML V4.2b0//EN"
+        uri="docbookx.dtd"/>
+
+<!-- ...................................................................... -->
+<!-- DocBook modules ...................................................... -->
+
+<public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.2b0//EN"
+        uri="calstblx.dtd"/>
+
+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+        uri="soextblx.dtd"/>
+
+<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.2b0//EN"
+        uri="dbpoolx.mod"/>
+
+<public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2b0//EN"
+        uri="dbhierx.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2b0//EN"
+        uri="dbgenent.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.2b0//EN"
+        uri="dbnotnx.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.2b0//EN"
+        uri="dbcentx.mod"/>
+
+<!-- ...................................................................... -->
+<!-- ISO entity sets ...................................................... -->
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Diacritical Marks//EN//XML"
+        uri="ent/iso-dia.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Numeric and Special Graphic//EN//XML"
+        uri="ent/iso-num.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Publishing//EN//XML"
+        uri="ent/iso-pub.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES General Technical//EN//XML"
+        uri="ent/iso-tech.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Latin 1//EN//XML"
+        uri="ent/iso-lat1.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Latin 2//EN//XML"
+        uri="ent/iso-lat2.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Greek Letters//EN//XML"
+        uri="ent/iso-grk1.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Monotoniko Greek//EN//XML"
+        uri="ent/iso-grk2.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Greek Symbols//EN//XML"
+        uri="ent/iso-grk3.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Alternative Greek Symbols//EN//XML"
+        uri="ent/iso-grk4.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Arrow Relations//EN//XML"
+        uri="ent/iso-amsa.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Binary Operators//EN//XML"
+        uri="ent/iso-amsb.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Delimiters//EN//XML"
+        uri="ent/iso-amsc.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Negated Relations//EN//XML"
+        uri="ent/iso-amsn.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Ordinary//EN//XML"
+        uri="ent/iso-amso.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Relations//EN//XML"
+        uri="ent/iso-amsr.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Box and Line Drawing//EN//XML"
+        uri="ent/iso-box.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Russian Cyrillic//EN//XML"
+        uri="ent/iso-cyr1.ent"/>
+
+<public publicId="ISO 8879:1986//EN//XMLTITIES Non-Russian Cyrillic//EN//XML"
+        uri="ent/iso-cyr2.ent"/>
+
+<!-- End of catalog data for DocBook XML V4.2b0 ............................. -->
+<!-- ...................................................................... -->

diff --git a/docbook/xml/docbook.cat b/docbook/xml/docbook.cat
index c24e5df78302618eb6e4bef4fe7c2a6fe8035006..683d8cc19e6048cd94b888aa055754ee7471ed64 100644 (file)
--- a/docbook/xml/docbook.cat
+++ b/docbook/xml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook XML V4.1.2 .................................... --
+  -- Catalog data for DocBook XML V4.2b0 .................................... --
   -- File docbook.cat ..................................................... --
 
   -- Please direct all questions, bug reports, or suggestions for
@@ -7,7 +7,7 @@
      information, see http://www.oasis-open.org/.
   --
 
-  -- This is the catalog data file for DocBook XML V4.1.2. It is provided as
+  -- This is the catalog data file for DocBook XML V4.2b0. It is provided as
      a convenience in building your own catalog files. You need not use
      the filenames listed here, and need not use the filename method of
      identifying storage objects at all.  See the documentation for
@@ -19,41 +19,92 @@
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
-PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
+PUBLIC "-//OASIS//DTD DocBook XML V4.2b0//EN"
+       "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"
-PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" "dbgenent.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
+PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.2b0//EN"
+       "calstblx.dtd"
+
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+       "soextblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2b0//EN"
+       "dbpoolx.mod"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2b0//EN"
+       "dbhierx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2b0//EN"
+       "dbgenent.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.2b0//EN"
+       "dbnotnx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.2b0//EN"
+       "dbcentx.mod"
 
   -- ...................................................................... --
   -- ISO entity sets ...................................................... --
 
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
-
-  -- End of catalog data for DocBook XML V4.1.2 ............................. --
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Diacritical Marks//EN//XML"
+       "ent/iso-dia.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Numeric and Special Graphic//EN//XML"
+       "ent/iso-num.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Publishing//EN//XML"
+       "ent/iso-pub.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES General Technical//EN//XML"
+       "ent/iso-tech.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Latin 1//EN//XML"
+       "ent/iso-lat1.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Latin 2//EN//XML"
+       "ent/iso-lat2.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Greek Letters//EN//XML"
+       "ent/iso-grk1.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Monotoniko Greek//EN//XML"
+       "ent/iso-grk2.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Greek Symbols//EN//XML"
+       "ent/iso-grk3.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Alternative Greek Symbols//EN//XML"
+       "ent/iso-grk4.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Arrow Relations//EN//XML"
+       "ent/iso-amsa.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Binary Operators//EN//XML"
+       "ent/iso-amsb.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Delimiters//EN//XML"
+       "ent/iso-amsc.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Negated Relations//EN//XML"
+       "ent/iso-amsn.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Ordinary//EN//XML"
+       "ent/iso-amso.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Relations//EN//XML"
+       "ent/iso-amsr.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Box and Line Drawing//EN//XML"
+       "ent/iso-box.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Russian Cyrillic//EN//XML"
+       "ent/iso-cyr1.ent"
+
+PUBLIC "ISO 8879:1986//EN//XMLTITIES Non-Russian Cyrillic//EN//XML"
+       "ent/iso-cyr2.ent"
+
+  -- End of catalog data for DocBook XML V4.2b0 ............................. --
   -- ...................................................................... --