Release Candidate 1

diff --git a/docbook/spec/Makefile b/docbook/spec/Makefile
index 2d98c481d19d6634e5f9baae3206f65c07bbef46..ae4b998908729877b10b04b282be90b81e9c0360 100644 (file)
--- a/docbook/spec/Makefile
+++ b/docbook/spec/Makefile
@@ -1,6 +1,7 @@
 include ../../cvstools/Makefile.incl
 
-SPECVER=
+SPECVER=4.2-CR1
+
 ifeq ($(SPECVER),)
 SPECSEP=
 else
@@ -11,9 +12,11 @@ HTMLSTYLE=/projects/oasis/stylesheets/tr.xsl
 HTML-CSS=spec.css
 
 OASIS-LOGO=http://www.oasis-open.org/docbook/oasis.png
-BIBLIO=file:///home/ndw/bibliography.xml
-XSLPARAM="html.stylesheet=$(HTML-CSS) oasis.logo=$(OASIS-LOGO) bibliography.collection=$(BIBLIO)"
+XSLPARAM="html.stylesheet=$(HTML-CSS) oasis.logo=$(OASIS-LOGO)"
 
 docbook.html: docbook.xml
        $(XJPARSE) $<
        $(XSLT) $< $(HTMLSTYLE) docbook$(SPECSEP)$(SPECVER).html $(XSLPARAM)
+
+clean:
+       $(RM) *.html

diff --git a/docbook/spec/docbook.xml b/docbook/spec/docbook.xml
index 6be3c5c63e6bbd0c00f63fc98d34d0a588d2e8e1..dbd843e40e319bf4fee96f54d1778bcc43435662 100644 (file)
--- a/docbook/spec/docbook.xml
+++ b/docbook/spec/docbook.xml
@@ -4,9 +4,11 @@
 <!ENTITY tracker "http://sourceforge.net/tracker/">
 <!ENTITY RFE "&tracker;/index.php?func=detail&amp;group_id=21935&amp;atid=384107&amp;">
 ]>
-<article status="Working Draft &ldquo;Beta 1&rdquo;">
+<article status="Candidate Release 1">
+<?dbhtml filename="docbook-4.2-cr1.html"?>
 <articleinfo>
-<title>The DocBook Document Type Version 4.2b1</title>
+<title>The DocBook Document Type</title>
+<productnumber>Version 4.2</productnumber>
 <subtitle>OASIS DocBook Technical Committee</subtitle>
 <authorgroup>
 <editor>
@@ -18,11 +20,11 @@
   </affiliation>
 </editor>
 </authorgroup>
-<pubdate>20 Nov 2001</pubdate>
-<releaseinfo role="meta">
+<pubdate>19 Mar 2002</pubdate>
+<releaseinfo role="cvs">
 $Id$
 </releaseinfo>
-<copyright><year>2001</year>
+<copyright><year>2001</year><year>2002</year>
 <holder>
 The Organization for the Advancement of Structured Information
 Standards [OASIS]. All Rights Reserved.
@@ -71,7 +73,8 @@ sent to
 
 <abstract><title>Abstract</title>
 
-<para>DocBook is general purpose XML and SGML document type
+<para>DocBook is general purpose <xref linkend="xml-rec"/> and
+<xref linkend="iso8879"/> document type
 particularly well suited to books and papers about computer hardware
 and software (though it is by no means limited to these applications).
 </para>
@@ -82,7 +85,11 @@ no backwards-incompatible changes.</para>
 </abstract>
 
 <revhistory>
-<revision role="docbook-4.2b1.html">
+<revision role="http://www.oasis-open.org/docbook/xml/4.2CR1/docbook-4.2-CR1.html">
+  <revnumber>Candidate Release 1</revnumber>
+  <date>19 Mar 2002</date>
+</revision>
+<revision role="http://www.oasis-open.org/docbook/xml/4.2b1/docbook-4.2b1.html">
   <revnumber>Working Draft &ldquo;Beta 1&rdquo;</revnumber>
   <date>20 Nov 2001</date>
 </revision>
@@ -136,7 +143,7 @@ document.</para>
 </section>
 
 <section id="docbook">
-<title>The DocBook Document Type V4.2b1</title>
+<title>The DocBook Document Type V4.2b2</title>
 
 <para>The DocBook document type is distributed for
 <ulink url="http://www.oasis-open.org/docbook/xml/">XML</ulink> and
