Documentation: move "spurious .sp" code into manpage-base.xsl

The "spurious .sp" code should be independent of docbook-xsl
versions.

Testing done with asciidoc 8.3.1 and docbook-xsl 1.74.0.

Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl
index a264fa616093cf4e28a1080dd76747b008859e19..16e2e4097638a49a758c9c198106005822f679e2 100644 (file)
--- a/Documentation/manpage-base.xsl
+++ b/Documentation/manpage-base.xsl
@@ -32,4 +32,17 @@
        <xsl:text>br&#10;</xsl:text>
 </xsl:template>
 
        <xsl:text>br&#10;</xsl:text>
 </xsl:template>
 

+<!-- attempt to work around spurious .sp at the tail of the line
+     that docbook stylesheets seem to add -->
+<xsl:template match="simpara">
+  <xsl:variable name="content">
+    <xsl:apply-templates/>
+  </xsl:variable>
+  <xsl:value-of select="normalize-space($content)"/>
+  <xsl:if test="not(ancestor::authorblurb) and
+                not(ancestor::personblurb)">
+    <xsl:text>&#10;&#10;</xsl:text>
+  </xsl:if>
+</xsl:template>
+

 </xsl:stylesheet>
 </xsl:stylesheet>

diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl
index e36472f5ad45d210c0ba8bf242fda9c439f46c84..a48f5b11f3dcc9227131d3a5caf1de4f857f0b28 100644 (file)
--- a/Documentation/manpage-normal.xsl
+++ b/Documentation/manpage-normal.xsl
@@ -10,17 +10,4 @@
 <xsl:param name="git.docbook.backslash">\</xsl:param>
 <xsl:param name="git.docbook.dot"      >.</xsl:param>
 
 <xsl:param name="git.docbook.backslash">\</xsl:param>
 <xsl:param name="git.docbook.dot"      >.</xsl:param>
 

-<!-- attempt to work around spurious .sp at the tail of the line
-     that docbook stylesheets seem to add -->
-<xsl:template match="simpara">
-  <xsl:variable name="content">
-    <xsl:apply-templates/>
-  </xsl:variable>
-  <xsl:value-of select="normalize-space($content)"/>
-  <xsl:if test="not(ancestor::authorblurb) and
-                not(ancestor::personblurb)">
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-

 </xsl:stylesheet>
 </xsl:stylesheet>