Took some templates for matching inline instances of come

"computer" markup and moved them out of synop.xsl file and into
the inline.xsl file.

diff --git a/xsl/manpages/inline.xsl b/xsl/manpages/inline.xsl
index d32fb8c91c0a4f32e369d8fd2df1d21db10f898d..67328c83de3dbb82489dc5ef646e28762346f501 100644 (file)
--- a/xsl/manpages/inline.xsl
+++ b/xsl/manpages/inline.xsl
@@ -36,6 +36,29 @@
   <xsl:apply-templates/>
 </xsl:template>
 
+<xsl:template match="command">
+  <xsl:if test="$man.hyphenate.computer.inlines = 0">
+    <xsl:call-template name="suppress.hyphenation"/>
+  </xsl:if>
+  <xsl:apply-templates mode="bold" select="."/>
+</xsl:template>
+
+<xsl:template match="function[not(ancestor::cmdsynopsis) and
+                     not(ancestor::funcsynopsis)]">
+  <xsl:if test="$man.hyphenate.computer.inlines = 0">
+    <xsl:call-template name="suppress.hyphenation"/>
+  </xsl:if>
+  <xsl:apply-templates mode="bold" select="."/>
+</xsl:template>
+
+<xsl:template match="parameter[not(ancestor::cmdsynopsis) and
+                     not(ancestor::funcsynopsis)]">
+  <xsl:if test="$man.hyphenate.computer.inlines = 0">
+    <xsl:call-template name="suppress.hyphenation"/>
+  </xsl:if>
+  <xsl:apply-templates mode="italic" select="."/>
+</xsl:template>
+
 <xsl:template match="filename">
   <!-- * add hyphenation suppression in Filename output only if -->
   <!-- * break.after.slash is also non-zero -->

diff --git a/xsl/manpages/synop.xsl b/xsl/manpages/synop.xsl
index 4026ca5ca516a58e5e58fed91121f8c498b6dffa..e6a74219ac704bab2b8f93027e4b532885518d7b 100644 (file)
--- a/xsl/manpages/synop.xsl
+++ b/xsl/manpages/synop.xsl
@@ -148,22 +148,6 @@
   <xsl:call-template name="group-or-arg"/>
 </xsl:template>
 
-
-<xsl:template match="command">
-  <xsl:call-template name="suppress.hyphenation"/>
-  <xsl:apply-templates mode="bold" select="."/>
-</xsl:template>
-
-<xsl:template match="function[not(ancestor::command)]">
-  <xsl:call-template name="suppress.hyphenation"/>
-  <xsl:apply-templates mode="bold" select="."/>
-</xsl:template>
-
-<xsl:template match="parameter[not(ancestor::command)]">
-  <xsl:call-template name="suppress.hyphenation"/>
-  <xsl:apply-templates mode="italic" select="."/>
-</xsl:template>
-
 <xsl:template match="sbr">
   <xsl:text>&#10;</xsl:text>
   <xsl:text>.br&#10;</xsl:text>