Updated for OASIS Standard V4.5 release

diff --git a/docbook/spec/Makefile b/docbook/spec/Makefile
index 2f4bfd7965cdd16327ebafa75c10b6a3c306a9d6..da64081be612e25ba39a404a46c3232add5dd1ed 100644 (file)
--- a/docbook/spec/Makefile
+++ b/docbook/spec/Makefile
@@ -1,6 +1,7 @@
 include ../../cvstools/Makefile.incl
 
 XJPARSE=/home/ndw/bin/xjparse
+TIDY=tidy
 
 HTMLSTYLE=html.xsl
 FOSTYLE=fo.xsl
@@ -12,14 +13,14 @@ all: docbook.html
 docbook.html: docbook.xml html.xsl
        $(XJPARSE) $<
        $(XSLT) $< $(HTMLSTYLE) $@ $(XSLPARAM)
-       tidy -q -utf8 -mn -asxml $@
+       $(TIDY) -q -utf8 -mn -asxml $@
 
 docbook.fo: docbook.xml fo.xsl
        $(XJPARSE) $<
        $(XSLT) $< $(FOSTYLE) docbook.fo $(XSLPARAM)
 
 docbook.pdf: docbook.fo
-       xep $<
+       xep -q $<
 
 clean:
-       $(RM) *.html
+       $(RM) -f *.html *.fo *.pdf

diff --git a/docbook/spec/docbook.xml b/docbook/spec/docbook.xml
index 421937a7a169baeacd3f7d24f3a1238b91db0938..19916195ebb778395e1e821cc8efa555a8b03433 100644 (file)
--- a/docbook/spec/docbook.xml
+++ b/docbook/spec/docbook.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE article [
-<!ENTITY standard "Committee Specification">
+<!ENTITY standard "OASIS Standard">
 <!ENTITY tracker "http://sourceforge.net/tracker">
 <!ENTITY RFE "&tracker;/index.php?func=detail&amp;group_id=21935&amp;atid=384107&amp;">
 <!ENTITY root "http://www.oasis-open.org/docbook/">
@@ -13,8 +13,8 @@ $Id$
 <!-- product -->        <productname>docbook</productname>
 <!-- productVersion --> <productnumber>4.5</productnumber>
 <!-- artifactType       spec; what else? :-) -->
-<!-- stage -->          <releaseinfo role="stage">cs</releaseinfo>
-<!-- revision -->       <pubsnumber>02</pubsnumber>
+<!-- stage -->          <releaseinfo role="stage">os</releaseinfo>
+<!-- revision -->       <pubsnumber></pubsnumber>
 <!-- language           en; see /article/@xml:lang -->
 <!-- form               xml -->
 
@@ -33,7 +33,7 @@ $Id$
 </editor>
 </authorgroup>
 
-<pubdate>2006-04-14</pubdate>
+<pubdate>2006-10-01</pubdate>
 
 <copyright>
 <year>2001</year>
@@ -59,10 +59,9 @@ no backwards-incompatible changes.</para>
 
 <legalnotice role="status">
 <para>This &standard; was
-<ulink url="http://www.oasis-open.org/committees/ballot.php?id=994">approved</ulink>
-for publication by the
-OASIS DocBook Technical Committee. It represents the
-consensus of the committee.
+<ulink url="http://www.oasis-open.org/committees/ballot.php?id=1109">approved</ulink>
+for publication by the OASIS Membership. It represents the
+consensus of the community.
 </para>
 
 <!--
@@ -150,7 +149,31 @@ The DocBook site is mirrored on
 <ulink url="http://docbook.org/"/>.
 </para>
 
+<section id="release">
+<title>Changes in the OASIS Standard of DocBook V4.5</title>
+
+<para>There are no technical changes in this release.
+</para>
+
+<para>Version 4.5 is an OASIS Standard.</para>
+</section>
+
 <section id="s.cs">
+<title>Changes in DocBook V4.5CR3</title>
+
+<para>There are no backwards-incompatible changes in this release.
+</para>
+
+<para>Version 4.5CR3 contains two small bug fixes to the SGML version
+of the DTD: the <sgmltag class="attribute">xml:lang</sgmltag> attribute
+no longer appears on the HTML table elements (it was present erroneously,
+the <sgmltag class="attribute">xml:*</sgmltag> attributes are suppressed
+in the SGML DTD) and markup minimization flags have been added to a few
+elements where they were missing. With these changes, the SGML DTD is
+once again consistent with the DocBook SGML declaration.</para>
+</section>
+
+<section id="s.cr2">
 <title>Changes in DocBook V4.5CR2</title>
 
 <para>There are no backwards-incompatible changes in this release.
@@ -544,10 +567,21 @@ of the DocBook web page
 <appendix id="a.revhistory">
 <title>Revision History</title>
 
