cvs: phpdoc(dev_docbook4) /dbxml 40chg.txt 41chg.txt COPYRIGHT ChangeLog README VERSION calstblx.dtd dbcentx.mod dbgenent.ent dbgenent.mod dbhierx.mod
dbnotnx.mod dbpoolx.mod dbtblcals.dtd dbtblxchg.dtd docbook.cat docbookx.dtd readme.txt soextblx.dtd tblcals.xml tblxchg.xml test.xml /dbxml/ent
iso-amsa.ent iso-amsb.ent iso-amsc.ent iso-amsn.ent iso-amso.ent iso-amsr.ent iso-box.ent iso-cyr1.ent iso-cyr2.ent iso-dia.ent iso-grk1.ent
iso-grk2.ent iso-grk3.ent iso-grk4.ent iso-lat1.ent iso-lat2.ent iso-num.ent iso-pub.ent iso-tech.ent

hholzgra Sun Nov 11 08:58:15 2001 EDT Added files: (Branch: dev_docbook4) /phpdoc/dbxml 40chg.txt 41chg.txt dbgenent.mod docbook.cat readme.txt Removed files: /phpdoc/dbxml COPYRIGHT README VERSION dbgenent.ent dbtblcals.dtd dbtblxchg.dtd tblcals.xml tblxchg.xml test.xml Modified files: /phpdoc/dbxml ChangeLog calstblx.dtd dbcentx.mod dbhierx.mod dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd /phpdoc/dbxml/ent iso-amsa.ent iso-amsb.ent iso-amsc.ent iso-amsn.ent iso-amso.ent iso-amsr.ent iso-box.ent iso-cyr1.ent iso-cyr2.ent iso-dia.ent iso-grk1.ent iso-grk2.ent iso-grk3.ent iso-grk4.ent iso-lat1.ent iso-lat2.ent iso-num.ent iso-pub.ent iso-tech.ent Log: DTD updated to official OASIS version 4.1.2