@@ -152,11 +159,11 @@ from the
 
 <itemizedlist>
 <listitem>
-<para>Public identifier: -//OASIS//DTD DocBook V4.2b1//EN
+<para>Public identifier: -//OASIS//DTD DocBook V4.2b2//EN
 </para>
 </listitem>
 <listitem>
-<para>System identifier: http://www.oasis-open.org/docbook/sgml/4.2b1/docbook.dtd
+<para>System identifier: http://www.oasis-open.org/docbook/sgml/4.2b2/docbook.dtd
 </para>
 </listitem>
 </itemizedlist>
@@ -173,11 +180,11 @@ from the
 
 <itemizedlist>
 <listitem>
-<para>Public identifier: -//OASIS//DTD DocBook XML V4.2b1//EN
+<para>Public identifier: -//OASIS//DTD DocBook XML V4.2b2//EN
 </para>
 </listitem>
 <listitem>
-<para>System identifier: http://www.oasis-open.org/docbook/xml/4.2b1/docbookx.dtd
+<para>System identifier: http://www.oasis-open.org/docbook/xml/4.2b2/docbookx.dtd
 </para>
 </listitem>
 </itemizedlist>
@@ -194,7 +201,7 @@ from the
 
 <itemizedlist>
 <listitem>
-<para>Public identifier: -//OASIS//ENTITIES DocBook Notations V4.2b1//EN
+<para>Public identifier: -//OASIS//ENTITIES DocBook Notations V4.2b2//EN
 </para>
 </listitem>
 </itemizedlist>
@@ -211,7 +218,7 @@ from the
 
 <itemizedlist>
 <listitem>
-<para>Public identifier: -//OASIS//ENTITIES DocBook Character Entities V4.2b1//EN
+<para>Public identifier: -//OASIS//ENTITIES DocBook Character Entities V4.2b2//EN
 </para>
 </listitem>
 </itemizedlist>
@@ -228,7 +235,7 @@ from the
 
 <itemizedlist>
 <listitem>
-<para>Public identifier: -//OASIS//ENTITIES DocBook Information Pool V4.2b1//EN
+<para>Public identifier: -//OASIS//ENTITIES DocBook Information Pool V4.2b2//EN
 </para>
 </listitem>
 </itemizedlist>
@@ -245,7 +252,7 @@ from the
 
 <itemizedlist>
 <listitem>
-<para>Public identifier: -//OASIS//ENTITIES DocBook Document Hierarchy V4.2b1//EN
+<para>Public identifier: -//OASIS//ENTITIES DocBook Document Hierarchy V4.2b2//EN
 </para>
 </listitem>
 </itemizedlist>
@@ -262,7 +269,7 @@ from the
 
 <itemizedlist>
 <listitem>
-<para>Public identifier: -//OASIS//ENTITIES DocBook Additional General Entities V4.2b1//EN
+<para>Public identifier: -//OASIS//ENTITIES DocBook Additional General Entities V4.2b2//EN
 </para>
 </listitem>
 </itemizedlist>
@@ -278,7 +285,7 @@ from the
 </section>
 
 <section id="s.changes">
-<title>Changes in DocBook V4.2b1</title>
+<title>Changes in DocBook V4.2b2</title>
 
 <para>There are no backwards-incompatible changes in this release.
 </para>
@@ -345,9 +352,30 @@ Allow literallayout in <sgmltag>epigraph</sgmltag>
 <listitem id="rfe.440597"><para><ulink url="&RFE;aid=440597">RFE 440597</ulink>:
 Add SVG notation
 </para></listitem>
+
+<listitem id="rfe.440667"><para><ulink url="&RFE;aid=440667">RFE 440667</ulink>:
+Add <sgmltag class="attribute">class</sgmltag> attribute to <sgmltag>orgname</sgmltag>.
+This proposal deprecates <sgmltag>corpname</sgmltag>
+<ulink url="http://sourceforge.net/docman/display_doc.php?docid=9351&amp;group_id=21935">as
+proposed</ulink>.
+</para></listitem>
+
+<listitem id="rfe.470599"><para><ulink url="&RFE;aid=470599">RFE 470599</ulink>:
+Revise graphic attributes
+<ulink url="http://sourceforge.net/docman/display_doc.php?docid=9357&amp;group_id=21935">as
+proposed</ulink>.
+</para></listitem>
+
 <listitem id="rfe.480956"><para><ulink url="&RFE;aid=480956">RFE 480956</ulink>:
 Add <sgmltag>co</sgmltag> to <sgmltag>userinput</sgmltag>, etc.
 </para></listitem>
