Removed duplicate conformance statement

diff --git a/docbook/relaxng/publishers/spec/fo.xsl b/docbook/relaxng/publishers/spec/fo.xsl
index 1495dad14184566bbdb19401c9d74c8ad99f89b2..0d7708683a1b256407b69ac2f9a153593ee99a56 100644 (file)
--- a/docbook/relaxng/publishers/spec/fo.xsl
+++ b/docbook/relaxng/publishers/spec/fo.xsl
@@ -1,345 +1,344 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-               xmlns:db="http://docbook.org/ns/docbook"
-                xmlns:m="http://docbook.org/xslt/ns/mode"
-                xmlns:t="http://docbook.org/xslt/ns/template"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-               exclude-result-prefixes="db m t xlink xs"
-                version="2.0">
-
-    <xsl:import href="/Users/keith/scratch/docbook-xsl-ns-1.74.0/fo/docbook.xsl"/>
-<xsl:param name="axf.extensions" select="1"/>
-
-<xsl:param name="draft.watermark.image"
-           select="'../../../sourceforge/docbook/xsl/images/draft.png'"/>
-
-<xsl:param name="generate.toc" as="element()*">
-  <tocparam path="appendix" toc="0" title="0"/>
-  <tocparam path="article"  toc="1" title="1"/>
-</xsl:param>
-
-    <xsl:param name="section.autolabel" select="1"/>
-    
-    <xsl:param name="autolabel.elements">
-  <db:appendix format="A"/>
-  <db:chapter/>
-  <db:figure/>
-  <db:example/>
-  <db:table/>
-  <db:equation/>
-  <db:part format="I"/>
-  <db:reference format="I"/>
-  <db:preface/>
-  <db:qandadiv/>
-  <db:section format="1"/>
-  <db:refsection/>
-</xsl:param>
-
-<xsl:param name="ulink.footnotes" select="0"/>
-
-<xsl:param name="ulink.hyphenate" select="'&#xAD;'"/>
-
-<xsl:param name="section.label.includes.component.label" select="1"/>
-
-<xsl:param name="bibliography.collection" select="'bibliography.xml'"/>
-
-<xsl:param name="linenumbering" as="element()*">
-<ln path="literallayout" everyNth="0"/>
-<ln path="programlisting" everyNth="0"/>
-<ln path="programlistingco" everyNth="0"/>
-<ln path="screen" everyNth="0"/>
-<ln path="synopsis" everyNth="0"/>
-<ln path="address" everyNth="0"/>
-<ln path="epigraph/literallayout" everyNth="0"/>
-</xsl:param>
-
-<xsl:param name="profile.condition" select="'print'"/>
-
-<xsl:attribute-set name="section.title.level1.properties" use-attribute-sets="section.title.properties">
-  <xsl:attribute name="font-size" select="'18pt'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.title.level2.properties" use-attribute-sets="section.title.properties">
-  <xsl:attribute name="font-size" select="'14pt'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.title.level3.properties" use-attribute-sets="section.title.properties">
-  <xsl:attribute name="font-size" select="'13pt'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.title.level4.properties" use-attribute-sets="section.title.properties">
-  <xsl:attribute name="font-size" select="'12pt'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.title.level5.properties" use-attribute-sets="section.title.properties">
-  <xsl:attribute name="font-size" select="'10pt'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.title.level6.properties" use-attribute-sets="section.title.properties">
-  <xsl:attribute name="font-size" select="'10pt'"/>
-</xsl:attribute-set>
-
-<xsl:template name="t:head-sep-rule">
-  <xsl:param name="pageclass"/>
-  <xsl:param name="sequence"/>
-  <xsl:param name="gentext-key"/>
-
-  <xsl:if test="$sequence != 'first' and $header.rule != 0">
-    <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
-    <xsl:attribute name="border-bottom-color">black</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!-- ============================================================ -->
-<!-- Wicked hack! -->
-
-<xsl:template match="db:link" mode="m:normalize">
-  <xsl:choose>
-    <xsl:when test="contains(@xlink:href,'/tracker/')">
-      <xsl:apply-templates mode="m:normalize"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:next-match/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:attribute-set name="oasis.header.properties">
-  <xsl:attribute name="color" select="'#66116D'"/>
-  <xsl:attribute name="font-family" select="'Arial, Helvetica, sans-serif'"/>
-  <xsl:attribute name="font-weight" select="'bold'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="oasis.head1.properties"
-                  use-attribute-sets="oasis.header.properties">
-  <xsl:attribute name="font-size" select="'18pt'"/>
-  <xsl:attribute name="margin-top" select="'18pt'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="oasis.head2.properties"
-                  use-attribute-sets="oasis.header.properties">
-  <xsl:attribute name="font-size" select="'14pt'"/>
-  <xsl:attribute name="margin-top" select="'14pt'"/>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="oasis.head3.properties"
-                  use-attribute-sets="oasis.header.properties">
-  <xsl:attribute name="font-size" select="'10pt'"/>
-  <xsl:attribute name="margin-top" select="'4pt'"/>
-</xsl:attribute-set>
-
-<!-- ============================================================ -->
-
-<xsl:template match="db:article/db:info" mode="m:titlepage-mode">
-  <xsl:variable name="odnRoot">
-    <xsl:value-of select="db:productname[1]"/>
-    <xsl:text>-</xsl:text>
-    <xsl:value-of select="db:productnumber[1]"/>
-    <xsl:text>-</xsl:text>
-    <xsl:value-of select="'spec'"/>
-    <xsl:text>-</xsl:text>
-    <xsl:value-of select="db:releaseinfo[@role='stage'][1]"/>
-    <xsl:text>-</xsl:text>
-    <xsl:value-of select="db:biblioid[@class='pubsnumber'][1]"/>
-    <xsl:if test="ancestor::*[@xml:lang][1]
-                 and ancestor::*[@xml:lang][1]/@xml:lang != 'en'">
-      <xsl:text>-</xsl:text>
-      <xsl:value-of select="ancestor::*[@xml:lang][1]/@xml:lang"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <fo:block margin-top="-0.75in">
-    <fo:external-graphic
-       src="url(http://docs.oasis-open.org/templates/OASISLogo.jpg)"
-       margin-left="-5pt"/>
-  </fo:block>
-
-  <fo:block xsl:use-attribute-sets="oasis.head1.properties">
-    <xsl:apply-templates select="db:title/node()"/>
-    <xsl:text> Version </xsl:text>
-    <xsl:value-of select="db:productnumber"/>
-  </fo:block>
-
-  <fo:block xsl:use-attribute-sets="oasis.head2.properties">
-    <xsl:value-of select="../@status"/>
-  </fo:block>
-
-  <fo:block xsl:use-attribute-sets="oasis.head2.properties"
-           margin-bottom="4pt">
-    <xsl:value-of select="format-date(xs:date(db:pubdate[1]),
-                                     '[D01] [MNn,*-3] [Y0001]')"/>
-  </fo:block>
-
-  <fo:block xsl:use-attribute-sets="oasis.head3.properties"
-           margin-top="14pt">
-    <xsl:text>Specification URIs:</xsl:text>
-  </fo:block>
-
-  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"
-           keep-together.within-column="always" 
-           keep-with-next.within-column="always">
-    <xsl:text>This Version:</xsl:text>
-  </fo:block>
-
-  <fo:block margin-left="0.3in">
-    <xsl:for-each select="('.html','.pdf','.xml')">
-      <fo:block>
-       <xsl:text>http://docs.oasis-open.org/docbook/specs/</xsl:text>
-       <xsl:value-of select="$odnRoot"/>
-       <xsl:value-of select="."/>
-      </fo:block>
-    </xsl:for-each>
-  </fo:block>
-
-  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"
-           keep-together.within-column="always" 
-           keep-with-next.within-column="always">
-    <xsl:text>Technical Committee:</xsl:text>
-  </fo:block>
-
-  <fo:block margin-left="0.3in">
-    <xsl:for-each select="db:org/db:orgdiv">
-      <fo:block>
-       <xsl:value-of select="."/>
-      </fo:block>
-    </xsl:for-each>
-  </fo:block>
-
-  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"
-           keep-together.within-column="always" 
-           keep-with-next.within-column="always">
-    <xsl:text>Chair</xsl:text>
-    <xsl:if test="count(db:othercredit[@otherclass = 'chair']) &gt; 1">
-      <xsl:text>s</xsl:text>
-    </xsl:if>
-  </fo:block>
-
-  <fo:block margin-left="0.3in">
-    <xsl:for-each select="db:othercredit[@otherclass = 'chair']">
-      <fo:block>
-       <xsl:apply-templates select="db:personname"/>
-      </fo:block>
-    </xsl:for-each>
-  </fo:block>
-
-  <xsl:variable name="editors" select="db:authorgroup/db:editor|db:editor"/>
-
-  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"
-           keep-together.within-column="always" 
-           keep-with-next.within-column="always">
-    <xsl:text>Editor</xsl:text>
-    <xsl:if test="count($editors) &gt; 1">
-      <xsl:text>s</xsl:text>
-    </xsl:if>
-  </fo:block>
-
-  <fo:block margin-left="0.3in">
-    <xsl:for-each select="$editors">
-      <fo:block>
-       <xsl:apply-templates select="db:personname"/>
-      </fo:block>
-    </xsl:for-each>
-  </fo:block>
-
-  <xsl:variable name="replaces" select="db:bibliorelation[@type='replaces']"/>
-  <xsl:variable name="supersedes" select="db:bibliorelation[@othertype='supersedes']"/>
-  <xsl:variable name="related" select="db:bibliorelation[@type='references']"/>
-
-  <xsl:if test="$replaces | $supersedes | $related">
-    <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"
-             keep-together.within-column="always" 
-             keep-with-next.within-column="always">
-         <xsl:text>Related Work:</xsl:text>
-    </fo:block>
-
-    <fo:block margin-left="0.3in">
-      <xsl:if test="$replaces|$supersedes">
-       <fo:block xsl:use-attribute-sets="list.item.spacing"  
-                 keep-together.within-column="always" 
-                 keep-with-next.within-column="always"
-                 font-weight="bold" font-family="Arial, Helvetica, sans-serif">
-         <xsl:text>This specification replaces or supersedes:</xsl:text>
-       </fo:block>
-       <fo:block margin-left="0.3in">
-         <xsl:for-each select="$replaces|$supersedes">
-           <fo:block>
-             <xsl:value-of select="@xlink:href"/>
-           </fo:block>
-         </xsl:for-each>
-       </fo:block>
-      </xsl:if>
-
-      <xsl:if test="$related">
-       <fo:block xsl:use-attribute-sets="list.item.spacing"  
-                 keep-together.within-column="always" 
-                 keep-with-next.within-column="always"
-                 font-weight="bold" font-family="Arial, Helvetica, sans-serif">
-         <xsl:text>This specification is related to:</xsl:text>
-       </fo:block>
-       <fo:block margin-left="0.3in">
-         <xsl:for-each select="$related">
-           <fo:block>
-             <xsl:value-of select="@xlink:href"/>
-           </fo:block>
-         </xsl:for-each>
-       </fo:block>
-      </xsl:if>
-    </fo:block>
-  </xsl:if>
-
-  <xsl:if test="db:bibliomisc[@role='namespace']">
-      <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"
-               keep-together.within-column="always" 
-               keep-with-next.within-column="always">
-       <xsl:text>Declared XML Namespace</xsl:text>
-       <xsl:if test="count(db:bibliomisc[@role='namespace']) &gt; 1">s</xsl:if>
-      </fo:block>
-
-      <fo:block margin-left="0.3in">
-       <xsl:for-each select="db:bibliomisc[@role='namespace']">
-         <fo:block>
-           <xsl:value-of select="."/>
-         </fo:block>
-       </xsl:for-each>
-      </fo:block>
-  </xsl:if>
-
-  <fo:block>
-    <fo:block xsl:use-attribute-sets="oasis.head3.properties" margin-top="14pt"
-             keep-with-next.within-column="always">
-      <xsl:text>Abstract:</xsl:text>
-    </fo:block>
-    <fo:block margin-left="0.3in" font-family="Arial, Helvetica, sans-serif">
-      <xsl:apply-templates select="db:abstract"/>
-    </fo:block>
-  </fo:block>
-
-  <fo:block>
-    <fo:block xsl:use-attribute-sets="oasis.head3.properties" margin-top="14pt"
-             keep-with-next.within-column="always">
-      <xsl:text>Status:</xsl:text>
-    </fo:block>
-    <fo:block margin-left="0.3in" font-family="Arial, Helvetica, sans-serif">
-      <xsl:apply-templates select="db:legalnotice[@role='status']"/>
-    </fo:block>
-  </fo:block>
-
-  <fo:block>
-    <fo:block xsl:use-attribute-sets="oasis.head3.properties" margin-top="14pt"
-             keep-with-next.within-column="always">
-      <xsl:text>Notices:</xsl:text>
-    </fo:block>
-    <fo:block font-family="Arial, Helvetica, sans-serif">
-      <xsl:apply-templates select="db:legalnotice[@role='notices']"/>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-</xsl:stylesheet>
+<?xml version="1.0"?>\r
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"\r
+               xmlns:db="http://docbook.org/ns/docbook"\r
+                xmlns:m="http://docbook.org/xslt/ns/mode"\r
+                xmlns:t="http://docbook.org/xslt/ns/template"\r
+               xmlns:xlink="http://www.w3.org/1999/xlink"\r
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+               exclude-result-prefixes="db m t xlink xs"\r
+                version="2.0">\r
+\r
+    <xsl:import href="../../../docbook-xsl-ns-1.75.1/fo/docbook.xsl"/>\r
+\r
+<xsl:param name="draft.watermark.image"\r
+           select="'../../../sourceforge/docbook/xsl/images/draft.png'"/>\r
+\r
+<xsl:param name="generate.toc" as="element()*">\r
+  <tocparam path="appendix" toc="0" title="0"/>\r
+  <tocparam path="article"  toc="1" title="1"/>\r
+</xsl:param>\r
+\r
+    <xsl:param name="section.autolabel" select="1"/>\r
+    \r
+    <xsl:param name="autolabel.elements">\r
+  <db:appendix format="A"/>\r
+  <db:chapter/>\r
+  <db:figure/>\r
+  <db:example/>\r
+  <db:table/>\r
+  <db:equation/>\r
+  <db:part format="I"/>\r
+  <db:reference format="I"/>\r
+  <db:preface/>\r
+  <db:qandadiv/>\r
+  <db:section format="1"/>\r
+  <db:refsection/>\r
+</xsl:param>\r
+\r
+<xsl:param name="ulink.footnotes" select="0"/>\r
+\r
+<xsl:param name="ulink.hyphenate" select="'&#xAD;'"/>\r
+\r
+<xsl:param name="section.label.includes.component.label" select="1"/>\r
+\r
+<xsl:param name="bibliography.collection" select="'bibliography.xml'"/>\r
+\r
+<xsl:param name="linenumbering" as="element()*">\r
+<ln path="literallayout" everyNth="0"/>\r
+<ln path="programlisting" everyNth="0"/>\r
+<ln path="programlistingco" everyNth="0"/>\r
+<ln path="screen" everyNth="0"/>\r
+<ln path="synopsis" everyNth="0"/>\r
+<ln path="address" everyNth="0"/>\r
+<ln path="epigraph/literallayout" everyNth="0"/>\r
+</xsl:param>\r
+\r
+<xsl:param name="profile.condition" select="'print'"/>\r
+\r
+<xsl:attribute-set name="section.title.level1.properties" use-attribute-sets="section.title.properties">\r
+  <xsl:attribute name="font-size" select="'18pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="section.title.level2.properties" use-attribute-sets="section.title.properties">\r
+  <xsl:attribute name="font-size" select="'14pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="section.title.level3.properties" use-attribute-sets="section.title.properties">\r
+  <xsl:attribute name="font-size" select="'13pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="section.title.level4.properties" use-attribute-sets="section.title.properties">\r
+  <xsl:attribute name="font-size" select="'12pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="section.title.level5.properties" use-attribute-sets="section.title.properties">\r
+  <xsl:attribute name="font-size" select="'10pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="section.title.level6.properties" use-attribute-sets="section.title.properties">\r
+  <xsl:attribute name="font-size" select="'10pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:template name="t:head-sep-rule">\r
+  <xsl:param name="pageclass"/>\r
+  <xsl:param name="sequence"/>\r
+  <xsl:param name="gentext-key"/>\r
+\r
+  <xsl:if test="$sequence != 'first' and $header.rule != 0">\r
+    <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>\r
+    <xsl:attribute name="border-bottom-style">solid</xsl:attribute>\r
+    <xsl:attribute name="border-bottom-color">black</xsl:attribute>\r
+  </xsl:if>\r
+</xsl:template>\r
+\r
+<!-- ============================================================ -->\r
+<!-- Wicked hack! -->\r
+\r
+<xsl:template match="db:link" mode="m:normalize">\r
+  <xsl:choose>\r
+    <xsl:when test="contains(@xlink:href,'/tracker/')">\r
+      <xsl:apply-templates mode="m:normalize"/>\r
+    </xsl:when>\r
+    <xsl:otherwise>\r
+      <xsl:next-match/>\r
+    </xsl:otherwise>\r
+  </xsl:choose>\r
+</xsl:template>\r
+\r
+<!-- ============================================================ -->\r
+\r
+<xsl:attribute-set name="oasis.header.properties">\r
+  <xsl:attribute name="color" select="'#66116D'"/>\r
+  <xsl:attribute name="font-family" select="'Arial, Helvetica, sans-serif'"/>\r
+  <xsl:attribute name="font-weight" select="'bold'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="oasis.head1.properties"\r
+                  use-attribute-sets="oasis.header.properties">\r
+  <xsl:attribute name="font-size" select="'18pt'"/>\r
+  <xsl:attribute name="margin-top" select="'18pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="oasis.head2.properties"\r
+                  use-attribute-sets="oasis.header.properties">\r
+  <xsl:attribute name="font-size" select="'14pt'"/>\r
+  <xsl:attribute name="margin-top" select="'14pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<xsl:attribute-set name="oasis.head3.properties"\r
+                  use-attribute-sets="oasis.header.properties">\r
+  <xsl:attribute name="font-size" select="'10pt'"/>\r
+  <xsl:attribute name="margin-top" select="'4pt'"/>\r
+</xsl:attribute-set>\r
+\r
+<!-- ============================================================ -->\r
+\r
+<xsl:template match="db:article/db:info" mode="m:titlepage-mode">\r
+  <xsl:variable name="odnRoot">\r
+    <xsl:value-of select="db:productname[1]"/>\r
+    <xsl:text>-</xsl:text>\r
+    <xsl:value-of select="db:productnumber[1]"/>\r
+    <xsl:text>-</xsl:text>\r
+    <xsl:value-of select="'spec'"/>\r
+    <xsl:text>-</xsl:text>\r
+    <xsl:value-of select="db:releaseinfo[@role='stage'][1]"/>\r
+    <xsl:text>-</xsl:text>\r
+    <xsl:value-of select="db:biblioid[@class='pubsnumber'][1]"/>\r
+    <xsl:if test="ancestor::*[@xml:lang][1]\r
+                 and ancestor::*[@xml:lang][1]/@xml:lang != 'en'">\r
+      <xsl:text>-</xsl:text>\r
+      <xsl:value-of select="ancestor::*[@xml:lang][1]/@xml:lang"/>\r
+    </xsl:if>\r
+  </xsl:variable>\r
+\r
+  <fo:block margin-top="-0.75in">\r
+    <fo:external-graphic\r
+       src="url(http://docs.oasis-open.org/templates/OASISLogo.jpg)"\r
+       margin-left="-5pt"/>\r
+  </fo:block>\r
+\r
+  <fo:block xsl:use-attribute-sets="oasis.head1.properties">\r
+    <xsl:apply-templates select="db:title/node()"/>\r
+    <xsl:text> Version </xsl:text>\r
+    <xsl:value-of select="db:productnumber"/>\r
+  </fo:block>\r
+\r
+  <fo:block xsl:use-attribute-sets="oasis.head2.properties">\r
+    <xsl:value-of select="../@status"/>\r
+  </fo:block>\r
+\r
+  <fo:block xsl:use-attribute-sets="oasis.head2.properties"\r
+           margin-bottom="4pt">\r
+    <xsl:value-of select="format-date(xs:date(db:pubdate[1]),\r
+                                     '[D01] [MNn,*-3] [Y0001]')"/>\r
+  </fo:block>\r
+\r
+  <fo:block xsl:use-attribute-sets="oasis.head3.properties"\r
+           margin-top="14pt">\r
+    <xsl:text>Specification URIs:</xsl:text>\r
+  </fo:block>\r
+\r
+  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"\r
+           keep-together.within-column="always" \r
+           keep-with-next.within-column="always">\r
+    <xsl:text>This Version:</xsl:text>\r
+  </fo:block>\r
+\r
+  <fo:block margin-left="0.3in">\r
+    <xsl:for-each select="('.html','.pdf','.xml')">\r
+      <fo:block>\r
+       <xsl:text>http://docs.oasis-open.org/docbook/specs/</xsl:text>\r
+       <xsl:value-of select="$odnRoot"/>\r
+       <xsl:value-of select="."/>\r
+      </fo:block>\r
+    </xsl:for-each>\r
+  </fo:block>\r
+\r
+  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"\r
+           keep-together.within-column="always" \r
+           keep-with-next.within-column="always">\r
+    <xsl:text>Technical Committee:</xsl:text>\r
+  </fo:block>\r
+\r
+  <fo:block margin-left="0.3in">\r
+    <xsl:for-each select="db:org/db:orgdiv">\r
+      <fo:block>\r
+       <xsl:value-of select="."/>\r
+      </fo:block>\r
+    </xsl:for-each>\r
+  </fo:block>\r
+\r
+  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"\r
+           keep-together.within-column="always" \r
+           keep-with-next.within-column="always">\r
+    <xsl:text>Chair</xsl:text>\r
+    <xsl:if test="count(db:othercredit[@otherclass = 'chair']) &gt; 1">\r
+      <xsl:text>s</xsl:text>\r
+    </xsl:if>\r
+  </fo:block>\r
+\r
+  <fo:block margin-left="0.3in">\r
+    <xsl:for-each select="db:othercredit[@otherclass = 'chair']">\r
+      <fo:block>\r
+       <xsl:apply-templates select="db:personname"/>\r
+      </fo:block>\r
+    </xsl:for-each>\r
+  </fo:block>\r
+\r
+  <xsl:variable name="editors" select="db:authorgroup/db:editor|db:editor"/>\r
+\r
+  <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"\r
+           keep-together.within-column="always" \r
+           keep-with-next.within-column="always">\r
+    <xsl:text>Editor</xsl:text>\r
+    <xsl:if test="count($editors) &gt; 1">\r
+      <xsl:text>s</xsl:text>\r
+    </xsl:if>\r
+  </fo:block>\r
+\r
+  <fo:block margin-left="0.3in">\r
+    <xsl:for-each select="$editors">\r
+      <fo:block>\r
+       <xsl:apply-templates select="db:personname"/>\r
+      </fo:block>\r
+    </xsl:for-each>\r
+  </fo:block>\r
+\r
+  <xsl:variable name="replaces" select="db:bibliorelation[@type='replaces']"/>\r
+  <xsl:variable name="supersedes" select="db:bibliorelation[@othertype='supersedes']"/>\r
+  <xsl:variable name="related" select="db:bibliorelation[@type='references']"/>\r
+\r
+  <xsl:if test="$replaces | $supersedes | $related">\r
+    <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"\r
+             keep-together.within-column="always" \r
+             keep-with-next.within-column="always">\r
+         <xsl:text>Related Work:</xsl:text>\r
+    </fo:block>\r
+\r
+    <fo:block margin-left="0.3in">\r
+      <xsl:if test="$replaces|$supersedes">\r
+       <fo:block xsl:use-attribute-sets="list.item.spacing"  \r
+                 keep-together.within-column="always" \r
+                 keep-with-next.within-column="always"\r
+                 font-weight="bold" font-family="Arial, Helvetica, sans-serif">\r
+         <xsl:text>This specification replaces or supersedes:</xsl:text>\r
+       </fo:block>\r
+       <fo:block margin-left="0.3in">\r
+         <xsl:for-each select="$replaces|$supersedes">\r
+           <fo:block>\r
+             <xsl:value-of select="@xlink:href"/>\r
+           </fo:block>\r
+         </xsl:for-each>\r
+       </fo:block>\r
+      </xsl:if>\r
+\r
+      <xsl:if test="$related">\r
+       <fo:block xsl:use-attribute-sets="list.item.spacing"  \r
+                 keep-together.within-column="always" \r
+                 keep-with-next.within-column="always"\r
+                 font-weight="bold" font-family="Arial, Helvetica, sans-serif">\r
+         <xsl:text>This specification is related to:</xsl:text>\r
+       </fo:block>\r
+       <fo:block margin-left="0.3in">\r
+         <xsl:for-each select="$related">\r
+           <fo:block>\r
+             <xsl:value-of select="@xlink:href"/>\r
+           </fo:block>\r
+         </xsl:for-each>\r
+       </fo:block>\r
+      </xsl:if>\r
+    </fo:block>\r
+  </xsl:if>\r
+\r
+  <xsl:if test="db:bibliomisc[@role='namespace']">\r
+      <fo:block xsl:use-attribute-sets="list.item.spacing oasis.head3.properties"\r
+               keep-together.within-column="always" \r
+               keep-with-next.within-column="always">\r
+       <xsl:text>Declared XML Namespace</xsl:text>\r
+       <xsl:if test="count(db:bibliomisc[@role='namespace']) &gt; 1">s</xsl:if>\r
+      </fo:block>\r
+\r
+      <fo:block margin-left="0.3in">\r
+       <xsl:for-each select="db:bibliomisc[@role='namespace']">\r
+         <fo:block>\r
+           <xsl:value-of select="."/>\r
+         </fo:block>\r
+       </xsl:for-each>\r
+      </fo:block>\r
+  </xsl:if>\r
+\r
+  <fo:block>\r
+    <fo:block xsl:use-attribute-sets="oasis.head3.properties" margin-top="14pt"\r
+             keep-with-next.within-column="always">\r
+      <xsl:text>Abstract:</xsl:text>\r
+    </fo:block>\r
+    <fo:block margin-left="0.3in" font-family="Arial, Helvetica, sans-serif">\r
+      <xsl:apply-templates select="db:abstract"/>\r
+    </fo:block>\r
+  </fo:block>\r
+\r
+  <fo:block>\r
+    <fo:block xsl:use-attribute-sets="oasis.head3.properties" margin-top="14pt"\r
+             keep-with-next.within-column="always">\r
+      <xsl:text>Status:</xsl:text>\r
+    </fo:block>\r
+    <fo:block margin-left="0.3in" font-family="Arial, Helvetica, sans-serif">\r
+      <xsl:apply-templates select="db:legalnotice[@role='status']"/>\r
+    </fo:block>\r
+  </fo:block>\r
+\r
+  <fo:block>\r
+    <fo:block xsl:use-attribute-sets="oasis.head3.properties" margin-top="14pt"\r
+             keep-with-next.within-column="always">\r
+      <xsl:text>Notices:</xsl:text>\r
+    </fo:block>\r
+    <fo:block font-family="Arial, Helvetica, sans-serif">\r
+      <xsl:apply-templates select="db:legalnotice[@role='notices']"/>\r
+    </fo:block>\r
+  </fo:block>\r
+</xsl:template>\r
+\r
+<!-- ============================================================ -->\r
+\r
+</xsl:stylesheet>\r

