{"thread":{"id":"9954","subject":"[PATCH] handle Docbook XSL 1.72 (incompletely)","startedAt":"2007-09-20T21:26:21Z","lastAt":"2007-09-29T12:48:01Z","messageCount":2,"participants":["Alexey Mahotkin","Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"53675","messageId":"bb5b640b0709201426u6ab77d07n6039499eb8baf381@mail.gmail.com","threadId":"9954","inReplyTo":null,"subject":"[PATCH] handle Docbook XSL 1.72 (incompletely)","fromName":"Alexey Mahotkin","fromEmail":"squadette@gmail.com","sentAt":"2007-09-20T21:26:21Z","receivedAt":"2007-09-20T21:26:21Z","isPatch":true,"sender":{"key":"squadette@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3052?v=4"},"body":"hi,\n\nFedora Core 7 has docbook-style-xsl-1.72.0-2.fc7\n\ngit-diff manpage (and couple of more, using callouts) is broken here:\n\nEXAMPLES\n       Various ways to check your working tree\n\n               $ git diff            \\fB(1)\\fR\n               $ git diff --cached   \\fB(2)\\fR\n               $ git diff HEAD       \\fB(3)\\fR\n\n           .sp \\fB1. \\fRChanges in the working tree not yet staged for\nthe next commit.\n\n\nI have fixed this for 1.72 (and probably 1.7x in general), but it does\nnot work under older Docbook XSL, e.g. 1.6x. I guess we could check\nfor version number during build, but cannot provide complete patch, so\nhere is the interim solution:\n\n\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex af5b155..ec9060c 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -28,11 +28,11 @@ ifdef::backend-docbook[]\n <example><title>{title}</title>\n <literallayout>\n ifdef::doctype-manpage[]\n-&#10;.ft C&#10;\n+&#x2302;ft C&#10;\n endif::doctype-manpage[]\n |\n ifdef::doctype-manpage[]\n-&#10;.ft&#10;\n+&#10;&#x2302;ft &#10;\n endif::doctype-manpage[]\n </literallayout>\n {title#}</example>\ndiff --git a/Documentation/callouts.xsl b/Documentation/callouts.xsl\nindex 6a361a2..b1b6882 100644\n--- a/Documentation/callouts.xsl\n+++ b/Documentation/callouts.xsl\n@@ -1,17 +1,17 @@\n <!-- callout.xsl: converts asciidoc callouts to man page format -->\n <xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n <xsl:template match=\"co\">\n-       <xsl:value-of select=\"concat('\\fB(',substring-after(@id,'-'),')\\fR')\"/>\n+       <xsl:value-of\nselect=\"concat('&#x2593;fB(',substring-after(@id,'-'),')&#x2593;fR')\"/>\n </xsl:template>\n <xsl:template match=\"calloutlist\">\n-       <xsl:text>.sp&#10;</xsl:text>\n+       <xsl:text>&#10;.sp&#10;</xsl:text>\n        <xsl:apply-templates/>\n        <xsl:text>&#10;</xsl:text>\n </xsl:template>\n <xsl:template match=\"callout\">\n-       <xsl:value-of\nselect=\"concat('\\fB',substring-after(@arearefs,'-'),'. \\fR')\"/>\n+       <xsl:value-of\nselect=\"concat('&#x2593;fB',substring-after(@arearefs,'-'),'.\n&#x2593;fR')\"/>\n        <xsl:apply-templates/>\n-       <xsl:text>.br&#10;</xsl:text>\n+       <xsl:text>&#x2302;br&#10;</xsl:text>\n </xsl:template>\n\n <!-- sorry, this is not about callouts, but attempts to work around\n\nSomeone more knowledgeable in this area should step in :)\n\n\nThank you,\n\n-- \nAlexey Mahotkin\nhttp://www.versioncontrolblog.com/\n"},{"id":"54333","messageId":"20070929124801.GI18156@genesis.frugalware.org","threadId":"9954","inReplyTo":"bb5b640b0709201426u6ab77d07n6039499eb8baf381@mail.gmail.com","subject":"Re: [PATCH] handle Docbook XSL 1.72 (incompletely)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2007-09-29T12:48:01Z","receivedAt":"2007-09-29T12:48:01Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Fri, Sep 21, 2007 at 01:26:21AM +0400, Alexey Mahotkin <squadette@gmail.com> wrote:\n> Fedora Core 7 has docbook-style-xsl-1.72.0-2.fc7\n> \n> git-diff manpage (and couple of more, using callouts) is broken here:\n> \n> EXAMPLES\n>        Various ways to check your working tree\n> \n>                $ git diff            \\fB(1)\\fR\n>                $ git diff --cached   \\fB(2)\\fR\n>                $ git diff HEAD       \\fB(3)\\fR\n> \n>            .sp \\fB1. \\fRChanges in the working tree not yet staged for\n> the next commit.\n\nthis is a bug in docbook-xsl. see\nhttp://article.gmane.org/gmane.comp.version-control.git/54785\n\nby the way, are gitlinks okay at you?\n\nexample: in the DESCRIPTION section:\n\n\"You can stage these changes by using git1[1].\"\n\nwhile the man branch has:\n\n\"You can stage these changes by using git-add(1).\"\n\nthis is asciidoc 8.2.3 and docbook-xsl 1.73.2\n\nthanks,\n- VMiklos\n"}]}