+
+<listitem id="rfe.480957"><para><ulink url="&RFE;aid=480957">RFE 480957</ulink>:
+New name and address markup
+<ulink url="http://sourceforge.net/docman/display_doc.php?docid=9354&amp;group_id=21935">as
+proposed</ulink>.
+</para></listitem>
+
 <listitem id="rfe.133"><para>Former RFE 133:
 Added <sgmltag>newsgroup</sgmltag> class to <sgmltag>systemitem</sgmltag>.
 </para></listitem>
@@ -357,6 +385,9 @@ Allow multiple <sgmltag>msgexplan</sgmltag> inside <sgmltag>simplemsgentry</sgml
 <listitem id="rfe.482053"><para><ulink url="&RFE;aid=482053">RFE 482053</ulink>:
 Former RFE 119: Add support for DOI in meta.</para>
 </listitem>
+<listitem id="rfe.480955"><para><ulink url="&RFE;aid=480955">RFE 480955</ulink>:
+Add <sgmltag>coref</sgmltag>.</para>
+</listitem>
 <listitem id="rfe.482817"><para><ulink url="&RFE;aid=482817">RFE 482817</ulink>:
 An <sgmltag>errortext</sgmltag> element will be added. The processing expectations
 of <sgmltag>errorname</sgmltag> will be clarified. See also
@@ -370,8 +401,221 @@ An <literal>extension</literal> value will be added to the
 <listitem id="rfe.482821"><para><ulink url="&RFE;aid=482821">RFE 482821</ulink>:
 Add introductory material to the beginning of list elements.</para>
 </listitem>
+
+<listitem id="rfe.487482"><para><ulink url="&RFE;aid=487482">RFE 487482</ulink>:
+Add metadata (<sgmltag>blockinfo</sgmltag>) to block elements:
+<sgmltag>equation</sgmltag>,
+<sgmltag>example</sgmltag>,
+<sgmltag>figure</sgmltag>,
+<sgmltag>informalequation</sgmltag>,
+<sgmltag>informalexample</sgmltag>,
+<sgmltag>informalfigure</sgmltag>,
+<sgmltag>informaltable</sgmltag>,
+<sgmltag>itemizedlist</sgmltag>,
+<sgmltag>legalnotice</sgmltag>,
+<sgmltag>msgset</sgmltag>,
+<sgmltag>orderedlist</sgmltag>,
+<sgmltag>procedure</sgmltag>,
+<sgmltag>qandadiv</sgmltag>,
+<sgmltag>qandaentry</sgmltag>,
+<sgmltag>qandaset</sgmltag>,
+<sgmltag>table</sgmltag>, and
+<sgmltag>variablelist</sgmltag>.</para>
+</listitem>
+
+<listitem id="rfe.491629"><para><ulink url="&RFE;aid=491629">RFE 491629</ulink>:
+Allow <sgmltag>personname</sgmltag> in inline content
+<ulink url="http://sourceforge.net/docman/display_doc.php?docid=9354&amp;group_id=21935">as
+proposed</ulink>.
+</para></listitem>
+
+<listitem id="rfe.492099"><para><ulink url="&RFE;aid=492099">RFE 492099</ulink>:
+Add new attributes to <sgmltag>olink</sgmltag>.</para>
+</listitem>
+<listitem id="rfe.498848"><para><ulink url="&RFE;aid=498848">RFE 498848</ulink>:
+Allow <sgmltag>segmentedlist</sgmltag>s with only a single <sgmltag>seg</sgmltag>.</para>
+</listitem>
+<listitem id="rfe.501363"><para><ulink url="&RFE;aid=501363">RFE 501363</ulink>:
+Add <sgmltag class="paramentity">section.class</sgmltag> parameter entity.</para>
+</listitem>
+
+<listitem id="rfe.513426"><para><ulink url="&RFE;aid=513426">RFE 513426</ulink>:
+Add text alternative for tables
+<ulink url="http://sourceforge.net/docman/display_doc.php?docid=9356&amp;group_id=21935">as
+proposed</ulink>.
+</para>
+</listitem>
+
+<listitem id="dublincore"><para><ulink url="http://lists.oasis-open.org/archives/docbook-tc/200202/msg00005.html">Extended metadata</ulink> elements to capture all of the
+<ulink url="http://dublincore.org/documents/1998/09/dces/">Dublin
+Core Metadata Element Set</ulink>, Version 1.0.</para>
+</listitem>
+
 </itemizedlist>
 </section>
