From 5bf5f44561358f77730f02d97268b245ae0b10ba Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 9 Mar 2006 20:08:08 +0000
Subject: [PATCH] Documentation for 4.5CR2

---
 docbook/spec/Makefile    |   8 +-
 docbook/spec/docbook.xml |  55 ++++++++-----
 docbook/spec/fo.xsl      |  86 +++++++++++++++++++++
 docbook/spec/html.xsl    | 163 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 289 insertions(+), 23 deletions(-)
 create mode 100644 docbook/spec/html.xsl

diff --git a/docbook/spec/Makefile b/docbook/spec/Makefile
index efbf78e56..2f4bfd796 100644
--- a/docbook/spec/Makefile
+++ b/docbook/spec/Makefile
@@ -2,19 +2,19 @@ include ../../cvstools/Makefile.incl
 
 XJPARSE=/home/ndw/bin/xjparse
 
-HTMLSTYLE=/projects/oasis/spectools/stylesheets/oasis-docbook-html.xsl
+HTMLSTYLE=html.xsl
 FOSTYLE=fo.xsl
 
-XSLPARAM=""
+XSLPARAM=
 
 all: docbook.html
 
-docbook.html: docbook.xml
+docbook.html: docbook.xml html.xsl
 	$(XJPARSE) $<
 	$(XSLT) $< $(HTMLSTYLE) $@ $(XSLPARAM)
 	tidy -q -utf8 -mn -asxml $@
 
-docbook.fo: docbook.xml
+docbook.fo: docbook.xml fo.xsl
 	$(XJPARSE) $<
 	$(XSLT) $< $(FOSTYLE) docbook.fo $(XSLPARAM)
 
diff --git a/docbook/spec/docbook.xml b/docbook/spec/docbook.xml
index 4df2921a7..18ed567df 100644
--- a/docbook/spec/docbook.xml
+++ b/docbook/spec/docbook.xml
@@ -1,23 +1,22 @@
 <!DOCTYPE article [
-<!ENTITY name "wd-docbook-docbook">
-<!ENTITY version "4.5">
-<!ENTITY standard "Public Review Draft">
+<!ENTITY standard "Committee Specification">
 <!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/">
 ]>
-<article status="&standard;">
+<article lang="en" status="&standard;">
 <articleinfo>
 <releaseinfo role="cvs">
 $Id$
 </releaseinfo>
 
-<productname>&name;</productname>
-<productnumber>&version;</productnumber>
-
-<releaseinfo role="product"><ulink url="&name;-&version;.xml">XML</ulink></releaseinfo>
-<releaseinfo role="product"><ulink url="&name;-&version;.html">HTML</ulink></releaseinfo>
-<releaseinfo role="product"><ulink url="&name;-&version;.pdf">PDF</ulink></releaseinfo>
+<!-- product -->        <productname>docbook</productname>
+<!-- productVersion --> <productnumber>4.5</productnumber>
+<!-- artifactType       spec; what else? :-) -->
+<!-- stage -->          <releaseinfo role="stage">cs</releaseinfo>
+<!-- revision -->       <pubsnumber>01</pubsnumber>
+<!-- language           en; see /article/@xml:lang -->
+<!-- form               xml -->
 
 <releaseinfo role="location">&root;specs</releaseinfo>
 
@@ -34,7 +33,7 @@ $Id$
 </editor>
 </authorgroup>
 
-<pubdate>28 July 2005</pubdate>
+<pubdate>2006-03-09</pubdate>
 
 <copyright>
 <year>2001</year>
@@ -42,13 +41,14 @@ $Id$
 <year>2003</year>
 <year>2004</year>
 <year>2005</year>
+<year>2006</year>
 <holder>
 The Organization for the Advancement of Structured Information
 Standards [OASIS]. All Rights Reserved.
 </holder></copyright>
 
 <abstract><title>Abstract</title>
-<para>DocBook is general purpose <xref linkend="xml-rec"/> and
+<para>DocBook is a 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).
@@ -57,19 +57,19 @@ and software (though it is by no means limited to these applications).
 no backwards-incompatible changes.</para>
 </abstract>
 