diff --git a/docbook/relaxng/publishers/spec/html.xsl b/docbook/relaxng/publishers/spec/html.xsl
index 9bcc78d92c80e21f742785b51ffc4ebb48afe572..2578571f95fb576adc84e6456045de8b02177781 100644 (file)
--- a/docbook/relaxng/publishers/spec/html.xsl
+++ b/docbook/relaxng/publishers/spec/html.xsl
@@ -11,7 +11,7 @@
                exclude-result-prefixes="db f h m t xlink xs"
                 version="2.0">
 
-<xsl:import href="../../../docbook-xsl-ns-1.74.0/html/docbook.xsl"/>
+<xsl:import href="../../../docbook-xsl-ns-1.75.1/html/docbook.xsl"/>
 
 <xsl:param name="generate.toc" as="element()*">
 <tocparam path="appendix" toc="0" title="0"/>

diff --git a/docbook/relaxng/publishers/spec/publishers.pdf b/docbook/relaxng/publishers/spec/publishers.pdf
index 9011fe23dec92c34a68d8402612e5b369d855b5e..c2040688783a3274e7bf4b75231d2e5823e7caa1 100644 (file)
Binary files a/docbook/relaxng/publishers/spec/publishers.pdf and b/docbook/relaxng/publishers/spec/publishers.pdf differ