+
+<section><title>Release Notes</title>
+
+<section><title>Relationship to the QIC Technical Committee</title>
+
+<para>DocBook and the
+<ulink url="http://www.oasis-open.org/committees/ciq/">Customer Information
+Quality</ulink> (QIC) TC both define markup for names and addresses. In general,
+the requirements for bibliographic name metadata in DocBook are far less complex
+than the requirements for maintaining customer information.</para>
+
+<para>DocBook name and address markup is a proper subset of the QIC
+<ulink url="http://www.oasis-open.org/committees/ciq/ciq.shtml#5">xNL</ulink>
+markup with the following simple transformation:</para>
+
+<informaltable>
+<tgroup cols="2">
+<thead>
+<row>
+  <entry>DocBook Element</entry>
+  <entry>QIC xNL Element</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry><sgmltag>honorific</sgmltag></entry>
+  <entry><sgmltag>title</sgmltag></entry>
+</row>
+<row>
+  <entry><sgmltag>firstname</sgmltag></entry>
+  <entry><sgmltag>firstname</sgmltag></entry>
+</row>
+<row>
+  <entry><sgmltag>surname</sgmltag></entry>
+  <entry><sgmltag>lastname</sgmltag></entry>
+</row>
+<row>
+  <entry><sgmltag>lineage</sgmltag></entry>
+  <entry><sgmltag>generationidentifier</sgmltag></entry>
+</row>
+<row>
+  <entry><sgmltag>othername</sgmltag></entry>
+  <entry><sgmltag>othername</sgmltag></entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+</section>
+
+<section><title>Relationship to the Dublin Core</title>
+
+<para>DocBook Version 4.2 defines a proper superset of the
+<ulink url="http://dublincore.org/documents/1998/09/dces/">Dublin
+Core Metadata Element Set</ulink>, Version 1.0. In previous versions of
+DocBook, there were several Dublin Core elements that were not easily
+derived from DocBook metadata.</para>
+
+<para>The following table summarizes the
+<ulink url="http://lists.oasis-open.org/archives/docbook-tc/200202/msg00005.html">Dublin
+Core mapping for DocBook</ulink>
+(<ulink url="http://lists.oasis-open.org/archives/docbook-tc/200203/msg00010.html">as
+amended</ulink>).</para>
+
+<informaltable>
+<tgroup cols="3">
+<thead>
+<row>
+  <entry>DC Element</entry>
+  <entry>DC Label</entry>
+  <entry>DocBook Element(s)</entry>
+</row>
+</thead>
+<tbody>
+<row>
+  <entry>Title</entry>
+  <entry>Title</entry>
+  <entry><sgmltag>title</sgmltag></entry>
+</row>
+<row>
+  <entry>Author or Creator</entry>
+  <entry>Creator</entry>
+  <entry><sgmltag>author</sgmltag>, <sgmltag>editor</sgmltag>,
+         <sgmltag>othercredit</sgmltag>
+  </entry>
+</row>
+<row>
+  <entry>Subject and Keywords</entry>
+  <entry>Subject</entry>
+  <entry><sgmltag>keywordset</sgmltag>, <sgmltag>subjectset</sgmltag></entry>
+</row>
+<row>
+  <entry>Description</entry>
+  <entry>Description</entry>
+  <entry><sgmltag>abstract</sgmltag></entry>
+</row>
+<row>
+  <entry>Publisher</entry>
+  <entry>Publisher</entry>
+  <entry><sgmltag>publisher</sgmltag>, <sgmltag>publishername</sgmltag></entry>
+</row>
+<row>
+  <entry>Contributor</entry>
+  <entry>Contributor</entry>
+  <entry><sgmltag>author</sgmltag>, <sgmltag>editor</sgmltag>,
+         <sgmltag>othercredit</sgmltag>, <sgmltag>collab</sgmltag>
+  </entry>
+</row>
+<row>
+  <entry>Date</entry>
+  <entry>Date</entry>
+  <entry><sgmltag>date</sgmltag>, <sgmltag>pubdate</sgmltag></entry>
+</row>
+<row>
+  <entry>Type</entry>
+  <entry>Type</entry>
+  <entry>Derived from document element and <sgmltag class="attribute">status</sgmltag>
+         attribute</entry>
+</row>
+<row>
+  <entry>Format</entry>
+  <entry>Format</entry>
+  <entry><literal>text/xml</literal></entry>
+</row>
+<row>
+  <entry>Resource Identifier</entry>
+  <entry>Identifier</entry>
+  <entry><sgmltag>biblioid</sgmltag></entry>
+</row>
+<row>
+  <entry>Source</entry>
+  <entry>Source</entry>
+  <entry><sgmltag>bibliosource</sgmltag></entry>
+</row>
+<row>
+  <entry>Language</entry>
+  <entry>Language</entry>
+  <entry><sgmltag class="attribute">lang</sgmltag> or
+         <sgmltag class="attribute">xml:lang</sgmltag> attribute</entry>
+</row>
+<row>
+  <entry>Relation</entry>
+  <entry>Relation</entry>
+  <entry><sgmltag>bibliorelation</sgmltag></entry>
+</row>
+<row>
+  <entry>Coverage</entry>
+  <entry>Coverage</entry>
+  <entry><sgmltag>bibliocoverage</sgmltag></entry>
+</row>
+<row>
+  <entry>Rights Management</entry>
+  <entry>Rights</entry>
+  <entry><sgmltag>copyright</sgmltag>, <sgmltag>legalnotice</sgmltag></entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>In some cases, additional <sgmltag class="attribute">role</sgmltag> attributes
+or other logic may be required to determine the best mapping.</para>
+</section>
+</section>
 </section>
 
 <section id="docbook.v5">