-<legalnotice role="status"><title>Status</title>
-<!--
+<legalnotice role="status">
 <para>This &standard; was
-<ulink url="http://lists.oasis-open.org/archives/docbook/200501/msg00118.html">approved</ulink>
+<ulink url="http://www.oasis-open.org/committees/ballot.php?id=939">approved</ulink>
 for publication by the
 OASIS DocBook Technical Committee. It represents the
 consensus of the committee.
 </para>
--->
 
+<!--
 <para>This &standard; is an editor's draft. It does not necessarily
 represent the consensus of the committee.
 </para>
+-->
 
 <para>Please send comments on this specification to the
 <email>docbook@lists.oasis-open.org</email> list. To subscribe, please
@@ -150,6 +150,19 @@ The DocBook site is mirrored on
 <ulink url="http://docbook.org/"/>.
 </para>
 
+<section id="s.cs">
+<title>Changes in DocBook V4.5CR2</title>
+
+<para>There are no backwards-incompatible changes in this release.
+</para>
+
+<para>Version 4.5CR2 contains one small bug-fix applied after the
+Committee Specification was approved: the <sgmltag>citebiblioid</sgmltag>
+element is now allowed everywhere that the other citation elements are
+allowed. It had been accidentally excluded from some inline contexts
+in 4.5CR1.</para>
+</section>
+
 <section id="s.pr">
 <title>Changes in the Public Review Draft of DocBook V4.5</title>
 
@@ -251,7 +264,7 @@ meeting.
 </section>
 </section>
 
-<section><title>Release Notes</title>
+<section id="releasenotes"><title>Release Notes</title>
 
 <para>XML validation technologies have evolved rapidly in the last few
 years. The Technical Committee is exploring the possibility of using
@@ -457,7 +470,7 @@ the formulation of this &standard;:</para>
 
 <para>Copyright &#169; The Organization for the Advancement of
 Structured Information Standards [OASIS]
-2001, 2002, 2003, 2004, 2005.
+2001, 2002, 2003, 2004, 2005, 2006.
 All Rights Reserved.</para>
 
 <para>OASIS takes no position regarding the validity
@@ -533,6 +546,10 @@ of the DocBook web page
 
 <para>
 <revhistory>
+<revision role="&root;specs/docbook-4.5-spec-cs-01.html">
+  <revnumber>Committee Specification CR2</revnumber>
+  <date>09 March 2006</date>
+</revision>
 <revision role="&root;specs/pr-docbook-docbook-4.5.html">
   <revnumber>Public Review Draft</revnumber>
   <date>28 July 2005</date>
@@ -552,7 +569,7 @@ of the DocBook web page
 
 <bibliography id="references"><title>References</title>
 
-<bibliodiv><title>Normative</title>
+<bibliodiv id="normative-refs"><title>Normative</title>
 
 <bibliomixed id="iso8879"/>
 <bibliomixed id="xml-rec"/>
diff --git a/docbook/spec/fo.xsl b/docbook/spec/fo.xsl
index f760162a6..eff03a6c8 100644
--- a/docbook/spec/fo.xsl
+++ b/docbook/spec/fo.xsl
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
 
 <xsl:import href="/projects/oasis/spectools/stylesheets/oasis-docbook-fo.xsl"/>
@@ -7,4 +8,89 @@
 <xsl:param name="draft.watermark.image"
            select="'/sourceforge/docbook/xsl/images/draft.png'"/>
 