Index: phpdoc/dbxml/ChangeLog diff -u phpdoc/dbxml/ChangeLog:1.2 phpdoc/dbxml/ChangeLog:1.2.6.1 --- phpdoc/dbxml/ChangeLog:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/ChangeLog Sun Nov 11 08:58:14 2001 @@ -1,249 +1,101 @@ -1999-11-10 Norman Walsh <ndw@nwalsh.com> +2000-08-12 Norman Walsh <ndw@nwalsh.com> - * COPYRIGHT, README, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, test.xml: - Updated version numbers - - * VERSION: Version 3.1.7 released - - * dbpoolx.mod: Finally wrote a program to compare the SGML and XML DTDs. Oh my! - Added informalfigure to a number of contexts where it was missing - Changed the format attribute on graphics back into a notation list - (why had I made it CDATA?) - Tweaked the parameterization of table attributes, this restores the 'role' - attribute to 'entry', 'row', and perhaps a few other places where it - was missing. - Added journal, series, set, and manuscript as values for the pubwork - attribute on citetitle - Removed extraneous '?' from the declaration for indexterm. Indexterms - are not allowed to be empty! - -1999-10-19 Norman Walsh <ndw@nwalsh.com> - - * COPYRIGHT, README, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, test.xml: - Updated version numbers - - * VERSION: Version 3.1.6 released + * 40chg.txt: Updated; changed version number - * dbhierx.mod, dbpoolx.mod: Added missing mediaobject/inlinemediaobject elements + * 41chg.txt, readme.txt: Updated; changed version number, release date - * soextblx.dtd: Official OASIS table model: TR9901:1999 + * calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat: + Changed version number -1999-08-26 Norman Walsh <ndw@nwalsh.com> + * docbookx.dtd: DocBook XML V4.1.1 released - * COPYRIGHT, README, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, soextblx.dtd, test.xml: - Updated version number +2000-07-06 Norman Walsh <ndw@nwalsh.com> - * VERSION: Version 3.1.5 released + * 40chg.txt, 41chg.txt, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, readme.txt: + Changed version numbers to 4.1.1beta1 - * dbpoolx.mod: Fixed a number of erroneous comments - Added constant and varname to tech.char.class - Changed "VarName" to "varname" - Changed %argpagenums to %artpagenums + * docbook.cat: Fixed incorrect system identifiers -1999-06-04 Norman Walsh <ndw@nwalsh.com> + * docbookx.dtd: Version 4.1.1beta1 released - * COPYRIGHT, README, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, soextblx.dtd, test.xml: - Updated version numbers - - * VERSION: Version 3.1.4 released - - * dbhierx.mod: Made artheader optional - - * dbpoolx.mod: Fix common attribute problem on informaltable a different way +2000-06-19 Norman Walsh <ndw@nwalsh.com> - * dbpoolx.mod: The common.attrib PE was missing from informaltable - - * dbpoolx.mod: Reformulated parameterization of table attributes (again) to get it right. - - * dbtblcals.dtd, dbtblxchg.dtd, tblcals.xml, tblxchg.xml: - New file. + * 40chg.txt: Added notes about comment and interfacedefinition -1999-03-31 Norman Walsh <ndw@nwalsh.com> + * 41chg.txt: New file. - * COPYRIGHT, README, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, soextblx.dtd, test.xml: - Changed version number to 3.1.3 + * calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.dtd, readme.txt: + Updated version numbers to 4.1 - * VERSION: Version 3.1.3 released - - * dbhierx.mod, dbpoolx.mod, docbookx.dtd: Added param. ent. decls. to make IE5 happy. - -1999-03-19 Norman Walsh <ndw@nwalsh.com> - - * COPYRIGHT, README, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, soextblx.dtd, test.xml: - Updated version number to 3.1.2 - - * VERSION: Version 3.1.2 released - - * dbpoolx.mod: Changed my mind, CALS has to be the default table model - -1999-03-17 Norman Walsh <ndw@nwalsh.com> - - * README: Updated manifest - - * VERSION: Version 3.1.1 released - - This release introduces several significant changes: - - - An XML version of the OASIS Exchange Table Model - is used in favor of the full CALS model. This can - be "toggled" back with a single parameter entity - change - - - The version number has changed dramatically to make - it clear that it tracks 3.1. (Version 1.3 of the - XML version of DocBook 3.1 was just too confusing!) - - - I added parameter entities to include/exclude the - dbcentx.mod and dbnotnx.mod modules all at once - - - Fixed a few small content model bugs + * dbgenent.ent: Fixed FPI; added 'XML' - * docbookx.dtd: Added marked sections around dbnotn and dbcent modules + * dbhierx.mod: Removed 4.0 future use comments -1999-03-16 Norman Walsh <ndw@nwalsh.com> + * dbpoolx.mod: Removed 4.0 future use comments; fixed table model selection comment; fixed 'Norman Walsh' FPIs - * dbpoolx.mod: In the XML exchange table model case, the attlist for informaltable was wrong + * docbook.cat: New file. -1999-03-11 Norman Walsh <ndw@nwalsh.com> +2000-05-18 Norman Walsh <ndw@nwalsh.com> - * calstblx.dtd: Removed unused PEs + * 40chg.txt, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt: + Removed references to beta6 - * dbpoolx.mod: Added switch for exchange or CALS table model; made exchange the default + * docbookx.dtd: DocBook XML V4.0 released. - * soextblx.dtd: New file. +2000-04-10 Norman Walsh <ndw@nwalsh.com> -1999-03-06 Norman Walsh <ndw@nwalsh.com> + * 40chg.txt, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt: + Updated release date and version to 4.0beta6 - * COPYRIGHT, README, calstblx.dtd, dbgenent.ent, docbookx.dtd: - Changed version number to 3.1.1 + * dbpoolx.mod: Added support for EBNF hook; fixed equation content bug - * changes: Replaced by ChangeLog +2000-04-03 Norman Walsh <ndw@nwalsh.com> - * db3xml.dtd, docbookx.dtd: Renamed db3xml.dtd to docbookx.dtd + * 40chg.txt: Added note about renaming DocInfo to *Info. - * dbcentx.mod: Fixed broken public identifiers. Changed version number to 3.1.1 - - * dbhierx.mod: Fixed bug: added section to %bookcomponent.content; - Changed version number to 3.1.1. - - * dbnotnx.mod: Changed the PUBLIC identifiers that were just a single word (like - "DITROFF") back into SYSTEM identifiers. I don't know why I made - the PUBLIC in the first place. - Changed version number to 3.1.1 - - * dbpoolx.mod: Fixed bug: added qandaset to %compound.class; - Fixed bug: added citetitle to %bibliocomponent.mix; - Changed version to 3.1.1 - - * test.xml: Changed version number to 3.1.1; changed system identifier - -1999-01-31 Norman Walsh <ndw@nwalsh.com> - - * COPYRIGHT, README, calstblx.dtd, db3xml.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, test.xml: - Converted version to 1.3 - - * VERSION: Version 1.3 released. - Based on DocBook 3.1. - Public identifiers now contain the string "DocBk XML" instead of - just "DocBk30 XML". - - * db3xml.dtd: Added dbnotnx.mod; added notations back into the DTD. Notations don't - require system identifiers, so the public IDs will be just fine. - - Moved ISO character entity declarations into dbcentx.mod. Added - Unicode versions of the entity sets to the distribution. - - * dbcentx.mod, dbnotnx.mod: New file. - - * dbhierx.mod: Converted to DocBook 3.1: - - - Add 'faq' as a class value to Article - - Cleaned up, and significantly loosened, the content model of Book. - - Added Colophon to Book. - - Add LinkEnd to LoTEntry. - - Sets are no longer required to contain at least two books. - - Added recursive Divisions. - - Added Subtitle to divisions (Set, Book, etc.), components, and - sections. It may occur outside of *Info elements. - - Added Title, TitleAbbrev, and SubTitle outside ArtHeader; ArtHeader - is now optional. - - Parameterized element and attribute declarations separately. - - * dbpoolx.mod: Converted to DocBook 3.1: - - - Added optional title to MsgSet - - Added inline Constant for marking up constants and limits - - Added inline VarName for marking up variable names - - Added several elements to the content model of ArtHeader that were - accidentally left out in 3.0: Graphic, LegalNotice, ModeSpec, - SubjectSet, KeywordSet, and ITermSet. - - Added pagewide attribute to Figure, added InformalFigure - - Added person name elements to Address. - - Added Class attribute to LiteralLayout indicating Monospaced or - Normal font. - - Added ULink to docinfo.char.mix. - - Added RevHistory to GlossEntry. - - Added CmdLength attribute to CmdSynopsis to indicate Command length - - Added QAndASet, MediaObject, and InlineMediaObject. - - Parameterized element and attribute declarations separately. - -1999-01-30 Norman Walsh <ndw@nwalsh.com> - - * COPYRIGHT: Moved install info to README, updated year & URL - - * README: Changed version, added manifest and installation instructions, updated year + * 40chg.txt, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt: + Updated version numbers - * VERSION: Updated version +2000-03-30 Norman Walsh <ndw@nwalsh.com> - * calstblx.dtd: Changed version number + * dbpoolx.mod: Removed beginpage from highlights.mix; it's excluded in the SGML version. - * db3xml.dtd, dbgenent.ent, dbhierx.mod, dbpoolx.mod: Changed version +2000-03-24 Norman Walsh <ndw@nwalsh.com> - * test.xml: Added glossary test, fixed indexterm example + * 40chg.txt, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt: + Updated version numbers -1999-01-13 Norman Walsh <ndw@nwalsh.com> + * dbefsyn.mod: Removed - * dbhierx.mod: Added indexterms to RefEntry and RefMeta + * dbpoolx.mod: Removed ELEMENT from comments to ease text searching of the DTD. + Merged dbefsyn.mod into dbpoolx.mod + Added Modifier as an optional element at the end of MethodSynopsis + and MethodParam. - * dbpoolx.mod: Added indexterm to glossentry between glossterm and glossdef. +2000-03-07 Norman Walsh <ndw@nwalsh.com> -1998-12-09 Norman Walsh <ndw@nwalsh.com> + * 40chg.txt: New file. - * COPYRIGHT, README, calstblx.dtd, db3xml.dtd, dbgenent.ent, dbhierx.mod, dbpoolx.mod, test.xml: - Changed embedded version number to 1.1 + * 40chg.txt, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt, soextblx.dtd: + Updated internal versions to beta3 - * VERSION: Version 1.1 released. +2000-03-03 Norman Walsh <ndw@nwalsh.com> - * VERSION: New file. + * dbpoolx.mod: Removed erroneous comment about inline synopses - * calstblx.dtd: Ripped out a whole bunch of comments. In XML, parameter - entities are expanded in comments and that made some of the - comments bogus. +2000-03-02 Norman Walsh <ndw@nwalsh.com> - * dbhierx.mod: Added indexterms to refinline.char.mix. + * calstblx.dtd, dbcentx.mod, dbefsyn.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt, soextblx.dtd: + New file. - * dbpoolx.mod: Added indexterm and beginpage to example.mix, highlights.mix, - admon.mix, figure.mix, glossdef.mix, legalnotice.mix. + * dbefsyn.mod, dbpoolx.mod: Added ooclass, oointerface, and ooexception as wrappers for modifiers + and names in classsynopsis. Also allow them inline. - Allow indexterms between title and para in formalpara. - - Added indexterms to tbl.table.mdl, between title and the rest of - the content of table. - - Removed a few extraneous parameter entities (exclusions in - tables, mostly). - - * test.xml: Change systemid; added test indexterms + Fixed SGML PE parsing problem with hook PEs. -1998-09-16 Norman Walsh <ndw@nwalsh.com> + * dbhierx.mod, dbpoolx.mod: Added hook PEs for future module extension - * db3xml.dtd: Changed declaration of linespecific; former declaration - was not a valid URI + * dbpoolx.mod: Removed unused PEs for equation content - * dbpoolx.mod: Removed duplicate declaration of local.keywordset.attrib - -1998-09-10 Norman Walsh <ndw@nwalsh.com> - - * COPYRIGHT, README, calstblx.dtd, changes, db3xml.dtd, dbgenent.ent, dbhierx.mod, dbpoolx.mod, test.xml: - New file. + * dbpoolx.mod: Made primary optional (XML has no #CONREF) Index: phpdoc/dbxml/calstblx.dtd diff -u phpdoc/dbxml/calstblx.dtd:1.2 phpdoc/dbxml/calstblx.dtd:1.2.6.1 --- phpdoc/dbxml/calstblx.dtd:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/calstblx.dtd Sun Nov 11 08:58:14 2001 @@ -1,17 +1,40 @@ -<!-- ====================================================================== --> -<!-- CALS Table Model XML V3.1.7 - Part of the DocBk XML V3.1.7 DTD - http://nwalsh.com/docbook/xml/ - - See COPYRIGHT for more information - - Please direct all questions and comments about this DTD to - Norman Walsh, <ndw@nwalsh.com>. +<!-- ...................................................................... --> +<!-- DocBook XML CALS Table Model V4.1.2 .................................... --> +<!-- File calstblx.mod .................................................... --> + +<!-- 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). This DTD is based on the CALS Table Model PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" - --> -<!-- ====================================================================== --> + + $Id: calstblx.dtd,v 1.2.6.1 2001/11/11 13:58:14 hholzgra Exp $ + + Permission to use, copy, modify and distribute the DocBook XML DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook XML DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + 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/docbook/. +--> + +<!-- ...................................................................... --> + +<!-- This module contains the definitions for the CALS Table Model + converted to XML. +--> <!-- These definitions are not directly related to the table model, but are used in the default CALS table model and are usually defined elsewhere @@ -172,5 +195,5 @@ %secur; > -<!-- End of CALS Table Model XML V3.1.7 ..................................... --> +<!-- End of DocBook XML CALS Table Model V4.1.2 ............................. --> <!-- ...................................................................... --> Index: phpdoc/dbxml/dbcentx.mod diff -u phpdoc/dbxml/dbcentx.mod:1.2 phpdoc/dbxml/dbcentx.mod:1.2.6.1 --- phpdoc/dbxml/dbcentx.mod:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/dbcentx.mod Sun Nov 11 08:58:14 2001 @@ -1,14 +1,52 @@ -<!-- ====================================================================== --> -<!-- DocBk XML Character Entity Sets V3.1.7 - Part of the DocBk XML V3.1.7 DTD - http://nwalsh.com/docbook/xml/ - - See COPYRIGHT for more information - - Please direct all questions and comments about this DTD to - Norman Walsh, <ndw@nwalsh.com>. - --> -<!-- ====================================================================== --> +<!-- ...................................................................... --> +<!-- DocBook XML character entities module V4.1.2 ........................... --> +<!-- File dbcentx.mod ..................................................... --> + +<!-- 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). + + $Id: dbcentx.mod,v 1.2.6.1 2001/11/11 13:58:14 hholzgra Exp $ + + Permission to use, copy, modify and distribute the DocBook XML DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook XML DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + 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/docbook/. +--> + +<!-- ...................................................................... --> + +<!-- This module contains the entity declarations for the standard ISO + entity sets used by DocBook. + + In DTD driver files referring to this module, please use an entity + declaration that uses the public identifier shown below: + + <!ENTITY % dbcent PUBLIC + "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" + "dbcentx.mod"> + %dbcent; + + See the documentation for detailed information on the parameter + entity and module scheme used in DocBook, customizing DocBook and + planning for interchange, and changes made since the last release + of DocBook. +--> + +<!-- ...................................................................... --> <!ENTITY % ISOamsa.module "INCLUDE"> <![%ISOamsa.module;[ @@ -162,5 +200,5 @@ %ISOtech; <!--end of ISOtech.module-->]]> -<!-- End of DocBk XML character entity sets module V3.1.7 ................... --> +<!-- End of DocBook XML character entity sets module V4.1.2 ................. --> <!-- ...................................................................... --> Index: phpdoc/dbxml/dbhierx.mod diff -u phpdoc/dbxml/dbhierx.mod:1.2 phpdoc/dbxml/dbhierx.mod:1.2.6.1 --- phpdoc/dbxml/dbhierx.mod:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/dbhierx.mod Sun Nov 11 08:58:14 2001 @@ -1,14 +1,57 @@ -<!-- ====================================================================== --> -<!-- DocBk XML Document Hierarchy V3.1.7 - Part of the DocBk XML V3.1.7 DTD - http://nwalsh.com/docbook/xml/ - - See COPYRIGHT for more information - - Please direct all questions and comments about this DTD to - Norman Walsh, <ndw@nwalsh.com>. - --> -<!-- ====================================================================== --> +<!-- ...................................................................... --> +<!-- DocBook XML document hierarchy module V4.1.2 ........................... --> +<!-- File dbhierx.mod ..................................................... --> + +<!-- 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). + + $Id: dbhierx.mod,v 1.2.6.1 2001/11/11 13:58:14 hholzgra Exp $ + + Permission to use, copy, modify and distribute the DocBook XML DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook XML DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + 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/docbook/. +--> + +<!-- ...................................................................... --> + +<!-- This module contains the definitions for the overall document + hierarchies of DocBook documents. It covers computer documentation + manuals and manual fragments, as well as reference entries (such as + man pages) and technical journals or anthologies containing + articles. + + This module depends on the DocBook information pool module. All + elements and entities referenced but not defined here are assumed + to be defined in the information pool module. + + In DTD driver files referring to this module, please use an entity + declaration that uses the public identifier shown below: + + <!ENTITY % dbhier PUBLIC + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" + "dbhierx.mod"> + %dbhier; + + See the documentation for detailed information on the parameter + entity and module scheme used in DocBook, customizing DocBook and + planning for interchange, and changes made since the last release + of DocBook. +--> <!-- ...................................................................... --> <!-- Entities for module inclusions ....................................... --> @@ -56,6 +99,10 @@ <!-- ...................................................................... --> <!-- Entities for element mixtures ........................................ --> +<!-- The DocBook TC may produce an official forms module for DocBook. --> +<!-- This PE provides the hook by which it can be inserted into the DTD. --> +<!ENTITY % forms.hook ""> + <!ENTITY % local.divcomponent.mix ""> <!ENTITY % divcomponent.mix "%list.class; |%admon.class; @@ -64,6 +111,7 @@ |%formal.class; |%compound.class; |%genobj.class; |%descobj.class; |%ndxterm.class; |beginpage + %forms.hook; %local.divcomponent.mix;"> <!ENTITY % local.refcomponent.mix ""> @@ -81,7 +129,7 @@ "itemizedlist|orderedlist|variablelist|simplelist |%linespecific.class; |%synop.class; |%para.class; |%informal.class; - |anchor|comment + |anchor|remark |%link.char.class; |beginpage %local.indexdivcomponent.mix;"> @@ -131,14 +179,8 @@ <!ENTITY % div.title.content "title, subtitle?, titleabbrev?"> -<!--FUTURE USE (V4.0): -...................... -The DocInfo element will be split out into ChapterInfo, AppendixInfo, -etc. -...................... ---> <!ENTITY % bookcomponent.title.content - "docinfo?, title, subtitle?, titleabbrev?"> + "title, subtitle?, titleabbrev?"> <!ENTITY % sect.title.content "title, subtitle?, titleabbrev?"> @@ -217,12 +259,6 @@ <![%book.content.module;[ <!ENTITY % book.module "INCLUDE"> <![%book.module;[ -<!--FUTURE USE (V4.0): -...................... -The %article.class; entity *may* be removed from the Book content model. -(Article may be made part of a new top-level document hierarchy.) -...................... ---> <!ENTITY % local.book.attrib ""> <!ENTITY % book.role.attrib "%role.attrib;"> @@ -256,11 +292,6 @@ <!ENTITY % bookinfo.module "INCLUDE"> <![%bookinfo.module;[ -<!--FUTURE USE (V4.0): -...................... -BookBiblio will be discarded. -...................... ---> <!ENTITY % local.bookinfo.attrib ""> <!ENTITY % bookinfo.role.attrib "%role.attrib;"> @@ -268,7 +299,7 @@ <![%bookinfo.element;[ <!ELEMENT bookinfo ((graphic | mediaobject | legalnotice | modespec | subjectset - | keywordset | itermset | %bibliocomponent.mix; | bookbiblio)+)> + | keywordset | itermset | %bibliocomponent.mix;)+)> <!--end of bookinfo.element-->]]> <!-- Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters, @@ -632,8 +663,12 @@ <!ENTITY % appendix.element "INCLUDE"> <![%appendix.element;[ -<!ELEMENT appendix ((%bookcomponent.title.content;), tocchap?, - (%bookcomponent.content;))> +<!ELEMENT appendix (appendixinfo?, + (%bookcomponent.title.content;), + (%nav.class;)*, + tocchap?, + (%bookcomponent.content;), + (%nav.class;)*)> <!--end of appendix.element-->]]> <!ENTITY % appendix.attlist "INCLUDE"> @@ -655,8 +690,12 @@ <!ENTITY % chapter.element "INCLUDE"> <![%chapter.element;[ -<!ELEMENT chapter ((%bookcomponent.title.content;), tocchap?, - (%bookcomponent.content;), (index | glossary | bibliography)*)> +<!ELEMENT chapter (chapterinfo?, + (%bookcomponent.title.content;), + (%nav.class;)*, + tocchap?, + (%bookcomponent.content;), + (%nav.class;)*)> <!--end of chapter.element-->]]> <!ENTITY % chapter.attlist "INCLUDE"> @@ -674,7 +713,7 @@ <!ENTITY % part.module "INCLUDE"> <![%part.module;[ -<!-- Note that Part was to have its content model reduced in V4.0. This +<!-- Note that Part was to have its content model reduced in V4.1.2. This change will not be made after all. --> <!ENTITY % local.part.attrib ""> @@ -682,7 +721,7 @@ <!ENTITY % part.element "INCLUDE"> <![%part.element;[ -<!ELEMENT part ((%bookcomponent.title.content;), partintro?, +<!ELEMENT part (partinfo?, (%bookcomponent.title.content;), partintro?, (%partcontent.mix;)+)> <!--end of part.element-->]]> @@ -706,8 +745,12 @@ <!ENTITY % preface.element "INCLUDE"> <![%preface.element;[ -<!ELEMENT preface ((%bookcomponent.title.content;), - (%bookcomponent.content;))> +<!ELEMENT preface (prefaceinfo?, + (%bookcomponent.title.content;), + (%nav.class;)*, + tocchap?, + (%bookcomponent.content;), + (%nav.class;)*)> <!--end of preface.element-->]]> <!ENTITY % preface.attlist "INCLUDE"> @@ -728,8 +771,9 @@ <!ENTITY % reference.element "INCLUDE"> <![%reference.element;[ -<!ELEMENT reference ((%bookcomponent.title.content;), partintro?, - (%refentry.class;)+)> +<!ELEMENT reference (referenceinfo?, + (%bookcomponent.title.content;), partintro?, + (%refentry.class;)+)> <!--end of reference.element-->]]> <!ENTITY % reference.attlist "INCLUDE"> @@ -769,27 +813,330 @@ <!-- ...................................................................... --> <!-- Other Info elements .................................................. --> -<!ENTITY % otherinfo.module "INCLUDE"> -<![%otherinfo.module;[ -<!ENTITY % local.otherinfo.attrib ""> -<!ENTITY % otherinfo.role.attrib "%role.attrib;"> +<!ENTITY % appendixinfo.module "INCLUDE"> +<![ %appendixinfo.module; [ +<!ENTITY % local.appendixinfo.attrib ""> +<!ENTITY % appendixinfo.role.attrib "%role.attrib;"> + +<!ENTITY % appendixinfo.element "INCLUDE"> +<![ %appendixinfo.element; [ +<!ELEMENT appendixinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of appendixinfo.element-->]]> + +<!ENTITY % appendixinfo.attlist "INCLUDE"> +<![ %appendixinfo.attlist; [ +<!ATTLIST appendixinfo + %common.attrib; + %appendixinfo.role.attrib; + %local.appendixinfo.attrib; +> +<!--end of appendixinfo.attlist-->]]> +<!--end of appendixinfo.module-->]]> + +<!ENTITY % bibliographyinfo.module "INCLUDE"> +<![ %bibliographyinfo.module; [ +<!ENTITY % local.bibliographyinfo.attrib ""> +<!ENTITY % bibliographyinfo.role.attrib "%role.attrib;"> + +<!ENTITY % bibliographyinfo.element "INCLUDE"> +<![ %bibliographyinfo.element; [ +<!ELEMENT bibliographyinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of bibliographyinfo.element-->]]> + +<!ENTITY % bibliographyinfo.attlist "INCLUDE"> +<![ %bibliographyinfo.attlist; [ +<!ATTLIST bibliographyinfo + %common.attrib; + %bibliographyinfo.role.attrib; + %local.bibliographyinfo.attrib; +> +<!--end of bibliographyinfo.attlist-->]]> +<!--end of bibliographyinfo.module-->]]> + +<!ENTITY % chapterinfo.module "INCLUDE"> +<![ %chapterinfo.module; [ +<!ENTITY % local.chapterinfo.attrib ""> +<!ENTITY % chapterinfo.role.attrib "%role.attrib;"> + +<!ENTITY % chapterinfo.element "INCLUDE"> +<![ %chapterinfo.element; [ +<!ELEMENT chapterinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of chapterinfo.element-->]]> + +<!ENTITY % chapterinfo.attlist "INCLUDE"> +<![ %chapterinfo.attlist; [ +<!ATTLIST chapterinfo + %common.attrib; + %chapterinfo.role.attrib; + %local.chapterinfo.attrib; +> +<!--end of chapterinfo.attlist-->]]> +<!--end of chapterinfo.module-->]]> + +<!ENTITY % glossaryinfo.module "INCLUDE"> +<![ %glossaryinfo.module; [ +<!ENTITY % local.glossaryinfo.attrib ""> +<!ENTITY % glossaryinfo.role.attrib "%role.attrib;"> + +<!ENTITY % glossaryinfo.element "INCLUDE"> +<![ %glossaryinfo.element; [ +<!ELEMENT glossaryinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of glossaryinfo.element-->]]> + +<!ENTITY % glossaryinfo.attlist "INCLUDE"> +<![ %glossaryinfo.attlist; [ +<!ATTLIST glossaryinfo + %common.attrib; + %glossaryinfo.role.attrib; + %local.glossaryinfo.attrib; +> +<!--end of glossaryinfo.attlist-->]]> +<!--end of glossaryinfo.module-->]]> + +<!ENTITY % indexinfo.module "INCLUDE"> +<![ %indexinfo.module; [ +<!ENTITY % local.indexinfo.attrib ""> +<!ENTITY % indexinfo.role.attrib "%role.attrib;"> + +<!ENTITY % indexinfo.element "INCLUDE"> +<![ %indexinfo.element; [ +<!ELEMENT indexinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of indexinfo.element-->]]> + +<!ENTITY % indexinfo.attlist "INCLUDE"> +<![ %indexinfo.attlist; [ +<!ATTLIST indexinfo + %common.attrib; + %indexinfo.role.attrib; + %local.indexinfo.attrib; +> +<!--end of indexinfo.attlist-->]]> +<!--end of indexinfo.module-->]]> + +<!ENTITY % setindexinfo.module "INCLUDE"> +<![ %setindexinfo.module; [ +<!ENTITY % local.setindexinfo.attrib ""> +<!ENTITY % setindexinfo.role.attrib "%role.attrib;"> + +<!ENTITY % setindexinfo.element "INCLUDE"> +<![ %setindexinfo.element; [ +<!ELEMENT setindexinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of setindexinfo.element-->]]> + +<!ENTITY % setindexinfo.attlist "INCLUDE"> +<![ %setindexinfo.attlist; [ +<!ATTLIST setindexinfo + %common.attrib; + %setindexinfo.role.attrib; + %local.setindexinfo.attrib; +> +<!--end of setindexinfo.attlist-->]]> +<!--end of setindexinfo.module-->]]> + +<!ENTITY % partinfo.module "INCLUDE"> +<![ %partinfo.module; [ +<!ENTITY % local.partinfo.attrib ""> +<!ENTITY % partinfo.role.attrib "%role.attrib;"> + +<!ENTITY % partinfo.element "INCLUDE"> +<![ %partinfo.element; [ +<!ELEMENT partinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of partinfo.element-->]]> + +<!ENTITY % partinfo.attlist "INCLUDE"> +<![ %partinfo.attlist; [ +<!ATTLIST partinfo + %common.attrib; + %partinfo.role.attrib; + %local.partinfo.attrib; +> +<!--end of partinfo.attlist-->]]> +<!--end of partinfo.module-->]]> + +<!ENTITY % prefaceinfo.module "INCLUDE"> +<![ %prefaceinfo.module; [ +<!ENTITY % local.prefaceinfo.attrib ""> +<!ENTITY % prefaceinfo.role.attrib "%role.attrib;"> + +<!ENTITY % prefaceinfo.element "INCLUDE"> +<![ %prefaceinfo.element; [ +<!ELEMENT prefaceinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of prefaceinfo.element-->]]> + +<!ENTITY % prefaceinfo.attlist "INCLUDE"> +<![ %prefaceinfo.attlist; [ +<!ATTLIST prefaceinfo + %common.attrib; + %prefaceinfo.role.attrib; + %local.prefaceinfo.attrib; +> +<!--end of prefaceinfo.attlist-->]]> +<!--end of prefaceinfo.module-->]]> + +<!ENTITY % refentryinfo.module "INCLUDE"> +<![ %refentryinfo.module; [ +<!ENTITY % local.refentryinfo.attrib ""> +<!ENTITY % refentryinfo.role.attrib "%role.attrib;"> + +<!ENTITY % refentryinfo.element "INCLUDE"> +<![ %refentryinfo.element; [ +<!ELEMENT refentryinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of refentryinfo.element-->]]> + +<!ENTITY % refentryinfo.attlist "INCLUDE"> +<![ %refentryinfo.attlist; [ +<!ATTLIST refentryinfo + %common.attrib; + %refentryinfo.role.attrib; + %local.refentryinfo.attrib; +> +<!--end of refentryinfo.attlist-->]]> +<!--end of refentryinfo.module-->]]> + +<!ENTITY % refsect1info.module "INCLUDE"> +<![ %refsect1info.module; [ +<!ENTITY % local.refsect1info.attrib ""> +<!ENTITY % refsect1info.role.attrib "%role.attrib;"> +<!ENTITY % refsect1info.element "INCLUDE"> +<![ %refsect1info.element; [ +<!ELEMENT refsect1info ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of refsect1info.element-->]]> -<!ENTITY % docinfo.element "INCLUDE"> -<![%docinfo.element;[ -<!ELEMENT docinfo ((graphic | mediaobject | legalnotice | modespec - | subjectset | keywordset | itermset | %bibliocomponent.mix;)+)> -<!--end of docinfo.element-->]]> +<!ENTITY % refsect1info.attlist "INCLUDE"> +<![ %refsect1info.attlist; [ +<!ATTLIST refsect1info + %common.attrib; + %refsect1info.role.attrib; + %local.refsect1info.attrib; +> +<!--end of refsect1info.attlist-->]]> +<!--end of refsect1info.module-->]]> + +<!ENTITY % refsect2info.module "INCLUDE"> +<![ %refsect2info.module; [ +<!ENTITY % local.refsect2info.attrib ""> +<!ENTITY % refsect2info.role.attrib "%role.attrib;"> + +<!ENTITY % refsect2info.element "INCLUDE"> +<![ %refsect2info.element; [ +<!ELEMENT refsect2info ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of refsect2info.element-->]]> -<!ENTITY % docinfo.attlist "INCLUDE"> -<![%docinfo.attlist;[ -<!ATTLIST docinfo +<!ENTITY % refsect2info.attlist "INCLUDE"> +<![ %refsect2info.attlist; [ +<!ATTLIST refsect2info %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; + %refsect2info.role.attrib; + %local.refsect2info.attrib; > -<!--end of docinfo.attlist-->]]> +<!--end of refsect2info.attlist-->]]> +<!--end of refsect2info.module-->]]> + +<!ENTITY % refsect3info.module "INCLUDE"> +<![ %refsect3info.module; [ +<!ENTITY % local.refsect3info.attrib ""> +<!ENTITY % refsect3info.role.attrib "%role.attrib;"> + +<!ENTITY % refsect3info.element "INCLUDE"> +<![ %refsect3info.element; [ +<!ELEMENT refsect3info ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of refsect3info.element-->]]> + +<!ENTITY % refsect3info.attlist "INCLUDE"> +<![ %refsect3info.attlist; [ +<!ATTLIST refsect3info + %common.attrib; + %refsect3info.role.attrib; + %local.refsect3info.attrib; +> +<!--end of refsect3info.attlist-->]]> +<!--end of refsect3info.module-->]]> +<!ENTITY % refsynopsisdivinfo.module "INCLUDE"> +<![ %refsynopsisdivinfo.module; [ +<!ENTITY % local.refsynopsisdivinfo.attrib ""> +<!ENTITY % refsynopsisdivinfo.role.attrib "%role.attrib;"> + +<!ENTITY % refsynopsisdivinfo.element "INCLUDE"> +<![ %refsynopsisdivinfo.element; [ +<!ELEMENT refsynopsisdivinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of refsynopsisdivinfo.element-->]]> + +<!ENTITY % refsynopsisdivinfo.attlist "INCLUDE"> +<![ %refsynopsisdivinfo.attlist; [ +<!ATTLIST refsynopsisdivinfo + %common.attrib; + %refsynopsisdivinfo.role.attrib; + %local.refsynopsisdivinfo.attrib; +> +<!--end of refsynopsisdivinfo.attlist-->]]> +<!--end of refsynopsisdivinfo.module-->]]> + +<!ENTITY % referenceinfo.module "INCLUDE"> +<![ %referenceinfo.module; [ +<!ENTITY % local.referenceinfo.attrib ""> +<!ENTITY % referenceinfo.role.attrib "%role.attrib;"> + +<!ENTITY % referenceinfo.element "INCLUDE"> +<![ %referenceinfo.element; [ +<!ELEMENT referenceinfo ((graphic | mediaobject + | legalnotice | modespec + | subjectset | keywordset | itermset + | %bibliocomponent.mix;)+)> +<!--end of referenceinfo.element-->]]> + +<!ENTITY % referenceinfo.attlist "INCLUDE"> +<![ %referenceinfo.attlist; [ +<!ATTLIST referenceinfo + %common.attrib; + %referenceinfo.role.attrib; + %local.referenceinfo.attrib; +> +<!--end of referenceinfo.attlist-->]]> +<!--end of referenceinfo.module-->]]> + +<!ENTITY % local.sect1info.attrib ""> +<!ENTITY % sect1info.role.attrib "%role.attrib;"> <!ENTITY % sect1info.element "INCLUDE"> <![%sect1info.element;[ @@ -801,11 +1148,13 @@ <![%sect1info.attlist;[ <!ATTLIST sect1info %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; + %sect1info.role.attrib; + %local.sect1info.attrib; > <!--end of sect1info.attlist-->]]> +<!ENTITY % local.sect2info.attrib ""> +<!ENTITY % sect2info.role.attrib "%role.attrib;"> <!ENTITY % sect2info.element "INCLUDE"> <![%sect2info.element;[ @@ -817,11 +1166,13 @@ <![%sect2info.attlist;[ <!ATTLIST sect2info %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; + %sect2info.role.attrib; + %local.sect2info.attrib; > <!--end of sect2info.attlist-->]]> +<!ENTITY % local.sect3info.attrib ""> +<!ENTITY % sect3info.role.attrib "%role.attrib;"> <!ENTITY % sect3info.element "INCLUDE"> <![%sect3info.element;[ @@ -833,11 +1184,13 @@ <![%sect3info.attlist;[ <!ATTLIST sect3info %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; + %sect3info.role.attrib; + %local.sect3info.attrib; > <!--end of sect3info.attlist-->]]> +<!ENTITY % local.sect4info.attrib ""> +<!ENTITY % sect4info.role.attrib "%role.attrib;"> <!ENTITY % sect4info.element "INCLUDE"> <![%sect4info.element;[ @@ -849,11 +1202,13 @@ <![%sect4info.attlist;[ <!ATTLIST sect4info %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; + %sect4info.role.attrib; + %local.sect4info.attrib; > <!--end of sect4info.attlist-->]]> +<!ENTITY % local.sect5info.attrib ""> +<!ENTITY % sect5info.role.attrib "%role.attrib;"> <!ENTITY % sect5info.element "INCLUDE"> <![%sect5info.element;[ @@ -865,76 +1220,11 @@ <![%sect5info.attlist;[ <!ATTLIST sect5info %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; + %sect5info.role.attrib; + %local.sect5info.attrib; > <!--end of sect5info.attlist-->]]> - -<!ENTITY % refsect1info.element "INCLUDE"> -<![%refsect1info.element;[ -<!ELEMENT refsect1info ((graphic | mediaobject | legalnotice | modespec - | subjectset | keywordset | itermset | %bibliocomponent.mix;)+)> -<!--end of refsect1info.element-->]]> - -<!ENTITY % refsect1info.attlist "INCLUDE"> -<![%refsect1info.attlist;[ -<!ATTLIST refsect1info - %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; -> -<!--end of refsect1info.attlist-->]]> - - -<!ENTITY % refsect2info.element "INCLUDE"> -<![%refsect2info.element;[ -<!ELEMENT refsect2info ((graphic | mediaobject | legalnotice | modespec - | subjectset | keywordset | itermset | %bibliocomponent.mix;)+)> -<!--end of refsect2info.element-->]]> - -<!ENTITY % refsect2info.attlist "INCLUDE"> -<![%refsect2info.attlist;[ -<!ATTLIST refsect2info - %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; -> -<!--end of refsect2info.attlist-->]]> - - -<!ENTITY % refsect3info.element "INCLUDE"> -<![%refsect3info.element;[ -<!ELEMENT refsect3info ((graphic | mediaobject | legalnotice | modespec - | subjectset | keywordset | itermset | %bibliocomponent.mix;)+)> -<!--end of refsect3info.element-->]]> - -<!ENTITY % refsect3info.attlist "INCLUDE"> -<![%refsect3info.attlist;[ -<!ATTLIST refsect3info - %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; -> -<!--end of refsect3info.attlist-->]]> - - -<!ENTITY % refsynopsisdivinfo.element "INCLUDE"> -<![%refsynopsisdivinfo.element;[ -<!ELEMENT refsynopsisdivinfo ((graphic | mediaobject | legalnotice | modespec - | subjectset | keywordset | itermset | %bibliocomponent.mix;)+)> -<!--end of refsynopsisdivinfo.element-->]]> - -<!ENTITY % refsynopsisdivinfo.attlist "INCLUDE"> -<![%refsynopsisdivinfo.attlist;[ -<!ATTLIST refsynopsisdivinfo - %common.attrib; - %otherinfo.role.attrib; - %local.otherinfo.attrib; -> -<!--end of refsynopsisdivinfo.attlist-->]]> -<!--end of otherinfo.module-->]]> - <!-- ...................................................................... --> <!-- Section (parallel to Sect*) ......................................... --> @@ -1189,9 +1479,10 @@ <!ENTITY % bibliography.element "INCLUDE"> <![%bibliography.element;[ -<!ELEMENT bibliography ((%bookcomponent.title.content;)?, - (%component.mix;)*, - (bibliodiv+ | (biblioentry|bibliomixed)+))> +<!ELEMENT bibliography (bibliographyinfo?, + (%bookcomponent.title.content;)?, + (%component.mix;)*, + (bibliodiv+ | (biblioentry|bibliomixed)+))> <!--end of bibliography.element-->]]> <!ENTITY % bibliography.attlist "INCLUDE"> @@ -1240,8 +1531,10 @@ <!ENTITY % glossary.element "INCLUDE"> <![%glossary.element;[ -<!ELEMENT glossary ((%bookcomponent.title.content;)?, (%component.mix;)*, - (glossdiv+ | glossentry+), bibliography?)> +<!ELEMENT glossary (glossaryinfo?, + (%bookcomponent.title.content;)?, + (%component.mix;)*, + (glossdiv+ | glossentry+), bibliography?)> <!--end of glossary.element-->]]> <!ENTITY % glossary.attlist "INCLUDE"> @@ -1290,8 +1583,10 @@ <!ENTITY % index.element "INCLUDE"> <![%index.element;[ -<!ELEMENT index ((%bookcomponent.title.content;)?, - (%component.mix;)*, (indexdiv* | indexentry*))> +<!ELEMENT index (indexinfo?, + (%bookcomponent.title.content;)?, + (%component.mix;)*, + (indexdiv* | indexentry*))> <!--end of index.element-->]]> <!ENTITY % index.attlist "INCLUDE"> @@ -1305,8 +1600,9 @@ <!ENTITY % setindex.element "INCLUDE"> <![%setindex.element;[ -<!ELEMENT setindex ((%bookcomponent.title.content;)?, - (%component.mix;)*, (indexdiv* | indexentry*))> +<!ELEMENT setindex (setindexinfo?, + (%bookcomponent.title.content;)?, + (%component.mix;)*, (indexdiv* | indexentry*))> <!--end of setindex.element-->]]> <!ENTITY % setindex.attlist "INCLUDE"> @@ -1478,17 +1774,11 @@ <![%refentry.module;[ <!ENTITY % local.refentry.attrib ""> <!ENTITY % refentry.role.attrib "%role.attrib;"> -<!--FUTURE USE (V4.0): -...................... -The DocInfo element will be split out into ChapterInfo, AppendixInfo, -etc. -...................... ---> <!ENTITY % refentry.element "INCLUDE"> <![%refentry.element;[ <!ELEMENT refentry ((%ndxterm.class;)*, - docinfo?, refmeta?, (comment|%link.char.class;)*, + refentryinfo?, refmeta?, (remark|%link.char.class;)*, refnamediv, refsynopsisdiv?, refsect1+)> <!--end of refentry.element-->]]> @@ -1557,7 +1847,7 @@ <!ENTITY % refnamediv.element "INCLUDE"> <![%refnamediv.element;[ <!ELEMENT refnamediv (refdescriptor?, refname+, refpurpose, refclass*, - (comment|%link.char.class;)*)> + (remark|%link.char.class;)*)> <!--end of refnamediv.element-->]]> <!ENTITY % refnamediv.attlist "INCLUDE"> @@ -1745,25 +2035,13 @@ <![%article.module;[ <!-- An Article is a chapter-level, stand-alone document that is often, but need not be, collected into a Book. --> -<!--FUTURE USE (V4.0): -...................... -The %nav.class; entity now allows ToC; ToCchap will be allowed instead. -RefEntry will be removed from the main content of Article. -...................... ---> - -<!--FUTURE USE (V4.0): -...................... -The ArtHeader element will be renamed to ArticleInfo. -...................... ---> <!ENTITY % local.article.attrib ""> <!ENTITY % article.role.attrib "%role.attrib;"> <!ENTITY % article.element "INCLUDE"> <![%article.element;[ -<!ELEMENT article ((%div.title.content;)?, artheader?, tocchap?, lot*, +<!ELEMENT article ((%div.title.content;)?, articleinfo?, tocchap?, lot*, (%bookcomponent.content;), ((%nav.class;) | (%appendix.class;) | ackno)*)> <!--end of article.element-->]]> @@ -1781,6 +2059,7 @@ |productsheet |whitepaper |techreport + |specification |faq) #IMPLIED parentbook IDREF #IMPLIED %status.attrib; @@ -1791,5 +2070,5 @@ <!--end of article.attlist-->]]> <!--end of article.module-->]]> -<!-- End of DocBk XML document hierarchy module V3.1.7 .................... --> +<!-- End of DocBook XML document hierarchy module V4.1.2 .................... --> <!-- ...................................................................... --> Index: phpdoc/dbxml/dbnotnx.mod diff -u phpdoc/dbxml/dbnotnx.mod:1.2 phpdoc/dbxml/dbnotnx.mod:1.2.6.1 --- phpdoc/dbxml/dbnotnx.mod:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/dbnotnx.mod Sun Nov 11 08:58:14 2001 @@ -1,21 +1,57 @@ -<!-- ====================================================================== --> -<!-- DocBk XML Notations V3.1.7 - Part of the DocBk XML V3.1.7 DTD - http://nwalsh.com/docbook/xml/ - - See COPYRIGHT for more information - - Please direct all questions and comments about this DTD to - Norman Walsh, <ndw@nwalsh.com>. - --> -<!-- ====================================================================== --> +<!-- ...................................................................... --> +<!-- DocBook XML notations module V4.1.2 .................................... --> +<!-- File dbnotnx.mod ..................................................... --> + +<!-- 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). + + $Id: dbnotnx.mod,v 1.2.6.1 2001/11/11 13:58:14 hholzgra Exp $ + + Permission to use, copy, modify and distribute the DocBook XML DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + 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/docbook/. +--> + +<!-- ...................................................................... --> + +<!-- This module contains the entity declarations for the standard ISO + entity sets used by DocBook. + + In DTD driver files referring to this module, please use an entity + declaration that uses the public identifier shown below: + + <!ENTITY % dbnotn PUBLIC + "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" + "dbnotnx.mod"> + %dbnotn; + + See the documentation for detailed information on the parameter + entity and module scheme used in DocBook, customizing DocBook and + planning for interchange, and changes made since the last release + of DocBook. +--> <!ENTITY % local.notation.class ""> <!ENTITY % notation.class "BMP| CGM-CHAR | CGM-BINARY | CGM-CLEAR | DITROFF | DVI | EPS | EQN | FAX | GIF | GIF87a | GIF89a | JPG | JPEG | IGES | PCX - | PIC | PS | SGML | TBL | TEX | TIFF | WMF | WPG + | PIC | PNG | PS | SGML | TBL | TEX | TIFF | WMF | WPG | linespecific %local.notation.class;"> @@ -44,6 +80,7 @@ <!NOTATION PCX PUBLIC "+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION ZSoft PCX bitmap//EN"> <!NOTATION PIC SYSTEM "PIC"> +<!NOTATION PNG SYSTEM "http://www.w3.org/TR/REC-png"> <!NOTATION PS SYSTEM "PS"> <!NOTATION SGML PUBLIC "ISO 8879:1986//NOTATION Standard Generalized Markup Language//EN"> @@ -56,5 +93,5 @@ <!NOTATION WPG SYSTEM "WPG"> <!--WordPerfect Graphic format--> <!NOTATION linespecific SYSTEM "linespecific"> -<!-- End of DocBk XML notations module V3.1.7 ............................. --> +<!-- End of DocBook XML notations module V4.1.2 ............................. --> <!-- ...................................................................... --> Index: phpdoc/dbxml/dbpoolx.mod diff -u phpdoc/dbxml/dbpoolx.mod:1.2 phpdoc/dbxml/dbpoolx.mod:1.2.6.1 --- phpdoc/dbxml/dbpoolx.mod:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/dbpoolx.mod Sun Nov 11 08:58:14 2001 @@ -1,14 +1,63 @@ -<!-- ====================================================================== --> -<!-- DocBk XML Information Pool V3.1.7 - Part of the DocBk XML V3.1.7 DTD - http://nwalsh.com/docbook/xml/ - - See COPYRIGHT for more information - - Please direct all questions and comments about this DTD to - Norman Walsh, <ndw@nwalsh.com>. - --> -<!-- ====================================================================== --> +<!-- ...................................................................... --> +<!-- DocBook XML information pool module V4.1.2 ............................. --> +<!-- File dbpoolx.mod ..................................................... --> + +<!-- 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). + + $Id: dbpoolx.mod,v 1.2.6.1 2001/11/11 13:58:14 hholzgra Exp $ + + Permission to use, copy, modify and distribute the DocBook XML DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook XML DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + 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/docbook/. +--> + +<!-- ...................................................................... --> + +<!-- This module contains the definitions for the objects, inline + elements, and so on that are available to be used as the main + content of DocBook documents. Some elements are useful for general + publishing, and others are useful specifically for computer + documentation. + + This module has the following dependencies on other modules: + + o It assumes that a %notation.class; entity is defined by the + driver file or other high-level module. This entity is + referenced in the NOTATION attributes for the graphic-related and + ModeSpec elements. + + o It assumes that an appropriately parameterized table module is + available for use with the table-related elements. + + In DTD driver files referring to this module, please use an entity + declaration that uses the public identifier shown below: + + <!ENTITY % dbpool PUBLIC + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" + "dbpoolx.mod"> + %dbpool; + + See the documentation for detailed information on the parameter + entity and module scheme used in DocBook, customizing DocBook and + planning for interchange, and changes made since the last release + of DocBook. +--> <!-- ...................................................................... --> <!-- General-purpose semantics entities ................................... --> @@ -45,9 +94,17 @@ "literallayout|programlisting|programlistingco|screen |screenco|screenshot %local.linespecific.class;"> +<!ENTITY % local.method.synop.class ""> +<!ENTITY % method.synop.class + "constructorsynopsis + |destructorsynopsis + |methodsynopsis %local.method.synop.class;"> + <!ENTITY % local.synop.class ""> <!ENTITY % synop.class - "synopsis|cmdsynopsis|funcsynopsis %local.synop.class;"> + "synopsis|cmdsynopsis|funcsynopsis + |classsynopsis|fieldsynopsis + |%method.synop.class; %local.synop.class;"> <!ENTITY % local.para.class ""> <!ENTITY % para.class @@ -66,13 +123,19 @@ <!ENTITY % formal.class "equation|example|figure|table %local.formal.class;"> +<!-- The DocBook TC may produce an official EBNF module for DocBook. --> +<!-- This PE provides the hook by which it can be inserted into the DTD. --> +<!ENTITY % ebnf.block.hook ""> + <!ENTITY % local.compound.class ""> <!ENTITY % compound.class - "msgset|procedure|sidebar|qandaset %local.compound.class;"> + "msgset|procedure|sidebar|qandaset + %ebnf.block.hook; + %local.compound.class;"> <!ENTITY % local.genobj.class ""> <!ENTITY % genobj.class - "anchor|bridgehead|comment|highlights + "anchor|bridgehead|remark|highlights %local.genobj.class;"> <!ENTITY % local.descobj.class ""> @@ -96,22 +159,24 @@ <!ENTITY % link.char.class "link|olink|ulink %local.link.char.class;"> +<!-- The DocBook TC may produce an official EBNF module for DocBook. --> +<!-- This PE provides the hook by which it can be inserted into the DTD. --> +<!ENTITY % ebnf.inline.hook ""> + <!ENTITY % local.tech.char.class ""> -<!--FUTURE USE (V4.0): -...................... -MsgText will be removed from tech.char.class to a more appropriate -parameter entity. -...................... ---> <!ENTITY % tech.char.class - "action|application|classname|command|computeroutput + "action|application + |classname|methodname|interfacename|exceptionname + |ooclass|oointerface|ooexception + |command|computeroutput |database|email|envar|errorcode|errorname|errortype|filename |function|guibutton|guiicon|guilabel|guimenu|guimenuitem - |guisubmenu|hardware|interface|interfacedefinition|keycap + |guisubmenu|hardware|interface|keycap |keycode|keycombo|keysym|literal|constant|markup|medialabel - |menuchoice|mousebutton|msgtext|option|optional|parameter + |menuchoice|mousebutton|option|optional|parameter |prompt|property|replaceable|returnvalue|sgmltag|structfield |structname|symbol|systemitem|token|type|userinput|varname + %ebnf.inline.hook; %local.tech.char.class;"> <!ENTITY % local.base.char.class ""> @@ -126,7 +191,7 @@ <!ENTITY % local.other.char.class ""> <!ENTITY % other.char.class - "comment|subscript|superscript %local.other.char.class;"> + "remark|subscript|superscript %local.other.char.class;"> <!ENTITY % local.inlineobj.char.class ""> <!ENTITY % inlineobj.char.class @@ -190,7 +255,7 @@ <!ENTITY % local.qandaset.mix ""> <!ENTITY % qandaset.mix - "%list.class; + "%list.class; |%admon.class; |%linespecific.class; |%synop.class; |%para.class; |%informal.class; |%formal.class; |procedure @@ -198,6 +263,16 @@ |%ndxterm.class; %local.qandaset.mix;"> +<!ENTITY % local.revdescription.mix ""> +<!ENTITY % revdescription.mix + "%list.class; |%admon.class; + |%linespecific.class; |%synop.class; + |%para.class; |%informal.class; + |%formal.class; |procedure + |%genobj.class; + |%ndxterm.class; + %local.revdescription.mix;"> + <!ENTITY % local.footnote.mix ""> <!ENTITY % footnote.mix "%list.class; @@ -217,11 +292,9 @@ <!ENTITY % highlights.mix "%list.class; |%admon.class; |%para.class; - |%ndxterm.class; |beginpage + |%ndxterm.class; %local.highlights.mix;"> -<!-- %synop.class; is already included in para.char.mix because synopses - used inside paragraph-like contexts are "inline" synopses --> <!-- %formal.class; is explicitly excluded from many contexts in which paragraphs are used --> <!ENTITY % local.para.mix ""> @@ -238,7 +311,7 @@ |%linespecific.class; |%synop.class; |%para.class; |%informal.class; |%formal.class; |procedure|sidebar - |anchor|bridgehead|comment + |anchor|bridgehead|remark |%ndxterm.class; |beginpage %local.admon.mix;"> @@ -262,7 +335,7 @@ |%linespecific.class; |%synop.class; |%para.class; |%informal.class; |%formal.class; - |comment + |remark |%ndxterm.class; |beginpage %local.glossdef.mix;"> @@ -289,13 +362,13 @@ <!-- #PCD xref word link cptr base dnfo othr inob (synop) -para.char.mix X X X X X X X X X X +para.char.mix X X X X X X X X X title.char.mix X X X X X X X X X ndxterm.char.mix X X X X X X X X a cptr.char.mix X X X X X a smallcptr.char.mix X b a word.char.mix X c X X X a -docinfo.char.mix X d b X a +docinfo.char.mix X d X b X a a. Just InlineGraphic; no InlineEquation. b. Just Replaceable; no other computer terms. @@ -303,9 +376,10 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements. --> -<!-- Note that synop.class is not usually used for *.char.mixes, - but is used here because synopses used inside paragraph - contexts are "inline" synopses --> +<!-- The DocBook TC may produce an official forms module for DocBook. --> +<!-- This PE provides the hook by which it can be inserted into the DTD. --> +<!ENTITY % forminlines.hook ""> + <!ENTITY % local.para.char.mix ""> <!ENTITY % para.char.mix "#PCDATA @@ -315,6 +389,7 @@ |%other.char.class; |%inlineobj.char.class; |%synop.class; |%ndxterm.class; |beginpage + %forminlines.hook; %local.para.char.mix;"> <!ENTITY % local.title.char.mix ""> @@ -380,14 +455,6 @@ <!ENTITY % formalobject.title.content "title, titleabbrev?"> -<!ENTITY % equation.content "(graphic+|mediaobject+)"> - -<!ENTITY % inlineequation.content "(graphic+|inlinemediaobject+)"> - -<!ENTITY % programlisting.content "%para.char.mix; | co | lineannotation"> - -<!ENTITY % screen.content "%para.char.mix; | co | lineannotation"> - <!-- ...................................................................... --> <!-- Entities for attributes and attribute components ..................... --> @@ -400,6 +467,10 @@ <!ENTITY % arch.attrib "arch CDATA #IMPLIED"> +<!-- Condition: General-purpose effectivity attribute --> + +<!ENTITY % condition.attrib + "condition CDATA #IMPLIED"> <!-- Conformance: Standards conformance characteristics --> @@ -418,6 +489,10 @@ <!ENTITY % revision.attrib "revision CDATA #IMPLIED"> +<!-- Security: Security classification; no default --> + +<!ENTITY % security.attrib + "security CDATA #IMPLIED"> <!-- UserLevel: Level of user experience to which element applies; no default --> @@ -434,9 +509,11 @@ <!ENTITY % local.effectivity.attrib ""> <!ENTITY % effectivity.attrib "%arch.attrib; + %condition.attrib; %conformance.attrib; %os.attrib; %revision.attrib; + %security.attrib; %userlevel.attrib; %vendor.attrib; %local.effectivity.attrib;" @@ -587,7 +664,8 @@ <!ENTITY % linespecific.attrib "format NOTATION - (linespecific) 'linespecific'"> + (linespecific) 'linespecific' + linenumbering (numbered|unnumbered) #IMPLIED"> <!-- Linkend: link to related information; no default --> @@ -717,13 +795,6 @@ below. --> <!ENTITY % local.person.ident.mix ""> -<!--FUTURE USE (V4.0): -...................... -AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new -wrapper element created to allow association of those two elements with -Author name information. -...................... ---> <!ENTITY % person.ident.mix "honorific|firstname|surname|lineage|othername|affiliation |authorblurb|contrib %local.person.ident.mix;"> @@ -746,17 +817,11 @@ <!ENTITY % biblioentry.module "INCLUDE"> <![%biblioentry.module;[ <!ENTITY % local.biblioentry.attrib ""> -<!--FUTURE USE (V4.0): -...................... -The ArtHeader element will be renamed to ArticleInfo. -...................... ---> <!ENTITY % biblioentry.role.attrib "%role.attrib;"> <!ENTITY % biblioentry.element "INCLUDE"> <![%biblioentry.element;[ -<!ELEMENT biblioentry ((artheader | bookbiblio | seriesinfo - | (%bibliocomponent.mix;))+)> +<!ELEMENT biblioentry ((articleinfo | (%bibliocomponent.mix;))+)> <!--end of biblioentry.element-->]]> <!ENTITY % biblioentry.attlist "INCLUDE"> @@ -789,83 +854,26 @@ <!--end of bibliomixed.attlist-->]]> <!--end of bibliomixed.module-->]]> -<!ENTITY % bookbiblio.module "INCLUDE"> -<![%bookbiblio.module;[ -<!--FUTURE USE (V4.0): -...................... -BookBiblio will be discarded. -...................... ---> -<!ENTITY % local.bookbiblio.attrib ""> -<!ENTITY % bookbiblio.role.attrib "%role.attrib;"> - -<!ENTITY % bookbiblio.element "INCLUDE"> -<![%bookbiblio.element;[ -<!ELEMENT bookbiblio ((%bibliocomponent.mix; | seriesinfo)+)> -<!--end of bookbiblio.element-->]]> - -<!ENTITY % bookbiblio.attlist "INCLUDE"> -<![%bookbiblio.attlist;[ -<!ATTLIST bookbiblio - %common.attrib; - %bookbiblio.role.attrib; - %local.bookbiblio.attrib; -> -<!--end of bookbiblio.attlist-->]]> -<!--end of bookbiblio.module-->]]> - -<!ENTITY % seriesinfo.module "INCLUDE"> -<![%seriesinfo.module;[ -<!--FUTURE USE (V4.0): -...................... -SeriesInfo *may* be discarded; it has become a special case of BiblioSet. -...................... ---> -<!ENTITY % local.seriesinfo.attrib ""> -<!ENTITY % seriesinfo.role.attrib "%role.attrib;"> - -<!ENTITY % seriesinfo.element "INCLUDE"> -<![%seriesinfo.element;[ -<!ELEMENT seriesinfo ((%bibliocomponent.mix;)+)> -<!--end of seriesinfo.element-->]]> - -<!ENTITY % seriesinfo.attlist "INCLUDE"> -<![%seriesinfo.attlist;[ -<!ATTLIST seriesinfo - %common.attrib; - %seriesinfo.role.attrib; - %local.seriesinfo.attrib; -> -<!--end of seriesinfo.attlist-->]]> -<!--end of seriesinfo.module-->]]> - -<!ENTITY % artheader.module "INCLUDE"> -<![%artheader.module;[ -<!--FUTURE USE (V4.0): -...................... -BookBiblio will be discarded and will be removed from ArtHeader, which -will be renamed to ArticleInfo. -...................... ---> -<!ENTITY % local.artheader.attrib ""> -<!ENTITY % artheader.role.attrib "%role.attrib;"> +<!ENTITY % articleinfo.module "INCLUDE"> +<![%articleinfo.module;[ +<!ENTITY % local.articleinfo.attrib ""> +<!ENTITY % articleinfo.role.attrib "%role.attrib;"> + +<!ENTITY % articleinfo.element "INCLUDE"> +<![%articleinfo.element;[ +<!ELEMENT articleinfo ((graphic | mediaobject | legalnotice | modespec + | subjectset | keywordset | itermset | %bibliocomponent.mix;)+)> +<!--end of articleinfo.element-->]]> -<!ENTITY % artheader.element "INCLUDE"> -<![%artheader.element;[ -<!ELEMENT artheader ((graphic | mediaobject | legalnotice | modespec - | subjectset | keywordset | itermset | %bibliocomponent.mix; - | bookbiblio)+)> -<!--end of artheader.element-->]]> - -<!ENTITY % artheader.attlist "INCLUDE"> -<![%artheader.attlist;[ -<!ATTLIST artheader +<!ENTITY % articleinfo.attlist "INCLUDE"> +<![%articleinfo.attlist;[ +<!ATTLIST articleinfo %common.attrib; - %artheader.role.attrib; - %local.artheader.attrib; + %articleinfo.role.attrib; + %local.articleinfo.attrib; > -<!--end of artheader.attlist-->]]> -<!--end of artheader.module-->]]> +<!--end of articleinfo.attlist-->]]> +<!--end of articleinfo.module-->]]> <!ENTITY % biblioset.module "INCLUDE"> <![%biblioset.module;[ @@ -1087,7 +1095,7 @@ <!ENTITY % msgset.element "INCLUDE"> <![%msgset.element;[ -<!ELEMENT msgset ((%formalobject.title.content;)?, msgentry+)> +<!ELEMENT msgset ((%formalobject.title.content;)?, (msgentry+|simplemsgentry+))> <!--end of msgset.element-->]]> <!ENTITY % msgset.attlist "INCLUDE"> @@ -1120,6 +1128,29 @@ <!--end of msgentry.attlist-->]]> <!--end of msgentry.module-->]]> +<!ENTITY % simplemsgentry.module "INCLUDE"> +<![ %simplemsgentry.module; [ +<!ENTITY % local.simplemsgentry.attrib ""> +<!ENTITY % simplemsgentry.role.attrib "%role.attrib;"> + +<!ENTITY % simplemsgentry.element "INCLUDE"> +<![ %simplemsgentry.element; [ +<!ELEMENT simplemsgentry (msgtext, msgexplan)> +<!--end of simplemsgentry.element-->]]> + +<!ENTITY % simplemsgentry.attlist "INCLUDE"> +<![ %simplemsgentry.attlist; [ +<!ATTLIST simplemsgentry + %common.attrib; + %simplemsgentry.role.attrib; + %local.simplemsgentry.attrib; + audience CDATA #IMPLIED + level CDATA #IMPLIED + origin CDATA #IMPLIED +> +<!--end of simplemsgentry.attlist-->]]> +<!--end of simplemsgentry.module-->]]> + <!ENTITY % msg.module "INCLUDE"> <![%msg.module;[ <!ENTITY % local.msg.attrib ""> @@ -1200,7 +1231,7 @@ <!--end of msgrel.attlist-->]]> <!--end of msgrel.module-->]]> -<!--ELEMENT MsgText (defined in the Inlines section, below)--> +<!-- MsgText (defined in the Inlines section, below)--> <!ENTITY % msginfo.module "INCLUDE"> <![%msginfo.module;[ @@ -1356,7 +1387,7 @@ <!ENTITY % qandaentry.element "INCLUDE"> <![ %qandaentry.element; [ -<!ELEMENT qandaentry (question, answer*)> +<!ELEMENT qandaentry (revhistory?, question, answer*)> <!--end of qandaentry.element-->]]> <!ENTITY % qandaentry.attlist "INCLUDE"> @@ -1510,6 +1541,30 @@ <!-- Sidebar .......................... --> +<!ENTITY % sidebar.content.model "INCLUDE"> +<![ %sidebar.content.model; [ + +<!ENTITY % sidebarinfo.module "INCLUDE"> +<![ %sidebarinfo.module; [ +<!ENTITY % local.sidebarinfo.attrib ""> +<!ENTITY % sidebarinfo.role.attrib "%role.attrib;"> + +<!ENTITY % sidebarinfo.element "INCLUDE"> +<![ %sidebarinfo.element; [ +<!ELEMENT sidebarinfo ((graphic | mediaobject | legalnotice | modespec + | subjectset | keywordset | itermset | %bibliocomponent.mix;)+)> +<!--end of sidebarinfo.element-->]]> + +<!ENTITY % sidebarinfo.attlist "INCLUDE"> +<![ %sidebarinfo.attlist; [ +<!ATTLIST sidebarinfo + %common.attrib; + %sidebarinfo.role.attrib; + %local.sidebarinfo.attrib; +> +<!--end of sidebarinfo.attlist-->]]> +<!--end of sidebarinfo.module-->]]> + <!ENTITY % sidebar.module "INCLUDE"> <![%sidebar.module;[ <!ENTITY % local.sidebar.attrib ""> @@ -1517,7 +1572,9 @@ <!ENTITY % sidebar.element "INCLUDE"> <![%sidebar.element;[ -<!ELEMENT sidebar ((%formalobject.title.content;)?, (%sidebar.mix;)+)> +<!ELEMENT sidebar (sidebarinfo?, + (%formalobject.title.content;)?, + (%sidebar.mix;)+)> <!--end of sidebar.element-->]]> <!ENTITY % sidebar.attlist "INCLUDE"> @@ -1529,6 +1586,7 @@ > <!--end of sidebar.attlist-->]]> <!--end of sidebar.module-->]]> +<!--end of sidebar.content.model-->]]> <!-- ...................................................................... --> <!-- Paragraph-related elements ........................................... --> @@ -1575,11 +1633,6 @@ <!ENTITY % blockquote.module "INCLUDE"> <![%blockquote.module;[ -<!--FUTURE USE (V4.0): -...................... -Epigraph will be disallowed from appearing in BlockQuote. -...................... ---> <!ENTITY % local.blockquote.attrib ""> <!ENTITY % blockquote.role.attrib "%role.attrib;"> @@ -1649,30 +1702,25 @@ <!--end of bridgehead.attlist-->]]> <!--end of bridgehead.module-->]]> -<!ENTITY % comment.module "INCLUDE"> -<![%comment.module;[ -<!--FUTURE USE (V4.0): -...................... -Comment will be renamed to Remark and will be excluded from itself. -...................... ---> -<!ENTITY % local.comment.attrib ""> -<!ENTITY % comment.role.attrib "%role.attrib;"> - -<!ENTITY % comment.element "INCLUDE"> -<![%comment.element;[ -<!ELEMENT comment (%para.char.mix;)*> -<!--end of comment.element-->]]> - -<!ENTITY % comment.attlist "INCLUDE"> -<![%comment.attlist;[ -<!ATTLIST comment +<!ENTITY % remark.module "INCLUDE"> +<![%remark.module;[ +<!ENTITY % local.remark.attrib ""> +<!ENTITY % remark.role.attrib "%role.attrib;"> + +<!ENTITY % remark.element "INCLUDE"> +<![%remark.element;[ +<!ELEMENT remark (%para.char.mix;)*> +<!--end of remark.element-->]]> + +<!ENTITY % remark.attlist "INCLUDE"> +<![%remark.attlist;[ +<!ATTLIST remark %common.attrib; - %comment.role.attrib; - %local.comment.attrib; + %remark.role.attrib; + %local.remark.attrib; > -<!--end of comment.attlist-->]]> -<!--end of comment.module-->]]> +<!--end of remark.attlist-->]]> +<!--end of remark.module-->]]> <!ENTITY % epigraph.module "INCLUDE"> <![%epigraph.module;[ @@ -1692,7 +1740,7 @@ %local.epigraph.attrib; > <!--end of epigraph.attlist-->]]> -<!--ELEMENT Attribution (defined above)--> +<!-- Attribution (defined above)--> <!--end of epigraph.module-->]]> <!ENTITY % footnote.module "INCLUDE"> @@ -1932,14 +1980,7 @@ <!--end of glossentry.attlist-->]]> <!--end of glossentry.module-->]]> -<!--FUTURE USE (V4.0): -...................... -GlossTerm will be excluded from itself. Also, GlossTerm *may* be split -into an element that appears in a Glossary and an element that can -appear in the main text. -...................... ---> -<!--ELEMENT GlossTerm (defined in the Inlines section, below)--> +<!-- GlossTerm (defined in the Inlines section, below)--> <!ENTITY % glossdef.module "INCLUDE"> <![%glossdef.module;[ <!ENTITY % local.glossdef.attrib ""> @@ -1949,11 +1990,6 @@ <![%glossdef.element;[ <!ELEMENT glossdef ((%glossdef.mix;)+, glossseealso*)> <!--end of glossdef.element-->]]> -<!--FUTURE USE (V4.0): -...................... -The Subject attribute will be renamed Keyword. -...................... ---> <!-- Subject: List of subjects; keywords for the definition --> @@ -2029,7 +2065,7 @@ <!ENTITY % itemizedlist.element "INCLUDE"> <![%itemizedlist.element;[ -<!ELEMENT itemizedlist (listitem+)> +<!ELEMENT itemizedlist ((%formalobject.title.content;)?, listitem+)> <!--end of itemizedlist.element-->]]> <!-- Spacing: Whether the vertical space in the list should be @@ -2057,7 +2093,7 @@ <!ENTITY % orderedlist.element "INCLUDE"> <![%orderedlist.element;[ -<!ELEMENT orderedlist (listitem+)> +<!ELEMENT orderedlist ((%formalobject.title.content;)?, listitem+)> <!--end of orderedlist.element-->]]> <!-- Numeration: Style of ListItem numbered; default is expected @@ -2123,11 +2159,6 @@ <!-- SegmentedList .................... --> <!ENTITY % segmentedlist.content.module "INCLUDE"> <![%segmentedlist.content.module;[ -<!--FUTURE USE (V4.0): -...................... -Two SegTitles will be required. -...................... ---> <!ENTITY % segmentedlist.module "INCLUDE"> <![%segmentedlist.module;[ <!ENTITY % local.segmentedlist.attrib ""> @@ -2135,8 +2166,9 @@ <!ENTITY % segmentedlist.element "INCLUDE"> <![%segmentedlist.element;[ -<!ELEMENT segmentedlist ((%formalobject.title.content;)?, segtitle*, - seglistitem+)> +<!ELEMENT segmentedlist ((%formalobject.title.content;)?, + segtitle, segtitle+, + seglistitem+)> <!--end of segmentedlist.element-->]]> <!ENTITY % segmentedlist.attlist "INCLUDE"> @@ -2338,7 +2370,7 @@ <!--end of term.attlist-->]]> <!--end of term.module-->]]> -<!--ELEMENT ListItem (defined above)--> +<!-- ListItem (defined above)--> <!--end of variablelist.content.module-->]]> <!-- CalloutList ...................... --> @@ -2457,7 +2489,7 @@ %local.programlistingco.attrib; > <!--end of programlistingco.attlist-->]]> -<!--ELEMENT CalloutList (defined above in Lists)--> +<!-- CalloutList (defined above in Lists)--> <!--end of informalexample.module-->]]> <!ENTITY % areaspec.content.module "INCLUDE"> @@ -2593,7 +2625,7 @@ <!ENTITY % programlisting.element "INCLUDE"> <![%programlisting.element;[ -<!ELEMENT programlisting (%programlisting.content;)*> +<!ELEMENT programlisting (%para.char.mix; | co | lineannotation)*> <!--end of programlisting.element-->]]> <!ENTITY % programlisting.attlist "INCLUDE"> @@ -2615,7 +2647,7 @@ <!ENTITY % literallayout.element "INCLUDE"> <![%literallayout.element;[ -<!ELEMENT literallayout (%para.char.mix; | lineannotation)*> +<!ELEMENT literallayout (%para.char.mix; | lineannotation | co)*> <!--end of literallayout.element-->]]> <!ENTITY % literallayout.attlist "INCLUDE"> @@ -2629,7 +2661,7 @@ %local.literallayout.attrib; > <!--end of literallayout.attlist-->]]> -<!--ELEMENT LineAnnotation (defined in the Inlines section, below)--> +<!-- LineAnnotation (defined in the Inlines section, below)--> <!--end of literallayout.module-->]]> <!ENTITY % screenco.module "INCLUDE"> @@ -2650,8 +2682,8 @@ %local.screenco.attrib; > <!--end of screenco.attlist-->]]> -<!--ELEMENT AreaSpec (defined above)--> -<!--ELEMENT CalloutList (defined above in Lists)--> +<!-- AreaSpec (defined above)--> +<!-- CalloutList (defined above in Lists)--> <!--end of screenco.module-->]]> <!ENTITY % screen.module "INCLUDE"> @@ -2661,7 +2693,7 @@ <!ENTITY % screen.element "INCLUDE"> <![%screen.element;[ -<!ELEMENT screen (%screen.content;)*> +<!ELEMENT screen (%para.char.mix; | co | lineannotation)*> <!--end of screen.element-->]]> <!ENTITY % screen.attlist "INCLUDE"> @@ -2798,8 +2830,8 @@ %local.graphicco.attrib; > <!--end of graphicco.attlist-->]]> -<!--ELEMENT AreaSpec (defined above in Examples)--> -<!--ELEMENT CalloutList (defined above in Lists)--> +<!-- AreaSpec (defined above in Examples)--> +<!-- CalloutList (defined above in Lists)--> <!--end of graphicco.module-->]]> <!-- Graphical data can be the content of Graphic, or you can reference @@ -2808,13 +2840,6 @@ <!ENTITY % graphic.module "INCLUDE"> <![%graphic.module;[ -<!--FUTURE USE (V4.0): -...................... -Graphic will be declared EMPTY. This change will require that end-tags -be removed and that any embedded graphic content be stored outside the -SGML source and pointed to from an Entityref or Fileref attribute. -...................... ---> <!ENTITY % local.graphic.attrib ""> <!ENTITY % graphic.role.attrib "%role.attrib;"> @@ -2836,14 +2861,6 @@ <!ENTITY % inlinegraphic.module "INCLUDE"> <![%inlinegraphic.module;[ -<!--FUTURE USE (V4.0): -...................... -InlineGraphic will be declared EMPTY. This change will require that -end-tags be removed and that any embedded graphic content be stored -outside the SGML source and pointed to from an Entityref or Fileref -attribute. -...................... ---> <!ENTITY % local.inlinegraphic.attrib ""> <!ENTITY % inlinegraphic.role.attrib "%role.attrib;"> @@ -3186,6 +3203,11 @@ <!-- Equations ........................ --> +<!-- This PE provides a mechanism for replacing equation content, --> +<!-- perhaps adding a new or different model (e.g., MathML) --> +<!ENTITY % equation.content "(alt?, (graphic+|mediaobject+))"> +<!ENTITY % inlineequation.content "(alt?, (graphic+|inlinemediaobject+))"> + <!ENTITY % equation.module "INCLUDE"> <![%equation.module;[ <!ENTITY % local.equation.attrib ""> @@ -3194,7 +3216,7 @@ <!ENTITY % equation.element "INCLUDE"> <![%equation.element;[ <!ELEMENT equation ((%formalobject.title.content;)?, (informalequation | - (alt?, %equation.content;)))> + %equation.content;))> <!--end of equation.element-->]]> <!ENTITY % equation.attlist "INCLUDE"> @@ -3215,7 +3237,7 @@ <!ENTITY % informalequation.element "INCLUDE"> <![%informalequation.element;[ -<!ELEMENT informalequation (alt?, %equation.content;)> +<!ELEMENT informalequation (%equation.content;) > <!--end of informalequation.element-->]]> <!ENTITY % informalequation.attlist "INCLUDE"> @@ -3235,7 +3257,7 @@ <!ENTITY % inlineequation.element "INCLUDE"> <![%inlineequation.element;[ -<!ELEMENT inlineequation (alt?, %inlineequation.content;)> +<!ELEMENT inlineequation (%inlineequation.content;)> <!--end of inlineequation.element-->]]> <!ENTITY % inlineequation.attlist "INCLUDE"> @@ -3273,8 +3295,7 @@ <!ENTITY % table.module "INCLUDE"> <![%table.module;[ -<!-- Choose a table model. CALS is off by default, so the default --> -<!-- is now the SGML Open Exchange table model. --> +<!-- Choose a table model. CALS or OASIS XML Exchange --> <!ENTITY % cals.table.module "INCLUDE"> <![%cals.table.module;[ @@ -3306,9 +3327,9 @@ <!-- Allow either objects or inlines; beware of REs between elements. --> <!ENTITY % tbl.entry.mdl "%para.char.mix; | %tabentry.mix;"> -<!-- Reference SGML Open Exchange Table Model --> +<!-- Reference CALS Table Model --> <!ENTITY % tablemodel - PUBLIC "-//Norman Walsh//DTD CALS Table Model XML V3.1.7//EN" + PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"> ]]> @@ -3341,8 +3362,9 @@ <!-- Allow either objects or inlines; beware of REs between elements. --> <!ENTITY % tbl.entry.mdl "(%para.char.mix; | %tabentry.mix;)*"> +<!-- Reference OASIS Exchange Table Model --> <!ENTITY % tablemodel - PUBLIC "-//Norman Walsh//DTD Exchange Table Model 19960430 XML V3.1.7//EN" + PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"> ]]> @@ -3401,7 +3423,7 @@ <!ENTITY % synopsis.element "INCLUDE"> <![%synopsis.element;[ -<!ELEMENT synopsis (%para.char.mix; | graphic | mediaobject | lineannotation)*> +<!ELEMENT synopsis (%para.char.mix; | graphic | mediaobject | lineannotation | co)*> <!--end of synopsis.element-->]]> <!ENTITY % synopsis.attlist "INCLUDE"> @@ -3415,7 +3437,7 @@ > <!--end of synopsis.attlist-->]]> -<!--ELEMENT LineAnnotation (defined in the Inlines section, below)--> +<!-- LineAnnotation (defined in the Inlines section, below)--> <!--end of synopsis.module-->]]> <!-- CmdSynopsis ...................... --> @@ -3489,13 +3511,6 @@ <!ENTITY % group.module "INCLUDE"> <![%group.module;[ -<!--FUTURE USE (V4.0): -...................... -The OptMult and ReqMult values for the Choice attribute on Group will be -removed. Use the Rep attribute instead to indicate that the choice is -repeatable. -...................... ---> <!ENTITY % local.group.attrib ""> <!ENTITY % group.role.attrib "%role.attrib;"> @@ -3521,9 +3536,7 @@ <!ATTLIST group choice (opt |req - |plain - |optmult - |reqmult) 'opt' + |plain) 'opt' rep (norepeat |repeat) 'norepeat' %common.attrib; @@ -3598,9 +3611,9 @@ <!--end of synopfragment.attlist-->]]> <!--end of synopfragment.module-->]]> -<!--ELEMENT Command (defined in the Inlines section, below)--> -<!--ELEMENT Option (defined in the Inlines section, below)--> -<!--ELEMENT Replaceable (defined in the Inlines section, below)--> +<!-- Command (defined in the Inlines section, below)--> +<!-- Option (defined in the Inlines section, below)--> +<!-- Replaceable (defined in the Inlines section, below)--> <!--end of cmdsynopsis.content.module-->]]> <!-- FuncSynopsis ..................... --> @@ -3609,24 +3622,13 @@ <![%funcsynopsis.content.module;[ <!ENTITY % funcsynopsis.module "INCLUDE"> <![%funcsynopsis.module;[ -<!--FUTURE USE (V4.0): -...................... -The content model group starting with FuncDef will not be available; you -will have to use FuncPrototype. Also, you will be able to have a -mixture of FuncPrototypes and FuncSynopsisInfos (this is not -backwards-incompatible all by itself). - -<!ELEMENT funcsynopsis ((funcsynopsisinfo|funcprototype)+)> -...................... ---> <!ENTITY % local.funcsynopsis.attrib ""> <!ENTITY % funcsynopsis.role.attrib "%role.attrib;"> <!ENTITY % funcsynopsis.element "INCLUDE"> <![%funcsynopsis.element;[ -<!ELEMENT funcsynopsis (funcsynopsisinfo?, (funcprototype+ | - (funcdef, (void | varargs | paramdef+))+), funcsynopsisinfo?)> +<!ELEMENT funcsynopsis ((funcsynopsisinfo | funcprototype)+)> <!--end of funcsynopsis.element-->]]> <!ENTITY % funcsynopsis.attlist "INCLUDE"> @@ -3791,12 +3793,342 @@ <!--end of funcparams.attlist-->]]> <!--end of funcparams.module-->]]> -<!--ELEMENT LineAnnotation (defined in the Inlines section, below)--> -<!--ELEMENT Replaceable (defined in the Inlines section, below)--> -<!--ELEMENT Function (defined in the Inlines section, below)--> -<!--ELEMENT Parameter (defined in the Inlines section, below)--> +<!-- LineAnnotation (defined in the Inlines section, below)--> +<!-- Replaceable (defined in the Inlines section, below)--> +<!-- Function (defined in the Inlines section, below)--> +<!-- Parameter (defined in the Inlines section, below)--> <!--end of funcsynopsis.content.module-->]]> +<!-- ClassSynopsis ..................... --> + +<!ENTITY % classsynopsis.content.module "INCLUDE"> +<![%classsynopsis.content.module;[ + +<!ENTITY % classsynopsis.module "INCLUDE"> +<![%classsynopsis.module;[ +<!ENTITY % local.classsynopsis.attrib ""> +<!ENTITY % classsynopsis.role.attrib "%role.attrib;"> + +<!ENTITY % classsynopsis.element "INCLUDE"> +<![%classsynopsis.element;[ +<!ELEMENT classsynopsis ((ooclass|oointerface|ooexception)+, + (classsynopsisinfo + |fieldsynopsis|%method.synop.class;)*)> +<!--end of classsynopsis.element-->]]> + +<!ENTITY % classsynopsis.attlist "INCLUDE"> +<![%classsynopsis.attlist;[ +<!ATTLIST classsynopsis + %common.attrib; + %classsynopsis.role.attrib; + %local.classsynopsis.attrib; + language CDATA #IMPLIED + class (class|interface) "class" +> +<!--end of classsynopsis.attlist-->]]> +<!--end of classsynopsis.module-->]]> + +<!ENTITY % classsynopsisinfo.module "INCLUDE"> +<![ %classsynopsisinfo.module; [ +<!ENTITY % local.classsynopsisinfo.attrib ""> +<!ENTITY % classsynopsisinfo.role.attrib "%role.attrib;"> + +<!ENTITY % classsynopsisinfo.element "INCLUDE"> +<![ %classsynopsisinfo.element; [ +<!ELEMENT classsynopsisinfo (%cptr.char.mix; | lineannotation)*> +<!--end of classsynopsisinfo.element-->]]> + +<!ENTITY % classsynopsisinfo.attlist "INCLUDE"> +<![ %classsynopsisinfo.attlist; [ +<!ATTLIST classsynopsisinfo + %linespecific.attrib; + %common.attrib; + %classsynopsisinfo.role.attrib; + %local.classsynopsisinfo.attrib; +> +<!--end of classsynopsisinfo.attlist-->]]> +<!--end of classsynopsisinfo.module-->]]> + +<!ENTITY % ooclass.module "INCLUDE"> +<![%ooclass.module;[ +<!ENTITY % local.ooclass.attrib ""> +<!ENTITY % ooclass.role.attrib "%role.attrib;"> + +<!ENTITY % ooclass.element "INCLUDE"> +<![%ooclass.element;[ +<!ELEMENT ooclass (modifier*, classname)> +<!--end of ooclass.element-->]]> + +<!ENTITY % ooclass.attlist "INCLUDE"> +<![%ooclass.attlist;[ +<!ATTLIST ooclass + %common.attrib; + %ooclass.role.attrib; + %local.ooclass.attrib; +> +<!--end of ooclass.attlist-->]]> +<!--end of ooclass.module-->]]> + +<!ENTITY % oointerface.module "INCLUDE"> +<![%oointerface.module;[ +<!ENTITY % local.oointerface.attrib ""> +<!ENTITY % oointerface.role.attrib "%role.attrib;"> + +<!ENTITY % oointerface.element "INCLUDE"> +<![%oointerface.element;[ +<!ELEMENT oointerface (modifier*, interfacename)> +<!--end of oointerface.element-->]]> + +<!ENTITY % oointerface.attlist "INCLUDE"> +<![%oointerface.attlist;[ +<!ATTLIST oointerface + %common.attrib; + %oointerface.role.attrib; + %local.oointerface.attrib; +> +<!--end of oointerface.attlist-->]]> +<!--end of oointerface.module-->]]> + +<!ENTITY % ooexception.module "INCLUDE"> +<![%ooexception.module;[ +<!ENTITY % local.ooexception.attrib ""> +<!ENTITY % ooexception.role.attrib "%role.attrib;"> + +<!ENTITY % ooexception.element "INCLUDE"> +<![%ooexception.element;[ +<!ELEMENT ooexception (modifier*, exceptionname)> +<!--end of ooexception.element-->]]> + +<!ENTITY % ooexception.attlist "INCLUDE"> +<![%ooexception.attlist;[ +<!ATTLIST ooexception + %common.attrib; + %ooexception.role.attrib; + %local.ooexception.attrib; +> +<!--end of ooexception.attlist-->]]> +<!--end of ooexception.module-->]]> + +<!ENTITY % modifier.module "INCLUDE"> +<![%modifier.module;[ +<!ENTITY % local.modifier.attrib ""> +<!ENTITY % modifier.role.attrib "%role.attrib;"> + +<!ENTITY % modifier.element "INCLUDE"> +<![%modifier.element;[ +<!ELEMENT modifier (%smallcptr.char.mix;)*> +<!--end of modifier.element-->]]> + +<!ENTITY % modifier.attlist "INCLUDE"> +<![%modifier.attlist;[ +<!ATTLIST modifier + %common.attrib; + %modifier.role.attrib; + %local.modifier.attrib; +> +<!--end of modifier.attlist-->]]> +<!--end of modifier.module-->]]> + +<!ENTITY % interfacename.module "INCLUDE"> +<![%interfacename.module;[ +<!ENTITY % local.interfacename.attrib ""> +<!ENTITY % interfacename.role.attrib "%role.attrib;"> + +<!ENTITY % interfacename.element "INCLUDE"> +<![%interfacename.element;[ +<!ELEMENT interfacename (%smallcptr.char.mix;)*> +<!--end of interfacename.element-->]]> + +<!ENTITY % interfacename.attlist "INCLUDE"> +<![%interfacename.attlist;[ +<!ATTLIST interfacename + %common.attrib; + %interfacename.role.attrib; + %local.interfacename.attrib; +> +<!--end of interfacename.attlist-->]]> +<!--end of interfacename.module-->]]> + +<!ENTITY % exceptionname.module "INCLUDE"> +<![%exceptionname.module;[ +<!ENTITY % local.exceptionname.attrib ""> +<!ENTITY % exceptionname.role.attrib "%role.attrib;"> + +<!ENTITY % exceptionname.element "INCLUDE"> +<![%exceptionname.element;[ +<!ELEMENT exceptionname (%smallcptr.char.mix;)*> +<!--end of exceptionname.element-->]]> + +<!ENTITY % exceptionname.attlist "INCLUDE"> +<![%exceptionname.attlist;[ +<!ATTLIST exceptionname + %common.attrib; + %exceptionname.role.attrib; + %local.exceptionname.attrib; +> +<!--end of exceptionname.attlist-->]]> +<!--end of exceptionname.module-->]]> + +<!ENTITY % fieldsynopsis.module "INCLUDE"> +<![%fieldsynopsis.module;[ +<!ENTITY % local.fieldsynopsis.attrib ""> +<!ENTITY % fieldsynopsis.role.attrib "%role.attrib;"> + +<!ENTITY % fieldsynopsis.element "INCLUDE"> +<![%fieldsynopsis.element;[ +<!ELEMENT fieldsynopsis (modifier*, type?, varname, initializer?)> +<!--end of fieldsynopsis.element-->]]> + +<!ENTITY % fieldsynopsis.attlist "INCLUDE"> +<![%fieldsynopsis.attlist;[ +<!ATTLIST fieldsynopsis + %common.attrib; + %fieldsynopsis.role.attrib; + %local.fieldsynopsis.attrib; +> +<!--end of fieldsynopsis.attlist-->]]> +<!--end of fieldsynopsis.module-->]]> + +<!ENTITY % initializer.module "INCLUDE"> +<![%initializer.module;[ +<!ENTITY % local.initializer.attrib ""> +<!ENTITY % initializer.role.attrib "%role.attrib;"> + +<!ENTITY % initializer.element "INCLUDE"> +<![%initializer.element;[ +<!ELEMENT initializer (%smallcptr.char.mix;)*> +<!--end of initializer.element-->]]> + +<!ENTITY % initializer.attlist "INCLUDE"> +<![%initializer.attlist;[ +<!ATTLIST initializer + %common.attrib; + %initializer.role.attrib; + %local.initializer.attrib; +> +<!--end of initializer.attlist-->]]> +<!--end of initializer.module-->]]> + +<!ENTITY % constructorsynopsis.module "INCLUDE"> +<![%constructorsynopsis.module;[ +<!ENTITY % local.constructorsynopsis.attrib ""> +<!ENTITY % constructorsynopsis.role.attrib "%role.attrib;"> + +<!ENTITY % constructorsynopsis.element "INCLUDE"> +<![%constructorsynopsis.element;[ +<!ELEMENT constructorsynopsis (modifier*, + methodname?, + (methodparam+|void), + exceptionname*)> +<!--end of constructorsynopsis.element-->]]> + +<!ENTITY % constructorsynopsis.attlist "INCLUDE"> +<![%constructorsynopsis.attlist;[ +<!ATTLIST constructorsynopsis + %common.attrib; + %constructorsynopsis.role.attrib; + %local.constructorsynopsis.attrib; +> +<!--end of constructorsynopsis.attlist-->]]> +<!--end of constructorsynopsis.module-->]]> + +<!ENTITY % destructorsynopsis.module "INCLUDE"> +<![%destructorsynopsis.module;[ +<!ENTITY % local.destructorsynopsis.attrib ""> +<!ENTITY % destructorsynopsis.role.attrib "%role.attrib;"> + +<!ENTITY % destructorsynopsis.element "INCLUDE"> +<![%destructorsynopsis.element;[ +<!ELEMENT destructorsynopsis (modifier*, + methodname?, + (methodparam+|void), + exceptionname*)> +<!--end of destructorsynopsis.element-->]]> + +<!ENTITY % destructorsynopsis.attlist "INCLUDE"> +<![%destructorsynopsis.attlist;[ +<!ATTLIST destructorsynopsis + %common.attrib; + %destructorsynopsis.role.attrib; + %local.destructorsynopsis.attrib; +> +<!--end of destructorsynopsis.attlist-->]]> +<!--end of destructorsynopsis.module-->]]> + +<!ENTITY % methodsynopsis.module "INCLUDE"> +<![%methodsynopsis.module;[ +<!ENTITY % local.methodsynopsis.attrib ""> +<!ENTITY % methodsynopsis.role.attrib "%role.attrib;"> + +<!ENTITY % methodsynopsis.element "INCLUDE"> +<![%methodsynopsis.element;[ +<!ELEMENT methodsynopsis (modifier*, + (type|void)?, + methodname, + (methodparam+|void), + exceptionname*, + modifier*)> +<!--end of methodsynopsis.element-->]]> + +<!ENTITY % methodsynopsis.attlist "INCLUDE"> +<![%methodsynopsis.attlist;[ +<!ATTLIST methodsynopsis + %common.attrib; + %methodsynopsis.role.attrib; + %local.methodsynopsis.attrib; +> +<!--end of methodsynopsis.attlist-->]]> +<!--end of methodsynopsis.module-->]]> + +<!ENTITY % methodname.module "INCLUDE"> +<![%methodname.module;[ +<!ENTITY % local.methodname.attrib ""> +<!ENTITY % methodname.role.attrib "%role.attrib;"> + +<!ENTITY % methodname.element "INCLUDE"> +<![%methodname.element;[ +<!ELEMENT methodname (%smallcptr.char.mix;)*> +<!--end of methodname.element-->]]> + +<!ENTITY % methodname.attlist "INCLUDE"> +<![%methodname.attlist;[ +<!ATTLIST methodname + %common.attrib; + %methodname.role.attrib; + %local.methodname.attrib; +> +<!--end of methodname.attlist-->]]> +<!--end of methodname.module-->]]> + +<!ENTITY % methodparam.module "INCLUDE"> +<![%methodparam.module;[ +<!ENTITY % local.methodparam.attrib ""> +<!ENTITY % methodparam.role.attrib "%role.attrib;"> + +<!ENTITY % methodparam.element "INCLUDE"> +<![%methodparam.element;[ +<!ELEMENT methodparam (modifier*, + type?, + ((parameter,initializer?)|funcparams), + modifier*)> +<!--end of methodparam.element-->]]> + +<!ENTITY % methodparam.attlist "INCLUDE"> +<![%methodparam.attlist;[ +<!ATTLIST methodparam + %common.attrib; + %methodparam.role.attrib; + %local.methodparam.attrib; + choice (opt + |req + |plain) "req" + rep (norepeat + |repeat) "norepeat" +> +<!--end of methodparam.attlist-->]]> +<!--end of methodparam.module-->]]> +<!--end of classsynopsis.content.module-->]]> + <!-- ...................................................................... --> <!-- Document information entities and elements ........................... --> @@ -4019,7 +4351,7 @@ <!--end of fax.attlist-->]]> <!--end of fax.module-->]]> - <!--ELEMENT Email (defined in the Inlines section, below)--> + <!-- Email (defined in the Inlines section, below)--> <!ENTITY % otheraddr.module "INCLUDE"> <![%otheraddr.module;[ @@ -4107,7 +4439,7 @@ <!--end of jobtitle.attlist-->]]> <!--end of jobtitle.module-->]]> - <!--ELEMENT OrgName (defined elsewhere in this section)--> + <!-- OrgName (defined elsewhere in this section)--> <!ENTITY % orgdiv.module "INCLUDE"> <![%orgdiv.module;[ @@ -4129,7 +4461,7 @@ <!--end of orgdiv.attlist-->]]> <!--end of orgdiv.module-->]]> - <!--ELEMENT Address (defined elsewhere in this section)--> + <!-- Address (defined elsewhere in this section)--> <!--end of affiliation.content.module-->]]> <!-- ArtPageNums ...................... --> @@ -4158,13 +4490,6 @@ <!ENTITY % author.module "INCLUDE"> <![%author.module;[ -<!--FUTURE USE (V4.0): -...................... -AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new -wrapper element created to allow association of those two elements with -Author name information. -...................... ---> <!ENTITY % local.author.attrib ""> <!ENTITY % author.role.attrib "%role.attrib;"> @@ -4208,8 +4533,8 @@ <!--end of authorgroup.attlist-->]]> <!--end of authorgroup.module-->]]> - <!--ELEMENT Author (defined elsewhere in this section)--> - <!--ELEMENT Editor (defined elsewhere in this section)--> + <!-- Author (defined elsewhere in this section)--> + <!-- Editor (defined elsewhere in this section)--> <!ENTITY % collab.content.module "INCLUDE"> <![%collab.content.module;[ @@ -4253,11 +4578,11 @@ <!--end of collabname.attlist-->]]> <!--end of collabname.module-->]]> - <!--ELEMENT Affiliation (defined elsewhere in this section)--> + <!-- Affiliation (defined elsewhere in this section)--> <!--end of collab.content.module-->]]> - <!--ELEMENT CorpAuthor (defined elsewhere in this section)--> - <!--ELEMENT OtherCredit (defined elsewhere in this section)--> + <!-- CorpAuthor (defined elsewhere in this section)--> + <!-- OtherCredit (defined elsewhere in this section)--> <!--end of authorgroup.content.module-->]]> @@ -4367,7 +4692,7 @@ <!--end of confnum.attlist-->]]> <!--end of confnum.module-->]]> - <!--ELEMENT Address (defined elsewhere in this section)--> + <!-- Address (defined elsewhere in this section)--> <!ENTITY % confsponsor.module "INCLUDE"> <![%confsponsor.module;[ @@ -4591,13 +4916,6 @@ <!ENTITY % editor.module "INCLUDE"> <![%editor.module;[ -<!--FUTURE USE (V4.0): -...................... -AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new -wrapper element created to allow association of those two elements with -Editor name information. -...................... ---> <!ENTITY % local.editor.attrib ""> <!ENTITY % editor.role.attrib "%role.attrib;"> @@ -4782,13 +5100,6 @@ <!ENTITY % othercredit.module "INCLUDE"> <![%othercredit.module;[ -<!--FUTURE USE (V4.0): -...................... -AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new -wrapper element created to allow association of those two elements with -OtherCredit name information. -...................... ---> <!ENTITY % local.othercredit.attrib ""> <!ENTITY % othercredit.role.attrib "%role.attrib;"> @@ -4837,13 +5148,6 @@ <!ENTITY % person.ident.module "INCLUDE"> <![%person.ident.module;[ -<!--FUTURE USE (V4.0): -...................... -AuthorBlurb and Affiliation will be removed from %person.ident.mix; and -a new wrapper element created to allow association of those two elements -with Contrib name information. -...................... ---> <!ENTITY % contrib.module "INCLUDE"> <![%contrib.module;[ <!ENTITY % local.contrib.attrib ""> @@ -5104,7 +5408,7 @@ <!--end of publishername.attlist-->]]> <!--end of publishername.module-->]]> - <!--ELEMENT Address (defined elsewhere in this section)--> + <!-- Address (defined elsewhere in this section)--> <!--end of publisher.content.module-->]]> <!-- PubsNumber ....................... --> @@ -5175,16 +5479,17 @@ <!--end of revhistory.attlist-->]]> <!--end of revhistory.module-->]]> - <!ENTITY % revision.module "INCLUDE"> - <![%revision.module;[ - <!ENTITY % local.revision.attrib ""> - <!ENTITY % revision.role.attrib "%role.attrib;"> - +<!ENTITY % revision.module "INCLUDE"> +<![%revision.module;[ +<!ENTITY % local.revision.attrib ""> +<!ENTITY % revision.role.attrib "%role.attrib;"> + <!ENTITY % revision.element "INCLUDE"> <![%revision.element;[ -<!ELEMENT revision (revnumber, date, authorinitials*, revremark?)> +<!ELEMENT revision (revnumber, date, authorinitials*, + (revremark|revdescription)?)> <!--end of revision.element-->]]> - + <!ENTITY % revision.attlist "INCLUDE"> <![%revision.attlist;[ <!ATTLIST revision @@ -5193,18 +5498,18 @@ %local.revision.attrib; > <!--end of revision.attlist-->]]> - <!--end of revision.module-->]]> +<!--end of revision.module-->]]> + +<!ENTITY % revnumber.module "INCLUDE"> +<![%revnumber.module;[ +<!ENTITY % local.revnumber.attrib ""> +<!ENTITY % revnumber.role.attrib "%role.attrib;"> - <!ENTITY % revnumber.module "INCLUDE"> - <![%revnumber.module;[ - <!ENTITY % local.revnumber.attrib ""> - <!ENTITY % revnumber.role.attrib "%role.attrib;"> - <!ENTITY % revnumber.element "INCLUDE"> <![%revnumber.element;[ <!ELEMENT revnumber (%docinfo.char.mix;)*> <!--end of revnumber.element-->]]> - + <!ENTITY % revnumber.attlist "INCLUDE"> <![%revnumber.attlist;[ <!ATTLIST revnumber @@ -5213,21 +5518,21 @@ %local.revnumber.attrib; > <!--end of revnumber.attlist-->]]> - <!--end of revnumber.module-->]]> +<!--end of revnumber.module-->]]> - <!--ELEMENT Date (defined elsewhere in this section)--> - <!--ELEMENT AuthorInitials (defined elsewhere in this section)--> +<!-- Date (defined elsewhere in this section)--> +<!-- AuthorInitials (defined elsewhere in this section)--> + +<!ENTITY % revremark.module "INCLUDE"> +<![%revremark.module;[ +<!ENTITY % local.revremark.attrib ""> +<!ENTITY % revremark.role.attrib "%role.attrib;"> - <!ENTITY % revremark.module "INCLUDE"> - <![%revremark.module;[ - <!ENTITY % local.revremark.attrib ""> - <!ENTITY % revremark.role.attrib "%role.attrib;"> - <!ENTITY % revremark.element "INCLUDE"> <![%revremark.element;[ <!ELEMENT revremark (%docinfo.char.mix;)*> <!--end of revremark.element-->]]> - + <!ENTITY % revremark.attlist "INCLUDE"> <![%revremark.attlist;[ <!ATTLIST revremark @@ -5236,7 +5541,27 @@ %local.revremark.attrib; > <!--end of revremark.attlist-->]]> - <!--end of revremark.module-->]]> +<!--end of revremark.module-->]]> + +<!ENTITY % revdescription.module "INCLUDE"> +<![ %revdescription.module; [ +<!ENTITY % local.revdescription.attrib ""> +<!ENTITY % revdescription.role.attrib "%role.attrib;"> + +<!ENTITY % revdescription.element "INCLUDE"> +<![ %revdescription.element; [ +<!ELEMENT revdescription ((%revdescription.mix;)+)> +<!--end of revdescription.element-->]]> + +<!ENTITY % revdescription.attlist "INCLUDE"> +<![ %revdescription.attlist; [ +<!ATTLIST revdescription + %common.attrib; + %revdescription.role.attrib; + %local.revdescription.attrib; +> +<!--end of revdescription.attlist-->]]> +<!--end of revdescription.module-->]]> <!--end of revhistory.content.module-->]]> <!-- SeriesVolNums .................... --> @@ -5314,17 +5639,12 @@ <!ENTITY % action.module "INCLUDE"> <![%action.module;[ -<!--FUTURE USE (V4.0): -...................... -Action will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.action.attrib ""> <!ENTITY % action.role.attrib "%role.attrib;"> <!ENTITY % action.element "INCLUDE"> <![%action.element;[ -<!ELEMENT action (%cptr.char.mix;)*> +<!ELEMENT action (%smallcptr.char.mix;)*> <!--end of action.element-->]]> <!ENTITY % action.attlist "INCLUDE"> @@ -5411,11 +5731,6 @@ <!ENTITY % command.module "INCLUDE"> <![%command.module;[ -<!--FUTURE USE (V4.0): -...................... -Command will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.command.attrib ""> <!ENTITY % command.role.attrib "%role.attrib;"> @@ -5458,17 +5773,12 @@ <!ENTITY % database.module "INCLUDE"> <![%database.module;[ -<!--FUTURE USE (V4.0): -...................... -Database will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.database.attrib ""> <!ENTITY % database.role.attrib "%role.attrib;"> <!ENTITY % database.element "INCLUDE"> <![%database.element;[ -<!ELEMENT database (%cptr.char.mix;)*> +<!ELEMENT database (%smallcptr.char.mix;)*> <!--end of database.element-->]]> <!-- Class: Type of database the element names; no default --> @@ -5595,17 +5905,12 @@ <!ENTITY % filename.module "INCLUDE"> <![%filename.module;[ -<!--FUTURE USE (V4.0): -...................... -Filename will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.filename.attrib ""> <!ENTITY % filename.role.attrib "%role.attrib;"> <!ENTITY % filename.element "INCLUDE"> <![%filename.element;[ -<!ELEMENT filename (%cptr.char.mix;)*> +<!ELEMENT filename (%smallcptr.char.mix;)*> <!--end of filename.element-->]]> <!-- Class: Type of filename the element names; no default --> @@ -5617,8 +5922,10 @@ <![%filename.attlist;[ <!ATTLIST filename class (headerfile - |symlink - |directory) #IMPLIED + |devicefile + |libraryfile + |directory + |symlink) #IMPLIED path CDATA #IMPLIED %moreinfo.attrib; %common.attrib; @@ -5777,17 +6084,12 @@ <!ENTITY % hardware.module "INCLUDE"> <![%hardware.module;[ -<!--FUTURE USE (V4.0): -...................... -Hardware will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.hardware.attrib ""> <!ENTITY % hardware.role.attrib "%role.attrib;"> <!ENTITY % hardware.element "INCLUDE"> <![%hardware.element;[ -<!ELEMENT hardware (%cptr.char.mix;)*> +<!ELEMENT hardware (%smallcptr.char.mix;)*> <!--end of hardware.element-->]]> <!ENTITY % hardware.attlist "INCLUDE"> @@ -5803,20 +6105,12 @@ <!ENTITY % interface.module "INCLUDE"> <![%interface.module;[ -<!--FUTURE USE (V4.0): -...................... -Interface will no longer have a Class attribute; if you want to subclass -interface information, use GUIButton, GUIIcon, GUILabel, GUIMenu, -GUIMenuItem, or GUISubmenu, or use a Role value on Interface. Also, -Interface will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.interface.attrib ""> <!ENTITY % interface.role.attrib "%role.attrib;"> <!ENTITY % interface.element "INCLUDE"> <![%interface.element;[ -<!ELEMENT interface (%cptr.char.mix;|accel)*> +<!ELEMENT interface (%smallcptr.char.mix;|accel)*> <!--end of interface.element-->]]> <!-- Class: Type of the Interface item; no default --> @@ -5825,10 +6119,6 @@ <!ENTITY % interface.attlist "INCLUDE"> <![%interface.attlist;[ <!ATTLIST interface - class (button - |icon - |menu - |menuitem) #IMPLIED %moreinfo.attrib; %common.attrib; %interface.role.attrib; @@ -5837,45 +6127,14 @@ <!--end of interface.attlist-->]]> <!--end of interface.module-->]]> -<!ENTITY % interfacedefinition.module "INCLUDE"> -<![%interfacedefinition.module;[ -<!--FUTURE USE (V4.0): -...................... -InterfaceDefinition will be discarded. -...................... ---> -<!ENTITY % local.interfacedefinition.attrib ""> -<!ENTITY % interfacedefinition.role.attrib "%role.attrib;"> - -<!ENTITY % interfacedefinition.element "INCLUDE"> -<![%interfacedefinition.element;[ -<!ELEMENT interfacedefinition (%cptr.char.mix;)*> -<!--end of interfacedefinition.element-->]]> - -<!ENTITY % interfacedefinition.attlist "INCLUDE"> -<![%interfacedefinition.attlist;[ -<!ATTLIST interfacedefinition - %moreinfo.attrib; - %common.attrib; - %interfacedefinition.role.attrib; - %local.interfacedefinition.attrib; -> -<!--end of interfacedefinition.attlist-->]]> -<!--end of interfacedefinition.module-->]]> - <!ENTITY % keycap.module "INCLUDE"> <![%keycap.module;[ -<!--FUTURE USE (V4.0): -...................... -KeyCap will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.keycap.attrib ""> <!ENTITY % keycap.role.attrib "%role.attrib;"> <!ENTITY % keycap.element "INCLUDE"> <![%keycap.element;[ -<!ELEMENT keycap (%cptr.char.mix;)*> +<!ELEMENT keycap (%smallcptr.char.mix;)*> <!--end of keycap.element-->]]> <!ENTITY % keycap.attlist "INCLUDE"> @@ -5973,11 +6232,6 @@ <!ENTITY % literal.module "INCLUDE"> <![%literal.module;[ -<!--FUTURE USE (V4.0): -...................... -Literal will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.literal.attrib ""> <!ENTITY % literal.role.attrib "%role.attrib;"> @@ -6176,17 +6430,12 @@ <!ENTITY % option.module "INCLUDE"> <![%option.module;[ -<!--FUTURE USE (V4.0): -...................... -Option will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.option.attrib ""> <!ENTITY % option.role.attrib "%role.attrib;"> <!ENTITY % option.element "INCLUDE"> <![%option.element;[ -<!ELEMENT option (%cptr.char.mix;)*> +<!ELEMENT option (%smallcptr.char.mix;)*> <!--end of option.element-->]]> <!ENTITY % option.attlist "INCLUDE"> @@ -6221,17 +6470,12 @@ <!ENTITY % parameter.module "INCLUDE"> <![%parameter.module;[ -<!--FUTURE USE (V4.0): -...................... -Parameter will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.parameter.attrib ""> <!ENTITY % parameter.role.attrib "%role.attrib;"> <!ENTITY % parameter.element "INCLUDE"> <![%parameter.element;[ -<!ELEMENT parameter (%cptr.char.mix;)*> +<!ELEMENT parameter (%smallcptr.char.mix;)*> <!--end of parameter.element-->]]> <!-- Class: Type of the Parameter; no default --> @@ -6274,17 +6518,12 @@ <!ENTITY % property.module "INCLUDE"> <![%property.module;[ -<!--FUTURE USE (V4.0): -...................... -Property will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.property.attrib ""> <!ENTITY % property.role.attrib "%role.attrib;"> <!ENTITY % property.element "INCLUDE"> <![%property.element;[ -<!ELEMENT property (%cptr.char.mix;)*> +<!ELEMENT property (%smallcptr.char.mix;)*> <!--end of property.element-->]]> <!ENTITY % property.attlist "INCLUDE"> @@ -6372,10 +6611,12 @@ |attvalue |element |endtag + |emptytag |genentity |numcharref |paramentity |pi + |xmlpi |starttag |sgmlcomment) #IMPLIED %common.attrib; @@ -6451,38 +6692,27 @@ <!ENTITY % systemitem.module "INCLUDE"> <![%systemitem.module;[ -<!--FUTURE USE (V4.0): -...................... -SystemItem will have its content constrained to smallcptr.char.mix. -...................... ---> <!ENTITY % local.systemitem.attrib ""> <!ENTITY % systemitem.role.attrib "%role.attrib;"> <!ENTITY % systemitem.element "INCLUDE"> <![%systemitem.element;[ -<!ELEMENT systemitem (%cptr.char.mix; | acronym)*> +<!ELEMENT systemitem (%smallcptr.char.mix; | acronym)*> <!--end of systemitem.element-->]]> -<!--FUTURE USE (V4.0): -...................... -The EnvironVar and Prompt values of Class will be eliminated; -use the EnVar and Prompt elements new in 3.0 instead. -...................... ---> <!-- Class: Type of system item the element names; no default --> - <!ENTITY % systemitem.attlist "INCLUDE"> <![%systemitem.attlist;[ <!ATTLIST systemitem class (constant - |environvar + |groupname + |library |macro |osname - |prompt |resource - |systemname) #IMPLIED + |systemname + |username) #IMPLIED %moreinfo.attrib; %common.attrib; %systemitem.role.attrib; @@ -6945,11 +7175,6 @@ <!ENTITY % link.module "INCLUDE"> <![%link.module;[ -<!--FUTURE USE (V4.0): -...................... -All link elements will be excluded from themselves and each other. -...................... ---> <!ENTITY % local.link.attrib ""> <!ENTITY % link.role.attrib "%role.attrib;"> @@ -7150,7 +7375,7 @@ <!ENTITY % indexterm.element "INCLUDE"> <![%indexterm.element;[ -<!ELEMENT indexterm (primary, ((secondary, ((tertiary, (see|seealso+)?) +<!ELEMENT indexterm (primary?, ((secondary, ((tertiary, (see|seealso+)?) | see | seealso+)?) | see | seealso+)?)> <!--end of indexterm.element-->]]> @@ -7287,5 +7512,5 @@ <!--end of seeseealso.module-->]]> <!--end of indexterm.content.module-->]]> -<!-- End of DocBk XML information pool module V3.1.7 ...................... --> +<!-- End of DocBook XML information pool module V4.1.2 ...................... --> <!-- ...................................................................... --> Index: phpdoc/dbxml/docbookx.dtd diff -u phpdoc/dbxml/docbookx.dtd:1.2 phpdoc/dbxml/docbookx.dtd:1.2.6.1 --- phpdoc/dbxml/docbookx.dtd:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/docbookx.dtd Sun Nov 11 08:58:14 2001 @@ -1,14 +1,59 @@ -<!-- ====================================================================== --> -<!-- DocBk XML V3.1.7 DTD - Copyright (C) 1998, 1999 Norman Walsh - http://nwalsh.com/docbook/xml/ - - See COPYRIGHT for more information - - Please direct all questions and comments about this DTD to - Norman Walsh, <ndw@nwalsh.com>. - --> -<!-- ====================================================================== --> +<!-- ...................................................................... --> +<!-- DocBook XML DTD V4.1.2 ................................................. --> +<!-- File docbookx.dtd .................................................... --> + +<!-- 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). + + $Id: docbookx.dtd,v 1.2.6.1 2001/11/11 13:58:14 hholzgra Exp $ + + Permission to use, copy, modify and distribute the DocBook XML DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + 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/docbook/. +--> + +<!-- ...................................................................... --> + +<!-- This is the driver file for V4.1.2 of the DocBook DTD. + Please use the following formal public identifier to identify it: + + "-//OASIS//DTD DocBook XML V4.1.2//EN" + + For example, if your document's top-level element is Book, and + you are using DocBook directly, use the FPI in the DOCTYPE + declaration: + + <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" + [...]> + + Or, if you have a higher-level driver file that customizes DocBook, + 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; + + See the documentation for detailed information on the parameter + entity and module scheme used in DocBook, customizing DocBook and + planning for interchange, and changes made since the last release + of DocBook. +--> <!-- ...................................................................... --> <!-- Notation declarations ................................................ --> @@ -16,7 +61,7 @@ <!ENTITY % dbnotn.module "INCLUDE"> <![%dbnotn.module;[ <!ENTITY % dbnotn PUBLIC -"-//Norman Walsh//ENTITIES DocBk XML Notations V3.1.7//EN" +"-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"> %dbnotn; ]]> @@ -26,8 +71,9 @@ <!ENTITY % dbcent.module "INCLUDE"> <![%dbcent.module;[ +<!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW --> <!ENTITY % dbcent PUBLIC -"-//Norman Walsh//ENTITIES DocBk XML Character Entities V3.1.7//EN" +"-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"> %dbcent; ]]> @@ -37,10 +83,13 @@ <!-- Information pool .............. --> +<!ENTITY % dbpool.module "INCLUDE"> +<![ %dbpool.module; [ <!ENTITY % dbpool PUBLIC -"-//Norman Walsh//ELEMENTS DocBk XML Information Pool V3.1.7//EN" +"-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"> %dbpool; +]]> <!-- Redeclaration placeholder ..... --> @@ -53,17 +102,24 @@ <!-- Document hierarchy ............ --> +<!ENTITY % dbhier.module "INCLUDE"> +<![ %dbhier.module; [ <!ENTITY % dbhier PUBLIC -"-//Norman Walsh//ELEMENTS DocBk XML Document Hierarchy V3.1.7//EN" +"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"> %dbhier; +]]> + <!-- ...................................................................... --> <!-- Other general entities ............................................... --> +<!ENTITY % dbgenent.module "INCLUDE"> +<![ %dbgenent.module; [ <!ENTITY % dbgenent PUBLIC -"-//Norman Walsh//ENTITIES DocBk XML Additional General Entities V3.1.7//EN" -"dbgenent.ent"> +"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" +"dbgenent.mod"> %dbgenent; +]]> -<!-- End of DocBk XML DTD V3.1.7 .......................................... --> +<!-- End of DocBook XML DTD V4.1.2 .......................................... --> <!-- ...................................................................... --> Index: phpdoc/dbxml/soextblx.dtd diff -u phpdoc/dbxml/soextblx.dtd:1.2 phpdoc/dbxml/soextblx.dtd:1.2.6.1 --- phpdoc/dbxml/soextblx.dtd:1.2 Thu Dec 9 19:34:25 1999 +++ phpdoc/dbxml/soextblx.dtd Sun Nov 11 08:58:14 2001 @@ -145,7 +145,8 @@ <!ENTITY % yesorno 'NMTOKEN'> <!-- no if zero(s), yes if any other value --> <!ENTITY % titles 'title?'> -<!ENTITY % paracon '#PCDATA'> <!-- default for use in entry content --> +<!ENTITY % pcd "#PCDATA"> +<!ENTITY % paracon '%pcd;'> <!-- default for use in entry content --> <!-- The parameter entities as defined below change and simplify the CALS table Index: phpdoc/dbxml/ent/iso-amsa.ent diff -u phpdoc/dbxml/ent/iso-amsa.ent:1.2 phpdoc/dbxml/ent/iso-amsa.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-amsa.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-amsa.ent Sun Nov 11 08:58:14 2001 @@ -1,7 +1,9 @@ -<!-- iso-amsa.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-amsa.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set - and the Unicode character mappings provided by Sebastian Rahtz --> + and the Unicode character mappings provided by Sebastian Rahtz + With additional derivations from + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY cularr "&#x21B6;"> <!-- ANTICLOCKWISE TOP SEMICIRCLE ARROW --> <!ENTITY curarr "&#x21B7;"> <!-- CLOCKWISE TOP SEMICIRCLE ARROW --> @@ -55,7 +57,7 @@ <!ENTITY varr "&#x2195;"> <!-- UP DOWN ARROW --> <!ENTITY uharl "&#x21BF;"> <!-- UPWARDS HARPOON WITH BARB LEFTWARDS --> <!ENTITY uharr "&#x21BE;"> <!-- UPWARDS HARPOON WITH BARB RIGHTWARDS --> -<!ENTITY xlArr "&#xE200;"> <!-- --> -<!ENTITY xhArr "&#xE202;"> <!-- --> -<!ENTITY xharr "&#xE203;"> <!-- --> -<!ENTITY xrArr "&#xE204;"> <!-- --> +<!ENTITY xlArr "&#x21D0;"> <!-- LEFTWARDS DOUBLE ARROW --> +<!ENTITY xhArr "&#x2194;"> <!-- LEFT RIGHT ARROW --> +<!ENTITY xharr "&#x2194;"> <!-- LEFT RIGHT ARROW --> +<!ENTITY xrArr "&#x21D2;"> <!-- RIGHTWARDS DOUBLE ARROW --> Index: phpdoc/dbxml/ent/iso-amsb.ent diff -u phpdoc/dbxml/ent/iso-amsb.ent:1.2 phpdoc/dbxml/ent/iso-amsb.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-amsb.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-amsb.ent Sun Nov 11 08:58:14 2001 @@ -1,9 +1,11 @@ -<!-- iso-amsb.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-amsb.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set - and the Unicode character mappings provided by Sebastian Rahtz --> + and the Unicode character mappings provided by Sebastian Rahtz. + With additional derivations from + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> -<!ENTITY amalg "&#xE251;"> <!-- --> +<!ENTITY amalg "&#x2210;"> <!-- N-ARY COPRODUCT --> <!ENTITY Barwed "&#x2306;"> <!-- PERSPECTIVE --> <!ENTITY barwed "&#x22BC;"> <!-- NAND --> <!ENTITY Cap "&#x22D2;"> <!-- DOUBLE INTERSECTION --> @@ -33,7 +35,7 @@ <!ENTITY setmn "&#x2216;"> <!-- SET MINUS --> <!ENTITY sqcap "&#x2293;"> <!-- SQUARE CAP --> <!ENTITY sqcup "&#x2294;"> <!-- SQUARE CUP --> -<!ENTITY ssetmn "&#xE844;"> <!-- --> +<!ENTITY ssetmn "&#x2216;"> <!-- SET MINUS --> <!ENTITY sstarf "&#x22C6;"> <!-- STAR OPERATOR --> <!ENTITY timesb "&#x22A0;"> <!-- SQUARED TIMES --> <!ENTITY top "&#x22A4;"> <!-- DOWN TACK --> Index: phpdoc/dbxml/ent/iso-amsc.ent diff -u phpdoc/dbxml/ent/iso-amsc.ent:1.2 phpdoc/dbxml/ent/iso-amsc.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-amsc.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-amsc.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-amsc.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-amsc.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-amsn.ent diff -u phpdoc/dbxml/ent/iso-amsn.ent:1.2 phpdoc/dbxml/ent/iso-amsn.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-amsn.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-amsn.ent Sun Nov 11 08:58:14 2001 @@ -1,26 +1,28 @@ -<!-- iso-amsn.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-amsn.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set - and the Unicode character mappings provided by Sebastian Rahtz --> + and the Unicode character mappings provided by Sebastian Rahtz + With additional derivations from + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY gnap "&#xE411;"> <!-- --> <!ENTITY gne "&#x2269;"> <!-- --> <!ENTITY gnE "&#x2269;"> <!-- --> <!ENTITY gnsim "&#x22E7;"> <!-- GREATER-THAN BUT NOT EQUIVALENT TO --> -<!ENTITY gvnE "&#xE2A1;"> <!-- --> +<!ENTITY gvnE "&#x2269;"> <!-- GREATER-THAN BUT NOT EQUAL TO --> <!ENTITY lnap "&#xE2A2;"> <!-- --> <!ENTITY lnE "&#x2268;"> <!-- --> <!ENTITY lne "&#x2268;"> <!-- --> <!ENTITY lnsim "&#x22E6;"> <!-- --> -<!ENTITY lvnE "&#xE2A4;"> <!-- --> +<!ENTITY lvnE "&#x2268;"> <!-- LESS-THAN BUT NOT EQUAL TO --> <!ENTITY nap "&#x2249;"> <!-- NOT ALMOST EQUAL TO --> <!ENTITY ncong "&#x2247;"> <!-- NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO --> <!ENTITY nequiv "&#x2262;"> <!-- NOT IDENTICAL TO --> <!ENTITY ngE "&#x2271;"> <!-- --> -<!ENTITY nge "&#xE2A6;"> <!-- --> +<!ENTITY nge "&#x2271;"> <!-- NEITHER GREATER-THAN NOR EQUAL TO --> <!ENTITY nges "&#x2271;"> <!-- --> <!ENTITY ngt "&#x226F;"> <!-- NOT GREATER-THAN --> -<!ENTITY nle "&#xE2A7;"> <!-- --> +<!ENTITY nle "&#x2270;"> <!-- NEITHER LESS-THAN NOR EQUAL TO --> <!ENTITY nlE "&#x2270;"> <!-- --> <!ENTITY nles "&#x2270;"> <!-- --> <!ENTITY nlt "&#x226E;"> <!-- NOT LESS-THAN --> @@ -29,15 +31,15 @@ <!ENTITY nmid "&#x2224;"> <!-- DOES NOT DIVIDE --> <!ENTITY npar "&#x2226;"> <!-- NOT PARALLEL TO --> <!ENTITY npr "&#x2280;"> <!-- DOES NOT PRECEDE --> -<!ENTITY npre "&#xE412;"> <!-- --> +<!ENTITY npre "&#x22E0;"> <!-- DOES NOT PRECEDE OR EQUAL --> <!ENTITY nrtri "&#x22EB;"> <!-- DOES NOT CONTAIN AS NORMAL SUBGROUP --> <!ENTITY nrtrie "&#x22ED;"> <!-- DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL --> <!ENTITY nsc "&#x2281;"> <!-- DOES NOT SUCCEED --> -<!ENTITY nsce "&#xE413;"> <!-- --> +<!ENTITY nsce "&#x22E1;"> <!-- DOES NOT SUCCEED OR EQUAL --> <!ENTITY nsim "&#x2241;"> <!-- --> <!ENTITY nsime "&#x2244;"> <!-- --> <!ENTITY nsmid "&#xE2AA;"> <!-- --> -<!ENTITY nspar "&#xE2AB;"> <!-- --> +<!ENTITY nspar "&#x2226;"> <!-- NOT PARALLEL TO --> <!ENTITY nsub "&#x2284;"> <!-- NOT A SUBSET OF --> <!ENTITY nsube "&#x2288;"> <!-- --> <!ENTITY nsubE "&#x2288;"> <!-- --> @@ -55,10 +57,10 @@ <!ENTITY scnE "&#xE2B5;"> <!-- --> <!ENTITY scnsim "&#x22E9;"> <!-- --> <!ENTITY subne "&#x228A;"> <!-- --> -<!ENTITY subnE "&#x228A;"> <!-- --> +<!ENTITY subnE "&#x228A;"> <!-- SUBSET OF WITH NOT EQUAL TO --> <!ENTITY supne "&#x228B;"> <!-- --> <!ENTITY supnE "&#x228B;"> <!-- --> <!ENTITY vsubnE "&#xE2B8;"> <!-- --> -<!ENTITY vsubne "&#xE2B9;"> <!-- --> -<!ENTITY vsupne "&#xE2BA;"> <!-- --> -<!ENTITY vsupnE "&#xE2BB;"> <!-- --> +<!ENTITY vsubne "&#x228A;"> <!-- SUBSET OF WITH NOT EQUAL TO --> +<!ENTITY vsupne "&#x228B;"> <!-- SUPERSET OF WITH NOT EQUAL TO --> +<!ENTITY vsupnE "&#x228B;"> <!-- SUPERSET OF WITH NOT EQUAL TO --> Index: phpdoc/dbxml/ent/iso-amso.ent diff -u phpdoc/dbxml/ent/iso-amso.ent:1.2 phpdoc/dbxml/ent/iso-amso.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-amso.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-amso.ent Sun Nov 11 08:58:14 2001 @@ -1,7 +1,9 @@ -<!-- iso-amso.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-amso.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set - and the Unicode character mappings provided by Sebastian Rahtz --> + and the Unicode character mappings provided by Sebastian Rahtz + With additional derivations from + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY ang "&#x2220;"> <!-- ANGLE --> <!ENTITY angmsd "&#x2221;"> <!-- MEASURED ANGLE --> @@ -10,15 +12,15 @@ <!ENTITY comp "&#x2201;"> <!-- COMPLEMENT --> <!ENTITY daleth "&#x2138;"> <!-- DALET SYMBOL --> <!ENTITY ell "&#x2113;"> <!-- SCRIPT SMALL L --> -<!ENTITY empty "&#xE2D3;"> <!-- --> +<!ENTITY empty "&#x2205;"> <!-- --> <!ENTITY gimel "&#x2137;"> <!-- GIMEL SYMBOL --> <!ENTITY image "&#x2111;"> <!-- BLACK-LETTER CAPITAL I --> <!ENTITY inodot "&#x0131;"> <!-- LATIN SMALL LETTER DOTLESS I --> <!-- jnodot Unknown unicode character --> <!ENTITY nexist "&#x2204;"> <!-- THERE DOES NOT EXIST --> -<!ENTITY oS "&#xE41D;"> <!-- --> +<!ENTITY oS "&#x24C8;"> <!-- CIRCLED LATIN CAPITAL LETTER S --> <!ENTITY planck "&#x210F;"> <!-- PLANCK CONSTANT OVER TWO PI --> <!ENTITY real "&#x211C;"> <!-- BLACK-LETTER CAPITAL R --> <!ENTITY sbsol "&#xFE68;"> <!-- SMALL REVERSE SOLIDUS --> -<!-- vprime Unknown unicode character --> +<!ENTITY vprime "&#x2032;"> <!-- PRIME --> <!ENTITY weierp "&#x2118;"> <!-- SCRIPT CAPITAL P --> Index: phpdoc/dbxml/ent/iso-amsr.ent diff -u phpdoc/dbxml/ent/iso-amsr.ent:1.2 phpdoc/dbxml/ent/iso-amsr.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-amsr.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-amsr.ent Sun Nov 11 08:58:14 2001 @@ -1,12 +1,14 @@ -<!-- iso-amsr.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-amsr.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set - and the Unicode character mappings provided by Sebastian Rahtz --> + and the Unicode character mappings provided by Sebastian Rahtz. + With additional derivations from + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY ape "&#x224A;"> <!-- --> <!ENTITY asymp "&#x224D;"> <!-- EQUIVALENT TO --> <!ENTITY bcong "&#x224C;"> <!-- ALL EQUAL TO --> -<!ENTITY bepsi "&#xE420;"> <!-- --> +<!ENTITY bepsi "&#x220D;"> <!-- SMALL CONTAINS AS MEMBER --> <!ENTITY bowtie "&#x22C8;"> <!-- --> <!ENTITY bsim "&#x223D;"> <!-- --> <!ENTITY bsime "&#x22CD;"> <!-- --> @@ -33,7 +35,7 @@ <!ENTITY gE "&#x2267;"> <!-- --> <!ENTITY gel "&#x22DB;"> <!-- --> <!ENTITY gEl "&#x22DB;"> <!-- --> -<!ENTITY ges "&#xE421;"> <!-- --> +<!ENTITY ges "&#x2265;"> <!-- GREATER-THAN OR EQUAL TO --> <!ENTITY Gg "&#x22D9;"> <!-- VERY MUCH GREATER-THAN --> <!ENTITY gl "&#x2277;"> <!-- --> <!ENTITY gsim "&#x2273;"> <!-- GREATER-THAN OR EQUIVALENT TO --> @@ -43,7 +45,7 @@ <!ENTITY lE "&#x2266;"> <!-- --> <!ENTITY lEg "&#x22DA;"> <!-- --> <!ENTITY leg "&#x22DA;"> <!-- --> -<!ENTITY les "&#xE425;"> <!-- --> +<!ENTITY les "&#x2264;"> <!-- LESS-THAN OR EQUAL TO --> <!ENTITY lg "&#x2276;"> <!-- LESS-THAN OR GREATER-THAN --> <!ENTITY Ll "&#x22D8;"> <!-- --> <!ENTITY lsim "&#x2272;"> <!-- LESS-THAN OR EQUIVALENT TO --> @@ -56,27 +58,27 @@ <!ENTITY pre "&#x227C;"> <!-- --> <!ENTITY prsim "&#x227E;"> <!-- --> <!ENTITY rtrie "&#x22B5;"> <!-- --> -<!-- samalg Unknown unicode character --> +<!ENTITY samalg "&#x2210;"> <!-- --> <!ENTITY sc "&#x227B;"> <!-- --> <!ENTITY scap "&#x227F;"> <!-- --> <!ENTITY sccue "&#x227D;"> <!-- --> <!ENTITY sce "&#x227D;"> <!-- --> <!ENTITY scsim "&#x227F;"> <!-- --> -<!ENTITY sfrown "&#xE426;"> <!-- --> +<!ENTITY sfrown "&#x2322;"> <!-- FROWN --> <!ENTITY smid "&#xE301;"> <!-- --> <!ENTITY smile "&#x2323;"> <!-- --> -<!ENTITY spar "&#xE302;"> <!-- --> +<!ENTITY spar "&#x2225;"> <!-- PARALLEL TO --> <!ENTITY sqsub "&#x228F;"> <!-- --> <!ENTITY sqsube "&#x2291;"> <!-- --> <!ENTITY sqsup "&#x2290;"> <!-- --> <!ENTITY sqsupe "&#x2292;"> <!-- --> -<!ENTITY ssmile "&#xE303;"> <!-- --> +<!ENTITY ssmile "&#x2323;"> <!-- SMILE --> <!ENTITY Sub "&#x22D0;"> <!-- --> <!ENTITY subE "&#x2286;"> <!-- --> <!ENTITY Sup "&#x22D1;"> <!-- --> <!ENTITY supE "&#x2287;"> <!-- --> -<!ENTITY thkap "&#xE306;"> <!-- --> -<!ENTITY thksim "&#xE429;"> <!-- --> +<!ENTITY thkap "&#x2248;"> <!-- ALMOST EQUAL TO --> +<!ENTITY thksim "&#x223C;"> <!-- TILDE OPERATOR --> <!ENTITY trie "&#x225C;"> <!-- --> <!ENTITY twixt "&#x226C;"> <!-- BETWEEN --> <!ENTITY vdash "&#x22A2;"> <!-- --> Index: phpdoc/dbxml/ent/iso-box.ent diff -u phpdoc/dbxml/ent/iso-box.ent:1.2 phpdoc/dbxml/ent/iso-box.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-box.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-box.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-box.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-box.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-cyr1.ent diff -u phpdoc/dbxml/ent/iso-cyr1.ent:1.2 phpdoc/dbxml/ent/iso-cyr1.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-cyr1.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-cyr1.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-cyr1.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-cyr1.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-cyr2.ent diff -u phpdoc/dbxml/ent/iso-cyr2.ent:1.2 phpdoc/dbxml/ent/iso-cyr2.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-cyr2.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-cyr2.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-cyr2.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-cyr2.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-dia.ent diff -u phpdoc/dbxml/ent/iso-dia.ent:1.2 phpdoc/dbxml/ent/iso-dia.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-dia.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-dia.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-dia.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-dia.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> @@ -7,7 +7,7 @@ <!ENTITY breve "&#x02D8;"> <!-- BREVE --> <!ENTITY caron "&#x02C7;"> <!-- CARON --> <!ENTITY cedil "&#x00B8;"> <!-- CEDILLA --> -<!ENTITY circ "&#x2218;"> <!-- RING OPERATOR --> +<!ENTITY circ "&#x005E;"> <!-- RING OPERATOR --> <!ENTITY dblac "&#x02DD;"> <!-- DOUBLE ACUTE ACCENT --> <!ENTITY die "&#x00A8;"> <!-- --> <!ENTITY dot "&#x02D9;"> <!-- DOT ABOVE --> @@ -15,5 +15,5 @@ <!ENTITY macr "&#x00AF;"> <!-- MACRON --> <!ENTITY ogon "&#x02DB;"> <!-- OGONEK --> <!ENTITY ring "&#x02DA;"> <!-- RING ABOVE --> -<!ENTITY tilde "&#x007E;"> <!-- TILDE --> +<!ENTITY tilde "&#x02DC;"> <!-- TILDE --> <!ENTITY uml "&#x00A8;"> <!-- --> Index: phpdoc/dbxml/ent/iso-grk1.ent diff -u phpdoc/dbxml/ent/iso-grk1.ent:1.2 phpdoc/dbxml/ent/iso-grk1.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-grk1.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-grk1.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-grk1.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-grk1.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-grk2.ent diff -u phpdoc/dbxml/ent/iso-grk2.ent:1.2 phpdoc/dbxml/ent/iso-grk2.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-grk2.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-grk2.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-grk2.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-grk2.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-grk3.ent diff -u phpdoc/dbxml/ent/iso-grk3.ent:1.2 phpdoc/dbxml/ent/iso-grk3.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-grk3.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-grk3.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-grk3.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-grk3.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-grk4.ent diff -u phpdoc/dbxml/ent/iso-grk4.ent:1.2 phpdoc/dbxml/ent/iso-grk4.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-grk4.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-grk4.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-grk4.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-grk4.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-lat1.ent diff -u phpdoc/dbxml/ent/iso-lat1.ent:1.2 phpdoc/dbxml/ent/iso-lat1.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-lat1.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-lat1.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-lat1.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-lat1.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> @@ -19,8 +19,8 @@ <!ENTITY AElig "&#x00C6;"> <!-- LATIN CAPITAL LETTER AE --> <!ENTITY ccedil "&#x00E7;"> <!-- LATIN SMALL LETTER C WITH CEDILLA --> <!ENTITY Ccedil "&#x00C7;"> <!-- LATIN CAPITAL LETTER C WITH CEDILLA --> -<!ENTITY eth "&#x00D0;"> <!-- LATIN SMALL LETTER ETH --> -<!ENTITY ETH "&#x00F0;"> <!-- LATIN CAPITAL LETTER ETH --> +<!ENTITY eth "&#x00F0;"> <!-- LATIN SMALL LETTER ETH --> +<!ENTITY ETH "&#x00D0;"> <!-- LATIN CAPITAL LETTER ETH --> <!ENTITY eacute "&#x00E9;"> <!-- LATIN SMALL LETTER E WITH ACUTE --> <!ENTITY Eacute "&#x00C9;"> <!-- LATIN CAPITAL LETTER E WITH ACUTE --> <!ENTITY ecirc "&#x00EA;"> <!-- LATIN SMALL LETTER E WITH CIRCUMFLEX --> @@ -45,7 +45,7 @@ <!ENTITY Ocirc "&#x00D4;"> <!-- LATIN CAPITAL LETTER O WITH CIRCUMFLEX --> <!ENTITY ograve "&#x00F2;"> <!-- LATIN SMALL LETTER O WITH GRAVE --> <!ENTITY Ograve "&#x00D2;"> <!-- LATIN CAPITAL LETTER O WITH GRAVE --> -<!ENTITY oslash "&#x2298;"> <!-- CIRCLED DIVISION SLASH --> +<!ENTITY oslash "&#x00F8;"> <!-- CIRCLED DIVISION SLASH --> <!ENTITY Oslash "&#x00D8;"> <!-- LATIN CAPITAL LETTER O WITH STROKE --> <!ENTITY otilde "&#x00F5;"> <!-- LATIN SMALL LETTER O WITH TILDE --> <!ENTITY Otilde "&#x00D5;"> <!-- LATIN CAPITAL LETTER O WITH TILDE --> @@ -56,8 +56,8 @@ <!ENTITY THORN "&#x00DE;"> <!-- LATIN CAPITAL LETTER THORN --> <!ENTITY uacute "&#x00FA;"> <!-- LATIN SMALL LETTER U WITH ACUTE --> <!ENTITY Uacute "&#x00DA;"> <!-- LATIN CAPITAL LETTER U WITH ACUTE --> -<!ENTITY ucirc "&#x00DB;"> <!-- LATIN SMALL LETTER U WITH CIRCUMFLEX --> -<!ENTITY Ucirc "&#x00FB;"> <!-- LATIN CAPITAL LETTER U WITH CIRCUMFLEX --> +<!ENTITY ucirc "&#x00FB;"> <!-- LATIN SMALL LETTER U WITH CIRCUMFLEX --> +<!ENTITY Ucirc "&#x00DB;"> <!-- LATIN CAPITAL LETTER U WITH CIRCUMFLEX --> <!ENTITY ugrave "&#x00F9;"> <!-- LATIN SMALL LETTER U WITH GRAVE --> <!ENTITY Ugrave "&#x00D9;"> <!-- LATIN CAPITAL LETTER U WITH GRAVE --> <!ENTITY uuml "&#x00FC;"> <!-- LATIN SMALL LETTER U WITH DIAERESIS --> Index: phpdoc/dbxml/ent/iso-lat2.ent diff -u phpdoc/dbxml/ent/iso-lat2.ent:1.2 phpdoc/dbxml/ent/iso-lat2.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-lat2.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-lat2.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-lat2.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-lat2.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> @@ -15,7 +15,7 @@ <!ENTITY Ccaron "&#x010C;"> <!-- LATIN CAPITAL LETTER C WITH CARON --> <!ENTITY ccirc "&#x0109;"> <!-- LATIN SMALL LETTER C WITH CIRCUMFLEX --> <!ENTITY Ccirc "&#x0108;"> <!-- LATIN CAPITAL LETTER C WITH CIRCUMFLEX --> -<!ENTITY cdot "&#x22C5;"> <!-- DOT OPERATOR --> +<!ENTITY cdot "&#x010B;"> <!-- DOT OPERATOR --> <!ENTITY Cdot "&#x010A;"> <!-- LATIN CAPITAL LETTER C WITH DOT ABOVE --> <!ENTITY dcaron "&#x010F;"> <!-- LATIN SMALL LETTER D WITH CARON --> <!ENTITY Dcaron "&#x010E;"> <!-- LATIN CAPITAL LETTER D WITH CARON --> Index: phpdoc/dbxml/ent/iso-num.ent diff -u phpdoc/dbxml/ent/iso-num.ent:1.2 phpdoc/dbxml/ent/iso-num.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-num.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-num.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-num.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-num.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> @@ -16,7 +16,7 @@ <!ENTITY sup3 "&#x00B3;"> <!-- SUPERSCRIPT THREE --> <!ENTITY plus "&#x002B;"> <!-- PLUS SIGN --> <!ENTITY plusmn "&#x00B1;"> <!-- PLUS-MINUS SIGN --> -<!-- predeclared in XML <!ENTITY lt "&#x003C;"--> <!-- LESS-THAN SIGN --> +<!ENTITY lt "&#38;#60;"> <!-- LESS-THAN SIGN --> <!ENTITY equals "&#x003D;"> <!-- EQUALS SIGN --> <!ENTITY gt "&#x003E;"> <!-- GREATER-THAN SIGN --> <!ENTITY divide "&#x00F7;"> <!-- DIVISION SIGN --> @@ -28,8 +28,8 @@ <!ENTITY yen "&#x00A5;"> <!-- YEN SIGN --> <!ENTITY num "&#x0023;"> <!-- NUMBER SIGN --> <!ENTITY percnt "&#x0025;"> <!-- PERCENT SIGN --> -<!-- predeclared in XML <!ENTITY amp "&#x0026;"--> <!-- AMPERSAND --> -<!ENTITY ast "&#x2217;"> <!-- ASTERISK OPERATOR --> +<!ENTITY amp "&#38;#38;"> <!-- AMPERSAND --> +<!ENTITY ast "&#x002A;"> <!-- ASTERISK OPERATOR --> <!ENTITY commat "&#x0040;"> <!-- COMMERCIAL AT --> <!ENTITY lsqb "&#x005B;"> <!-- LEFT SQUARE BRACKET --> <!ENTITY bsol "&#x005C;"> <!-- REVERSE SOLIDUS --> @@ -51,7 +51,7 @@ <!ENTITY uarr "&#x2191;"> <!-- UPWARDS ARROW --> <!ENTITY darr "&#x2193;"> <!-- DOWNWARDS ARROW --> <!ENTITY copy "&#x00A9;"> <!-- COPYRIGHT SIGN --> -<!ENTITY reg "&#x00AF;"> <!-- MACRON --> +<!ENTITY reg "&#x00AE;"> <!-- REG TRADE MARK SIGN --> <!ENTITY trade "&#x2122;"> <!-- TRADE MARK SIGN --> <!ENTITY brvbar "&#x00A6;"> <!-- BROKEN BAR --> <!ENTITY not "&#x00AC;"> <!-- NOT SIGN --> @@ -64,7 +64,7 @@ <!ENTITY rpar "&#x0029;"> <!-- RIGHT PARENTHESIS --> <!ENTITY comma "&#x002C;"> <!-- COMMA --> <!ENTITY lowbar "&#x005F;"> <!-- LOW LINE --> -<!ENTITY hyphen "&#xE4F8;"> <!-- --> +<!ENTITY hyphen "&#x002D;"> <!-- HYPHEN-MINUS --> <!ENTITY period "&#x002E;"> <!-- FULL STOP --> <!ENTITY sol "&#x002F;"> <!-- SOLIDUS --> <!ENTITY colon "&#x003A;"> <!-- COLON --> Index: phpdoc/dbxml/ent/iso-pub.ent diff -u phpdoc/dbxml/ent/iso-pub.ent:1.2 phpdoc/dbxml/ent/iso-pub.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-pub.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-pub.ent Sun Nov 11 08:58:14 2001 @@ -1,4 +1,4 @@ -<!-- iso-pub.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-pub.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set and the Unicode character mappings provided by Sebastian Rahtz --> Index: phpdoc/dbxml/ent/iso-tech.ent diff -u phpdoc/dbxml/ent/iso-tech.ent:1.2 phpdoc/dbxml/ent/iso-tech.ent:1.2.6.1 --- phpdoc/dbxml/ent/iso-tech.ent:1.2 Thu Dec 9 19:34:26 1999 +++ phpdoc/dbxml/ent/iso-tech.ent Sun Nov 11 08:58:14 2001 @@ -1,7 +1,9 @@ -<!-- iso-tech.ent produced by Norman Walsh for the XML version of DocBook --> +<!-- iso-tech.ent (initially distributed with DocBook XML DTD V4.1.1beta1) --> <!-- Derived from the corresponding ISO 8879 standard entity set - and the Unicode character mappings provided by Sebastian Rahtz --> + and the Unicode character mappings provided by Sebastian Rahtz. + With additional derivations from + ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT --> <!ENTITY aleph "&#x2135;"> <!-- ALEF SYMBOL --> <!ENTITY and "&#x2227;"> <!-- --> @@ -19,7 +21,7 @@ <!ENTITY forall "&#x2200;"> <!-- --> <!ENTITY fnof "&#x0192;"> <!-- LATIN SMALL LETTER F WITH HOOK --> <!ENTITY ge "&#x2265;"> <!-- GREATER-THAN OR EQUAL TO --> -<!ENTITY iff "&#xE365;"> <!-- --> +<!ENTITY iff "&#x21D4;"> <!-- LEFT RIGHT DOUBLE ARROW --> <!ENTITY infin "&#x221E;"> <!-- --> <!ENTITY int "&#x222B;"> <!-- --> <!ENTITY isin "&#x220A;"> <!-- --> @@ -54,7 +56,7 @@ <!ENTITY angst "&#x212B;"> <!-- ANGSTROM SIGN --> <!ENTITY bernou "&#x212C;"> <!-- SCRIPT CAPITAL B --> <!ENTITY compfn "&#x2218;"> <!-- RING OPERATOR --> -<!ENTITY Dot "&#x0308;"> <!-- --> +<!ENTITY Dot "&#x00A8;"> <!-- --> <!ENTITY DotDot "&#x20DC;"> <!-- COMBINING FOUR DOTS ABOVE --> <!ENTITY hamilt "&#x210B;"> <!-- SCRIPT CAPITAL H --> <!ENTITY lagran "&#x2112;"> <!-- SCRIPT CAPITAL L --> Index: phpdoc/dbxml/40chg.txt +++ phpdoc/dbxml/40chg.txt Index: phpdoc/dbxml/41chg.txt +++ phpdoc/dbxml/41chg.txt Index: phpdoc/dbxml/dbgenent.mod +++ phpdoc/dbxml/dbgenent.mod Index: phpdoc/dbxml/docbook.cat +++ phpdoc/dbxml/docbook.cat Index: phpdoc/dbxml/readme.txt +++ phpdoc/dbxml/readme.txt