@@ -443,6 +687,7 @@ will be removed.</para>
 <para>Tables will be restricted from full CALS Table Model to the
 OASIS Exchange model.</para>
 </listitem>
+
 </itemizedlist>
 
 </section>
@@ -500,6 +745,16 @@ inside <sgmltag>msgset</sgmltag>. See also
 <ulink url="&RFE;aid=482817">RFE 482817</ulink>.
 </para>
 </listitem>
+<listitem id="rfe.531851"><para><ulink url="&RFE;aid=531851">RFE 531851</ulink>:
+Remove inline person name elements
+<ulink url="http://sourceforge.net/docman/display_doc.php?docid=9354&amp;group_id=21935">as
+proposed</ulink>.
+</para></listitem>
+<listitem id="rfe.531855"><para><ulink url="&RFE;aid=531855">RFE 531855</ulink>:
+Remove <sgmltag>corpname</sgmltag>
+<ulink url="http://sourceforge.net/docman/display_doc.php?docid=9351&amp;group_id=21935">as
+proposed</ulink>.
+</para></listitem>
 </itemizedlist>
 
 </section>
@@ -513,12 +768,13 @@ the formulation of this &standard;:</para>
 <itemizedlist>
 <listitem><para>Dennis Evans</para></listitem>
 <listitem><para>Patricia Gee-Best</para></listitem>
+<listitem><para>Paul Grosso (prospective)</para></listitem>
 <listitem><para>Dick Hamilton</para></listitem>
 <listitem><para>Nancy (Paisner) Harrison</para></listitem>
 <listitem><para>Sabine Ocker</para></listitem>
 <listitem><para>Michael Sabrio</para></listitem>
 <listitem><para>Michael Smith</para></listitem>
-<listitem><para>Norman Walsh (Chair,Editor)</para></listitem>
+<listitem><para>Norman Walsh (Chair, Editor)</para></listitem>
 </itemizedlist>
 
 </appendix>
@@ -529,10 +785,7 @@ the formulation of this &standard;:</para>
 
 <bibliomixed id="iso8879"/>
 <bibliomixed id="xml-rec"/>
-<bibliomixed id="xml-names"/>
 <bibliomixed id="rfc2119"/>
-<bibliomixed id="tr9401"/>
-<bibliomixed id="xmlcatalogs"/>
 
 </bibliodiv>