diff --git a/docbook-dtd412-entities.patch b/docbook-dtd412-entities.patch new file mode 100644 index 0000000..39a7bb2 --- /dev/null +++ b/docbook-dtd412-entities.patch @@ -0,0 +1,48 @@ +diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2009-02-19 13:49:08.000000000 +0100 ++++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-19 13:50:59.000000000 +0100 +@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C + -- ...................................................................... -- + -- 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" ++PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ent/iso-num.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent" ++PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" "ent/iso-grk4.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" "ent/iso-amsa.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" "ent/iso-amsb.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" "ent/iso-amsc.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ent/iso-amsn.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" "ent/iso-amso.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" "ent/iso-amsr.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/iso-box.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" "ent/iso-cyr2.ent" + + -- End of catalog data for DocBook XML V4.1.2 ............................. -- + -- ...................................................................... -- diff --git a/docbook-dtds-ents.patch b/docbook-dtds-ents.patch index c973617..bc45628 100644 --- a/docbook-dtds-ents.patch +++ b/docbook-dtds-ents.patch @@ -32,3 +32,22 @@ +-- -- End of catalog data for DocBook V4.4 ................................. -- -- ...................................................................... -- +diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2009-02-19 13:45:22.000000000 +0100 ++++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-19 13:47:31.000000000 +0100 +@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- ++ + -- End of catalog data for DocBook V4.5 ................................. -- + -- ...................................................................... -- diff --git a/docbook-dtds.spec b/docbook-dtds.spec index 54bea4c..6d43c1d 100644 --- a/docbook-dtds.spec +++ b/docbook-dtds.spec @@ -2,7 +2,7 @@ Name: docbook-dtds Version: 1.0 -Release: 43%{?dist} +Release: 44%{?dist} Group: Applications/Text Summary: SGML and XML document type definitions for DocBook @@ -70,6 +70,7 @@ Patch4: docbook-dtd42-sgml-1.0.catalog.patch Patch5: docbook-4.2-euro.patch Patch6: docbook-dtds-ents.patch Patch7: docbook-sgml-systemrewrite.patch +Patch8: docbook-dtd412-entities.patch BuildRequires: unzip %description @@ -167,12 +168,15 @@ cd .. # Fix € in SGML. %patch5 -p1 -# Fix ISO entities in 4.3/4.4 SGML +# Fix ISO entities in 4.3/4.4/4.5 SGML %patch6 -p1 # Rewrite SYSTEM to use local catalog instead web ones (#478680) %patch7 -p1 +# Add XML to the end of public identificators of 4.1.2 XML entities +%patch8 -p1 + # Increase NAMELEN (bug #36058, bug #159382). sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl @@ -1585,6 +1589,10 @@ then fi %changelog +* Thu Feb 19 2009 Ondrej Vasik - 1.0.44 +- fix ISO entities for 4.5 SGML, use XML at the end of + public identificators of XML 4.1.2 ISO entities + * Thu Feb 19 2009 Ondrej Vasik - 1.0-43 - register sgml catalogs before xml catalogs in openjade (#486257)