-<para>
-<revhistory>
-<revision role="&root;specs/docbook-4.5-spec-cs-01.html">
+<para><revhistory>
+<revision role="&root;specs/docbook-4.5-spec.html">
+  <revnumber>OASIS Standard</revnumber>
+  <date>1 October 2006</date>
+</revision>
+<revision role="&root;specs/docbook-4.5-spec-cs-03.html">
+  <revnumber>Committee Specification CR3</revnumber>
+  <date>2 June 2006</date>
+</revision>
+<revision role="&root;specs/docbook-4.5-spec-cs-02.html">
   <revnumber>Committee Specification CR2</revnumber>
+  <date>14 April 2006</date>
+</revision>
+<revision role="&root;specs/docbook-4.5-spec-cs-01.html">
+  <revnumber>Committee Specification CR1</revnumber>
   <date>09 March 2006</date>
 </revision>
 <revision role="&root;specs/pr-docbook-docbook-4.5.html">
@@ -562,8 +596,7 @@ of the DocBook web page
   <revnumber>Working Draft b1</revnumber>
   <date>05 May 2005</date>
 </revision>
-</revhistory>
-</para>
+</revhistory></para>
 
 </appendix>
 

diff --git a/docbook/spec/fo.xsl b/docbook/spec/fo.xsl
index eff03a6c888e71d5033f8ba574fe4bf7b7382455..c4af48332a215671659b4f7c2f1e3558a3f39564 100644 (file)
--- a/docbook/spec/fo.xsl
+++ b/docbook/spec/fo.xsl
@@ -28,10 +28,14 @@
   <xsl:value-of select="$tcProductVersion"/>
   <xsl:text>-</xsl:text>
   <xsl:value-of select="$tcArtifactType"/>
-  <xsl:text>-</xsl:text>
-  <xsl:value-of select="$tcStage"/>
-  <xsl:text>-</xsl:text>
-  <xsl:value-of select="$tcRevision"/>
+  <xsl:if test="$tcStage != 'os'">
+    <xsl:text>-</xsl:text>
+    <xsl:value-of select="$tcStage"/>
+  </xsl:if>
+  <xsl:if test="$tcRevision != ''">
+    <xsl:text>-</xsl:text>
+    <xsl:value-of select="$tcRevision"/>
+  </xsl:if>
   <xsl:if test="$tcLanguage != 'en' and $tcLanguage != ''">
     <xsl:text>-</xsl:text>
     <xsl:value-of select="$tcLanguage"/>

diff --git a/docbook/spec/html.xsl b/docbook/spec/html.xsl
index d718003e1380d08062ea8ad2b953849c988f1f31..9e3e80ccd844fa6e5c3d6838c78f818d8f09f886 100644 (file)
--- a/docbook/spec/html.xsl
+++ b/docbook/spec/html.xsl
@@ -19,10 +19,14 @@
   <xsl:value-of select="$tcProductVersion"/>
   <xsl:text>-</xsl:text>
   <xsl:value-of select="$tcArtifactType"/>
-  <xsl:text>-</xsl:text>
-  <xsl:value-of select="$tcStage"/>
-  <xsl:text>-</xsl:text>
-  <xsl:value-of select="$tcRevision"/>
+  <xsl:if test="$tcStage != 'os'">
+    <xsl:text>-</xsl:text>
+    <xsl:value-of select="$tcStage"/>
+  </xsl:if>
+  <xsl:if test="$tcRevision != ''">
+    <xsl:text>-</xsl:text>
+    <xsl:value-of select="$tcRevision"/>
+  </xsl:if>
   <xsl:if test="$tcLanguage != 'en' and $tcLanguage != ''">
     <xsl:text>-</xsl:text>
     <xsl:value-of select="$tcLanguage"/>
@@ -38,7 +42,7 @@
     <xsl:when test="$tcStage = 'cd'">oasis-cd.css</xsl:when>
     <xsl:when test="$tcStage = 'pr'">oasis-pr.css</xsl:when>
     <xsl:when test="$tcStage = 'cs'">oasis-cs.css</xsl:when>
-    <xsl:when test="$tcStage = 'os'">oasis-os.css</xsl:when>
+    <xsl:when test="$tcStage = 'os'">oasis-cs.css</xsl:when> <!-- sic -->
     <xsl:otherwise>
       <xsl:message>
         <xsl:text>Unrecognized stage: '</xsl:text>
@@ -56,8 +60,12 @@
   <meta name="tcProduct" content="{$tcProduct}"/>
   <meta name="tcProductVersion" content="{$tcProductVersion}"/>
   <meta name="tcArtifactType" content="{$tcArtifactType}"/>
-  <meta name="tcStage" content="{$tcStage}"/>
-  <meta name="tcRevision" content="{$tcRevision}"/>
+  <xsl:if test="$tcStage != ''">
+    <meta name="tcStage" content="{$tcStage}"/>
+  </xsl:if>
+  <xsl:if test="$tcRevision != ''">
+    <meta name="tcRevision" content="{$tcRevision}"/>
+  </xsl:if>
   <meta name="tcLanguage" content="{$tcLanguage}"/>
   <meta name="tcForm" content="html"/>