db2man.xsl:

  * temporarily add some params that chunker.xsl needs
  * fix bold/italic templates
  * update calls to bold/italic templates for new syntax
synop.xsl:
  * add support for synopfragment
  * update calls to bold/italic templates for new syntax

diff --git a/contrib/xsl/db2man/db2man.xsl b/contrib/xsl/db2man/db2man.xsl
index 46a451167edc270207719a1edc257a7c317d58c9..724589ec90b8293e7fc2006900fc50757af236d7 100644 (file)
--- a/contrib/xsl/db2man/db2man.xsl
+++ b/contrib/xsl/db2man/db2man.xsl
@@ -3,6 +3,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'>
 
+<!-- Needed for chunker.xsl (for now): -->
+<xsl:param name="output.method" select="'text'"/>
+<xsl:param name="default.encoding" select="'ISO-8859-1'"/>
+<xsl:param name="saxon.character.representation" select="'entity;decimal'"/>
+<xsl:param name="chunk.quietly" select="'0'"/>
+
 <xsl:include href="http://docbook.sourceforge.net/release/xsl/current/common/common.xsl"/>
 <xsl:include href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/>
 
@@ -17,17 +23,15 @@
 <!--
   named templates for bold and italic. call like:
 
-  <xsl:apply-templates name="bold" />
-  or,
-  <xsl:apply-templates name="bold" select="node-you-want" />
+  <xsl:apply-templates mode="bold" select="node-you-want" />
 -->
-<xsl:template name="bold">
+<xsl:template mode="bold" match="*">
   <xsl:text>\fB</xsl:text>
   <xsl:value-of select="."/>
   <xsl:text>\fR</xsl:text>
 </xsl:template>
 
-<xsl:template name="italic">
+<xsl:template mode="italic" match="*">
   <xsl:text>\fI</xsl:text>
   <xsl:value-of select="."/>
   <xsl:text>\fR</xsl:text>
@@ -195,11 +199,11 @@
 <xsl:template match="refentry/refentryinfo"></xsl:template>
 
 <xsl:template match="option">
-  <xsl:apply-templates name="bold" />
+  <xsl:apply-templates mode="bold" select="."/>
 </xsl:template>
 
 <xsl:template match="replaceable|varname">
-  <xsl:apply-templates name="italic" />
+  <xsl:apply-templates mode="italic" select="."/>
 </xsl:template>
 
 <xsl:template match="filename">
@@ -207,7 +211,7 @@
 </xsl:template>
 
 <xsl:template match="userinput">
-  <xsl:apply-templates name="bold" />
+  <xsl:apply-templates mode="bold" select="."/>
 </xsl:template>
 
 <xsl:template match="informalexample|screen">
@@ -217,15 +221,15 @@
 </xsl:template>
 
 <xsl:template match="envar">
-  <xsl:apply-templates name="bold" />
+  <xsl:apply-templates mode="bold" select="."/>
 </xsl:template>
 
 <xsl:template match="filename">
-  <xsl:apply-templates name="italic" />
+  <xsl:apply-templates mode="italic" select="."/>
 </xsl:template>
 
 <xsl:template match="errorcode|constant|type">
-  <xsl:apply-templates name="bold" />
+  <xsl:apply-templates mode="bold" select="."/>
 </xsl:template>
 
 <xsl:template match="quote">
@@ -244,9 +248,7 @@
   <xsl:param name="refentrytitle" select="''"/>
   <xsl:param name="manvolnum" select="''"/>
 
-  <xsl:call-template name="fB">
-    <xsl:with-param name="content" select="$refentrytitle"/>
-  </xsl:call-template>
+  <xsl:apply-templates mode="bold" select="$refentrytitle"/>
   <xsl:text>(</xsl:text>
   <xsl:value-of select="$manvolnum"/>
   <xsl:text>)</xsl:text>
@@ -262,7 +264,7 @@
 <xsl:template match="ulink">
   <xsl:apply-templates/>
   <xsl:text>: </xsl:text>
-  <xsl:apply-templates name="italic" select="@url" />
+  <xsl:apply-templates mode="italic" select="@url" />
 </xsl:template>
 
 <xsl:template match="/">

diff --git a/contrib/xsl/db2man/synop.xsl b/contrib/xsl/db2man/synop.xsl
index 3128544b6a125b8c994413ccd77871ae60273286..207a133f4c41b8f393751f11f5a14377ea1ab787 100644 (file)
--- a/contrib/xsl/db2man/synop.xsl
+++ b/contrib/xsl/db2man/synop.xsl
@@ -3,6 +3,14 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'>
 
+<xsl:template match="synopfragment">
+<xsl:text>&#10;.PP&#10;</xsl:text>
+<xsl:apply-templates/>
+</xsl:template>
+<!--
+  there's a bug were an <arg> that's not inside a <group> isn't made bold
+-->
+
 <xsl:template match="group|arg">
   <xsl:variable name="choice" select="@choice"/>
   <xsl:variable name="rep" select="@rep"/>
@@ -60,17 +68,19 @@
 </xsl:template>
 
 <xsl:template match="group/arg">
-  <xsl:if test="position()>1"><xsl:value-of select="$arg.or.sep"/></xsl:if>
-  <xsl:apply-templates name="bold" />
+  <xsl:if test="position()>1">
+    <xsl:value-of select="$arg.or.sep"/>
+  </xsl:if>
+  <xsl:apply-templates mode="bold" select="."/>
 </xsl:template>
 
 <xsl:template match="command">
-  <xsl:apply-templates name="bold" />
+  <xsl:apply-templates mode="bold" select="."/>
 </xsl:template>
 
 <xsl:template match="arg/replaceable">
   <xsl:text> </xsl:text>
-  <xsl:apply-templates name="italic" />
+  <xsl:apply-templates mode="italic" select="."/>
   <xsl:text> </xsl:text>
 </xsl:template>