threads / patch / 9576

patchProperly force listingblocks to be monospaced in manpages

Subject: [PATCH] Properly force listingblocks to be monospaced in manpages

## tl;dr

4 messages between Aug 19, 2007 and Aug 19, 2007. Diffs are folded; open one to read it.

replies: 3people: 1as markdown or json

Mike Hommey· Aug 19, 2007, 21:03 UTC · lore

Still insert a ".ft C" before and ".ft" after, but do it in a way as to avoid them to get escaped with "\&", which makes the manpages look pretty bad. Do it in a more docbook-xsl'ish way.

Reverts 281a53bb79786a6d7e54f9715cc8ad46fc2bdb0e.

Signed-off-by: Mike Hommey <mh@glandium.org>
---
 Documentation/asciidoc.conf |    6 ------
 Documentation/callouts.xsl  |    7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

Show changes to 2 files +7 −6

Documentation/asciidoc.conf, Documentation/callouts.xsl

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index af5b155..6b6220d 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -27,13 +27,7 @@ ifdef::backend-docbook[]
 [listingblock]
 <example><title>{title}</title>
 <literallayout>
-ifdef::doctype-manpage[]
-&#10;.ft C&#10;
-endif::doctype-manpage[]
 |
-ifdef::doctype-manpage[]
-&#10;.ft&#10;
-endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
 endif::backend-docbook[]
diff --git a/Documentation/callouts.xsl b/Documentation/callouts.xsl
index 6a361a2..e188f5e 100644
--- a/Documentation/callouts.xsl
+++ b/Documentation/callouts.xsl
@@ -27,4 +27,11 @@
   </xsl:if>
 </xsl:template>
 
+<!-- Force listingblocks to be monospaced in manpages -->
+<xsl:template match="literallayout">
+  <xsl:text>&#x2302;ft C&#10;</xsl:text>
+  <xsl:apply-templates/>
+  <xsl:text>&#x2302;ft&#10;</xsl:text>
+</xsl:template>
+
 </xsl:stylesheet>

-- 
1.5.3.rc4

Mike Hommey· Aug 19, 2007, 21:14 UTC · re: Mike Hommey · lore

Re: [PATCH] Properly force listingblocks to be monospaced in manpages

On Sun, Aug 19, 2007 at 11:03:17PM +0200, Mike Hommey <mh@glandium.org> wrote:

> Still insert a ".ft C" before and ".ft" after, but do it in a way as to
> avoid them to get escaped with "\&", which makes the manpages look pretty
> bad. Do it in a more docbook-xsl'ish way.

Actually, the escape thing seems to be a regression in docbook 1.72 which is supposed to be fixed in 1.73...

Anyways, I think it'd still be better to do this in the .xsl file.

Mike

Mike Hommey· Aug 19, 2007, 21:32 UTC · re: Mike Hommey · lore

[PATCH] Force listingblocks to be monospaced in manpages with xsl

Still insert a ".ft C" before and ".ft" after, but do it in a more docbook-xsl'ish way.

Reverts 281a53bb79786a6d7e54f9715cc8ad46fc2bdb0e.

Signed-off-by: Mike Hommey <mh@glandium.org>
---
 Documentation/asciidoc.conf |    6 ------
 Documentation/callouts.xsl  |    7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

Show changes to 2 files +7 −6

Documentation/asciidoc.conf, Documentation/callouts.xsl

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index af5b155..6b6220d 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -27,13 +27,7 @@ ifdef::backend-docbook[]
 [listingblock]
 <example><title>{title}</title>
 <literallayout>
-ifdef::doctype-manpage[]
-&#10;.ft C&#10;
-endif::doctype-manpage[]
 |
-ifdef::doctype-manpage[]
-&#10;.ft&#10;
-endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
 endif::backend-docbook[]
diff --git a/Documentation/callouts.xsl b/Documentation/callouts.xsl
index 6a361a2..e188f5e 100644
--- a/Documentation/callouts.xsl
+++ b/Documentation/callouts.xsl
@@ -27,4 +27,11 @@
   </xsl:if>
 </xsl:template>
 
+<!-- Force listingblocks to be monospaced in manpages -->
+<xsl:template match="literallayout">
+  <xsl:text>&#10;.ft C&#10;</xsl:text>
+  <xsl:apply-templates/>
+  <xsl:text>&#10;.ft&#10;</xsl:text>
+</xsl:template>
+
 </xsl:stylesheet>

-- 
1.5.3.rc4

Mike Hommey· Aug 19, 2007, 21:45 UTC · re: Mike Hommey · lore

Re: [PATCH] Force listingblocks to be monospaced in manpages with xsl

On Sun, Aug 19, 2007 at 11:32:05PM +0200, Mike Hommey <mh@glandium.org> wrote:

> Still insert a ".ft C" before and ".ft" after, but do it in a more
> docbook-xsl'ish way.

Forget it, it fails with docbook-xsl 1.73.1...

Sorry for the noise.

Mike