Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[16639] plugins/XML/trunk
|
From: <ker...@us...> - 2009-12-14 17:11:12
|
Revision: 16639
http://jedit.svn.sourceforge.net/jedit/?rev=16639&view=rev
Author: kerik-sf
Date: 2009-12-14 17:11:02 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
update docbook DTDs from 4.2 to 4.4
Modified Paths:
--------------
plugins/XML/trunk/docs/users-guide.xml
plugins/XML/trunk/xml/dtds/calstblx.dtd
plugins/XML/trunk/xml/dtds/dbcentx.mod
plugins/XML/trunk/xml/dtds/dbgenent.mod
plugins/XML/trunk/xml/dtds/dbhierx.mod
plugins/XML/trunk/xml/dtds/dbnotnx.mod
plugins/XML/trunk/xml/dtds/dbpoolx.mod
plugins/XML/trunk/xml/dtds/docbook-catalog.xml
plugins/XML/trunk/xml/dtds/docbookx.dtd
plugins/XML/trunk/xml/dtds/soextblx.dtd
Added Paths:
-----------
plugins/XML/trunk/xml/dtds/ent/isoamsa.ent
plugins/XML/trunk/xml/dtds/ent/isoamsb.ent
plugins/XML/trunk/xml/dtds/ent/isoamsc.ent
plugins/XML/trunk/xml/dtds/ent/isoamsn.ent
plugins/XML/trunk/xml/dtds/ent/isoamso.ent
plugins/XML/trunk/xml/dtds/ent/isoamsr.ent
plugins/XML/trunk/xml/dtds/ent/isobox.ent
plugins/XML/trunk/xml/dtds/ent/isocyr1.ent
plugins/XML/trunk/xml/dtds/ent/isocyr2.ent
plugins/XML/trunk/xml/dtds/ent/isodia.ent
plugins/XML/trunk/xml/dtds/ent/isogrk1.ent
plugins/XML/trunk/xml/dtds/ent/isogrk2.ent
plugins/XML/trunk/xml/dtds/ent/isogrk3.ent
plugins/XML/trunk/xml/dtds/ent/isogrk4.ent
plugins/XML/trunk/xml/dtds/ent/isolat1.ent
plugins/XML/trunk/xml/dtds/ent/isolat2.ent
plugins/XML/trunk/xml/dtds/ent/isonum.ent
plugins/XML/trunk/xml/dtds/ent/isopub.ent
plugins/XML/trunk/xml/dtds/ent/isotech.ent
Removed Paths:
-------------
plugins/XML/trunk/xml/dtds/ent/iso-amsa.ent
plugins/XML/trunk/xml/dtds/ent/iso-amsb.ent
plugins/XML/trunk/xml/dtds/ent/iso-amsc.ent
plugins/XML/trunk/xml/dtds/ent/iso-amsn.ent
plugins/XML/trunk/xml/dtds/ent/iso-amso.ent
plugins/XML/trunk/xml/dtds/ent/iso-amsr.ent
plugins/XML/trunk/xml/dtds/ent/iso-box.ent
plugins/XML/trunk/xml/dtds/ent/iso-cyr1.ent
plugins/XML/trunk/xml/dtds/ent/iso-cyr2.ent
plugins/XML/trunk/xml/dtds/ent/iso-dia.ent
plugins/XML/trunk/xml/dtds/ent/iso-grk1.ent
plugins/XML/trunk/xml/dtds/ent/iso-grk2.ent
plugins/XML/trunk/xml/dtds/ent/iso-grk3.ent
plugins/XML/trunk/xml/dtds/ent/iso-grk4.ent
plugins/XML/trunk/xml/dtds/ent/iso-lat1.ent
plugins/XML/trunk/xml/dtds/ent/iso-lat2.ent
plugins/XML/trunk/xml/dtds/ent/iso-num.ent
plugins/XML/trunk/xml/dtds/ent/iso-pub.ent
plugins/XML/trunk/xml/dtds/ent/iso-tech.ent
Modified: plugins/XML/trunk/docs/users-guide.xml
===================================================================
--- plugins/XML/trunk/docs/users-guide.xml 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/docs/users-guide.xml 2009-12-14 17:11:02 UTC (rev 16639)
@@ -259,13 +259,13 @@
of an XML file:
</para>
<programlisting><![CDATA[<?xml version="1.0"?>
- <!DOCTYPE PUBLIC "]]><replaceable>public ID</replaceable>" "<replaceable>system ID</replaceable>"
+ <!DOCTYPE PUBLIC "]]><replaceable>public ID</replaceable>" "<replaceable>system ID</replaceable>">
</programlisting>
<para>
Or alternatively:
</para>
<programlisting><![CDATA[<?xml version="1.0"?>
- <!DOCTYPE SYSTEM "]]><replaceable>system ID</replaceable>"
+ <!DOCTYPE SYSTEM "]]><replaceable>system ID</replaceable>">
</programlisting>
<para>
@@ -336,8 +336,8 @@
<listitem><para><literal>-//W3C//DTD XHTML 1.1//EN</literal></para></listitem>
</itemizedlist>
</listitem>
- <listitem><para>DocBook 4.2 DTDs, referenced with the
- <literal>-//OASIS//DTD DocBook XML V4.2//EN</literal> public ID.
+ <listitem><para>DocBook 4.4 DTDs, referenced with the
+ <literal>-//OASIS//DTD DocBook XML V4.4//EN</literal> public ID.
</para></listitem>
</itemizedlist>
@@ -345,7 +345,7 @@
</para>
<programlisting>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "docbookx.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11-flat.dtd">
</programlisting>
@@ -754,6 +754,7 @@
<listitem><para> XInclude support (Eric Le Lay) </para></listitem>
<listitem><para> Validation support with Relax-NG (RNG) schemas. (Eric Le Lay) </para></listitem>
<listitem><para> Copy XPath of element under caret. (Eric Le Lay) </para></listitem>
+ <listitem><para> bundled DTDs : update Docbook 4.2 to 4.4 </para></listitem>
</itemizedlist>
Modified: plugins/XML/trunk/xml/dtds/calstblx.dtd
===================================================================
--- plugins/XML/trunk/xml/dtds/calstblx.dtd 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/xml/dtds/calstblx.dtd 2009-12-14 17:11:02 UTC (rev 16639)
@@ -1,5 +1,5 @@
<!-- ...................................................................... -->
-<!-- DocBook CALS Table Model V4.2 ........................................ -->
+<!-- DocBook CALS Table Model V4.4 ........................................ -->
<!-- File calstblx.mod .................................................... -->
<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -34,7 +34,8 @@
<!-- ...................................................................... -->
<!-- This module contains the definitions for the CALS Table Model
- converted to XML.
+ converted to XML. It has been modified slightly for use in the
+ combined HTML/CALS models supported by DocBook V4.4.
-->
<!-- These definitions are not directly related to the table model, but are
@@ -82,12 +83,16 @@
<!ENTITY % tbl.row.mdl "(entry|entrytbl)+">
<!ENTITY % tbl.entrytbl.mdl "colspec*,spanspec*,thead?,tbody">
<!ENTITY % tbl.entry.mdl "(para|warning|caution|note|legend|%paracon;)*">
+
+<!ENTITY % tbl.frame.attval "top|bottom|topbot|all|sides|none">
+<!ENTITY % tbl.tbody.mdl "row+">
+
<!-- ===== Element and attribute declarations follow. ===== -->
<!ELEMENT table %ho; (%tbl.table.mdl;)>
<!ATTLIST table
- frame (top|bottom|topbot|all|sides|none) #IMPLIED
+ frame (%tbl.frame.attval;) #IMPLIED
colsep %yesorno; #IMPLIED
rowsep %yesorno; #IMPLIED
%tbl.table.att;
@@ -146,7 +151,7 @@
%secur;
>
-<!ELEMENT tbody %ho; (row+)>
+<!ELEMENT tbody %ho; (%tbl.tbody.mdl;)>
<!ATTLIST tbody
valign (top|middle|bottom) #IMPLIED
@@ -196,5 +201,5 @@
%secur;
>
-<!-- End of DocBook CALS Table Model V4.2 ................................. -->
+<!-- End of DocBook CALS Table Model V4.4 ................................. -->
<!-- ...................................................................... -->
Modified: plugins/XML/trunk/xml/dtds/dbcentx.mod
===================================================================
--- plugins/XML/trunk/xml/dtds/dbcentx.mod 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/xml/dtds/dbcentx.mod 2009-12-14 17:11:02 UTC (rev 16639)
@@ -1,8 +1,8 @@
<!-- ...................................................................... -->
-<!-- DocBook character entities module V4.2 ............................... -->
+<!-- DocBook character entities module V4.4 ............................... -->
<!-- File dbcentx.mod ..................................................... -->
-<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
Corporation, Norman Walsh, Sun Microsystems, Inc., and the
Organization for the Advancement of Structured Information
@@ -37,7 +37,7 @@
declaration that uses the public identifier shown below:
<!ENTITY % dbcent PUBLIC
- "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
+ "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
"dbcentx.mod">
%dbcent;
@@ -173,133 +173,133 @@
<![%ISOamsa.module;[
<!ENTITY % ISOamsa PUBLIC
"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
-"ent/iso-amsa.ent">
+"ent/isoamsa.ent">
<!--end of ISOamsa.module-->]]>
<!ENTITY % ISOamsb.module "INCLUDE">
<![%ISOamsb.module;[
<!ENTITY % ISOamsb PUBLIC
"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
-"ent/iso-amsb.ent">
+"ent/isoamsb.ent">
<!--end of ISOamsb.module-->]]>
<!ENTITY % ISOamsc.module "INCLUDE">
<![%ISOamsc.module;[
<!ENTITY % ISOamsc PUBLIC
"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
-"ent/iso-amsc.ent">
+"ent/isoamsc.ent">
<!--end of ISOamsc.module-->]]>
<!ENTITY % ISOamsn.module "INCLUDE">
<![%ISOamsn.module;[
<!ENTITY % ISOamsn PUBLIC
"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
-"ent/iso-amsn.ent">
+"ent/isoamsn.ent">
<!--end of ISOamsn.module-->]]>
<!ENTITY % ISOamso.module "INCLUDE">
<![%ISOamso.module;[
<!ENTITY % ISOamso PUBLIC
"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
-"ent/iso-amso.ent">
+"ent/isoamso.ent">
<!--end of ISOamso.module-->]]>
<!ENTITY % ISOamsr.module "INCLUDE">
<![%ISOamsr.module;[
<!ENTITY % ISOamsr PUBLIC
"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
-"ent/iso-amsr.ent">
+"ent/isoamsr.ent">
<!--end of ISOamsr.module-->]]>
<!ENTITY % ISObox.module "INCLUDE">
<![%ISObox.module;[
<!ENTITY % ISObox PUBLIC
"ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
-"ent/iso-box.ent">
+"ent/isobox.ent">
<!--end of ISObox.module-->]]>
<!ENTITY % ISOcyr1.module "INCLUDE">
<![%ISOcyr1.module;[
<!ENTITY % ISOcyr1 PUBLIC
"ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
-"ent/iso-cyr1.ent">
+"ent/isocyr1.ent">
<!--end of ISOcyr1.module-->]]>
<!ENTITY % ISOcyr2.module "INCLUDE">
<![%ISOcyr2.module;[
<!ENTITY % ISOcyr2 PUBLIC
"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
-"ent/iso-cyr2.ent">
+"ent/isocyr2.ent">
<!--end of ISOcyr2.module-->]]>
<!ENTITY % ISOdia.module "INCLUDE">
<![%ISOdia.module;[
<!ENTITY % ISOdia PUBLIC
"ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
-"ent/iso-dia.ent">
+"ent/isodia.ent">
<!--end of ISOdia.module-->]]>
<!ENTITY % ISOgrk1.module "INCLUDE">
<![%ISOgrk1.module;[
<!ENTITY % ISOgrk1 PUBLIC
"ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
-"ent/iso-grk1.ent">
+"ent/isogrk1.ent">
<!--end of ISOgrk1.module-->]]>
<!ENTITY % ISOgrk2.module "INCLUDE">
<![%ISOgrk2.module;[
<!ENTITY % ISOgrk2 PUBLIC
"ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
-"ent/iso-grk2.ent">
+"ent/isogrk2.ent">
<!--end of ISOgrk2.module-->]]>
<!ENTITY % ISOgrk3.module "INCLUDE">
<![%ISOgrk3.module;[
<!ENTITY % ISOgrk3 PUBLIC
"ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
-"ent/iso-grk3.ent">
+"ent/isogrk3.ent">
<!--end of ISOgrk3.module-->]]>
<!ENTITY % ISOgrk4.module "INCLUDE">
<![%ISOgrk4.module;[
<!ENTITY % ISOgrk4 PUBLIC
"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
-"ent/iso-grk4.ent">
+"ent/isogrk4.ent">
<!--end of ISOgrk4.module-->]]>
<!ENTITY % ISOlat1.module "INCLUDE">
<![%ISOlat1.module;[
<!ENTITY % ISOlat1 PUBLIC
"ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-"ent/iso-lat1.ent">
+"ent/isolat1.ent">
<!--end of ISOlat1.module-->]]>
<!ENTITY % ISOlat2.module "INCLUDE">
<![%ISOlat2.module;[
<!ENTITY % ISOlat2 PUBLIC
"ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
-"ent/iso-lat2.ent">
+"ent/isolat2.ent">
<!--end of ISOlat2.module-->]]>
<!ENTITY % ISOnum.module "INCLUDE">
<![%ISOnum.module;[
<!ENTITY % ISOnum PUBLIC
"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
-"ent/iso-num.ent">
+"ent/isonum.ent">
<!--end of ISOnum.module-->]]>
<!ENTITY % ISOpub.module "INCLUDE">
<![%ISOpub.module;[
<!ENTITY % ISOpub PUBLIC
"ISO 8879:1986//ENTITIES Publishing//EN//XML"
-"ent/iso-pub.ent">
+"ent/isopub.ent">
<!--end of ISOpub.module-->]]>
<!ENTITY % ISOtech.module "INCLUDE">
<![%ISOtech.module;[
<!ENTITY % ISOtech PUBLIC
"ISO 8879:1986//ENTITIES General Technical//EN//XML"
-"ent/iso-tech.ent">
+"ent/isotech.ent">
<!--end of ISOtech.module-->]]>
<!--end of xml.features-->]]>
@@ -380,5 +380,5 @@
%ISOtech;
]]>
-<!-- End of DocBook character entity sets module V4.2 ..................... -->
+<!-- End of DocBook character entity sets module V4.4 ..................... -->
<!-- ...................................................................... -->
Modified: plugins/XML/trunk/xml/dtds/dbgenent.mod
===================================================================
--- plugins/XML/trunk/xml/dtds/dbgenent.mod 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/xml/dtds/dbgenent.mod 2009-12-14 17:11:02 UTC (rev 16639)
@@ -1,7 +1,7 @@
<!-- ...................................................................... -->
-<!-- DocBook additional general entities V4.2 ............................. -->
+<!-- DocBook additional general entities V4.4 ............................. -->
-<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
Corporation, Norman Walsh, Sun Microsystems, Inc., and the
Organization for the Advancement of Structured Information
@@ -11,7 +11,7 @@
declaration that uses the public identifier shown below:
<!ENTITY % dbgenent PUBLIC
- "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN"
+ "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
"dbgenent.mod">
%dbgenent;
-->
@@ -37,5 +37,5 @@
%all-titles;
-->
-<!-- End of DocBook additional general entities V4.2 ...................... -->
+<!-- End of DocBook additional general entities V4.4 ...................... -->
<!-- ...................................................................... -->
Modified: plugins/XML/trunk/xml/dtds/dbhierx.mod
===================================================================
--- plugins/XML/trunk/xml/dtds/dbhierx.mod 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/xml/dtds/dbhierx.mod 2009-12-14 17:11:02 UTC (rev 16639)
@@ -1,8 +1,8 @@
<!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.2 ............................... -->
+<!-- DocBook document hierarchy module V4.4 ............................... -->
<!-- File dbhierx.mod ..................................................... -->
-<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
Corporation, Norman Walsh, Sun Microsystems, Inc., and the
Organization for the Advancement of Structured Information
@@ -44,7 +44,7 @@
declaration that uses the public identifier shown below:
<!ENTITY % dbhier PUBLIC
- "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
+ "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
"dbhierx.mod">
%dbhier;
@@ -103,10 +103,6 @@
<!-- ...................................................................... -->
<!-- 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;
@@ -126,7 +122,8 @@
|%formal.class; |%compound.class;
|%genobj.class; |%descobj.class;
|%ndxterm.class; |beginpage
- %local.refcomponent.mix;">
+ %forms.hook;
+ %local.refcomponent.mix;">
<!ENTITY % local.indexdivcomponent.mix "">
<!ENTITY % indexdivcomponent.mix
@@ -209,7 +206,7 @@
<!ENTITY % set.element "INCLUDE">
<![%set.element;[
-<!ELEMENT set %ho; ((%div.title.content;)?, setinfo?, toc?, (%book.class;)+,
+<!ELEMENT set %ho; ((%div.title.content;)?, setinfo?, toc?, (set|%book.class;)+,
setindex?)
%ubiq.inclusion;>
<!--end of set.element-->]]>
@@ -723,7 +720,7 @@
<!ENTITY % part.module "INCLUDE">
<![%part.module;[
-<!-- Note that Part was to have its content model reduced in V4.2. This
+<!-- Note that Part was to have its content model reduced in V4.4. This
change will not be made after all. -->
<!ENTITY % local.part.attrib "">
@@ -1605,6 +1602,7 @@
<!ENTITY % index.attlist "INCLUDE">
<![%index.attlist;[
<!ATTLIST index
+ type CDATA #IMPLIED
%common.attrib;
%indexes.role.attrib;
%local.indexes.attrib;
@@ -1795,7 +1793,7 @@
<!ELEMENT refentry %ho; (beginpage?,
(%ndxterm.class;)*,
refentryinfo?, refmeta?, (remark|%link.char.class;)*,
- refnamediv, refsynopsisdiv?, (refsect1+|refsection+))
+ refnamediv+, refsynopsisdiv?, (refsect1+|refsection+))
%ubiq.inclusion;>
<!--end of refentry.element-->]]>
@@ -2111,5 +2109,5 @@
<!--end of article.attlist-->]]>
<!--end of article.module-->]]>
-<!-- End of DocBook document hierarchy module V4.2 ........................ -->
+<!-- End of DocBook document hierarchy module V4.4 ........................ -->
<!-- ...................................................................... -->
Modified: plugins/XML/trunk/xml/dtds/dbnotnx.mod
===================================================================
--- plugins/XML/trunk/xml/dtds/dbnotnx.mod 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/xml/dtds/dbnotnx.mod 2009-12-14 17:11:02 UTC (rev 16639)
@@ -1,8 +1,8 @@
<!-- ...................................................................... -->
-<!-- DocBook notations module V4.2 ........................................ -->
+<!-- DocBook notations module V4.4 ........................................ -->
<!-- File dbnotnx.mod ..................................................... -->
-<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
Corporation, Norman Walsh, Sun Microsystems, Inc., and the
Organization for the Advancement of Structured Information
@@ -30,14 +30,13 @@
<!-- ...................................................................... -->
-<!-- This module contains the entity declarations for the standard ISO
- entity sets used by DocBook.
+<!-- This module contains the notation declarations 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 Notations V4.2//EN"
+ "-//OASIS//ENTITIES DocBook Notations V4.4//EN"
"dbnotnx.mod">
%dbnotn;
@@ -53,12 +52,12 @@
| EPS | EQN | FAX | GIF | GIF87a | GIF89a
| JPG | JPEG | IGES | PCX
| PIC | PNG | PS | SGML | TBL | TEX | TIFF | WMF | WPG
- | SVG
+ | SVG | PDF | SWF
| linespecific
%local.notation.class;">
<!NOTATION BMP PUBLIC
-"+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION Microsoft Windows bitmap//EN">
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows bitmap//EN">
<!NOTATION CGM-CHAR PUBLIC "ISO 8632/2//NOTATION Character encoding//EN">
<!NOTATION CGM-BINARY PUBLIC "ISO 8632/3//NOTATION Binary encoding//EN">
<!NOTATION CGM-CLEAR PUBLIC "ISO 8632/4//NOTATION Clear text encoding//EN">
@@ -80,7 +79,7 @@
<!NOTATION IGES PUBLIC
"-//USA-DOD//NOTATION (ASME/ANSI Y14.26M-1987) Initial Graphics Exchange Specification//EN">
<!NOTATION PCX PUBLIC
-"+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION ZSoft PCX bitmap//EN">
+"+//ISBN 0-7923-94.2-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">
@@ -91,10 +90,12 @@
"+//ISBN 0-201-13448-9::Knuth//NOTATION The TeXbook//EN">
<!NOTATION TIFF SYSTEM "TIFF">
<!NOTATION WMF PUBLIC
-"+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION Microsoft Windows Metafile//EN">
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows Metafile//EN">
<!NOTATION WPG SYSTEM "WPG"> <!--WordPerfect Graphic format-->
<!NOTATION SVG SYSTEM "http://www.w3.org/TR/SVG/">
+<!NOTATION PDF SYSTEM "http://www.adobe.com/products/acrobat/adobepdf.html">
+<!NOTATION SWF SYSTEM "http://www.macromedia.com/software/flash">
<!NOTATION linespecific SYSTEM "linespecific">
-<!-- End of DocBook notations module V4.2 ................................. -->
+<!-- End of DocBook notations module V4.4 ................................. -->
<!-- ...................................................................... -->
Modified: plugins/XML/trunk/xml/dtds/dbpoolx.mod
===================================================================
--- plugins/XML/trunk/xml/dtds/dbpoolx.mod 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/xml/dtds/dbpoolx.mod 2009-12-14 17:11:02 UTC (rev 16639)
@@ -1,8 +1,8 @@
<!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.2 ............................. -->
+<!-- DocBook XML information pool module V4.4 ............................. -->
<!-- File dbpoolx.mod ..................................................... -->
-<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
Corporation, Norman Walsh, Sun Microsystems, Inc., and the
Organization for the Advancement of Structured Information
@@ -50,7 +50,7 @@
declaration that uses the public identifier shown below:
<!ENTITY % dbpool PUBLIC
- "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN"
+ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN"
"dbpoolx.mod">
%dbpool;
@@ -61,6 +61,13 @@
-->
<!-- ...................................................................... -->
+<!-- Forms entities ....................................................... -->
+<!-- These PEs provide the hook by which the forms module can be inserted -->
+<!-- into the DTD. -->
+<!ENTITY % forminlines.hook "">
+<!ENTITY % forms.hook "">
+
+<!-- ...................................................................... -->
<!-- General-purpose semantics entities ................................... -->
<!ENTITY % yesorno.attvals "CDATA">
@@ -83,7 +90,7 @@
<!ENTITY % local.list.class "">
<!ENTITY % list.class
- "calloutlist|glosslist|itemizedlist|orderedlist|segmentedlist
+ "calloutlist|glosslist|bibliolist|itemizedlist|orderedlist|segmentedlist
|simplelist|variablelist %local.list.class;">
<!ENTITY % local.admon.class "">
@@ -130,7 +137,7 @@
<!ENTITY % local.compound.class "">
<!ENTITY % compound.class
- "msgset|procedure|sidebar|qandaset
+ "msgset|procedure|sidebar|qandaset|task
%ebnf.block.hook;
%local.compound.class;">
@@ -148,12 +155,12 @@
<!ENTITY % local.xref.char.class "">
<!ENTITY % xref.char.class
- "footnoteref|xref %local.xref.char.class;">
+ "footnoteref|xref|biblioref %local.xref.char.class;">
<!ENTITY % local.gen.char.class "">
<!ENTITY % gen.char.class
"abbrev|acronym|citation|citerefentry|citetitle|emphasis
- |firstterm|foreignphrase|glossterm|footnote|phrase
+ |firstterm|foreignphrase|glossterm|footnote|phrase|orgname
|quote|trademark|wordasword|personname %local.gen.char.class;">
<!ENTITY % local.link.char.class "">
@@ -169,14 +176,15 @@
"action|application
|classname|methodname|interfacename|exceptionname
|ooclass|oointerface|ooexception
+ |package
|command|computeroutput
|database|email|envar|errorcode|errorname|errortype|errortext|filename
|function|guibutton|guiicon|guilabel|guimenu|guimenuitem
|guisubmenu|hardware|interface|keycap
- |keycode|keycombo|keysym|literal|constant|markup|medialabel
+ |keycode|keycombo|keysym|literal|code|constant|markup|medialabel
|menuchoice|mousebutton|option|optional|parameter
|prompt|property|replaceable|returnvalue|sgmltag|structfield
- |structname|symbol|systemitem|token|type|userinput|varname
+ |structname|symbol|systemitem|uri|token|type|userinput|varname
%ebnf.inline.hook;
%local.tech.char.class;">
@@ -186,7 +194,7 @@
<!ENTITY % local.docinfo.char.class "">
<!ENTITY % docinfo.char.class
- "author|authorinitials|corpauthor|modespec|othercredit
+ "author|authorinitials|corpauthor|corpcredit|modespec|othercredit
|productname|productnumber|revhistory
%local.docinfo.char.class;">
@@ -247,7 +255,8 @@
|%formal.class; |%compound.class;
|%genobj.class; |%descobj.class;
|%ndxterm.class; |beginpage
- %local.component.mix;">
+ %forms.hook;
+ %local.component.mix;">
<!ENTITY % local.sidebar.mix "">
<!ENTITY % sidebar.mix
@@ -257,7 +266,8 @@
|%formal.class; |procedure
|%genobj.class;
|%ndxterm.class; |beginpage
- %local.sidebar.mix;">
+ %forms.hook;
+ %local.sidebar.mix;">
<!ENTITY % local.qandaset.mix "">
<!ENTITY % qandaset.mix
@@ -267,7 +277,8 @@
|%formal.class; |procedure
|%genobj.class;
|%ndxterm.class;
- %local.qandaset.mix;">
+ %forms.hook;
+ %local.qandaset.mix;">
<!ENTITY % local.revdescription.mix "">
<!ENTITY % revdescription.mix
@@ -292,7 +303,8 @@
|%linespecific.class; |%synop.class;
|%para.class; |%informal.class;
|%ndxterm.class; |beginpage
- %local.example.mix;">
+ %forms.hook;
+ %local.example.mix;">
<!ENTITY % local.highlights.mix "">
<!ENTITY % highlights.mix
@@ -319,20 +331,23 @@
|%formal.class; |procedure|sidebar
|anchor|bridgehead|remark
|%ndxterm.class; |beginpage
- %local.admon.mix;">
+ %forms.hook;
+ %local.admon.mix;">
<!ENTITY % local.figure.mix "">
<!ENTITY % figure.mix
"%linespecific.class; |%synop.class;
|%informal.class;
|%ndxterm.class; |beginpage
- %local.figure.mix;">
+ %forms.hook;
+ %local.figure.mix;">
<!ENTITY % local.tabentry.mix "">
<!ENTITY % tabentry.mix
"%list.class; |%admon.class;
|%linespecific.class;
|%para.class; |graphic|mediaobject
+ %forms.hook;
%local.tabentry.mix;">
<!ENTITY % local.glossdef.mix "">
@@ -362,7 +377,7 @@
<!ENTITY % local.mediaobject.mix "">
<!ENTITY % mediaobject.mix
- "videoobject|audioobject|imageobject|textobject %local.mediaobject.mix;">
+ "videoobject|audioobject|imageobject|imageobjectco|textobject %local.mediaobject.mix;">
<!ENTITY % local.listpreamble.mix "">
<!ENTITY % listpreamble.mix
@@ -371,7 +386,8 @@
|%para.class; |%informal.class;
|%genobj.class; |%descobj.class;
|%ndxterm.class; |beginpage
- %local.listpreamble.mix;">
+ %forms.hook;
+ %local.listpreamble.mix;">
<!-- Character-level mixtures ............................................. -->
@@ -392,7 +408,7 @@
<!ENTITY % blockquote.exclusion "-(epigraph)">
<!ENTITY % remark.exclusion "-(remark|%ubiq.mix;)">
<!ENTITY % glossterm.exclusion "-(glossterm)">
-<!ENTITY % links.exclusion "-(link|olink|ulink|xref)">
+<!ENTITY % links.exclusion "-(link|olink|ulink|xref|biblioref)">
]]><!-- sgml.features -->
<!-- not [sgml.features[ -->
@@ -431,10 +447,6 @@
d. Just Acronym, Emphasis, and Trademark; no other word elements.
-->
-<!-- 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
@@ -550,12 +562,16 @@
<!ENTITY % userlevel.attrib
"userlevel CDATA #IMPLIED">
-
<!-- Vendor: Computer vendor to which element applies; no default -->
<!ENTITY % vendor.attrib
"vendor CDATA #IMPLIED">
+<!-- Wordsize: Computer word size (32 bit, 64 bit, etc.); no default -->
+
+<!ENTITY % wordsize.attrib
+ "wordsize CDATA #IMPLIED">
+
<!ENTITY % local.effectivity.attrib "">
<!ENTITY % effectivity.attrib
"%arch.attrib;
@@ -566,6 +582,7 @@
%security.attrib;
%userlevel.attrib;
%vendor.attrib;
+ %wordsize.attrib;
%local.effectivity.attrib;"
>
@@ -623,6 +640,22 @@
<!ENTITY % local.common.attrib "">
+<!-- dir: Bidirectional override -->
+
+<!ENTITY % dir.attrib
+ "dir (ltr
+ |rtl
+ |lro
+ |rlo) #IMPLIED">
+
+<!-- xml:base: base URI -->
+
+<![%sgml.features;[
+<!ENTITY % xml-base.attrib "">
+]]>
+<!ENTITY % xml-base.attrib
+ "xml:base CDATA #IMPLIED">
+
<!-- Role is included explicitly on each element -->
<!ENTITY % common.attrib
@@ -632,10 +665,11 @@
%xreflabel.attrib;
%revisionflag.attrib;
%effectivity.attrib;
+ %dir.attrib;
+ %xml-base.attrib;
%local.common.attrib;"
>
-
<!-- Role is included explicitly on each element -->
<!ENTITY % idreq.common.attrib
@@ -645,6 +679,8 @@
%xreflabel.attrib;
%revisionflag.attrib;
%effectivity.attrib;
+ %dir.attrib;
+ %xml-base.attrib;
%local.common.attrib;"
>
@@ -714,15 +750,26 @@
"label CDATA #IMPLIED">
+<!-- xml:space: whitespace treatment -->
+
+<![%sgml.features;[
+<!ENTITY % xml-space.attrib "">
+]]>
+<!ENTITY % xml-space.attrib
+ "xml:space (preserve) #IMPLIED">
+
<!-- Format: whether element is assumed to contain significant white
space -->
<!ENTITY % linespecific.attrib
"format NOTATION
(linespecific) 'linespecific'
- linenumbering (numbered|unnumbered) #IMPLIED">
+ %xml-space.attrib;
+ linenumbering (numbered|unnumbered) #IMPLIED
+ continuation (continues|restarts) #IMPLIED
+ startinglinenumber CDATA #IMPLIED
+ language CDATA #IMPLIED">
-
<!-- Linkend: link to related information; no default -->
<!ENTITY % linkend.attrib
@@ -859,7 +906,7 @@
"abbrev|abstract|address|artpagenums|author
|authorgroup|authorinitials|bibliomisc|biblioset
|collab|confgroup|contractnum|contractsponsor
- |copyright|corpauthor|corpname|date|edition
+ |copyright|corpauthor|corpname|corpcredit|date|edition
|editor|invpartnumber|isbn|issn|issuenum|orgname
|biblioid|citebiblioid|bibliosource|bibliorelation|bibliocoverage
|othercredit|pagenums|printhistory|productname
@@ -878,6 +925,30 @@
| subjectset | keywordset | itermset | %bibliocomponent.mix;
%local.info.class;">
+
+<!-- BiblioList ........................ -->
+
+<!ENTITY % bibliolist.module "INCLUDE">
+<![%bibliolist.module;[
+<!ENTITY % local.bibliolist.attrib "">
+<!ENTITY % bibliolist.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliolist.element "INCLUDE">
+<![%bibliolist.element;[
+<!ELEMENT bibliolist %ho; (blockinfo?, (%formalobject.title.content;)?,
+ (biblioentry|bibliomixed)+)>
+<!--end of bibliolist.element-->]]>
+
+<!ENTITY % bibliolist.attlist "INCLUDE">
+<![%bibliolist.attlist;[
+<!ATTLIST bibliolist
+ %common.attrib;
+ %bibliolist.role.attrib;
+ %local.bibliolist.attrib;
+>
+<!--end of bibliolist.attlist-->]]>
+<!--end of bibliolist.module-->]]>
+
<!ENTITY % biblioentry.module "INCLUDE">
<![%biblioentry.module;[
<!ENTITY % local.biblioentry.attrib "">
@@ -1426,6 +1497,101 @@
<!--end of msgexplan.module-->]]>
<!--end of msgset.content.module-->]]>
+<!ENTITY % task.content.module "INCLUDE">
+<![%task.content.module;[
+<!ENTITY % task.module "INCLUDE">
+<![%task.module;[
+<!ENTITY % local.task.attrib "">
+<!ENTITY % task.role.attrib "%role.attrib;">
+
+<!ENTITY % task.element "INCLUDE">
+<![%task.element;[
+<!ELEMENT task %ho; (blockinfo?,(%ndxterm.class;)*,
+ (%formalobject.title.content;),
+ tasksummary?,
+ taskprerequisites?,
+ procedure,
+ example*,
+ taskrelated?)>
+<!--end of task.element-->]]>
+
+<!ENTITY % task.attlist "INCLUDE">
+<![%task.attlist;[
+<!ATTLIST task
+ %common.attrib;
+ %task.role.attrib;
+ %local.task.attrib;
+>
+<!--end of task.attlist-->]]>
+<!--end of task.module-->]]>
+
+<!ENTITY % tasksummary.module "INCLUDE">
+<![%tasksummary.module;[
+<!ENTITY % local.tasksummary.attrib "">
+<!ENTITY % tasksummary.role.attrib "%role.attrib;">
+
+<!ENTITY % tasksummary.element "INCLUDE">
+<![%tasksummary.element;[
+<!ELEMENT tasksummary %ho; (blockinfo?,
+ (%formalobject.title.content;)?,
+ (%component.mix;)+)>
+<!--end of tasksummary.element-->]]>
+
+<!ENTITY % tasksummary.attlist "INCLUDE">
+<![%tasksummary.attlist;[
+<!ATTLIST tasksummary
+ %common.attrib;
+ %tasksummary.role.attrib;
+ %local.tasksummary.attrib;
+>
+<!--end of tasksummary.attlist-->]]>
+<!--end of tasksummary.module-->]]>
+
+<!ENTITY % taskprerequisites.module "INCLUDE">
+<![%taskprerequisites.module;[
+<!ENTITY % local.taskprerequisites.attrib "">
+<!ENTITY % taskprerequisites.role.attrib "%role.attrib;">
+
+<!ENTITY % taskprerequisites.element "INCLUDE">
+<![%taskprerequisites.element;[
+<!ELEMENT taskprerequisites %ho; (blockinfo?,
+ (%formalobject.title.content;)?,
+ (%component.mix;)+)>
+<!--end of taskprerequisites.element-->]]>
+
+<!ENTITY % taskprerequisites.attlist "INCLUDE">
+<![%taskprerequisites.attlist;[
+<!ATTLIST taskprerequisites
+ %common.attrib;
+ %taskprerequisites.role.attrib;
+ %local.taskprerequisites.attrib;
+>
+<!--end of taskprerequisites.attlist-->]]>
+<!--end of taskprerequisites.module-->]]>
+
+<!ENTITY % taskrelated.module "INCLUDE">
+<![%taskrelated.module;[
+<!ENTITY % local.taskrelated.attrib "">
+<!ENTITY % taskrelated.role.attrib "%role.attrib;">
+
+<!ENTITY % taskrelated.element "INCLUDE">
+<![%taskrelated.element;[
+<!ELEMENT taskrelated %ho; (blockinfo?,
+ (%formalobject.title.content;)?,
+ (%component.mix;)+)>
+<!--end of taskrelated.element-->]]>
+
+<!ENTITY % taskrelated.attlist "INCLUDE">
+<![%taskrelated.attlist;[
+<!ATTLIST taskrelated
+ %common.attrib;
+ %taskrelated.role.attrib;
+ %local.taskrelated.attrib;
+>
+<!--end of taskrelated.attlist-->]]>
+<!--end of taskrelated.module-->]]>
+<!--end of task.content.module-->]]>
+
<!-- QandASet ........................ -->
<!ENTITY % qandaset.content.module "INCLUDE">
<![ %qandaset.content.module; [
@@ -1584,8 +1750,8 @@
<!ENTITY % step.element "INCLUDE">
<![%step.element;[
-<!ELEMENT step %ho; (title?, (((%component.mix;)+, (substeps,
- (%component.mix;)*)?) | (substeps, (%component.mix;)*)))>
+<!ELEMENT step %ho; (title?, (((%component.mix;)+, ((substeps|stepalternatives), (%component.mix;)*)?)
+ | ((substeps|stepalternatives), (%component.mix;)*)))>
<!--end of step.element-->]]>
<!-- Performance: Whether the Step must be performed -->
@@ -1617,7 +1783,6 @@
<!-- Performance: whether entire set of substeps must be performed -->
<!-- not #REQUIRED! -->
-
<!ENTITY % substeps.attlist "INCLUDE">
<![%substeps.attlist;[
<!ATTLIST substeps
@@ -1629,6 +1794,31 @@
>
<!--end of substeps.attlist-->]]>
<!--end of substeps.module-->]]>
+
+<!ENTITY % stepalternatives.module "INCLUDE">
+<![%stepalternatives.module;[
+<!ENTITY % local.stepalternatives.attrib "">
+<!ENTITY % stepalternatives.role.attrib "%role.attrib;">
+
+<!ENTITY % stepalternatives.element "INCLUDE">
+<![%stepalternatives.element;[
+<!ELEMENT stepalternatives %ho; (step+)>
+<!--end of stepalternatives.element-->]]>
+
+<!-- Performance: Whether (one of) the alternatives must be performed -->
+<!-- not #REQUIRED! -->
+
+<!ENTITY % stepalternatives.attlist "INCLUDE">
+<![%stepalternatives.attlist;[
+<!ATTLIST stepalternatives
+ performance (optional
+ |required) "required"
+ %common.attrib;
+ %stepalternatives.role.attrib;
+ %local.stepalternatives.attrib;
+>
+<!--end of stepalternatives.attlist-->]]>
+<!--end of stepalternatives.module-->]]>
<!--end of procedure.content.module-->]]>
<!-- Sidebar .......................... -->
@@ -1751,7 +1941,7 @@
<!ENTITY % blockquote.element "INCLUDE">
<![%blockquote.element;[
-<!ELEMENT blockquote %ho; (title?, attribution?, (%component.mix;)+)
+<!ELEMENT blockquote %ho; (blockinfo?, title?, attribution?, (%component.mix;)+)
%blockquote.exclusion;>
<!--end of blockquote.element-->]]>
@@ -2058,7 +2248,7 @@
<!ENTITY % glosslist.element "INCLUDE">
<![%glosslist.element;[
-<!ELEMENT glosslist %ho; (glossentry+)>
+<!ELEMENT glosslist %ho; (blockinfo?, (%formalobject.title.content;)?, glossentry+)>
<!--end of glosslist.element-->]]>
<!ENTITY % glosslist.attlist "INCLUDE">
@@ -2198,7 +2388,8 @@
<!ENTITY % itemizedlist.attlist "INCLUDE">
<![%itemizedlist.attlist;[
-<!ATTLIST itemizedlist spacing (normal
+<!ATTLIST itemizedlist
+ spacing (normal
|compact) #IMPLIED
%mark.attrib;
%common.attrib;
@@ -2448,6 +2639,8 @@
<![%variablelist.attlist;[
<!ATTLIST variablelist
termlength CDATA #IMPLIED
+ spacing (normal
+ |compact) #IMPLIED
%common.attrib;
%variablelist.role.attrib;
%local.variablelist.attrib;
@@ -2567,6 +2760,7 @@
<!ENTITY % example.attlist "INCLUDE">
<![%example.attlist;[
<!ATTLIST example
+ floatstyle CDATA #IMPLIED
%label.attrib;
%width.attrib;
%common.attrib;
@@ -2589,6 +2783,7 @@
<!ENTITY % informalexample.attlist "INCLUDE">
<![%informalexample.attlist;[
<!ATTLIST informalexample
+ floatstyle CDATA #IMPLIED
%width.attrib;
%common.attrib;
%informalexample.role.attrib;
@@ -2902,6 +3097,7 @@
<![%figure.attlist;[
<!ATTLIST figure
float %yesorno.attvals; '0'
+ floatstyle CDATA #IMPLIED
pgwide %yesorno.attvals; #IMPLIED
%label.attrib;
%common.attrib;
@@ -2930,6 +3126,7 @@
-->
<!ATTLIST informalfigure
float %yesorno.attvals; "0"
+ floatstyle CDATA #IMPLIED
pgwide %yesorno.attvals; #IMPLIED
%label.attrib;
%common.attrib;
@@ -3296,26 +3493,6 @@
<!--end of textdata.attlist-->]]>
<!--end of textdata.module-->]]>
-<!ENTITY % caption.module "INCLUDE">
-<![ %caption.module; [
-<!ENTITY % local.caption.attrib "">
-<!ENTITY % caption.role.attrib "%role.attrib;">
-
-<!ENTITY % caption.element "INCLUDE">
-<![ %caption.element; [
-<!ELEMENT caption %ho; (%textobject.mix;)*>
-<!--end of caption.element-->]]>
-
-<!ENTITY % caption.attlist "INCLUDE">
-<![ %caption.attlist; [
-<!ATTLIST caption
- %common.attrib;
- %caption.role.attrib;
- %local.caption.attrib;
->
-<!--end of caption.attlist-->]]>
-<!--end of caption.module-->]]>
-
<!ENTITY % mediaobjectco.module "INCLUDE">
<![ %mediaobjectco.module; [
<!ENTITY % local.mediaobjectco.attrib "">
@@ -3379,6 +3556,7 @@
<!ENTITY % equation.attlist "INCLUDE">
<![%equation.attlist;[
<!ATTLIST equation
+ floatstyle CDATA #IMPLIED
%label.attrib;
%common.attrib;
%equation.role.attrib;
@@ -3400,6 +3578,7 @@
<!ENTITY % informalequation.attlist "INCLUDE">
<![%informalequation.attlist;[
<!ATTLIST informalequation
+ floatstyle CDATA #IMPLIED
%common.attrib;
%informalequation.role.attrib;
%local.informalequation.attrib;
@@ -3460,11 +3639,31 @@
]]>
<!ENTITY % exchange.table.module "INCLUDE">
+<!-- Do we allow the HTML table model as well? -->
+<!ENTITY % allow.html.tables "INCLUDE">
+<![%allow.html.tables;[
+ <!-- ====================================================== -->
+ <!-- xhtmltbl.mod defines HTML tables and sets parameter
+ entities so that, when the CALS table module is read,
+ we end up allowing any table to be CALS or HTML.
+ i.e. This include must come first! -->
+ <!-- ====================================================== -->
+
+<!ENTITY % htmltbl
+ PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
+ "htmltblx.mod">
+%htmltbl;
+<!--end of allow.html.tables-->]]>
+
<!ENTITY % tables.role.attrib "%role.attrib;">
<![%cals.table.module;[
<!-- Add label and role attributes to table and informaltable -->
-<!ENTITY % bodyatt "%label.attrib;">
+<!ENTITY % bodyatt "
+ floatstyle CDATA #IMPLIED
+ rowheader (firstcol|norowheader) #IMPLIED
+ %label.attrib;"
+>
<!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
EntryTbl, and Entry (and InformalTable element). -->
@@ -3487,7 +3686,7 @@
<!-- Reference CALS Table Model -->
<!ENTITY % tablemodel
- PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2//EN"
+ PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
"calstblx.dtd">
]]>
@@ -3496,6 +3695,7 @@
<!-- InformalTable. -->
<!ENTITY % bodyatt
"%common.attrib;
+ rowheader (firstcol|norowheader) #IMPLIED
%label.attrib;
%tables.role.attrib;">
@@ -3538,9 +3738,12 @@
<!ENTITY % local.informaltable.attrib "">
+<!-- the following entity may have been declared by the XHTML table module -->
+<!ENTITY % informal.tbl.table.mdl "textobject*, (graphic+|mediaobject+|tgroup+)">
+
<!ENTITY % informaltable.element "INCLUDE">
<![%informaltable.element;[
-<!ELEMENT informaltable %ho; (blockinfo?, textobject*, (graphic+|mediaobject+|tgroup+))>
+<!ELEMENT informaltable %ho; (blockinfo?, (%informal.tbl.table.mdl;))>
<!--end of informaltable.element-->]]>
<!-- Frame, Colsep, and Rowsep must be repeated because
@@ -3550,16 +3753,10 @@
<!-- includes Label -->
<!-- includes common attributes -->
-
<!ENTITY % informaltable.attlist "INCLUDE">
<![%informaltable.attlist;[
<!ATTLIST informaltable
- frame (top
- |bottom
- |topbot
- |all
- |sides
- |none) #IMPLIED
+ frame (%tbl.frame.attval;) #IMPLIED
colsep %yesorno.attvals; #IMPLIED
rowsep %yesorno.attvals; #IMPLIED
%common.table.attribs;
@@ -3569,6 +3766,48 @@
<!--end of informaltable.attlist-->]]>
<!--end of informaltable.module-->]]>
+<!ENTITY % caption.module "INCLUDE">
+<![ %caption.module; [
+<!ENTITY % local.caption.attrib "">
+<!ENTITY % caption.role.attrib "%role.attrib;">
+
+<!ENTITY % caption.element "INCLUDE">
+<![ %caption.element; [
+<!ELEMENT caption %ho; (#PCDATA | %textobject.mix;)*>
+<!--end of caption.element-->]]>
+
+<!ENTITY % caption.attlist "INCLUDE">
+<![ %caption.attlist; [
+<!-- attrs comes from HTML tables ... -->
+
+<![ %allow.html.tables; [
+<!-- common.attrib, but without ID because ID is in attrs -->
+<!ENTITY % caption.attlist.content "
+ %lang.attrib;
+ %remap.attrib;
+ %xreflabel.attrib;
+ %revisionflag.attrib;
+ %effectivity.attrib;
+ %dir.attrib;
+ %xml-base.attrib;
+ %local.common.attrib;
+ %caption.role.attrib;
+ %attrs;
+ align (top|bottom|left|right) #IMPLIED
+ %local.caption.attrib;
+">
+]]>
+<!ENTITY % caption.attlist.content "
+ %common.attrib;
+ %caption.role.attrib;
+ %local.caption.attrib;
+">
+
+<!ATTLIST caption %caption.attlist.content;>
+
+<!--end of caption.attlist-->]]>
+<!--end of caption.module-->]]>
+
<!-- ...................................................................... -->
<!-- Synopses ............................................................. -->
@@ -3828,7 +4067,11 @@
<!ENTITY % funcprototype.element "INCLUDE">
<![%funcprototype.element;[
-<!ELEMENT funcprototype %ho; (funcdef, (void | varargs | paramdef+))>
+<!ELEMENT funcprototype %ho; (modifier*,
+ funcdef,
+ (void|varargs|(paramdef+, varargs?)),
+ modifier*)>
+
<!--end of funcprototype.element-->]]>
<!ENTITY % funcprototype.attlist "INCLUDE">
@@ -3917,6 +4160,7 @@
<!ENTITY % paramdef.element "INCLUDE">
<![%paramdef.element;[
<!ELEMENT paramdef %ho; (#PCDATA
+ | initializer
| type
| replaceable
| parameter
@@ -3926,6 +4170,8 @@
<!ENTITY % paramdef.attlist "INCLUDE">
<![%paramdef.attlist;[
<!ATTLIST paramdef
+ choice (opt
+ |req) #IMPLIED
%common.attrib;
%paramdef.role.attrib;
%local.paramdef.attrib;
@@ -4016,7 +4262,7 @@
<!ENTITY % ooclass.element "INCLUDE">
<![%ooclass.element;[
-<!ELEMENT ooclass %ho; (modifier*, classname)>
+<!ELEMENT ooclass %ho; ((modifier|package)*, classname)>
<!--end of ooclass.element-->]]>
<!ENTITY % ooclass.attlist "INCLUDE">
@@ -4036,7 +4282,7 @@
<!ENTITY % oointerface.element "INCLUDE">
<![%oointerface.element;[
-<!ELEMENT oointerface %ho; (modifier*, interfacename)>
+<!ELEMENT oointerface %ho; ((modifier|package)*, interfacename)>
<!--end of oointerface.element-->]]>
<!ENTITY % oointerface.attlist "INCLUDE">
@@ -4056,7 +4302,7 @@
<!ENTITY % ooexception.element "INCLUDE">
<![%ooexception.element;[
-<!ELEMENT ooexception %ho; (modifier*, exceptionname)>
+<!ELEMENT ooexception %ho; ((modifier|package)*, exceptionname)>
<!--end of ooexception.element-->]]>
<!ENTITY % ooexception.attlist "INCLUDE">
@@ -4179,7 +4425,7 @@
<![%constructorsynopsis.element;[
<!ELEMENT constructorsynopsis %ho; (modifier*,
methodname?,
- (methodparam+|void),
+ (methodparam+|void?),
exceptionname*)>
<!--end of constructorsynopsis.element-->]]>
@@ -4203,7 +4449,7 @@
<![%destructorsynopsis.element;[
<!ELEMENT destructorsynopsis %ho; (modifier*,
methodname?,
- (methodparam+|void),
+ (methodparam+|void?),
exceptionname*)>
<!--end of destructorsynopsis.element-->]]>
@@ -4228,7 +4474,7 @@
<!ELEMENT methodsynopsis %ho; (modifier*,
(type|void)?,
methodname,
- (methodparam+|void),
+ (methodparam+|void?),
exceptionname*,
modifier*)>
<!--end of methodsynopsis.element-->]]>
@@ -4706,7 +4952,7 @@
<!ENTITY % authorgroup.element "INCLUDE">
<![%authorgroup.element;[
-<!ELEMENT authorgroup %ho; ((author|editor|collab|corpauthor|othercredit)+)>
+<!ELEMENT authorgroup %ho; ((author|editor|collab|corpauthor|corpcredit|othercredit)+)>
<!--end of authorgroup.element-->]]>
<!ENTITY % authorgroup.attlist "INCLUDE">
@@ -5032,6 +5278,34 @@
<!--end of corpauthor.attlist-->]]>
<!--end of corpauthor.module-->]]>
+<!-- CorpCredit ...................... -->
+
+<!ENTITY % corpcredit.module "INCLUDE">
+<![%corpcredit.module;[
+<!ENTITY % local.corpcredit.attrib "">
+<!ENTITY % corpcredit.role.attrib "%role.attrib;">
+
+<!ENTITY % corpcredit.element "INCLUDE">
+<![%corpcredit.element;[
+<!ELEMENT corpcredit %ho; (%docinfo.char.mix;)*>
+<!--end of corpcredit.element-->]]>
+
+<!ENTITY % corpcredit.attlist "INCLUDE">
+<![%corpcredit.attlist;[
+<!ATTLIST corpcredit
+ class (graphicdesigner
+ |productioneditor
+ |copyeditor
+ |technicaleditor
+ |translator
+ |other) #IMPLIED
+ %common.attrib;
+ %corpcredit.role.attrib;
+ %local.corpcredit.attrib;
+>
+<!--end of corpcredit.attlist-->]]>
+<!--end of corpcredit.module-->]]>
+
<!-- CorpName ......................... -->
<!ENTITY % corpname.module "INCLUDE">
@@ -5451,6 +5725,12 @@
<!ENTITY % othercredit.attlist "INCLUDE">
<![%othercredit.attlist;[
<!ATTLIST othercredit
+ class (graphicdesigner
+ |productioneditor
+ |copyeditor
+ |technicaleditor
+ |translator
+ |other) #IMPLIED
%common.attrib;
%othercredit.role.attrib;
%local.othercredit.attrib;
@@ -5826,7 +6106,7 @@
<!ENTITY % revision.element "INCLUDE">
<![%revision.element;[
-<!ELEMENT revision %ho; (revnumber, date, authorinitials*,
+<!ELEMENT revision %ho; (revnumber, date, (author|authorinitials)*,
(revremark|revdescription)?)>
<!--end of revision.element-->]]>
@@ -6041,6 +6321,26 @@
<!--end of classname.attlist-->]]>
<!--end of classname.module-->]]>
+<!ENTITY % package.module "INCLUDE">
+<![%package.module;[
+<!ENTITY % local.package.attrib "">
+<!ENTITY % package.role.attrib "%role.attrib;">
+
+<!ENTITY % package.element "INCLUDE">
+<![%package.element;[
+<!ELEMENT package %ho; (%smallcptr.char.mix;)*>
+<!--end of package.element-->]]>
+
+<!ENTITY % package.attlist "INCLUDE">
+<![%package.attlist;[
+<!ATTLIST package
+ %common.attrib;
+ %package.role.attrib;
+ %local.package.attrib;
+>
+<!--end of package.attlist-->]]>
+<!--end of package.module-->]]>
+
<!ENTITY % co.module "INCLUDE">
<![%co.module;[
<!ENTITY % local.co.attrib "">
@@ -6158,7 +6458,19 @@
|field
|key1
|key2
- |record) #IMPLIED
+ |record
+ |index
+ |view
+ |primarykey
+ |secondarykey
+ |foreignkey
+ |altkey
+ |procedure
+ |datatype
+ |constraint
+ |rule
+ |user
+ |group) #IMPLIED
%moreinfo.attrib;
%common.attrib;
%database.role.attrib;
@@ -6351,7 +6663,7 @@
<!ENTITY % guibutton.element "INCLUDE">
<![%guibutton.element;[
-<!ELEMENT guibutton %ho; (%smallcptr.char.mix;|accel)*>
+<!ELEMENT guibutton %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
<!--end of guibutton.element-->]]>
<!ENTITY % guibutton.attlist "INCLUDE">
@@ -6372,7 +6684,7 @@
<!ENTITY % guiicon.element "INCLUDE">
<![%guiicon.element;[
-<!ELEMENT guiicon %ho; (%smallcptr.char.mix;|accel)*>
+<!ELEMENT guiicon %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
<!--end of guiicon.element-->]]>
<!ENTITY % guiicon.attlist "INCLUDE">
@@ -6393,7 +6705,7 @@
<!ENTITY % guilabel.element "INCLUDE">
<![%guilabel.element;[
-<!ELEMENT guilabel %ho; (%smallcptr.char.mix;|accel)*>
+<!ELEMENT guilabel %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
<!--end of guilabel.element-->]]>
<!ENTITY % guilabel.attlist "INCLUDE">
@@ -6414,7 +6726,7 @@
<!ENTITY % guimenu.element "INCLUDE">
<![%guimenu.element;[
-<!ELEMENT guimenu %ho; (%smallcptr.char.mix;|accel)*>
+<!ELEMENT guimenu %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
<!--end of guimenu.element-->]]>
<!ENTITY % guimenu.attlist "INCLUDE">
@@ -6435,7 +6747,7 @@
<!ENTITY % guimenuitem.element "INCLUDE">
<![%guimenuitem.element;[
-<!ELEMENT guimenuitem %ho; (%smallcptr.char.mix;|accel)*>
+<!ELEMENT guimenuitem %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
<!--end of guimenuitem.element-->]]>
<!ENTITY % guimenuitem.attlist "INCLUDE">
@@ -6456,7 +6768,7 @@
<!ENTITY % guisubmenu.element "INCLUDE">
<![%guisubmenu.element;[
-<!ELEMENT guisubmenu %ho; (%smallcptr.char.mix;|accel)*>
+<!ELEMENT guisubmenu %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
<!--end of guisubmenu.element-->]]>
<!ENTITY % guisubmenu.attlist "INCLUDE">
@@ -6528,6 +6840,29 @@
<!ENTITY % keycap.attlist "INCLUDE">
<![%keycap.attlist;[
<!ATTLIST keycap
+ function (alt
+ |control
+ |shift
+ |meta
+ |escape
+ |enter
+ |tab
+ |backspace
+ |command
+ |option
+ |space
+ |delete
+ |insert
+ |up
+ |down
+ |left
+ |right
+ |home
+ |end
+ |pageup
+ |pagedown
+ |other) #IMPLIED
+ otherfunction CDATA #IMPLIED
%moreinfo.attrib;
%common.attrib;
%keycap.role.attrib;
@@ -6639,6 +6974,27 @@
<!--end of literal.attlist-->]]>
<!--end of literal.module-->]]>
+<!ENTITY % code.module "INCLUDE">
+<![%code.module;[
+<!ENTITY % local.code.attrib "">
+<!ENTITY % code.role.attrib "%role.attrib;">
+
+<!ENTITY % code.element "INCLUDE">
+<![%code.element;[
+<!ELEMENT code %ho; (%cptr.char.mix;)*>
+<!--end of code.element-->]]>
+
+<!ENTITY % code.attlist "INCLUDE">
+<![%code.attlist;[
+<!ATTLIST code
+ language CDATA #IMPLIED
+ %common.attrib;
+ %code.role.attrib;
+ %local.code.attrib;
+>
+<!--end of code.attlist-->]]>
+<!--end of code.module-->]]>
+
<!ENTITY % constant.module "INCLUDE">
<![ %constant.module; [
<!ENTITY % local.constant.attrib "">
@@ -7007,7 +7363,11 @@
|pi
|xmlpi
|starttag
- |sgmlcomment) #IMPLIED
+ |sgmlcomment
+ |prefix
+ |namespace
+ |localname) #IMPLIED
+ namespace CDATA #IMPLIED
%common.attrib;
%sgmltag.role.attrib;
%local.sgmltag.attrib;
@@ -7095,22 +7455,27 @@
<![%systemitem.attlist;[
<!ATTLIST systemitem
class (constant
+ |daemon
+ |domainname
+ |etheraddress
|event
|eventhandler
- |domainname
+ |filesystem
|fqdomainname
+ |groupname
|ipaddress
- |netmask
- |etheraddress
- |groupname
|library
|macro
+ |netmask
+ |newsgroup
|osname
- |filesystem
+ |protocol
|resource
|systemname
|username
- |newsgroup) #IMPLIED
+ |process
+ |server
+ |service) #IMPLIED
%moreinfo.attrib;
%common.attrib;
%systemitem.role.attrib;
@@ -7119,7 +7484,29 @@
<!--end of systemitem.attlist-->]]>
<!--end of systemitem.module-->]]>
+<!ENTITY % uri.module "INCLUDE">
+<![%uri.module;[
+<!ENTITY % local.uri.attrib "">
+<!ENTITY % uri.role.attrib "%role.attrib;">
+<!ENTITY % uri.element "INCLUDE">
+<![%uri.element;[
+<!ELEMENT uri %ho; (%smallcptr.char.mix;)*>
+<!--end of uri.element-->]]>
+
+<!-- Type: Type of URI; no default -->
+
+<!ENTITY % uri.attlist "INCLUDE">
+<![%uri.attlist;[
+<!ATTLIST uri
+ type CDATA #IMPLIED
+ %common.attrib;
+ %uri.role.attrib;
+ %local.uri.attrib;
+>
+<!--end of uri.attlist-->]]>
+<!--end of uri.module-->]]>
+
<!ENTITY % token.module "INCLUDE">
<![%token.module;[
<!ENTITY % local.token.attrib "">
@@ -7329,7 +7716,15 @@
|journal
|series
|set
- |manuscript) #IMPLIED
+ |manuscript
+ |cdrom
+ |dvd
+ |wiki
+ |gopher
+ |bbs
+ |emailmessage
+ |webpage
+ |newsposting) #IMPLIED
%common.attrib;
%citetitle.role.attrib;
%local.citetitle.attrib;
@@ -7357,29 +7752,6 @@
<!--end of emphasis.attlist-->]]>
<!--end of emphasis.module-->]]>
-<!ENTITY % firstterm.module "INCLUDE">
-<![%firstterm.module;[
-<!ENTITY % local.firstterm.attrib "">
-<!ENTITY % firstterm.role.attrib "%role.attrib;">
-
-<!ENTITY % firstterm.element "INCLUDE">
-<![%firstterm.element;[
-<!ELEMENT firstterm %ho; (%word.char.mix;)*>
-<!--end of firstterm.element-->]]>
-
-<!-- to GlossEntry or other explanation -->
-
-
-<!ENTITY % firstterm.attlist "INCLUDE">
-<![%firstterm.attlist;[
-<!ATTLIST firstterm
- %linkend.attrib; %common.attrib;
- %firstterm.role.attrib;
- %local.firstterm.attrib;
->
-<!--end of firstterm.attlist-->]]>
-<!--end of firstterm.module-->]]>
-
<!ENTITY % foreignphrase.module "INCLUDE">
<![%foreignphrase.module;[
<!ENTITY % local.foreignphrase.attrib "">
@@ -7415,11 +7787,11 @@
<!-- BaseForm: Provides the form of GlossTerm to be used
for indexing -->
-
<!ENTITY % glossterm.attlist "INCLUDE">
<![%glossterm.attlist;[
<!ATTLIST glossterm
- %linkend.attrib; baseform CDATA #IMPLIED
+ baseform CDATA #IMPLIED
+ %linkend.attrib;
%common.attrib;
%glossterm.role.attrib;
%local.glossterm.attrib;
@@ -7427,6 +7799,32 @@
<!--end of glossterm.attlist-->]]>
<!--end of glossterm.module-->]]>
+<!ENTITY % firstterm.module "INCLUDE">
+<![%firstterm.module;[
+<!ENTITY % local.firstterm.attrib "">
+<!ENTITY % firstterm.role.attrib "%role.attrib;">
+
+<!ENTITY % firstterm.element "INCLUDE">
+<![%firstterm.element;[
+<!ELEMENT firstterm %ho; (%para.char.mix;)*
+ %glossterm.exclusion;>
+<!--end of firstterm.element-->]]>
+
+<!-- to GlossEntry or other explanation -->
+
+
+<!ENTITY % firstterm.attlist "INCLUDE">
+<![%firstterm.attlist;[
+<!ATTLIST firstterm
+ baseform CDATA #IMPLIED
+ %linkend.attrib;
+ %common.attrib;
+ %firstterm.role.attrib;
+ %local.firstterm.attrib;
+>
+<!--end of firstterm.attlist-->]]>
+<!--end of firstterm.module-->]]>
+
<!ENTITY % phrase.module "INCLUDE">
<![%phrase.module;[
<!ENTITY % local.phrase.attrib "">
@@ -7597,7 +7995,9 @@
<![%link.attlist;[
<!ATTLIST link
endterm IDREF #IMPLIED
- %linkendreq.attrib; type CDATA #IMPLIED
+ xrefstyle CDATA #IMPLIED
+ type CDATA #IMPLIED
+ %linkendreq.attrib;
%common.attrib;
%link.role.attrib;
%local.link.attrib;
@@ -7632,6 +8032,7 @@
type CDATA #IMPLIED
targetdoc CDATA #IMPLIED
targetptr CDATA #IMPLIED
+ xrefstyle CDATA #IMPLIED
%common.attrib;
%olink.role.attrib;
%local.olink.attrib;
@@ -7659,6 +8060,7 @@
<!ATTLIST ulink
url CDATA #REQUIRED
type CDATA #IMPLIED
+ xrefstyle CDATA #IMPLIED
%common.attrib;
%ulink.role.attrib;
%local.ulink.attrib;
@@ -7710,13 +8112,41 @@
<![%xref.attlist;[
<!ATTLIST xref
endterm IDREF #IMPLIED
- %linkendreq.attrib; %common.attrib;
+ xrefstyle CDATA #IMPLIED
+ %common.attrib;
+ %linkendreq.attrib;
%xref.role.attrib;
%local.xref.attrib;
>
<!--end of xref.attlist-->]]>
<!--end of xref.module-->]]>
+<!ENTITY % biblioref.module "INCLUDE">
+<![%biblioref.module;[
+<!ENTITY % local.biblioref.attrib "">
+<!ENTITY % biblioref.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioref.element "INCLUDE">
+<![%biblioref.element;[
+<!ELEMENT biblioref %ho; EMPTY>
+<!--end of biblioref.element-->]]>
+
+<!ENTITY % biblioref.attlist "INCLUDE">
+<![%biblioref.attlist;[
+<!ATTLIST biblioref
+ endterm IDREF #IMPLIED
+ xrefstyle CDATA #IMPLIED
+ units CDATA #IMPLIED
+ begin CDATA #IMPLIED
+ end CDATA #IMPLIED
+ %common.attrib;
+ %linkendreq.attrib;
+ %biblioref.role.attrib;
+ %local.biblioref.attrib;
+>
+<!--end of biblioref.attlist-->]]>
+<!--end of biblioref.module-->]]>
+
<!-- Ubiquitous elements .................................................. -->
<!ENTITY % anchor.module "INCLUDE">
@@ -7815,8 +8245,9 @@
class (singular
|startofrange
|endofrange) #IMPLIED
- startref IDREF #IMPLIED
- zone IDREFS #IMPLIED
+ startref IDREF #IMPLIED
+ zone IDREFS #IMPLIED
+ type CDATA #IMPLIED
%common.attrib;
%indexterm.role.attrib;
%local.indexterm.attrib;
@@ -7920,5 +8351,5 @@
<!--end of seeseealso.module-->]]>
<!--end of indexterm.content.module-->]]>
-<!-- End of DocBook XML information pool module V4.2 ...................... -->
+<!-- End of DocBook XML information pool module V4.4 ...................... -->
<!-- ...................................................................... -->
Modified: plugins/XML/trunk/xml/dtds/docbook-catalog.xml
===================================================================
--- plugins/XML/trunk/xml/dtds/docbook-catalog.xml 2009-12-14 17:02:24 UTC (rev 16638)
+++ plugins/XML/trunk/xml/dtds/docbook-catalog.xml 2009-12-14 17:11:02 UTC (rev 16639)
@@ -1,8 +1,8 @@
<?xml version='1.0'?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<!-- ...................................................................... -->
-<!-- XML Catalog data for DocBook XML V4.2 ................................ -->
+<!-- XML Catalog data for DocBook XML V4.4 ................................ -->
<!-- File catalog.xml ..................................................... -->
<!-- Please direct all questions, bug reports, or suggestions for
@@ -10,7 +10,7 @@
information, see http://www.oasis-open.org/.
-->
-<!-- This is the catalog data file for DocBook V4.2. It is provided as
+<!-- This is the catalog data file for DocBook V4.4. It is provided as
a convenience in building your own catalog files. You need not use
the filenames listed here, and need not use the filename method of
identifying storage objects at all. See the documentation for
@@ -22,94 +22,103 @@
<!-- ...................................................................... -->
<!-- DocBook driver file .................................................. -->
-<public publicId="-//OASIS//DTD DocBook XML V4.2//EN"
+<publ...
[truncated message content] |