+<!-- These get evaluated before stripping! -->
+
+<xsl:variable name="tcProduct" 
+	      select="//articleinfo/productname[1]"/>
+<xsl:variable name="tcProductVersion"
+	      select="//articleinfo/productnumber[1]"/>
+<xsl:variable name="tcArtifactType" select="'spec'"/>
+<xsl:variable name="tcStage"
+	      select="//articleinfo/releaseinfo[@role='stage'][1]"/>
+<xsl:variable name="tcRevision"
+	      select="//articleinfo/pubsnumber[1]"/>
+<xsl:variable name="tcLanguage" select="/@xml:lang"/>
+<xsl:variable name="tcForm" select="'xml'"/>
+
+<xsl:variable name="odnRoot">
+  <xsl:value-of select="$tcProduct"/>
+  <xsl:text>-</xsl:text>
+  <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="$tcLanguage != 'en' and $tcLanguage != ''">
+    <xsl:text>-</xsl:text>
+    <xsl:value-of select="$tcLanguage"/>
+  </xsl:if>
+</xsl:variable>
+
+<xsl:template match="productname" mode="titlepage.mode">
+  <xsl:variable name="pn" select="../productnumber[1]"/>
+
+  <fo:block>
+    <fo:block font-family="{$title.font.family}"
+              space-before="0.5em">Document identifier:</fo:block>
+    <fo:block margin-left="2em">
+      <xsl:value-of select="$odnRoot"/>
+    </fo:block>
+  </fo:block>
+</xsl:template>
+
+<xsl:template match="legalnotice[@role='status']" mode="titlepage.mode">
+  <fo:block>
+    <fo:block font-family="{$title.font.family}"
+              space-before="0.5em">
+      <xsl:text>Status:</xsl:text>
+    </fo:block>
+    <fo:block margin-left="2em">
+      <xsl:apply-templates mode="titlepage.mode"/>
+    </fo:block>
+  </fo:block>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="titlepage.mode">
+  <fo:block keep-with-next="always"
+            font-size="18pt"
+            space-before="10pt"
+            space-after="8pt"
+            font-weight="bold"
+            font-family="{$title.font.family}">
+    <xsl:choose>
+      <xsl:when test="/*/@status">
+        <xsl:value-of select="/*/@status"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>???Unknown Status???</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+
+    <xsl:text>&#160;</xsl:text>
+
+    <xsl:if test="../productnumber">
+      <xsl:text>V</xsl:text>
+      <xsl:value-of select="../productnumber[1]"/>
+      <xsl:text>,&#160;</xsl:text>
+    </xsl:if>
+
+    <xsl:call-template name="datetime.format">
+      <xsl:with-param name="date" select="."/>
+      <xsl:with-param name="format" select="'d B Y'"/>
+    </xsl:call-template>
+  </fo:block>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/docbook/spec/html.xsl b/docbook/spec/html.xsl
new file mode 100644
index 000000000..dc4b5bcd8
--- /dev/null
+++ b/docbook/spec/html.xsl
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="/projects/oasis/spectools/stylesheets/oasis-docbook-html.xsl"/>
+
+<xsl:variable name="tcProduct" select="//articleinfo/productname[1]"/>
+<xsl:variable name="tcProductVersion" select="//articleinfo/productnumber[1]"/>
+<xsl:variable name="tcArtifactType" select="'spec'"/>
+<xsl:variable name="tcStage"
+	      select="//articleinfo/releaseinfo[@role='stage'][1]"/>
+<xsl:variable name="tcRevision" select="//articleinfo/pubsnumber[1]"/>
+<xsl:variable name="tcLanguage" select="/@lang"/>
+<xsl:variable name="tcForm" select="'xml'"/>
+
+<xsl:variable name="odnRoot">
+  <xsl:value-of select="$tcProduct"/>
+  <xsl:text>-</xsl:text>
+  <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="$tcLanguage != 'en' and $tcLanguage != ''">
+    <xsl:text>-</xsl:text>
+    <xsl:value-of select="$tcLanguage"/>
+  </xsl:if>
+</xsl:variable>
+
+<xsl:param name="css.path"
+           select="'http://www.oasis-open.org/spectools/css/'"/>
+
+<xsl:param name="css.stylesheet">
+  <xsl:choose>
+    <xsl:when test="$tcStage = 'wd'">oasis-wd.css</xsl:when>
+    <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:otherwise>
+      <xsl:message>
+        <xsl:text>Unrecognized stage: '</xsl:text>
+	<xsl:value-of select="$tcStage"/>
+        <xsl:text>'; styling as Working Draft.</xsl:text>
+      </xsl:message>
+      <xsl:text>oasis-wd.css</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<xsl:template name="user.head.content">
+  <xsl:param name="node" select="."/>
+
+  <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}"/>
+  <meta name="tcLanguage" content="{$tcLanguage}"/>
+  <meta name="tcForm" content="html"/>
+
+  <style type="text/css">
+    span.paranum { color: #7F7F7F;
+                   font-style: italic;
+                   font-family: monospace;
+                 }
+    span.filename { font-weight: bold; }		 
+  </style>
+</xsl:template>
+
+<xsl:template name="article.titlepage">
+  <div class="titlepage">
+    <p class="logo">
+      <a href="http://www.oasis-open.org/">
+	<img src="http://www.oasis-open.org/spectools/images/oasis.gif"
+	     alt="OASIS" border="0" />
+      </a>
+    </p>
+
+    <xsl:apply-templates select="//articleinfo/title"
+			 mode="titlepage.mode"/>
+
+    <h2>
+      <xsl:choose>
+	<xsl:when test="$tcStage = 'wd'">Working Draft</xsl:when>
+	<xsl:when test="$tcStage = 'cd'">Committee Draft</xsl:when>
+	<xsl:when test="$tcStage = 'pr'">Public Review Draft</xsl:when>
+	<xsl:when test="$tcStage = 'cs'">Committee Specification</xsl:when>
+	<xsl:when test="$tcStage = 'os'">OASIS Standard</xsl:when>
+	<xsl:otherwise>
+	  <xsl:message>
+	    <xsl:text>Unrecognized stage: '</xsl:text>
+	    <xsl:value-of select="$tcStage"/>
+	    <xsl:text>'; labeling as Working Draft.</xsl:text>
+	  </xsl:message>
+	  <xsl:text>Working Draft</xsl:text>
+	</xsl:otherwise>
+      </xsl:choose>
+      <xsl:text>,&#160;</xsl:text>
+      <xsl:value-of select="//articleinfo/pubdate[1]"/>
+    </h2>
+
+    <dl>
+      <dt><span class="docid-heading">Document identifier:</span></dt>
+      <dd>
+	<p>
+	  <xsl:value-of select="$odnRoot"/>
+	  <xsl:text> (</xsl:text>
+	  <a href="{$odnRoot}.xml">.xml</a>
+	  <xsl:text>, </xsl:text>
+	  <a href="{$odnRoot}.html">.html</a>
+	  <xsl:text>, </xsl:text>
+	  <a href="{$odnRoot}.pdf">.pdf</a>
+	  <xsl:text>)</xsl:text>
+	</p>
+      </dd>
+
+      <dt><span class="loc-heading">Location:</span></dt>
+      <dd>
+	<p>
+	  <a href="{//articleinfo/releaseinfo[@role='location']}">
+	    <xsl:value-of select="//articleinfo/releaseinfo[@role='location']"/>
+	  </a>
+	</p>
+      </dd>
+
+      <dt>
+	<span class="editor-heading">
+	  <xsl:text>Editor</xsl:text>
+	  <xsl:if test="count(//articleinfo//editor) &gt; 1">
+	    <xsl:text>s</xsl:text>
+	  </xsl:if>
+	  <xsl:text>:</xsl:text>
+	</span>
+      </dt>
+      <dd>
+	<xsl:for-each select="//articleinfo//editor">
+	  <p>
+	    <xsl:apply-templates select="." mode="titlepage.mode"/>
+	  </p>
+	</xsl:for-each>
+      </dd>
+
+      <dt><span class="abstract-heading">Abstract:</span></dt>
+      <dd>
+	<xsl:apply-templates select="//articleinfo/abstract[1]/*"/>
+      </dd>
+
+      <dt><span class="status-heading">Status:</span></dt>
+      <dd>
+	<xsl:apply-templates
+	    select="//articleinfo/legalnotice[@role='status']/*"/>
+      </dd>
+    </dl>
+
+    <xsl:apply-templates select="//articleinfo/copyright" mode="titlepage.mode"/>
+  </div>
+  <hr />
+</xsl:template>
+
+</xsl:stylesheet>
-- 
2.40.0