@matheusbsbs / matheus-bagliano / commits / ac3593da8f
Fork 0

man pages are littered with .ft C and others

Jakub Narebski <jnareb@gmail.com> wrote Sun, Feb 03, 2008: > Junio C Hamano wrote: > > Jakub Narebski <jnareb@gmail.com> writes: > > > > [From] http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458 > Julian Phillips: > > Are you using docbook xsl 1.72? There are known problems building the > > manpages with that version. 1.71 works, and 1.73 should work when it get > > released. I was able to solve this problem with this patch, which adds a XSL file used specifically for DOCBOOK_XSL_172=YesPlease and where dots and backslashes are escaped properly so they won't be substituted to the wrong thing further down the "DocBook XSL pipeline". Doing the escaping in the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end this part of the manpage nightmare. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonas Fonseca committed Feb 4, 2008 at 23:01 UTC ac3593da8f224d32cd4ffbd43ee7a04c732686dc
2 files changed +20 -1
Documentation/Makefile
+3 -1
@@ -45,6 +45,7 @@ man7dir=$(mandir)/man7
45
46 ASCIIDOC=asciidoc
47 ASCIIDOC_EXTRA =
48 +MANPAGE_XSL = callouts.xsl
49 INSTALL?=install
50 RM ?= rm -f
51 DOC_REF = origin/man
@@ -65,6 +66,7 @@ ASCIIDOC_EXTRA += -a asciidoc7compatible
66 endif
67 ifdef DOCBOOK_XSL_172
68 ASCIIDOC_EXTRA += -a docbook-xsl-172
69 +MANPAGE_XSL = manpage-1.72.xsl
70 endif
71
72 #
@@ -159,7 +161,7 @@ $(MAN_HTML): %.html : %.txt
161
162 %.1 %.5 %.7 : %.xml
163 $(RM) $@
162 - xmlto -m callouts.xsl man $<
164 + xmlto -m $(MANPAGE_XSL) man $<
165
166 %.xml : %.txt
167 $(RM) $@+ $@
Documentation/manpage-1.72.xsl new
+17
@@ -0,0 +1,17 @@
1 +<!-- callout.xsl: converts asciidoc callouts to man page format -->
2 +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
3 +<xsl:template match="co">
4 + <xsl:value-of select="concat('&#x2593;fB(',substring-after(@id,'-'),')&#x2593;fR')"/>
5 +</xsl:template>
6 +<xsl:template match="calloutlist">
7 + <xsl:text>&#x2302;sp&#10;</xsl:text>
8 + <xsl:apply-templates/>
9 + <xsl:text>&#10;</xsl:text>
10 +</xsl:template>
11 +<xsl:template match="callout">
12 + <xsl:value-of select="concat('&#x2593;fB',substring-after(@arearefs,'-'),'. &#x2593;fR')"/>
13 + <xsl:apply-templates/>
14 + <xsl:text>&#x2302;br&#10;</xsl:text>
15 +</xsl:template>
16 +
17 +</xsl:stylesheet>