From: <nw...@us...> - 2006-07-21 17:16:12
|
Revision: 6103 Author: nwalsh Date: 2006-07-21 10:16:03 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6103&view=rev Log Message: ----------- Use correct info patterns Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/mathml.rnc trunk/docbook/relaxng/docbook/src/svg.rnc Modified: trunk/docbook/relaxng/docbook/src/mathml.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/mathml.rnc 2006-07-21 17:14:59 UTC (rev 6102) +++ trunk/docbook/relaxng/docbook/src/mathml.rnc 2006-07-21 17:16:03 UTC (rev 6103) @@ -64,7 +64,7 @@ db.imagedata.mathml = element imagedata { db.imagedata.mathml.attlist, - db.imagedata.info, + db.imagedata.mathml.info, db._any.mml+ } } Modified: trunk/docbook/relaxng/docbook/src/svg.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/svg.rnc 2006-07-21 17:14:59 UTC (rev 6102) +++ trunk/docbook/relaxng/docbook/src/svg.rnc 2006-07-21 17:16:03 UTC (rev 6103) @@ -63,7 +63,7 @@ db.imagedata.svg = element imagedata { db.imagedata.svg.attlist, - db.imagedata.info, + db.imagedata.svg.info, db._any.svg+ } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2006-07-21 17:28:49
|
Revision: 6106 Author: nwalsh Date: 2006-07-21 10:28:22 -0700 (Fri, 21 Jul 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6106&view=rev Log Message: ----------- DocBook V5.0b7 released Modified Paths: -------------- trunk/docbook/relaxng/docbook/dbforms/dbforms.rnc trunk/docbook/relaxng/docbook/dbforms/htmlform.rnc trunk/docbook/relaxng/docbook/defguide/defguide.rnc trunk/docbook/relaxng/docbook/docbook/docbook.rnc trunk/docbook/relaxng/docbook/docbookxi/docbookxi.rnc trunk/docbook/relaxng/docbook/docbookxi/xinclude.rnc trunk/docbook/relaxng/docbook/spec/docbook.xml trunk/docbook/relaxng/docbook/src/annotations.rnc trunk/docbook/relaxng/docbook/src/bibliography.rnc trunk/docbook/relaxng/docbook/src/callouts.rnc trunk/docbook/relaxng/docbook/src/calstbl.rnc trunk/docbook/relaxng/docbook/src/docbook.rnc trunk/docbook/relaxng/docbook/src/ebnf.rnc trunk/docbook/relaxng/docbook/src/glossary.rnc trunk/docbook/relaxng/docbook/src/hier.rnc trunk/docbook/relaxng/docbook/src/htmltbl.rnc trunk/docbook/relaxng/docbook/src/index.rnc trunk/docbook/relaxng/docbook/src/math.rnc trunk/docbook/relaxng/docbook/src/mathml.rnc trunk/docbook/relaxng/docbook/src/msgset.rnc trunk/docbook/relaxng/docbook/src/pool.rnc trunk/docbook/relaxng/docbook/src/qandaset.rnc trunk/docbook/relaxng/docbook/src/refentry.rnc trunk/docbook/relaxng/docbook/src/refsect1.rnc trunk/docbook/relaxng/docbook/src/sect1.rnc trunk/docbook/relaxng/docbook/src/svg.rnc trunk/docbook/relaxng/docbook/src/tasks.rnc trunk/docbook/relaxng/docbook/src/toc.rnc trunk/docbook/relaxng/docbook/src/xlink.rnc Modified: trunk/docbook/relaxng/docbook/dbforms/dbforms.rnc =================================================================== --- trunk/docbook/relaxng/docbook/dbforms/dbforms.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/dbforms/dbforms.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/dbforms/htmlform.rnc =================================================================== --- trunk/docbook/relaxng/docbook/dbforms/htmlform.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/dbforms/htmlform.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/defguide/defguide.rnc =================================================================== --- trunk/docbook/relaxng/docbook/defguide/defguide.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/defguide/defguide.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/docbook/docbook.rnc =================================================================== --- trunk/docbook/relaxng/docbook/docbook/docbook.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/docbook/docbook.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/docbookxi/docbookxi.rnc =================================================================== --- trunk/docbook/relaxng/docbook/docbookxi/docbookxi.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/docbookxi/docbookxi.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/docbookxi/xinclude.rnc =================================================================== --- trunk/docbook/relaxng/docbook/docbookxi/xinclude.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/docbookxi/xinclude.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/spec/docbook.xml =================================================================== --- trunk/docbook/relaxng/docbook/spec/docbook.xml 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/spec/docbook.xml 2006-07-21 17:28:22 UTC (rev 6106) @@ -15,7 +15,7 @@ </releaseinfo> <!-- product --> <productname>docbook</productname> -<!-- productVersion --> <productnumber>5.0b6</productnumber> +<!-- productVersion --> <productnumber>5.0b7</productnumber> <!-- artifactType spec; what else? :-) --> <!-- stage --> <releaseinfo role="stage">wd</releaseinfo> <!-- revision --> <biblioid class="pubsnumber">01</biblioid> @@ -40,7 +40,7 @@ </editor> </authorgroup> -<pubdate>2006-06-02</pubdate> +<pubdate>2006-07-21</pubdate> <copyright> <year>2001</year><year>2002</year><year>2003</year> @@ -154,6 +154,46 @@ <link xlink:href="http://docbook.org/"/>. </para> +<section xml:id="s.50b7"> +<title>Changes in DocBook V5.0b7</title> + +<para>This release contains several improvements over V5.0b6.</para> + +<orderedlist> +<listitem xml:id="rfe.1520074"> +<para>Fixed <link xlink:href="&RFE;aid=1520074">RFE 1520074</link>: +Define separate patterns for all the effectivity attributes to make +customization easier.</para> +</listitem> +<listitem xml:id="rfe.1512505"> +<para>Attempted to address +<link xlink:href="&RFE;aid=1512505">RFE 1512505</link>: +Added an <tag class="attribute">audience</tag> effectivity attribute. +</para> +</listitem> +<listitem xml:id="msgaud"> +<para>Rename <tag class="attribute">audience</tag>, +<tag class="attribute">origin</tag>, and <tag class="attribute">level</tag> +on <tag>simplemsgentry</tag> to <tag class="attribute">msgaud</tag>, +<tag class="attribute">msgorig</tag>, and <tag class="attribute">msglevel</tag>, +respectively. This is a better parallel with the descendent elements of +<tag>msgentry</tag> and avoids a conflict with the newly introduced +<tag class="attribute">audience</tag> effectivity attribute.</para> +</listitem> +<listitem xml:id="startinglinenumber"> +<para>Added <tag class="attribute">startinglinenumber</tag> attribute +to <tag>orderedlist</tag>. +</para> +</listitem> +<listitem xml:id="imagedata.fileref"> +<para>Fixed bug where one of <tag class="attribute">fileref</tag> or +<tag class="attribute">entityref</tag> was required on +<tag>imagedata</tag> even when the content was inline MathML or SVG. +</para> +</listitem> +</orderedlist> +</section> + <section xml:id="s.50b6"> <title>Changes in DocBook V5.0b6</title> @@ -1054,6 +1094,7 @@ <listitem><para>Nancy Harrison, IBM</para></listitem> <listitem><para>Scott Hudson, Individual</para></listitem> <listitem><para>Mark Johnson, Debian</para></listitem> +<listitem><para>Gershon Joseph, Tech-Tav Documentation Ltd.</para></listitem> <listitem><para>Jirka Kosek, Individual</para></listitem> <listitem><para>Larry Rowland, Hewlett-Packard</para></listitem> <listitem><para>Michael Smith, Individual</para></listitem> @@ -1142,6 +1183,10 @@ <para> <revhistory> +<revision role="&root;specs/docbook-5.0b7-spec-wd-01.html"> + <revnumber>Working Draft “Beta 7”</revnumber> + <date>21 July 2006</date> +</revision> <revision role="&root;specs/docbook-5.0b6-spec-wd-01.html"> <revnumber>Working Draft “Beta 6”</revnumber> <date>2 June 2006</date> Modified: trunk/docbook/relaxng/docbook/src/annotations.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/annotations.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/annotations.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/bibliography.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/bibliography.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/bibliography.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/callouts.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/callouts.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/callouts.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/calstbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/calstbl.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/calstbl.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/docbook.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/docbook.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/docbook.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/ebnf.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/ebnf.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/ebnf.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/glossary.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/glossary.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/glossary.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/hier.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/hier.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/hier.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/htmltbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/index.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/index.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/index.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/math.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/math.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/math.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/mathml.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/mathml.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/mathml.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/msgset.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/msgset.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/msgset.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/qandaset.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/qandaset.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/qandaset.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/refentry.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/refentry.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/refentry.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/refsect1.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/refsect1.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/refsect1.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/sect1.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/sect1.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/sect1.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/svg.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/svg.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/svg.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/tasks.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/tasks.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/tasks.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/toc.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/toc.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/toc.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/xlink.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/xlink.rnc 2006-07-21 17:26:54 UTC (rev 6105) +++ trunk/docbook/relaxng/docbook/src/xlink.rnc 2006-07-21 17:28:22 UTC (rev 6106) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0b6 +# This file is part of DocBook V5.0b7 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2006-09-26 11:33:38
|
Revision: 6313 http://svn.sourceforge.net/docbook/?rev=6313&view=rev Author: nwalsh Date: 2006-09-26 04:33:29 -0700 (Tue, 26 Sep 2006) Log Message: ----------- Fix RFE #1535166: Improve datatypes for attributes Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/calstbl.rnc trunk/docbook/relaxng/docbook/src/ebnf.rnc trunk/docbook/relaxng/docbook/src/htmltbl.rnc trunk/docbook/relaxng/docbook/src/pool.rnc Modified: trunk/docbook/relaxng/docbook/src/calstbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/calstbl.rnc 2006-09-26 08:07:54 UTC (rev 6312) +++ trunk/docbook/relaxng/docbook/src/calstbl.rnc 2006-09-26 11:33:29 UTC (rev 6313) @@ -48,7 +48,7 @@ db:refpurpose [ "Specifies the percentage of the column's total width that should appear to the left of the first occurance of the character identified in " db:tag [ class="attribute" "char" ] " when " db:tag [ class="attribute" "align" ] " is set to " db:quote [ "char" ] "." ] ] - attribute charoff { text } + attribute charoff { xsd:decimal { minExclusive="0" maxExclusive="100" } } db.frame.attribute = [ @@ -86,7 +86,7 @@ ] ] ] - attribute colsep { text } + attribute colsep { "0" | "1" } db.rowsep.attribute = [ @@ -106,7 +106,7 @@ ] ] ] - attribute rowsep { text } + attribute rowsep { "0" | "1" } db.orient.attribute = [ @@ -235,7 +235,7 @@ [ db:refpurpose [ "The number of columns in the table. Must be an integer greater than zero." ] ] - attribute cols { xsd:integer } + attribute cols { xsd:positiveInteger } db.tgroup.attlist = db.tgroup.role.attribute? @@ -273,7 +273,7 @@ [ db:refpurpose [ "The number of the column to which this specification applies. Must be greater than any preceding column number. Defaults to one more than the number of the preceding column, if there is one, or one." ] ] - attribute colnum { xsd:integer } + attribute colnum { xsd:positiveInteger } db.colspec.colwidth.attribute = [ db:refpurpose [ "Specifies the width of the column." ] @@ -452,7 +452,7 @@ [ db:refpurpose [ "Specifies the rotation of this entry. FIXME: what are the legal values of this attribute?" ] ] - attribute rotate { text } + attribute rotate { "0" | "1" } db.entry.attlist = db.entry.role.attribute? @@ -492,7 +492,7 @@ [ db:refpurpose [ "The number of columns in the entry table. Must be an integer greater than zero." ] ] - attribute cols { xsd:integer } + attribute cols { xsd:positiveInteger } db.entrytbl.attlist = db.entrytbl.role.attribute? Modified: trunk/docbook/relaxng/docbook/src/ebnf.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/ebnf.rnc 2006-09-26 08:07:54 UTC (rev 6312) +++ trunk/docbook/relaxng/docbook/src/ebnf.rnc 2006-09-26 11:33:29 UTC (rev 6313) @@ -142,7 +142,7 @@ [ db:refpurpose [ "Specifies a URI that points to a " db:tag [ "production" ] "where the " db:tag [ "nonterminal" ] " is defined" ] ] - attribute def { text } + attribute def { xsd:anyURI } db.nonterminal.attlist = db.nonterminal.role.attribute? Modified: trunk/docbook/relaxng/docbook/src/htmltbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2006-09-26 08:07:54 UTC (rev 6312) +++ trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2006-09-26 11:33:29 UTC (rev 6313) @@ -127,7 +127,7 @@ & [ db:refpurpose [ "When present, this attribute specifies the offset to the first occurrence of the alignment character on each line. If a line doesn't include the alignment character, it should be horizontally shifted to end at the alignment position. When charoff is used to set the offset of an alignment character, the direction of offset is determined by the current text direction (set by the dir attribute). In left-to-right texts (the default), offset is from the left margin. In right-to-left texts, offset is from the right margin. User agents are not required to support this attribute." ] ] - attribute charoff { text }? + attribute charoff { xsd:integer | xsd:string { pattern="[0-9]+%" } }? db.html.cellvalign = [ @@ -151,11 +151,11 @@ & [ db:refpurpose [ "Specifies the desired width of the entire table and is intended for visual user agents. When the value is a percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent." ] ] - attribute width { text }? + attribute width { xsd:integer | xsd:string { pattern="[0-9]+%" } }? & [ db:refpurpose [ "Specifies the width (in pixels only) of the frame around a table." ] ] - attribute border { text }? + attribute border { xsd:nonNegativeInteger }? & [ db:refpurpose [ "Specifies which sides of the frame surrounding a table will be visible." ] ] @@ -196,11 +196,11 @@ & [ db:refpurpose [ "Specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells." ] ] - attribute cellspacing { text }? + attribute cellspacing { xsd:integer | xsd:string { pattern="[0-9]+%" } }? & [ db:refpurpose [ "Specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is a percentage length, the top and bottom margins should be equally separated from the content based on a percentage of the available vertical space, and the left and right margins should be equally separated from the content based on a percentage of the available horizontal space." ] ] - attribute cellpadding { text }? + attribute cellpadding { xsd:integer | xsd:string { pattern="[0-9]+%" } }? db.html.tablecell.attributes = [ @@ -231,11 +231,11 @@ & [ db:refpurpose [ "Specifies the number of rows spanned by the current cell. The default value of this attribute is one (" db:quote [ "1" ] "). The value zero (" db:quote [ "0" ] ") means that the cell spans all rows from the current row to the last row of the table section (" db:tag [ "thead" ] ", " db:tag [ "tbody" ] ", or " db:tag [ "tfoot" ] ") in which the cell is defined." ] ] - attribute rowspan { text }? + attribute rowspan { xsd:nonNegativeInteger }? & [ db:refpurpose [ "Specifies the number of columns spanned by the current cell. The default value of this attribute is one (" db:quote [ "1" ] "). The value zero (" db:quote [ "0" ] ") means that the cell spans all columns from the current column to the last column of the column group (" db:tag [ "colgroup" ] ") in which the cell is defined." ] ] - attribute colspan { text }? + attribute colspan { xsd:nonNegativeInteger }? db.html.table.model = db.html.caption, @@ -323,7 +323,7 @@ & [ db:refpurpose [ "This attribute, whose value must be an integer > 0, specifies the number of columns " db:quote [ "spanned" ] " by the " db:tag [ "col" ] " element; the " db:tag [ "col" ] " element shares its attributes with all the columns it spans. The default value for this attribute is 1 (i.e., a single column). If the span attribute is set to N > 1, the current " db:tag [ "col" ] " element shares its attributes with the next N-1 columns." ] ] - attribute span { text }? + attribute span { xsd:nonNegativeInteger }? & [ db:refpurpose [ "Specifies a default width for each column spanned by the current " db:tag [ "col" ] " element. It has the same meaning as the " db:tag [ class="attribute" "width" ] " attribute for the " db:tag [ "colgroup" ] " element and overrides it." ] ] @@ -351,7 +351,7 @@ & [ db:refpurpose [ "This attribute, which must be an integer > 0, specifies the number of columns in a column group. In the absence of a span attribute, each " db:tag [ "colgroup" ] " defines a column group containing one column. If the span attribute is set to N > 0, the current " db:tag [ "colgroup" ] " element defines a column group containing N columns. User agents must ignore this attribute if the " db:tag [ "colgroup" ] " element contains one or more " db:tag [ "col" ] " elements." ] ] - attribute span { text }? + attribute span { xsd:nonNegativeInteger }? & [ db:refpurpose [ "This attribute specifies a default width for each column in the current column group. In addition to the standard pixel, percentage, and relative values, this attribute allows the special form " db:quote [ "0*" ] " (zero asterisk) which means that the width of the each column in the group should be the minimum width necessary to hold the column's contents. This implies that a column's entire contents must be known before its width may be correctly computed. Authors should be aware that specifying " db:quote [ "0*" ] " will prevent visual user agents from rendering a table incrementally. This attribute is overridden for any column in the column group whose width is specified via a " db:tag [ "col" ] " element." ] ] Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2006-09-26 08:07:54 UTC (rev 6312) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2006-09-26 11:33:29 UTC (rev 6313) @@ -176,7 +176,7 @@ [ db:refpurpose [ "Identifies a link target with a URI" ] ] - attribute xlink:href { text } + attribute xlink:href { xsd:anyURI } db.xlink.type.attribute = [ @@ -272,7 +272,7 @@ [ db:refpurpose [ "Specifies the base URI of the element and its descendants" ] ] - attribute xml:base { text } + attribute xml:base { xsd:anyURI } db.remap.attribute = [ @@ -433,7 +433,7 @@ [ db:refpurpose [ "Specifies the width (in characters) of the element" ] ] - attribute width { xsd:integer } + attribute width { xsd:nonNegativeInteger } db.spacing.enumeration = ## The spacing should be "compact". @@ -517,7 +517,7 @@ [ db:refpurpose [ "Specifies the scaling factor" ] ] - attribute scale { text } + attribute scale { xsd:positiveInteger } # ====================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2006-09-26 16:36:18
|
Revision: 6321 http://svn.sourceforge.net/docbook/?rev=6321&view=rev Author: nwalsh Date: 2006-09-26 09:36:09 -0700 (Tue, 26 Sep 2006) Log Message: ----------- Added refpurpose to format attributes Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/mathml.rnc trunk/docbook/relaxng/docbook/src/svg.rnc Modified: trunk/docbook/relaxng/docbook/src/mathml.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/mathml.rnc 2006-09-26 13:57:33 UTC (rev 6320) +++ trunk/docbook/relaxng/docbook/src/mathml.rnc 2006-09-26 16:36:09 UTC (rev 6321) @@ -49,7 +49,13 @@ db.imagedata.mathml.attlist = db.imagedata.mathml.role.attribute? & db.common.attributes - & attribute format { "mathml" }? + & [ + db:refpurpose [ "Specifies that the format of the data is MathML" ] + ] + attribute format { + ## Specifies MathML. + "mathml" + }? & db.imagedata.align.attribute? & db.imagedata.valign.attribute? & db.imagedata.width.attribute? Modified: trunk/docbook/relaxng/docbook/src/svg.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/svg.rnc 2006-09-26 13:57:33 UTC (rev 6320) +++ trunk/docbook/relaxng/docbook/src/svg.rnc 2006-09-26 16:36:09 UTC (rev 6321) @@ -48,7 +48,13 @@ db.imagedata.svg.attlist = db.imagedata.svg.role.attribute? & db.common.attributes - & attribute format { "svg" }? + & [ + db:refpurpose [ "Specifies that the format of the data is SVG" ] + ] + attribute format { + ## Specifies SVG. + "svg" + }? & db.imagedata.align.attribute? & db.imagedata.valign.attribute? & db.imagedata.width.attribute? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2007-03-13 12:58:38
|
Revision: 6689 http://svn.sourceforge.net/docbook/?rev=6689&view=rev Author: nwalsh Date: 2007-03-13 05:58:33 -0700 (Tue, 13 Mar 2007) Log Message: ----------- Fix RFE #1669465: Schematron rules refer to @id where @xml:id is required Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/glossary.rnc trunk/docbook/relaxng/docbook/src/pool.rnc Modified: trunk/docbook/relaxng/docbook/src/glossary.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/glossary.rnc 2007-03-13 12:35:58 UTC (rev 6688) +++ trunk/docbook/relaxng/docbook/src/glossary.rnc 2007-03-13 12:58:33 UTC (rev 6689) @@ -164,7 +164,7 @@ s:rule [ context = "db:glosssee[@otherterm]" s:assert [ - test = "local-name(//*[@id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" + test = "local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" "@otherterm on glosssee must point to a glossentry." ] ] @@ -204,7 +204,7 @@ s:rule [ context = "db:glossseealso[@otherterm]" s:assert [ - test = "local-name(//*[@id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" + test = "local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" "@otherterm on glossseealso must point to a glossentry." ] ] @@ -239,7 +239,7 @@ s:rule [ context = "db:firstterm[@linkend]" s:assert [ - test = "local-name(//*[@id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" + test = "local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" "@linkend on firstterm must point to a glossentry." ] ] @@ -274,7 +274,7 @@ s:rule [ context = "db:glossterm[@linkend]" s:assert [ - test = "local-name(//*[@id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" + test = "local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" "@linkend on glossterm must point to a glossentry." ] ] Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2007-03-13 12:35:58 UTC (rev 6688) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2007-03-13 12:58:33 UTC (rev 6689) @@ -3010,7 +3010,7 @@ s:rule [ context = "db:synopfragmentref" s:assert [ - test = "local-name(//*[@id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" + test = "local-name(//*[@xml:id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" "@linkend on synopfragmentref must point to a synopfragment." ] ] @@ -7304,7 +7304,7 @@ s:rule [ context = "db:footnoteref" s:assert [ - test = "local-name(//*[@id=current()/@linkend]) = 'footnote' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" + test = "local-name(//*[@xml:id=current()/@linkend]) = 'footnote' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" "@linkend on footnoteref must point to a footnote." ] ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2007-03-22 11:52:48
|
Revision: 6724 http://svn.sourceforge.net/docbook/?rev=6724&view=rev Author: nwalsh Date: 2007-03-22 04:52:46 -0700 (Thu, 22 Mar 2007) Log Message: ----------- Change semantics of termdef so that a firstterm is required; move the addition of termdef to the technical inlines into the glossary module where it belongs Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/glossary.rnc trunk/docbook/relaxng/docbook/src/pool.rnc Modified: trunk/docbook/relaxng/docbook/src/glossary.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/glossary.rnc 2007-03-21 16:20:35 UTC (rev 6723) +++ trunk/docbook/relaxng/docbook/src/glossary.rnc 2007-03-22 11:52:46 UTC (rev 6724) @@ -349,6 +349,8 @@ # ====================================================================== +db.technical.inlines |= db.termdef + [ db:refname [ "termdef" ] db:refpurpose [ "An inline definition of a term" ] @@ -369,7 +371,7 @@ s:rule [ context = "db:termdef" s:assert [ - test = "count(db:glossterm) = 1" + test = "count(db:firstterm) = 1" "A termdef must contain exactly one glossterm" ] ] Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2007-03-21 16:20:35 UTC (rev 6723) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2007-03-22 11:52:46 UTC (rev 6724) @@ -657,7 +657,6 @@ | db.package | db.parameter | db.property - | db.termdef db.error.inlines = db.errorcode This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2007-03-22 12:25:36
|
Revision: 6727 http://svn.sourceforge.net/docbook/?rev=6727&view=rev Author: nwalsh Date: 2007-03-22 05:25:35 -0700 (Thu, 22 Mar 2007) Log Message: ----------- RFE 1644553#: Added label attribute to CALS and HTML tables Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/calstbl.rnc trunk/docbook/relaxng/docbook/src/htmltbl.rnc Modified: trunk/docbook/relaxng/docbook/src/calstbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/calstbl.rnc 2007-03-22 12:24:43 UTC (rev 6726) +++ trunk/docbook/relaxng/docbook/src/calstbl.rnc 2007-03-22 12:25:35 UTC (rev 6727) @@ -614,9 +614,11 @@ ctrl:exclude [ from="db.cals.table" exclude="db.cals.informaltable" ] db.cals.table.role.attribute = attribute role { text } + db.cals.table.label.attribute = db.label.attribute db.cals.table.attlist = db.cals.table.role.attribute? + & db.cals.table.label.attribute? & db.common.attributes & db.common.linking.attributes & db.tabstyle.attribute? Modified: trunk/docbook/relaxng/docbook/src/htmltbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2007-03-22 12:24:43 UTC (rev 6726) +++ trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2007-03-22 12:25:35 UTC (rev 6727) @@ -257,10 +257,14 @@ db:refpurpose [ "A formal (captioned) HTML table in a document" ] ] div { + db.html.table.role.attribute = attribute role { text } + db.html.table.label.attribute = db.label.attribute db.html.table.attlist = db.html.attrs & db.html.table.attributes + & db.html.table.role.attribute? + & db.html.table.label.attribute? & db.orient.attribute? & db.pgwide.attribute? & db.tabstyle.attribute? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2007-03-22 17:07:43
|
Revision: 6744 http://svn.sourceforge.net/docbook/?rev=6744&view=rev Author: nwalsh Date: 2007-03-22 10:07:40 -0700 (Thu, 22 Mar 2007) Log Message: ----------- Changed version number from 5.0CR2 to 5.0CR3 Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/annotations.rnc trunk/docbook/relaxng/docbook/src/bibliography.rnc trunk/docbook/relaxng/docbook/src/callouts.rnc trunk/docbook/relaxng/docbook/src/calstbl.rnc trunk/docbook/relaxng/docbook/src/docbook.rnc trunk/docbook/relaxng/docbook/src/ebnf.rnc trunk/docbook/relaxng/docbook/src/glossary.rnc trunk/docbook/relaxng/docbook/src/hier.rnc trunk/docbook/relaxng/docbook/src/htmltbl.rnc trunk/docbook/relaxng/docbook/src/index.rnc trunk/docbook/relaxng/docbook/src/math.rnc trunk/docbook/relaxng/docbook/src/mathml.rnc trunk/docbook/relaxng/docbook/src/msgset.rnc trunk/docbook/relaxng/docbook/src/pool.rnc trunk/docbook/relaxng/docbook/src/qandaset.rnc trunk/docbook/relaxng/docbook/src/refentry.rnc trunk/docbook/relaxng/docbook/src/refsect1.rnc trunk/docbook/relaxng/docbook/src/sect1.rnc trunk/docbook/relaxng/docbook/src/svg.rnc trunk/docbook/relaxng/docbook/src/tasks.rnc trunk/docbook/relaxng/docbook/src/toc.rnc trunk/docbook/relaxng/docbook/src/xlink.rnc Modified: trunk/docbook/relaxng/docbook/src/annotations.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/annotations.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/annotations.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/bibliography.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/bibliography.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/bibliography.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/callouts.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/callouts.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/callouts.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/calstbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/calstbl.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/calstbl.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/docbook.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/docbook.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/docbook.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/ebnf.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/ebnf.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/ebnf.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/glossary.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/glossary.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/glossary.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/hier.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/hier.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/hier.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/htmltbl.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/htmltbl.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/index.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/index.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/index.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/math.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/math.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/math.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/mathml.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/mathml.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/mathml.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/msgset.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/msgset.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/msgset.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/qandaset.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/qandaset.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/qandaset.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/refentry.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/refentry.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/refentry.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/refsect1.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/refsect1.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/refsect1.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/sect1.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/sect1.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/sect1.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/svg.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/svg.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/svg.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/tasks.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/tasks.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/tasks.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/toc.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/toc.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/toc.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software Modified: trunk/docbook/relaxng/docbook/src/xlink.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/xlink.rnc 2007-03-22 17:01:14 UTC (rev 6743) +++ trunk/docbook/relaxng/docbook/src/xlink.rnc 2007-03-22 17:07:40 UTC (rev 6744) @@ -1,4 +1,4 @@ -# This file is part of DocBook V5.0CR2 +# This file is part of DocBook V5.0CR3 # # Copyright 1992-2005 HaL Computer Systems, Inc., # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2007-05-18 17:26:02
|
Revision: 6809 http://svn.sourceforge.net/docbook/?rev=6809&view=rev Author: nwalsh Date: 2007-05-18 10:26:00 -0700 (Fri, 18 May 2007) Log Message: ----------- RFE #1708032: Fix pattern naming inconsistency with db.href.attribute*s* Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/callouts.rnc trunk/docbook/relaxng/docbook/src/pool.rnc Modified: trunk/docbook/relaxng/docbook/src/callouts.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/callouts.rnc 2007-05-18 17:19:31 UTC (rev 6808) +++ trunk/docbook/relaxng/docbook/src/callouts.rnc 2007-05-18 17:26:00 UTC (rev 6809) @@ -214,7 +214,7 @@ db.area.role.attribute? & db.common.idreq.attributes & db.area.units.attribute - & (db.area.linkends.attribute | db.href.attribute)? + & (db.area.linkends.attribute | db.href.attributes)? & db.area.label.attribute? & db.area.coords.attribute @@ -237,7 +237,7 @@ db.area.role.attribute? & db.common.attributes & db.area.units.attribute - & (db.area.linkends.attribute | db.href.attribute)? + & (db.area.linkends.attribute | db.href.attributes)? & db.area.label.attribute? & db.area.coords.attribute @@ -264,7 +264,7 @@ db.areaset.role.attribute? & db.common.idreq.attributes & db.area.units.attribute - & (db.areaset.linkends.attribute | db.href.attribute)? + & (db.areaset.linkends.attribute | db.href.attributes)? & db.areaset.label.attribute? db.areaset = Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2007-05-18 17:19:31 UTC (rev 6808) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2007-05-18 17:26:00 UTC (rev 6809) @@ -250,7 +250,7 @@ ] attribute xlink:actuate { db.xlink.actuate.enumeration } -db.href.attribute = +db.href.attributes = db.xlink.href.attribute & db.xlink.type.attribute? & db.xlink.role.attribute? @@ -358,10 +358,10 @@ & db.effectivity.attributes db.common.linking.attributes = - (db.linkend.attribute | db.href.attribute)? + (db.linkend.attribute | db.href.attributes)? db.common.req.linking.attributes = - db.linkend.attribute | db.href.attribute + db.linkend.attribute | db.href.attributes db.common.data.attributes = [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2007-09-27 12:55:13
|
Revision: 7461 http://docbook.svn.sourceforge.net/docbook/?rev=7461&view=rev Author: nwalsh Date: 2007-09-27 05:55:11 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Fix (part of) RFE 1784312: Allow book to be completely empty Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/hier.rnc trunk/docbook/relaxng/docbook/src/pool.rnc Modified: trunk/docbook/relaxng/docbook/src/hier.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/hier.rnc 2007-09-27 12:52:42 UTC (rev 7460) +++ trunk/docbook/relaxng/docbook/src/hier.rnc 2007-09-27 12:55:11 UTC (rev 7461) @@ -129,13 +129,13 @@ & db.label.attribute? & db.book.status.attribute? - db.book.info = db._info.title.req + db.book.info = db._info db.book = element book { db.book.attlist, db.book.info, - (db.navigation.components | db.components | db.divisions)+ + (db.navigation.components | db.components | db.divisions)* } } Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2007-09-27 12:52:42 UTC (rev 7460) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2007-09-27 12:55:11 UTC (rev 7461) @@ -621,7 +621,7 @@ db._title.onlyreq = db.title & db.titleabbrev? db._info = - (db._title.req?, db.titleforbidden.info?) | db.info? + (db._title, db.titleforbidden.info?) | db.info? db._info.title.req = (db._title.req, db.titleforbidden.info?) | db.titlereq.info This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nw...@us...> - 2007-09-28 18:34:16
|
Revision: 7473 http://docbook.svn.sourceforge.net/docbook/?rev=7473&view=rev Author: nwalsh Date: 2007-09-28 11:34:15 -0700 (Fri, 28 Sep 2007) Log Message: ----------- Refactor to make the work of the Publishing Subcommitee easier Modified Paths: -------------- trunk/docbook/relaxng/docbook/src/docbook.rnc trunk/docbook/relaxng/docbook/src/pool.rnc Added Paths: ----------- trunk/docbook/relaxng/docbook/src/admonitions.rnc trunk/docbook/relaxng/docbook/src/core.rnc trunk/docbook/relaxng/docbook/src/error.rnc trunk/docbook/relaxng/docbook/src/gui.rnc trunk/docbook/relaxng/docbook/src/keyboard.rnc trunk/docbook/relaxng/docbook/src/markup.rnc trunk/docbook/relaxng/docbook/src/os.rnc trunk/docbook/relaxng/docbook/src/product.rnc trunk/docbook/relaxng/docbook/src/programming.rnc trunk/docbook/relaxng/docbook/src/technical.rnc Added: trunk/docbook/relaxng/docbook/src/admonitions.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/admonitions.rnc (rev 0) +++ trunk/docbook/relaxng/docbook/src/admonitions.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -0,0 +1,162 @@ +# This file is part of DocBook V5.0CR6 +# +# Copyright 1992-2005 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 +# Standards (OASIS). +# +# Release: $Id: pool.rnc 7466 2007-09-27 14:03:55Z nwalsh $ +# +# Permission to use, copy, modify and distribute the DocBook schema +# 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 schema +# for any purpose. It is provided "as is" without expressed or implied +# warranty. +# +# If you modify the DocBook schema in any way, label your schema as a +# variant of DocBook. See the reference documentation +# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +# for more information. +# +# Please direct all questions, bug reports, or suggestions for changes +# to the do...@li... mailing list. For more +# information, see http://www.oasis-open.org/docbook/. +# +# ====================================================================== + +default namespace = "http://docbook.org/ns/docbook" +namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace s = "http://www.ascc.net/xml/schematron" +namespace db = "http://docbook.org/ns/docbook" + +db.nopara.blocks |= db.admonition.blocks + +# ====================================================================== + +ctrl:exclude [ from="db.formal.blocks" exclude="db.admonition.blocks" ] +ctrl:exclude [ from="db.admonition.blocks" exclude="db.admonition.blocks" ] +ctrl:exclude [ from="db.footnote" exclude="db.admonition.blocks" ] +ctrl:exclude [ from="db.caption" exclude="db.admonition.blocks" ] + +db.admonition.blocks = + db.caution + | db.important + | db.note + | db.tip + | db.warning + +db.admonition.contentmodel = db._info.title.only, db.all.blocks+ + +# ====================================================================== + +[ + db:refname [ "caution" ] + db:refpurpose [ "A note of caution" ] +] +div { + + db.caution.role.attribute = attribute role { text } + + db.caution.attlist = + db.caution.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.caution = + element caution { + db.caution.attlist, + db.admonition.contentmodel + } +} + +# ====================================================================== + +[ + db:refname [ "important" ] + db:refpurpose [ "An admonition set off from the text" ] +] +div { + + db.important.role.attribute = attribute role { text } + + db.important.attlist = + db.important.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.important = + element important { + db.important.attlist, + db.admonition.contentmodel + } +} + +# ====================================================================== + +[ + db:refname [ "note" ] + db:refpurpose [ "A message set off from the text" ] +] +div { + + db.note.role.attribute = attribute role { text } + + db.note.attlist = + db.note.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.note = + element note { + db.note.attlist, + db.admonition.contentmodel + } +} + +# ====================================================================== + +[ + db:refname [ "tip" ] + db:refpurpose [ "A suggestion to the user, set off from the text" ] +] +div { + + db.tip.role.attribute = attribute role { text } + + db.tip.attlist = + db.tip.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.tip = + element tip { + db.tip.attlist, + db.admonition.contentmodel + } +} + +# ====================================================================== + +[ + db:refname [ "warning" ] + db:refpurpose [ "An admonition set off from the text" ] +] +div { + + db.warning.role.attribute = attribute role { text } + + db.warning.attlist = + db.warning.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.warning = + element warning { + db.warning.attlist, + db.admonition.contentmodel + } +} Added: trunk/docbook/relaxng/docbook/src/core.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/core.rnc (rev 0) +++ trunk/docbook/relaxng/docbook/src/core.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -0,0 +1,45 @@ +# This file is part of DocBook V5.0CR6 +# +# Copyright 1992-2005 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 +# Standards (OASIS). +# +# Release: $Id: docbook.rnc 7466 2007-09-27 14:03:55Z nwalsh $ +# +# Permission to use, copy, modify and distribute the DocBook schema +# 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 schema +# for any purpose. It is provided "as is" without expressed or implied +# warranty. +# +# If you modify the DocBook schema in any way, label your schema as a +# variant of DocBook. See the reference documentation +# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +# for more information. +# +# Please direct all questions, bug reports, or suggestions for changes +# to the do...@li... mailing list. For more +# information, see http://www.oasis-open.org/docbook/. +# +# ====================================================================== + +namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace s = "http://www.ascc.net/xml/schematron" +namespace db = "http://docbook.org/ns/docbook" +default namespace = "http://docbook.org/ns/docbook" + +start = db.set + | db.book + | db.divisions + | db.components + | db.navigation.components + | db.section + | db.para + +include "pool.rnc" +include "hier.rnc" Modified: trunk/docbook/relaxng/docbook/src/docbook.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/docbook.rnc 2007-09-28 10:19:19 UTC (rev 7472) +++ trunk/docbook/relaxng/docbook/src/docbook.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -33,18 +33,9 @@ namespace db = "http://docbook.org/ns/docbook" default namespace = "http://docbook.org/ns/docbook" -start = db.set - | db.book - | db.divisions - | db.components - | db.navigation.components - | db.section - | db.para - -include "pool.rnc" +include "core.rnc" include "annotations.rnc" include "xlink.rnc" -include "hier.rnc" include "sect1.rnc" include "refentry.rnc" include "refsect1.rnc" @@ -62,4 +53,12 @@ include "math.rnc" include "mathml.rnc" include "svg.rnc" - +include "markup.rnc" +include "product.rnc" +include "gui.rnc" +include "keyboard.rnc" +include "os.rnc" +include "programming.rnc" +include "admonitions.rnc" +include "error.rnc" +include "technical.rnc" Added: trunk/docbook/relaxng/docbook/src/error.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/error.rnc (rev 0) +++ trunk/docbook/relaxng/docbook/src/error.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -0,0 +1,130 @@ +# This file is part of DocBook V5.0CR6 +# +# Copyright 1992-2005 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 +# Standards (OASIS). +# +# Release: $Id: pool.rnc 7466 2007-09-27 14:03:55Z nwalsh $ +# +# Permission to use, copy, modify and distribute the DocBook schema +# 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 schema +# for any purpose. It is provided "as is" without expressed or implied +# warranty. +# +# If you modify the DocBook schema in any way, label your schema as a +# variant of DocBook. See the reference documentation +# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +# for more information. +# +# Please direct all questions, bug reports, or suggestions for changes +# to the do...@li... mailing list. For more +# information, see http://www.oasis-open.org/docbook/. +# +# ====================================================================== + +default namespace = "http://docbook.org/ns/docbook" +namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace s = "http://www.ascc.net/xml/schematron" +namespace db = "http://docbook.org/ns/docbook" + +db.domain.inlines |= db.error.inlines + +db.error.inlines = + db.errorcode + | db.errortext + | db.errorname + | db.errortype + +# ====================================================================== + +[ + db:refname [ "errorcode" ] + db:refpurpose [ "An error code" ] +] +div { + + db.errorcode.role.attribute = attribute role { text } + + db.errorcode.attlist = + db.errorcode.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.errorcode = + element errorcode { + db.errorcode.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "errorname" ] + db:refpurpose [ "An error name" ] +] +div { + + db.errorname.role.attribute = attribute role { text } + + db.errorname.attlist = + db.errorname.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.errorname = + element errorname { + db.errorname.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "errortext" ] + db:refpurpose [ "An error message." ] +] +div { + + db.errortext.role.attribute = attribute role { text } + + db.errortext.attlist = + db.errortext.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.errortext = + element errortext { + db.errortext.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "errortype" ] + db:refpurpose [ "The classification of an error message" ] +] +div { + + db.errortype.role.attribute = attribute role { text } + + db.errortype.attlist = + db.errortype.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.errortype = + element errortype { + db.errortype.attlist, + db._text + } +} Added: trunk/docbook/relaxng/docbook/src/gui.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/gui.rnc (rev 0) +++ trunk/docbook/relaxng/docbook/src/gui.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -0,0 +1,228 @@ +# This file is part of DocBook V5.0CR6 +# +# Copyright 1992-2005 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 +# Standards (OASIS). +# +# Release: $Id: pool.rnc 7466 2007-09-27 14:03:55Z nwalsh $ +# +# Permission to use, copy, modify and distribute the DocBook schema +# 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 schema +# for any purpose. It is provided "as is" without expressed or implied +# warranty. +# +# If you modify the DocBook schema in any way, label your schema as a +# variant of DocBook. See the reference documentation +# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +# for more information. +# +# Please direct all questions, bug reports, or suggestions for changes +# to the do...@li... mailing list. For more +# information, see http://www.oasis-open.org/docbook/. +# +# ====================================================================== + +default namespace = "http://docbook.org/ns/docbook" +namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace s = "http://www.ascc.net/xml/schematron" +namespace db = "http://docbook.org/ns/docbook" + +db.domain.inlines |= db.gui.inlines + +db.userinput.inlines |= db.gui.inlines + +db.keycombination.contentmodel |= db.mousebutton + +db.gui.inlines = + db.guiicon + | db.guibutton + | db.guimenuitem + | db.guimenu + | db.guisubmenu + | db.guilabel + | db.menuchoice + | db.mousebutton + +# ====================================================================== + +[ + db:refname [ "guibutton" ] + db:refpurpose [ "The text on a button in a GUI" ] +] +div { + + db.guibutton.role.attribute = attribute role { text } + + db.guibutton.attlist = + db.guibutton.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.guibutton = + element guibutton { + db.guibutton.attlist, + (db._text | db.accel | db.superscript | db.subscript)* + } +} + +# ====================================================================== + +[ + db:refname [ "guiicon" ] + db:refpurpose [ "Graphic and/or text appearing as a icon in a GUI" ] +] +div { + + db.guiicon.role.attribute = attribute role { text } + + db.guiicon.attlist = + db.guiicon.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.guiicon = + element guiicon { + db.guiicon.attlist, + (db._text | db.accel | db.superscript | db.subscript)* + } +} + +# ====================================================================== + +[ + db:refname [ "guilabel" ] + db:refpurpose [ "The text of a label in a GUI" ] +] +div { + + db.guilabel.role.attribute = attribute role { text } + + db.guilabel.attlist = + db.guilabel.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.guilabel = + element guilabel { + db.guilabel.attlist, + (db._text | db.accel | db.superscript | db.subscript)* + } +} + +# ====================================================================== + +[ + db:refname [ "guimenu" ] + db:refpurpose [ "The name of a menu in a GUI" ] +] +div { + + db.guimenu.role.attribute = attribute role { text } + + db.guimenu.attlist = + db.guimenu.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.guimenu = + element guimenu { + db.guimenu.attlist, + (db._text | db.accel | db.superscript | db.subscript)* + } +} + +# ====================================================================== + +[ + db:refname [ "guimenuitem" ] + db:refpurpose [ "The name of a terminal menu item in a GUI" ] +] +div { + + db.guimenuitem.role.attribute = attribute role { text } + + db.guimenuitem.attlist = + db.guimenuitem.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.guimenuitem = + element guimenuitem { + db.guimenuitem.attlist, + (db._text | db.accel | db.superscript | db.subscript)* + } +} + +# ====================================================================== + +[ + db:refname [ "guisubmenu" ] + db:refpurpose [ "The name of a submenu in a GUI" ] +] +div { + + db.guisubmenu.role.attribute = attribute role { text } + + db.guisubmenu.attlist = + db.guisubmenu.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.guisubmenu = + element guisubmenu { + db.guisubmenu.attlist, + (db._text | db.accel | db.superscript | db.subscript)* + } +} + +# ====================================================================== + +[ + db:refname [ "menuchoice" ] + db:refpurpose [ "A selection or series of selections from a menu" ] +] +div { + + db.menuchoice.role.attribute = attribute role { text } + + db.menuchoice.attlist = + db.menuchoice.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.menuchoice = + element menuchoice { + db.menuchoice.attlist, + db.shortcut?, + (db.guibutton|db.guiicon|db.guilabel|db.guimenu|db.guimenuitem|db.guisubmenu)+ + } +} + +# ====================================================================== + +[ + db:refname [ "mousebutton" ] + db:refpurpose [ "The conventional name of a mouse button" ] +] +div { + + db.mousebutton.role.attribute = attribute role { text } + + db.mousebutton.attlist = + db.mousebutton.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.mousebutton = + element mousebutton { + db.mousebutton.attlist, + db._text + } +} + Added: trunk/docbook/relaxng/docbook/src/keyboard.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/keyboard.rnc (rev 0) +++ trunk/docbook/relaxng/docbook/src/keyboard.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -0,0 +1,294 @@ +# This file is part of DocBook V5.0CR6 +# +# Copyright 1992-2005 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 +# Standards (OASIS). +# +# Release: $Id: pool.rnc 7466 2007-09-27 14:03:55Z nwalsh $ +# +# Permission to use, copy, modify and distribute the DocBook schema +# 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 schema +# for any purpose. It is provided "as is" without expressed or implied +# warranty. +# +# If you modify the DocBook schema in any way, label your schema as a +# variant of DocBook. See the reference documentation +# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +# for more information. +# +# Please direct all questions, bug reports, or suggestions for changes +# to the do...@li... mailing list. For more +# information, see http://www.oasis-open.org/docbook/. +# +# ====================================================================== + +default namespace = "http://docbook.org/ns/docbook" +namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace s = "http://www.ascc.net/xml/schematron" +namespace db = "http://docbook.org/ns/docbook" + +db.domain.inlines |= db.keyboard.inlines + +db.userinput.inlines |= db.keyboard.inlines + +db.keyboard.inlines = + db.keycombo + | db.keycap + | db.keycode + | db.keysym + | db.shortcut + | db.accel + +# ====================================================================== + +[ + db:refname [ "keycap" ] + db:refpurpose [ "The text printed on a key on a keyboard" ] +] +div { + + ctrl:other-attribute [ name="db.keycap.function.attrib" + enum-name="db.keycap.function-enum.attribute" + other-name="db.keycap.function-other.attributes" ] + + db.keycap.function.enumeration = + ## The "Alt" key + "alt" + | ## The "Backspace" key + "backspace" + | ## The "Command" key + "command" + | ## The "Control" key + "control" + | ## The "Delete" key + "delete" + | ## The down arrow + "down" + | ## The "End" key + "end" + | ## The "Enter" or "Return" key + "enter" + | ## The "Escape" key + "escape" + | ## The "Home" key + "home" + | ## The "Insert" key + "insert" + | ## The left arrow + "left" + | ## The "Meta" key + "meta" + | ## The "Option" key + "option" + | ## The page down key + "pagedown" + | ## The page up key + "pageup" + | ## The right arrow + "right" + | ## The "Shift" key + "shift" + | ## The spacebar + "space" + | ## The "Tab" key + "tab" + | ## The up arrow + "up" + + db.keycap.function-enum.attribute = + [ + db:refpurpose [ "Identifies the function key" ] + ] + attribute function { db.keycap.function.enumeration }? + + db.keycap.function-other.attributes = + [ + db:refpurpose [ "Identifies the function key" ] + ] + attribute function { + ## Indicates a non-standard function key + "other" + }?, + [ + db:refpurpose [ "Specifies a keyword that identifies the non-standard key" ] + ] + attribute otherfunction { text } + + db.keycap.function.attrib = + (db.keycap.function-enum.attribute | db.keycap.function-other.attributes) + + db.keycap.role.attribute = attribute role { text } + + db.keycap.attlist = + db.keycap.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.keycap.function.attrib + + db.keycap = + element keycap { + db.keycap.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "keycode" ] + db:refpurpose [ "The internal, frequently numeric, identifier for a key on a keyboard" ] +] +div { + + db.keycode.role.attribute = attribute role { text } + + db.keycode.attlist = + db.keycode.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.keycode = + element keycode { + db.keycode.attlist, + db._text + } +} + +# ====================================================================== + +db.keycombination.contentmodel = db.keycap|db.keycombo|db.keysym + +[ + db:refname [ "keycombo" ] + db:refpurpose [ "A combination of input actions" ] +] +div { + + ctrl:other-attribute [ name="db.keycombo.action.attrib" + enum-name="db.keycombo.action-enum.attribute" + other-name="db.keycombo.action-other.attributes" ] + + db.keycombo.action.enumeration = + ## A (single) mouse click. + "click" + | ## A double mouse click. + "double-click" + | ## A mouse or key press. + "press" + | ## Sequential clicks or presses. + "seq" + | ## Simultaneous clicks or presses. + "simul" + + db.keycombo.action-enum.attribute = + [ + db:refpurpose [ "Identifies the nature of the action taken. If " db:tag [ "keycombo" ] " contains more than one element, " db:tag [ class="attvalue" "simul" ] " is the default, otherwise there is no default." ] + ] + attribute action { db.keycombo.action.enumeration }? + + db.keycombo.action-other.attributes = + [ + db:refpurpose [ "Identifies the nature of the action taken" ] + ] + attribute action { + ## Indicates a non-standard action + "other" + }?, + [ + db:refpurpose [ "Identifies the non-standard action in some unspecified way." ] + ] + attribute otheraction { text } + + db.keycombo.action.attrib = + (db.keycombo.action-enum.attribute | db.keycombo.action-other.attributes) + + db.keycombo.role.attribute = attribute role { text } + + db.keycombo.attlist = + db.keycombo.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.keycombo.action.attrib + + db.keycombo = + element keycombo { + db.keycombo.attlist, + (db.keycombination.contentmodel)+ + } +} + +# ====================================================================== + +[ + db:refname [ "keysym" ] + db:refpurpose [ "The symbolic name of a key on a keyboard" ] +] +div { + + db.keysym.role.attribute = attribute role { text } + + db.keysym.attlist = + db.keysym.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.keysym = + element keysym { + db.keysym.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "accel" ] + db:refpurpose [ "A graphical user interface (GUI) keyboard shortcut" ] +] +div { + + db.accel.role.attribute = attribute role { text } + + db.accel.attlist = + db.accel.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.accel = + element accel { + db.accel.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "shortcut" ] + db:refpurpose [ "A key combination for an action that is also accessible through a menu" ] +] +div { + + db.shortcut.action.attrib = db.keycombo.action.attrib + + db.shortcut.role.attribute = attribute role { text } + + db.shortcut.attlist = + db.shortcut.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.shortcut.action.attrib + + db.shortcut = + element shortcut { + db.shortcut.attlist, + (db.keycombination.contentmodel)+ + } +} + Added: trunk/docbook/relaxng/docbook/src/markup.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/markup.rnc (rev 0) +++ trunk/docbook/relaxng/docbook/src/markup.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -0,0 +1,278 @@ +# This file is part of DocBook V5.0CR6 +# +# Copyright 1992-2005 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 +# Standards (OASIS). +# +# Release: $Id: pool.rnc 7466 2007-09-27 14:03:55Z nwalsh $ +# +# Permission to use, copy, modify and distribute the DocBook schema +# 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 schema +# for any purpose. It is provided "as is" without expressed or implied +# warranty. +# +# If you modify the DocBook schema in any way, label your schema as a +# variant of DocBook. See the reference documentation +# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +# for more information. +# +# Please direct all questions, bug reports, or suggestions for changes +# to the do...@li... mailing list. For more +# information, see http://www.oasis-open.org/docbook/. +# +# ====================================================================== + +default namespace = "http://docbook.org/ns/docbook" +namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace s = "http://www.ascc.net/xml/schematron" +namespace db = "http://docbook.org/ns/docbook" + +db.domain.inlines |= db.markup.inlines + +db.userinput.inlines |= db.markup.inlines + +db.computeroutput.inlines |= db.markup.inlines + +db.markup.inlines = + db.tag + | db.markup + | db.token + | db.symbol + | db.literal + | db.code + | db.constant + | db.email + | db.uri + +# ====================================================================== + +[ + db:refname [ "markup" ] + db:refpurpose [ "A string of formatting markup in text that is to be represented literally" ] +] +div { + + db.markup.role.attribute = attribute role { text } + + db.markup.attlist = + db.markup.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.markup = + element markup { + db.markup.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "tag" ] + db:refpurpose [ "A component of XML (or SGML) markup" ] +] +div { + + db.tag.role.attribute = attribute role { text } + + db.tag.class.enumeration = + ## An attribute + "attribute" + | ## An attribute value + "attvalue" + | ## An element + "element" + | ## An empty element tag + "emptytag" + | ## An end tag + "endtag" + | ## A general entity + "genentity" + | ## The local name part of a qualified name + "localname" + | ## A namespace + "namespace" + | ## A numeric character reference + "numcharref" + | ## A parameter entity + "paramentity" + | ## A processing instruction + "pi" + | ## The prefix part of a qualified name + "prefix" + | ## An SGML comment + "comment" + | ## A start tag + "starttag" + | ## An XML processing instruction + "xmlpi" + + db.tag.class.attribute = + [ + db:refpurpose [ "Identifies the nature of the tag content" ] + ] + attribute class { db.tag.class.enumeration } + + db.tag.namespace.attribute = + [ + db:refpurpose [ "Identifies the namespace of the tag content" ] + ] + attribute namespace { xsd:anyURI } + + db.tag.attlist = + db.tag.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.tag.class.attribute? + & db.tag.namespace.attribute? + + db.tag = + element tag { + db.tag.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "symbol" ] + db:refpurpose [ "A name that is replaced by a value before processing" ] +] +div { + + db.symbol.class.attribute = + [ + db:refpurpose [ "Identifies the class of symbol" ] + ] + attribute class { + ## The value is a limit of some kind + "limit" + } + + db.symbol.role.attribute = attribute role { text } + + db.symbol.attlist = + db.symbol.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.symbol.class.attribute? + + db.symbol = + element symbol { + db.symbol.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "token" ] + db:refpurpose [ "A unit of information" ] +] +div { + + db.token.role.attribute = attribute role { text } + + db.token.attlist = + db.token.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.token = + element token { + db.token.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "literal" ] + db:refpurpose [ "Inline text that is some literal value" ] +] +div { + + db.literal.role.attribute = attribute role { text } + + db.literal.attlist = + db.literal.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.literal = + element literal { + db.literal.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "code" ] + db:refpurpose [ "An inline code fragment" ] +] +div { + + code.language.attribute = + [ + db:refpurpose [ "Identifies the (computer) language of the code fragment" ] + ] + attribute language { text } + + db.code.role.attribute = attribute role { text } + + db.code.attlist = + db.code.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & code.language.attribute? + + db.code = + element code { + db.code.attlist, + (db.programming.inlines | db._text)* + } +} + +# ====================================================================== + +[ + db:refname [ "constant" ] + db:refpurpose [ "A programming or system constant" ] +] +div { + + db.constant.class.attribute = + [ + db:refpurpose [ "Identifies the class of constant" ] + ] + attribute class { + ## The value is a limit of some kind + "limit" + } + + db.constant.role.attribute = attribute role { text } + + db.constant.attlist = + db.constant.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.constant.class.attribute? + + db.constant = + element constant { + db.constant.attlist, + db._text + } +} Added: trunk/docbook/relaxng/docbook/src/os.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/os.rnc (rev 0) +++ trunk/docbook/relaxng/docbook/src/os.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -0,0 +1,446 @@ +# This file is part of DocBook V5.0CR6 +# +# Copyright 1992-2005 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 +# Standards (OASIS). +# +# Release: $Id: pool.rnc 7466 2007-09-27 14:03:55Z nwalsh $ +# +# Permission to use, copy, modify and distribute the DocBook schema +# 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 schema +# for any purpose. It is provided "as is" without expressed or implied +# warranty. +# +# If you modify the DocBook schema in any way, label your schema as a +# variant of DocBook. See the reference documentation +# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +# for more information. +# +# Please direct all questions, bug reports, or suggestions for changes +# to the do...@li... mailing list. For more +# information, see http://www.oasis-open.org/docbook/. +# +# ====================================================================== + +default namespace = "http://docbook.org/ns/docbook" +namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace s = "http://www.ascc.net/xml/schematron" +namespace db = "http://docbook.org/ns/docbook" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" + +db.domain.inlines |= db.os.inlines + +db.synopsis.blocks |= db.cmdsynopsis + +db.os.inlines = + db.prompt + | db.envar + | db.filename + | db.command + | db.computeroutput + | db.userinput + +db.computeroutput.inlines = + text + | db.ubiq.inlines + | db.os.inlines + | db.technical.inlines + +db.userinput.inlines = + text + | db.ubiq.inlines + | db.os.inlines + | db.technical.inlines + +# ====================================================================== + +db.prompt.inlines = db._text + +# ====================================================================== + +[ + db:refname [ "prompt" ] + db:refpurpose [ "A character or string indicating the start of an input field in a computer display" ] +] +div { + + + db.prompt.role.attribute = attribute role { text } + + db.prompt.attlist = + db.prompt.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.prompt = + element prompt { + db.prompt.attlist, + db.prompt.inlines* + } +} + +# ====================================================================== + +[ + db:refname [ "envar" ] + db:refpurpose [ "A software environment variable" ] +] +div { + + db.envar.role.attribute = attribute role { text } + + db.envar.attlist = + db.envar.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.envar = + element envar { + db.envar.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "filename" ] + db:refpurpose [ "The name of a file" ] +] +div { + + db.filename.class.enumeration = + ## A device + "devicefile" + | ## A directory + "directory" + | ## A filename extension + "extension" + | ## A header file (as for a programming language) + "headerfile" + | ## A library file + "libraryfile" + | ## A partition (as of a hard disk) + "partition" + | ## A symbolic link + "symlink" + + db.filename.class.attribute = + [ + db:refpurpose [ "Identifies the class of filename" ] + ] + attribute class { db.filename.class.enumeration } + + db.filename.path.attribute = + [ + db:refpurpose [ "Specifies the path of the filename" ] + ] + attribute path { text } + + db.filename.role.attribute = attribute role { text } + + db.filename.attlist = + db.filename.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.filename.path.attribute? + & db.filename.class.attribute? + + db.filename = + element filename { + db.filename.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "command" ] + db:refpurpose [ "The name of an executable program or other software command" ] +] +div { + + db.command.role.attribute = attribute role { text } + + db.command.attlist = + db.command.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.command = + element command { + db.command.attlist, + db._text + } +} + +# ====================================================================== + +[ + db:refname [ "computeroutput" ] + db:refpurpose [ "Data, generally text, displayed or presented by a computer" ] +] +div { + + db.computeroutput.role.attribute = attribute role { text } + + db.computeroutput.attlist = + db.computeroutput.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.computeroutput = + element computeroutput { + db.computeroutput.attlist, + db.computeroutput.inlines* + } +} + +# ====================================================================== + +[ + db:refname [ "userinput" ] + db:refpurpose [ "Data entered by the user" ] +] +div { + + db.userinput.role.attribute = attribute role { text } + + db.userinput.attlist = + db.userinput.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.userinput = + element userinput { + db.userinput.attlist, + db.userinput.inlines* + } +} + +# ====================================================================== + +[ + db:refname [ "cmdsynopsis" ] + db:refpurpose [ "A syntax summary for a software command" ] +] +div { + + db.cmdsynopsis.role.attribute = attribute role { text } + + db.cmdsynopsis.sepchar.attribute = + [ + db:refpurpose [ "Specifies the character that should separate the command and its top-level arguments" ] + ] + attribute sepchar { text } + + db.cmdsynopsis.cmdlength.attribute = + [ + db:refpurpose [ "Indicates the displayed length of the command; this information may be used to intelligently indent command synopses which extend beyond one line" ] + ] + attribute cmdlength { text } + + db.cmdsynopsis.label.attribute = db.label.attribute + + db.cmdsynopsis.attlist = + db.cmdsynopsis.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.cmdsynopsis.sepchar.attribute? + & db.cmdsynopsis.cmdlength.attribute? + & db.cmdsynopsis.label.attribute? + + db.cmdsynopsis.info = db._info.title.forbidden + + db.cmdsynopsis = + element cmdsynopsis { + db.cmdsynopsis.attlist, + db.cmdsynopsis.info, + (db.command | db.arg | db.group | db.sbr)+, + db.synopfragment* + } +} + +# ====================================================================== + +db.rep.enumeration = + ## Can not be repeated. + "norepeat" + | ## Can be repeated. + "repeat" + +db.rep.attribute = + [ + a:defaultValue="norepeat" + db:refpurpose [ "Indicates whether or not repetition is possible." ] + ] + attribute rep { db.rep.enumeration } + +db.choice.enumeration = + ## Formatted to indicate that it is optional. + "opt" + | ## Formatted without indication. + "plain" + | ## Formatted to indicate that it is required. + "req" + +db.choice.opt.attribute = + [ + a:defaultValue="opt" + db:refpurpose [ "Indicates optionality." ] + ] + attribute choice { db.choice.enumeration } + +db.choice.req.attribute = + [ + a:defaultValue="req" + db:refpurpose [ "Indicates optionality." ] + ] + attribute choice { db.choice.enumeration } + +# ====================================================================== + +[ + db:refname [ "arg" ] + db:refpurpose [ "An argument in a CmdSynopsis" ] +] +div { + + db.arg.role.attribute = attribute role { text } + db.arg.rep.attribute = db.rep.attribute + db.arg.choice.attribute = db.choice.opt.attribute + + db.arg.attlist = + db.arg.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.arg.rep.attribute? + & db.arg.choice.attribute? + + db.arg = + element arg { + db.arg.attlist, + (db._text + | db.arg + | db.group + | db.option + | db.synopfragmentref + | db.sbr)* + } +} + +# ====================================================================== + +[ + db:refname [ "group" ] + db:refpurpose [ "A group of elements in a CmdSynopsis" ] +] +div { + + db.group.role.attribute = attribute role { text } + db.group.rep.attribute = db.rep.attribute + db.group.choice.attribute = db.choice.opt.attribute + + db.group.attlist = + db.group.role.attribute? + & db.common.attributes + & db.common.linking.attributes + & db.group.rep.attribute? + & db.group.choice.attribute? + + db.group = + element group { + db.group.attlist, + (db.arg + | db.group + | db.option + | db.synopfragmentref + | db.replaceable + | db.sbr)+ + } +} + +# ====================================================================== + +[ + db:refname [ "sbr" ] + db:refpurpose [ "An explicit line break in a command synopsis" ] +] +div { + + db.sbr.role.attribute = attribute role { text } + + db.sbr.attlist = + db.sbr.role.attribute? + & db.common.attributes + + db.sbr = + element sbr { + db.sbr.attlist, + empty + } +} + +# ====================================================================== + +[ + db:refname [ "synopfragment" ] + db:refpurpose [ "A portion of a CmdSynopsis broken out from the main body of the synopsis" ] +] +div { + + db.synopfragment.role.attribute = attribute role { text } + + db.synopfragment.attlist = + db.synopfragment.role.attribute? + & db.common.attributes + & db.common.linking.attributes + + db.synopfragment = + element synopfragment { + db.synopfragment.attlist, + (db.arg | db.group)+ + } +} + +# ====================================================================== + +[ + db:refname [ "synopfragmentref" ] + db:refpurpose [ "A reference to a fragment of a command synopsis" ] +] +div { + + db.synopfragmentref.role.attribute = attribute role { text } + + db.synopfragmentref.attlist = + db.synopfragmentref.role.attribute? + & db.common.attributes + & db.linkend.attribute + + db.synopfragmentref = + [ + s:pattern [ + name = "Synopsis fragment type constraint" + s:rule [ + context = "db:synopfragmentref" + s:assert [ + test = "local-name(//*[@xml:id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" + "@linkend on synopfragmentref must point to a synopfragment." + ] + ] + ] + ] + element synopfragmentref { + db.synopfragmentref.attlist, + text + } +} + Modified: trunk/docbook/relaxng/docbook/src/pool.rnc =================================================================== --- trunk/docbook/relaxng/docbook/src/pool.rnc 2007-09-28 10:19:19 UTC (rev 7472) +++ trunk/docbook/relaxng/docbook/src/pool.rnc 2007-09-28 18:34:15 UTC (rev 7473) @@ -653,74 +653,15 @@ db.domain.inlines = db.technical.inlines - | db.error.inlines - | db.os.inlines - | db.programming.inlines - | db.markup.inlines - | db.gui.inlines - | db.keyboard.inlines db.technical.inlines = db.replaceable - | db.systemitem - | db.option - | db.optional | db.package | db.parameter - | db.property -db.error.inlines = - db.errorcode - | db.errortext - | db.errorname - | db.errortype - -db.oo.inlines = - db.ooclass - | db.ooexception - | db.oointerface - -db.programming.inlines = - db.function - | db.parameter - | db.varname - | db.returnvalue - | db.type - | db.classname - | db.exceptionname - | db.interfacename - | db.methodname - | db.modifier - | db.initializer - | db.oo.inlines - db.product.inlines = - db.productnumber - | db.productname - | db.database - | db.application - | db.hardware - | db.trademark + db.trademark -db.os.inlines = - db.prompt - | db.envar - | db.filename - | db.command - | db.computeroutput - | db.userinput - -db.markup.inlines = - db.tag - | db.markup - | db.token - | db.symbol - | db.literal - | db.code - | db.constant - | db.email - | db.uri - db.bibliography.inlines = db.citation | db.citerefentry @@ -752,24 +693,6 @@ db.indexing.inlines = notAllowed -db.gui.inlines = - db.guiicon - | db.guibutton - | db.guimenuitem - | db.guimenu - | db.guisubmenu - | db.guilabel - | db.menuchoice - | db.mousebutton - -db.keyboard.inlines = - db.keycombo - | db.keycap - | db.keycode - | db.keysym - | db.shortcut - | db.accel - db.link.inlines = db.xref | db.link @@ -782,14 +705,12 @@ db.nopara.blocks = db.list.blocks - | db.admonition.blocks | db.formal.blocks | db.informal.blocks | db.publishing.blocks | db.graphic.blocks | db.technical.blocks | db.verbatim.blocks - | db.synopsis.blocks | db.bridgehead | db.remark | db.revhistory @@ -806,7 +727,6 @@ | db.extension.blocks ctrl:exclude [ from="db.formal.blocks" exclude="db.formal.blocks" ] -ctrl:exclude [ from="db.formal.blocks" exclude="db.admonition.blocks" ] db.formal.blocks = db.example @@ -830,15 +750,6 @@ db.technical.blocks = db.procedure -ctrl:exclude [ from="db.admonition.blocks" exclude="db.admonition.blocks" ] - -db.admonition.blocks = - db.caution - | db.important - | db.note - | db.tip - | db.warning - db.list.blocks = db.itemizedlist | db.orderedlist @@ -848,20 +759,9 @@ | db.segmentedlist db.verbatim.blocks = - db.programlisting - | db.screen + db.screen | db.literallayout - | db.synopsis -db.synopsis.blocks = - db.cmdsynopsis - | db.funcsynopsis - | db.classsynopsis - | db.methodsynopsis - | db.constructorsynopsis - | db.destructorsynopsis - | db.fieldsynopsis - db.extension.blocks = notAllowed # ====================================================================== @@ -896,8 +796,6 @@ | db.othercredit | db.pagenums | db.printhistory - | db.productname - | db.productnumber | db.pubdate | db.publisher | db.publishername @@ -1569,7 +1467,6 @@ ctrl:exclude [ from="db.footnote" exclude="db.footnote" ] ctrl:exclude [ from="db.footnote" exclude="db.formal.blocks" ] - ctrl:exclude [ from="db.footnote" exclude="db.admonition.blocks" ] ctrl:exclude [ from="db.footnote" exclude="db.indexterm" ] ctrl:exclude [ from="db.footnote" exclude="db.sidebar" ] ctrl:exclude [ from="db.footnote" exclude="db.task" ] @@ -1674,121 +1571,7 @@ # ====================================================================== -db.admonition.contentmodel = db._info.title.only, db.all.blocks+ - -# ====================================================================== - [ - db:refname [ "caution" ] - db:refpurpose [ "A note of caution" ] -] -div { - - db.caution.role.attribute = attribute role { text } - - db.caution.attlist = - db.caution.role.attribute? - & db.common.attributes - & db.common.linking.attributes - - db.caution = - element caution { - db.caution.attlist, - db.admonition.contentmodel - } -} - -# ====================================================================== - -[ - db:refname [ "important" ] - db:refpurpose [ "An admonition set off from the text" ] -] -div { - - db.important.role.attribute = attribute role { text } - - db.important.attlist = - db.important.role.attribute? - & db.common.attributes - & db.common.linking.attributes - - db.important = - element important { - db.important.attlist, - db.admonition.contentmodel - } -} - -# ====================================================================== - -[ - db:refname [ "note" ] - db:refpurpose [ "A message set off from the text" ] -] -div { - - db.note.role.attribute = attribute role { text } - - db.note.attlist = - db.note.role.attribute? - & db.common.attributes - & db.common.linking.attributes - - db.note = - element note { - db.note.attlist, - db.admonition.contentmodel - } -} - -# ====================================================================== - -[ - db:refname [ "tip" ] - db:refpurpose [ "A suggestion to the user, set off from the text" ] -] -div { - - db.tip.role.attribute = attribute role { text } - - db.tip.attlist = - db.tip.role.attribute? - & db.common.attributes - & db.common.linking.attributes - - db.tip = - element tip { - db.tip.attlist, - db.admonition.contentmodel - } -} - -# ====================================================================== - -[ - db:refname [ "warning" ] - db:refpurpose [ "An admonition set off from the text" ] -] -div { - - db.warning.role.attribute = attribute role { text } - - db.warning.attlist = - db.warning.role.attribute? - & db.common.attributes - & db.common.linking.attributes - - db.warning = - element warning { - db.warning.attlist, - db.admonition.contentmodel - } -} - -# ====================================================================== - -[ db:refname [ "itemizedlist" ] db:refpurpose [ "A list in which each entry is marked with a bullet or other dingbat" ] ] @@ -2251,32 +2034,6 @@ # ====================================================================== [ - db:refname [ "programlisting" ] - db:refpurpose [ "A literal listing of all or part of a program" ] -] -div { - - db.programlisting.role.attribute = attribute role { text } - - db.programlisting.width.attribute = db.width.characters.attribute - - db.programlisting.attlist = - db.programlisting.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.programlisting.width.attribute? - - db.programlisting = - element programlisting { - db.programlisting.attlist, - db.verbatim.contentmodel - } -} - -# ====================================================================== - -[ db:refname [ "literallayout" ] db:refpurpose [ "A block of text in which line breaks and white space are to be reproduced faithfully" ] ] @@ -2771,7 +2528,6 @@ ] div { ctrl:exclude [ from="db.caption" exclude="db.formal.blocks" ] - ctrl:exclude [ from="db.caption" exclude="db.admonition.blocks" ] ctrl:exclude [ from="db.caption" exclude="db.sidebar" ] ctrl:exclude [ from="db.caption" exclude="db.task" ] @@ -2795,848 +2551,6 @@ # ====================================================================== [ - db:refname [ "synopsis" ] - db:refpurpose [ "A general-purpose element for representing the syntax of commands or functions" ] -] -div { - - db.synopsis.role.attribute = attribute role { text } - db.synopsis.label.attribute = db.label.attribute - - db.synopsis.attlist = - db.synopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.synopsis.label.attribute? - - db.synopsis = - element synopsis { - db.synopsis.attlist, - db.verbatim.contentmodel - } -} - -# ====================================================================== - -[ - db:refname [ "cmdsynopsis" ] - db:refpurpose [ "A syntax summary for a software command" ] -] -div { - - db.cmdsynopsis.role.attribute = attribute role { text } - - db.cmdsynopsis.sepchar.attribute = - [ - db:refpurpose [ "Specifies the character that should separate the command and its top-level arguments" ] - ] - attribute sepchar { text } - - db.cmdsynopsis.cmdlength.attribute = - [ - db:refpurpose [ "Indicates the displayed length of the command; this information may be used to intelligently indent command synopses which extend beyond one line" ] - ] - attribute cmdlength { text } - - db.cmdsynopsis.label.attribute = db.label.attribute - - db.cmdsynopsis.attlist = - db.cmdsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.cmdsynopsis.sepchar.attribute? - & db.cmdsynopsis.cmdlength.attribute? - & db.cmdsynopsis.label.attribute? - - db.cmdsynopsis.info = db._info.title.forbidden - - db.cmdsynopsis = - element cmdsynopsis { - db.cmdsynopsis.attlist, - db.cmdsynopsis.info, - (db.command | db.arg | db.group | db.sbr)+, - db.synopfragment* - } -} - -# ====================================================================== - -db.rep.enumeration = - ## Can not be repeated. - "norepeat" - | ## Can be repeated. - "repeat" - -db.rep.attribute = - [ - a:defaultValue="norepeat" - db:refpurpose [ "Indicates whether or not repetition is possible." ] - ] - attribute rep { db.rep.enumeration } - -db.choice.enumeration = - ## Formatted to indicate that it is optional. - "opt" - | ## Formatted without indication. - "plain" - | ## Formatted to indicate that it is required. - "req" - -db.choice.opt.attribute = - [ - a:defaultValue="opt" - db:refpurpose [ "Indicates optionality." ] - ] - attribute choice { db.choice.enumeration } - -db.choice.req.attribute = - [ - a:defaultValue="req" - db:refpurpose [ "Indicates optionality." ] - ] - attribute choice { db.choice.enumeration } - -# ====================================================================== - -[ - db:refname [ "arg" ] - db:refpurpose [ "An argument in a CmdSynopsis" ] -] -div { - - db.arg.role.attribute = attribute role { text } - db.arg.rep.attribute = db.rep.attribute - db.arg.choice.attribute = db.choice.opt.attribute - - db.arg.attlist = - db.arg.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.arg.rep.attribute? - & db.arg.choice.attribute? - - db.arg = - element arg { - db.arg.attlist, - (db._text - | db.arg - | db.group - | db.option - | db.synopfragmentref - | db.sbr)* - } -} - -# ====================================================================== - -[ - db:refname [ "group" ] - db:refpurpose [ "A group of elements in a CmdSynopsis" ] -] -div { - - db.group.role.attribute = attribute role { text } - db.group.rep.attribute = db.rep.attribute - db.group.choice.attribute = db.choice.opt.attribute - - db.group.attlist = - db.group.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.group.rep.attribute? - & db.group.choice.attribute? - - db.group = - element group { - db.group.attlist, - (db.arg - | db.group - | db.option - | db.synopfragmentref - | db.replaceable - | db.sbr)+ - } -} - -# ====================================================================== - -[ - db:refname [ "sbr" ] - db:refpurpose [ "An explicit line break in a command synopsis" ] -] -div { - - db.sbr.role.attribute = attribute role { text } - - db.sbr.attlist = - db.sbr.role.attribute? - & db.common.attributes - - db.sbr = - element sbr { - db.sbr.attlist, - empty - } -} - -# ====================================================================== - -[ - db:refname [ "synopfragment" ] - db:refpurpose [ "A portion of a CmdSynopsis broken out from the main body of the synopsis" ] -] -div { - - db.synopfragment.role.attribute = attribute role { text } - - db.synopfragment.attlist = - db.synopfragment.role.attribute? - & db.common.attributes - & db.common.linking.attributes - - db.synopfragment = - element synopfragment { - db.synopfragment.attlist, - (db.arg | db.group)+ - } -} - -# ====================================================================== - -[ - db:refname [ "synopfragmentref" ] - db:refpurpose [ "A reference to a fragment of a command synopsis" ] -] -div { - - db.synopfragmentref.role.attribute = attribute role { text } - - db.synopfragmentref.attlist = - db.synopfragmentref.role.attribute? - & db.common.attributes - & db.linkend.attribute - - db.synopfragmentref = - [ - s:pattern [ - name = "Synopsis fragment type constraint" - s:rule [ - context = "db:synopfragmentref" - s:assert [ - test = "local-name(//*[@xml:id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on synopfragmentref must point to a synopfragment." - ] - ] - ] - ] - element synopfragmentref { - db.synopfragmentref.attlist, - text - } -} - -# ====================================================================== - -[ - db:refname [ "funcsynopsis" ] - db:refpurpose [ "The syntax summary for a function definition" ] -] -div { - - db.funcs... [truncated message content] |