git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Johnsen <chris_johnsen@pobox.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Chris Johnsen <chris_johnsen@pobox.com>
Subject: [PATCH 5/8] Documentation: move "spurious .sp" code into manpage-base.xsl
Date: Tue, 24 Mar 2009 03:04:23 -0500	[thread overview]
Message-ID: <1237881866-5497-6-git-send-email-chris_johnsen@pobox.com> (raw)
In-Reply-To: <1237881866-5497-1-git-send-email-chris_johnsen@pobox.com>

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>

---

I do not know why this was only in the non-1.72 variant. Maybe
docbook-xsl 1.72.0 did not need it. But it does not seem like it
would hurt to push it into the shared XSLT. As before, if there
is a good reason to keep it out of the -1.72 processing, then
just drop this patch, none of the rest depend on it.
---
 Documentation/manpage-base.xsl   |   13 +++++++++++++
 Documentation/manpage-normal.xsl |   13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl
index a264fa6..16e2e40 100644
--- a/Documentation/manpage-base.xsl
+++ b/Documentation/manpage-base.xsl
@@ -32,4 +32,17 @@
 	<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>
diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl
index be0afc9..0412722 100644
--- a/Documentation/manpage-normal.xsl
+++ b/Documentation/manpage-normal.xsl
@@ -9,17 +9,4 @@
 <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>
-- 
1.6.2.1.214.ge986c

  parent reply	other threads:[~2009-03-24  8:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-24  8:04 [PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals Chris Johnsen
2009-03-24  8:04 ` [PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl Chris Johnsen
2009-03-24  8:51   ` Jeff King
2009-03-24 19:36     ` Chris Johnsen
2009-03-26  9:40       ` Jeff King
2009-03-24  8:04 ` [PATCH 2/8] Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl Chris Johnsen
2009-03-24  8:57   ` Jeff King
2009-03-24 19:42     ` Chris Johnsen
2009-03-24  8:04 ` [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff Chris Johnsen
2009-03-24  9:04   ` Jeff King
2009-03-24 19:48     ` Chris Johnsen
2009-03-26  9:43       ` Jeff King
2009-03-26 16:47         ` Junio C Hamano
2009-03-26 18:49           ` Michael J Gruber
2009-03-24  8:04 ` [PATCH 4/8] Documentation: move quieting params into manpage-base.xsl Chris Johnsen
2009-03-24  9:18   ` Jeff King
2009-03-25  4:21     ` [PATCH 1/2] Documentation/Makefile: make most operations "quiet" Chris Johnsen
2009-03-25  4:21       ` [PATCH 2/2] Documentation/Makefile: break up texi pipeline Chris Johnsen
2009-03-25  4:28       ` [PATCH 1/2] Documentation/Makefile: make most operations "quiet" Jeff King
2009-03-25  9:55         ` Chris Johnsen
2009-03-24  8:04 ` Chris Johnsen [this message]
2009-03-24  8:04 ` [PATCH 6/8] Documentation: asciidoc.conf: always use <literallayout> for [blocktext] Chris Johnsen
2009-03-24  8:04 ` [PATCH 7/8] Documentation: asciidoc.conf: fix verse block with block titles Chris Johnsen
2009-03-24  8:04 ` [PATCH 8/8] Documentation: option to render literal text as bold for manpages Chris Johnsen
2009-03-26  8:59 ` [PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1237881866-5497-6-git-send-email-chris_johnsen@pobox.com \
    --to=chris_johnsen@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).