diff --git a/docbook/relaxng/publishers/spec/publishers.xml b/docbook/relaxng/publishers/spec/publishers.xml
index c234dc0a98266fc19a4760fdcb766cf367e24bab..d743f6285b96bf63b1cacb8318470efd32d989bd 100644 (file)
--- a/docbook/relaxng/publishers/spec/publishers.xml
+++ b/docbook/relaxng/publishers/spec/publishers.xml
@@ -225,28 +225,6 @@ for publication by the OASIS DocBook Technical Committee. It represents the cons
             </bibliolist>
         </section>
     </section>
-    <section xml:id="s.conformance">
-        <title>Conformance</title>
-        <para>The DocBook Publishers schema is a valid DocBook v5.0 customization.
-        Publications or documents will be considered conformant to this
-        specification if they validate against the DocBook Publishers schema
-        (publishers.rnc or publishers.rng).</para>
-        <para>Extensions allow implementers to include features that are in demand
-        by their customers. Extensions may migrate into future versions of this
-        specification. However, the use of extensions can have an impact on interoperability.</para>
-        <para>Any extenstions to this schema SHALL follow the principles and
-        guidelines of the DocBook v5.0 and this Publishers specification;
-        that is, the specifications SHALL be extended in a standard manner
-        as described in <link xlink:href="http://docbook.org/tdg5/en/html/ch05.html">http://docbook.org/tdg5/en/html/ch05.html</link>.</para>
-        <para>For implementations and/or applications that contain extensions,
-        extensions SHALL
-        be clearly described in supporting documentation, and the extensions
-        SHALL be marked
-        as such within the implementation/application.</para>
-        <para>This document’s normative language is English. Translation into
-        other languages
-        is permitted.</para>
-    </section>
     <section xml:id="s.docbook">
         <title>The DocBook Publishers RELAX NG Schema</title>
         <para>The DocBook Publishers <link xlink:href="http://docs.oasis-open.org/docbook/rng/"
@@ -8230,7 +8208,8 @@ for publication by the OASIS DocBook Technical Committee. It represents the cons
             (removed dc namespace, added dc elements to dcterms; better formatted examples, summary
             of elements added/removed in Introduction.</para>
         <para>Revised Draft. 15 January 2009. Removed spurious "remap" attributes from examples.
-            Added table mapping Dublin Core to DocBook equivalents per request from Jirka Kosek.</para>
+        Added table mapping Dublin Core to DocBook equivalents per request from Jirka Kosek.</para>
+        <para>Revised Draft. 7 May 2009. Added conformance statement.</para>
         <!--
 <listitem xml:id="rfe.">
 <para>Fixed <link xlink:href="&RFE;aid=">RFE </link>: