Menu
▾
▴
[docbook-checkins] CVS: docbook/relaxng dbcent.rng,1.1,1.2 dbhier.rng,1.1,1.2 dbnotn.rng,1.1,1.2 dbpool.rng,1.1,1.2 docbook.rng,1.1,1.2
|
From: Norman W. <nw...@us...> - 2001-06-08 14:35:04
|
Update of /cvsroot/docbook/docbook/relaxng In directory usw-pr-cvs1:/tmp/cvs-serv23603 Modified Files: dbcent.rng dbhier.rng dbnotn.rng dbpool.rng docbook.rng Log Message: Validated against relaxng.rng (note: this means the grammars are valid RELAX NG documents, not that they validate DocBook) Index: dbcent.rng =================================================================== RCS file: /cvsroot/docbook/docbook/relaxng/dbcent.rng,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** dbcent.rng 2001/06/07 16:17:48 1.1 --- dbcent.rng 2001/06/08 14:35:00 1.2 *************** *** 1,6 **** ! <grammar xmlns="http://www.thaiopensource.com/trex" ! xmlns:xsd="http://www.w3.org/2000/10/XMLSchema" ! xmlns:dtd="http://www.oasis-open.org/docbook/dtd" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> --- 1,7 ---- ! <?xml version="1.0"?> ! <grammar xmlns="http://relaxng.org/ns/structure/0.9" ! datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ! xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> *************** *** 9,13 **** <dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc., ! O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, and the Organization for the Advancement of Structured Information Standards (OASIS). --- 10,14 ---- <dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc., ! O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, and the Organization for the Advancement of Structured Information Standards (OASIS). *************** *** 41,45 **** declaration that uses the public identifier shown below: ! <!ENTITY % dbcent PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"> --- 42,46 ---- declaration that uses the public identifier shown below: ! <!ENTITY % dbcent PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"> Index: dbhier.rng =================================================================== RCS file: /cvsroot/docbook/docbook/relaxng/dbhier.rng,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** dbhier.rng 2001/06/07 16:17:48 1.1 --- dbhier.rng 2001/06/08 14:35:00 1.2 *************** *** 1,6 **** ! <grammar xmlns="http://www.thaiopensource.com/trex" ! xmlns:xsd="http://www.w3.org/2000/10/XMLSchema" ! xmlns:dtd="http://www.oasis-open.org/docbook/dtd" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> --- 1,7 ---- ! <?xml version="1.0"?> ! <grammar xmlns="http://relaxng.org/ns/structure/0.9" ! datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ! xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> *************** *** 9,13 **** <dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc., ! O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, and the Organization for the Advancement of Structured Information Standards (OASIS). --- 10,14 ---- <dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc., ! O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, and the Organization for the Advancement of Structured Information Standards (OASIS). *************** *** 48,52 **** declaration that uses the public identifier shown below: ! <!ENTITY % dbhier PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"> --- 49,53 ---- declaration that uses the public identifier shown below: ! <!ENTITY % dbhier PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"> *************** *** 69,72 **** --- 70,74 ---- <define name="local.appendix.class"> + <notAllowed/> </define> <define name="appendix.class"> *************** *** 76,79 **** --- 78,82 ---- <define name="local.article.class"> + <notAllowed/> </define> <define name="article.class"> *************** *** 83,86 **** --- 86,90 ---- <define name="local.book.class"> + <notAllowed/> </define> <define name="book.class"> *************** *** 90,93 **** --- 94,98 ---- <define name="local.chapter.class"> + <notAllowed/> </define> <define name="chapter.class"> *************** *** 97,100 **** --- 102,106 ---- <define name="local.index.class"> + <notAllowed/> </define> <define name="index.class"> *************** *** 105,108 **** --- 111,115 ---- <define name="local.refentry.class"> + <notAllowed/> </define> <define name="refentry.class"> *************** *** 112,115 **** --- 119,123 ---- <define name="local.nav.class"> + <notAllowed/> </define> <define name="nav.class"> *************** *** 142,145 **** --- 150,154 ---- <define name="local.divcomponent.mix"> + <notAllowed/> </define> <define name="divcomponent.mix"> *************** *** 160,163 **** --- 169,173 ---- <define name="local.refcomponent.mix"> + <notAllowed/> </define> <define name="refcomponent.mix"> *************** *** 178,181 **** --- 188,192 ---- <define name="local.indexdivcomponent.mix"> + <notAllowed/> </define> <define name="indexdivcomponent.mix"> *************** *** 196,206 **** <define name="local.refname.char.mix"> </define> <define name="refname.char.mix"> ! <ref name="#PCDATA.element"/> ! <ref name="tech.char.class"/> </define> <define name="local.partcontent.mix"> </define> <define name="partcontent.mix"> --- 207,225 ---- <define name="local.refname.char.mix"> + <notAllowed/> </define> + <define name="refname.char.mix"> ! <mixed> ! <zeroOrMore> ! <choice> ! <ref name="tech.char.class"/> ! </choice> ! </zeroOrMore> ! </mixed> </define> <define name="local.partcontent.mix"> + <notAllowed/> </define> <define name="partcontent.mix"> *************** *** 216,240 **** <define name="local.refinline.char.mix"> </define> <define name="refinline.char.mix"> ! <ref name="#PCDATA.element"/> ! <ref name="xref.char.class"/> ! <ref name="gen.char.class"/> ! <ref name="link.char.class"/> ! <ref name="tech.char.class"/> ! <ref name="base.char.class"/> ! <ref name="docinfo.char.class"/> ! <ref name="other.char.class"/> ! <ref name="ndxterm.class"/> ! <ref name="beginpage.element"/> ! <ref name="local.refinline.char.mix"/> </define> <define name="local.refclass.char.mix"> </define> <define name="refclass.char.mix"> ! <ref name="#PCDATA.element"/> ! <ref name="application.element"/> ! <ref name="local.refclass.char.mix"/> </define> --- 235,271 ---- <define name="local.refinline.char.mix"> + <notAllowed/> </define> <define name="refinline.char.mix"> ! <mixed> ! <zeroOrMore> ! <choice> ! <ref name="xref.char.class"/> ! <ref name="gen.char.class"/> ! <ref name="link.char.class"/> ! <ref name="tech.char.class"/> ! <ref name="base.char.class"/> ! <ref name="docinfo.char.class"/> ! <ref name="other.char.class"/> ! <ref name="ndxterm.class"/> ! <ref name="beginpage.element"/> ! <ref name="local.refinline.char.mix"/> ! </choice> ! </zeroOrMore> ! </mixed> </define> <define name="local.refclass.char.mix"> + <notAllowed/> </define> <define name="refclass.char.mix"> ! <mixed> ! <zeroOrMore> ! <choice> ! <ref name="application.element"/> ! <ref name="local.refclass.char.mix"/> ! </choice> ! </zeroOrMore> ! </mixed> </define> *************** *** 436,440 **** <optional> <attribute name="contents"> ! <data type="xsd:IDREFS"/> </attribute> </optional> --- 467,471 ---- <optional> <attribute name="contents"> ! <data type="IDREFS"/> </attribute> </optional> *************** *** 556,560 **** <optional> <attribute name="contents"> ! <data type="xsd:IDREFS"/> </attribute> </optional> --- 587,591 ---- <optional> <attribute name="contents"> ! <data type="IDREFS"/> </attribute> </optional> *************** *** 731,735 **** <define name="tocfront.attlist"> <ref name="label.attrib"/> ! <ref name="linkend.attrib"/> %pagenum.attrib; <ref name="common.attrib"/> <ref name="tocfront.role.attrib"/> --- 762,767 ---- <define name="tocfront.attlist"> <ref name="label.attrib"/> ! <ref name="linkend.attrib"/> ! <ref name="pagenum.attrib"/> <ref name="common.attrib"/> <ref name="tocfront.role.attrib"/> *************** *** 767,771 **** <dtd:marked-section start="tocentry.attlist"/> <define name="tocentry.attlist"> ! <ref name="linkend.attrib"/> %pagenum.attrib; <ref name="common.attrib"/> <ref name="tocentry.role.attrib"/> --- 799,804 ---- <dtd:marked-section start="tocentry.attlist"/> <define name="tocentry.attlist"> ! <ref name="linkend.attrib"/> ! <ref name="pagenum.attrib"/> <ref name="common.attrib"/> <ref name="tocentry.role.attrib"/> *************** *** 1047,1051 **** <define name="tocback.attlist"> <ref name="label.attrib"/> ! <ref name="linkend.attrib"/> %pagenum.attrib; <ref name="common.attrib"/> <ref name="tocback.role.attrib"/> --- 1080,1085 ---- <define name="tocback.attlist"> <ref name="label.attrib"/> ! <ref name="linkend.attrib"/> ! <ref name="pagenum.attrib"/> <ref name="common.attrib"/> <ref name="tocback.role.attrib"/> *************** *** 2419,2426 **** <attribute name="renderas"> <choice> ! <string>sect2</string> ! <string>sect3</string> ! <string>sect4</string> ! <string>sect5</string> </choice> </attribute> --- 2453,2460 ---- <attribute name="renderas"> <choice> ! <value>sect2</value> ! <value>sect3</value> ! <value>sect4</value> ! <value>sect5</value> </choice> </attribute> *************** *** 2513,2520 **** <attribute name="renderas"> <choice> ! <string>sect1</string> ! <string>sect3</string> ! <string>sect4</string> ! <string>sect5</string> </choice> </attribute> --- 2547,2554 ---- <attribute name="renderas"> <choice> ! <value>sect1</value> ! <value>sect3</value> ! <value>sect4</value> ! <value>sect5</value> </choice> </attribute> *************** *** 2607,2614 **** <attribute name="renderas"> <choice> ! <string>sect1</string> ! <string>sect2</string> ! <string>sect4</string> ! <string>sect5</string> </choice> </attribute> --- 2641,2648 ---- <attribute name="renderas"> <choice> ! <value>sect1</value> ! <value>sect2</value> ! <value>sect4</value> ! <value>sect5</value> </choice> </attribute> *************** *** 2701,2708 **** <attribute name="renderas"> <choice> ! <string>sect1</string> ! <string>sect2</string> ! <string>sect3</string> ! <string>sect5</string> </choice> </attribute> --- 2735,2742 ---- <attribute name="renderas"> <choice> ! <value>sect1</value> ! <value>sect2</value> ! <value>sect3</value> ! <value>sect5</value> </choice> </attribute> *************** *** 2789,2796 **** <attribute name="renderas"> <choice> ! <string>sect1</string> ! <string>sect2</string> ! <string>sect3</string> ! <string>sect4</string> </choice> </attribute> --- 2823,2830 ---- <attribute name="renderas"> <choice> ! <value>sect1</value> ! <value>sect2</value> ! <value>sect3</value> ! <value>sect4</value> </choice> </attribute> *************** *** 3272,3276 **** <dtd:marked-section start="primaryie.attlist"/> <define name="primaryie.attlist"> ! <ref name="linkends.attrib"/> %common.attrib; <ref name="primsecterie.role.attrib"/> <ref name="local.primsecterie.attrib"/> --- 3306,3311 ---- <dtd:marked-section start="primaryie.attlist"/> <define name="primaryie.attlist"> ! <ref name="linkends.attrib"/> ! <ref name="common.attrib"/> <ref name="primsecterie.role.attrib"/> <ref name="local.primsecterie.attrib"/> *************** *** 3296,3300 **** <dtd:marked-section start="secondaryie.attlist"/> <define name="secondaryie.attlist"> ! <ref name="linkends.attrib"/> %common.attrib; <ref name="primsecterie.role.attrib"/> <ref name="local.primsecterie.attrib"/> --- 3331,3336 ---- <dtd:marked-section start="secondaryie.attlist"/> <define name="secondaryie.attlist"> ! <ref name="linkends.attrib"/> ! <ref name="common.attrib"/> <ref name="primsecterie.role.attrib"/> <ref name="local.primsecterie.attrib"/> *************** *** 3320,3324 **** <dtd:marked-section start="tertiaryie.attlist"/> <define name="tertiaryie.attlist"> ! <ref name="linkends.attrib"/> %common.attrib; <ref name="primsecterie.role.attrib"/> <ref name="local.primsecterie.attrib"/> --- 3356,3361 ---- <dtd:marked-section start="tertiaryie.attlist"/> <define name="tertiaryie.attlist"> ! <ref name="linkends.attrib"/> ! <ref name="common.attrib"/> <ref name="primsecterie.role.attrib"/> <ref name="local.primsecterie.attrib"/> *************** *** 3356,3360 **** <dtd:marked-section start="seeie.attlist"/> <define name="seeie.attlist"> ! <ref name="linkend.attrib"/> %common.attrib; <ref name="seeie.role.attrib"/> <ref name="local.seeie.attrib"/> --- 3393,3398 ---- <dtd:marked-section start="seeie.attlist"/> <define name="seeie.attlist"> ! <ref name="linkend.attrib"/> ! <ref name="common.attrib"/> <ref name="seeie.role.attrib"/> <ref name="local.seeie.attrib"/> *************** *** 3391,3395 **** <dtd:marked-section start="seealsoie.attlist"/> <define name="seealsoie.attlist"> ! <ref name="linkends.attrib"/> %common.attrib; <ref name="seealsoie.role.attrib"/> <ref name="local.seealsoie.attrib"/> --- 3429,3434 ---- <dtd:marked-section start="seealsoie.attlist"/> <define name="seealsoie.attlist"> ! <ref name="linkends.attrib"/> ! <ref name="common.attrib"/> <ref name="seealsoie.role.attrib"/> <ref name="local.seealsoie.attrib"/> *************** *** 3981,3990 **** <attribute name="class"> <choice> ! <string>journalarticle</string> ! <string>productsheet</string> ! <string>whitepaper</string> ! <string>techreport</string> ! <string>specification</string> ! <string>faq</string> </choice> </attribute> --- 4020,4029 ---- <attribute name="class"> <choice> ! <value>journalarticle</value> ! <value>productsheet</value> ! <value>whitepaper</value> ! <value>techreport</value> ! <value>specification</value> ! <value>faq</value> </choice> </attribute> *************** *** 3992,3996 **** <optional> <attribute name="parentbook"> ! <data type="xsd:IDREF"/> </attribute> </optional> --- 4031,4035 ---- <optional> <attribute name="parentbook"> ! <data type="IDREF"/> </attribute> </optional> Index: dbnotn.rng =================================================================== RCS file: /cvsroot/docbook/docbook/relaxng/dbnotn.rng,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** dbnotn.rng 2001/06/07 16:17:48 1.1 --- dbnotn.rng 2001/06/08 14:35:00 1.2 *************** *** 1,6 **** ! <grammar xmlns="http://www.thaiopensource.com/trex" ! xmlns:xsd="http://www.w3.org/2000/10/XMLSchema" ! xmlns:dtd="http://www.oasis-open.org/docbook/dtd" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> --- 1,7 ---- ! <?xml version="1.0"?> ! <grammar xmlns="http://relaxng.org/ns/structure/0.9" ! datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ! xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> *************** *** 58,87 **** <define name="notation.class"> <choice> ! <string>BMP</string> ! <string>CGM-CHAR</string> ! <string>CGM-BINARY</string> ! <string>CGM-CLEAR</string> ! <string>DITROFF</string> ! <string>DVI</string> ! <string>EPS</string> ! <string>EQN</string> ! <string>FAX</string> ! <string>GIF</string> ! <string>GIF87a</string> ! <string>GIF89a</string> ! <string>JPG</string> ! <string>JPEG</string> ! <string>IGES</string> ! <string>PCX</string> ! <string>PIC</string> ! <string>PNG</string> ! <string>PS</string> ! <string>SGML</string> ! <string>TBL</string> ! <string>TEX</string> ! <string>TIFF</string> ! <string>WMF</string> ! <string>WPG</string> ! <string>linespecific</string> <ref name="local.notation.class"/> </choice> --- 59,88 ---- <define name="notation.class"> <choice> ! <value>BMP</value> ! <value>CGM-CHAR</value> ! <value>CGM-BINARY</value> ! <value>CGM-CLEAR</value> ! <value>DITROFF</value> ! <value>DVI</value> ! <value>EPS</value> ! <value>EQN</value> ! <value>FAX</value> ! <value>GIF</value> ! <value>GIF87a</value> ! <value>GIF89a</value> ! <value>JPG</value> ! <value>JPEG</value> ! <value>IGES</value> ! <value>PCX</value> ! <value>PIC</value> ! <value>PNG</value> ! <value>PS</value> ! <value>SGML</value> ! <value>TBL</value> ! <value>TEX</value> ! <value>TIFF</value> ! <value>WMF</value> ! <value>WPG</value> ! <value>linespecific</value> <ref name="local.notation.class"/> </choice> Index: dbpool.rng =================================================================== RCS file: /cvsroot/docbook/docbook/relaxng/dbpool.rng,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** dbpool.rng 2001/06/07 16:17:48 1.1 --- dbpool.rng 2001/06/08 14:35:00 1.2 *************** *** 1,7 **** <?xml version="1.0"?> ! <grammar xmlns="http://www.thaiopensource.com/trex" ! xmlns:xsd="http://www.w3.org/2000/10/XMLSchema" ! xmlns:dtd="http://www.oasis-open.org/docbook/dtd" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> <dtd:comment> DocBook XML information pool module V4.1.2 ............................. </dtd:comment> --- 1,8 ---- <?xml version="1.0"?> ! <grammar xmlns="http://relaxng.org/ns/structure/0.9" [...1845 lines suppressed...] <attribute name="startref"> ! <data type="xsd:IDREF"/> </attribute> </optional> <optional> <attribute name="zone"> ! <data type="xsd:IDREFS"/> </attribute> </optional> --- 11424,11433 ---- <optional> <attribute name="startref"> ! <data type="IDREF"/> </attribute> </optional> <optional> <attribute name="zone"> ! <data type="IDREFS"/> </attribute> </optional> Index: docbook.rng =================================================================== RCS file: /cvsroot/docbook/docbook/relaxng/docbook.rng,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** docbook.rng 2001/06/07 16:17:48 1.1 --- docbook.rng 2001/06/08 14:35:00 1.2 *************** *** 1,6 **** ! <grammar xmlns="http://www.thaiopensource.com/trex" ! xmlns:xsd="http://www.w3.org/2000/10/XMLSchema" ! xmlns:dtd="http://www.oasis-open.org/docbook/dtd" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> --- 1,7 ---- ! <?xml version="1.0"?> ! <grammar xmlns="http://relaxng.org/ns/structure/0.9" ! datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ! xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations" ! ns=""> <dtd:comment> ...................................................................... </dtd:comment> *************** *** 9,13 **** <dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc., ! O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, and the Organization for the Advancement of Structured Information Standards (OASIS). --- 10,14 ---- <dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc., ! O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, and the Organization for the Advancement of Structured Information Standards (OASIS). *************** *** 44,48 **** declaration: ! <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" [...]> --- 45,49 ---- declaration: ! <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" [...]> *************** *** 51,55 **** use the FPI in the parameter entity declaration: ! <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"> %DocBookDTD; --- 52,56 ---- use the FPI in the parameter entity declaration: ! <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"> %DocBookDTD; *************** *** 72,75 **** --- 73,78 ---- <dtd:marked-section end="dbnotn.module"/> + <include href="dbnotn.rng"/> + <dtd:comment> ...................................................................... </dtd:comment> <dtd:comment> ISO character entity sets ............................................ </dtd:comment> *************** *** 84,87 **** --- 87,92 ---- <dtd:marked-section end="dbcent.module"/> + <include href="dbcent.rng"/> + <dtd:comment> ...................................................................... </dtd:comment> <dtd:comment> DTD modules .......................................................... </dtd:comment> *************** *** 97,100 **** --- 102,107 ---- <dtd:marked-section end="dbpool.module"/> + <include href="dbpool.rng"/> + <dtd:comment> Redeclaration placeholder ..... </dtd:comment> *************** *** 115,118 **** --- 122,127 ---- <dtd:pe-ref name="dbhier"/> <dtd:marked-section end="dbhier.module"/> + + <include href="dbhier.rng"/> <dtd:comment> ...................................................................... </dtd:comment> |