{"thread":{"id":"18584","subject":"[PATCH v2 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals","startedAt":"2009-03-27T06:43:57Z","lastAt":"2009-03-29T11:50:52Z","messageCount":10,"participants":["Chris Johnsen","Jeff King"],"isPatch":true,"patchVersion":2,"patchTotal":8},"messages":[{"id":"109605","messageId":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":null,"subject":"[PATCH v2 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:43:57Z","receivedAt":"2009-03-27T06:43:57Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"\"v1\" of this series can be found here: <http://thread.gmane.org/gmane.comp.version-control.git/114417>.\n\nChange since \"v1\":\n\n  1/8: No content change from \"v1\". This time -C -M was used to\n       show copy/rename of callouts.xsl (thanks to Peff for\n       pointing to diff.renames config option).\n\n  2/8: Use <xsl:import> instead of xmlto command line to reuse\n       manpage-base.xsl. In commit message, move discussion of\n       --stringparm to 8/8.\n\n  8/8: No content change from \"v1\" (though context is changed due\n       to content change in 2/8). In commit message, add some of\n       --stringparm discussion from \"v1\" 2/8.\n\n-- \nChris\n"},{"id":"109606","messageId":"1238136245-22853-2-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:43:58Z","receivedAt":"2009-03-27T06:43:58Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"Each of manpage-base.xsl and manpage-normal.xsl gets a copy of\nthe contents of callouts.xsl and the original is removed. The\nMakefile is adjusted to refer to manpage-normal.xsl instead of\ncallouts.xsl. manpage-base.xsl will be later made into a common\nbase for -normal and -1.72.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nThis duplication is in preparation for refactoring. It should\nmake it easier to keep track of the source of the various XSL\nconstructs while reviewing.\n---\n Documentation/Makefile                             |    2 +-\n Documentation/{callouts.xsl => manpage-base.xsl}   |    0\n Documentation/{callouts.xsl => manpage-normal.xsl} |    0\n 3 files changed, 1 insertions(+), 1 deletions(-)\n copy Documentation/{callouts.xsl => manpage-base.xsl} (100%)\n rename Documentation/{callouts.xsl => manpage-normal.xsl} (100%)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 144ec32..e1562e3 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -41,7 +41,7 @@ man7dir=$(mandir)/man7\n \n ASCIIDOC=asciidoc\n ASCIIDOC_EXTRA =\n-MANPAGE_XSL = callouts.xsl\n+MANPAGE_XSL = manpage-normal.xsl\n INSTALL?=install\n RM ?= rm -f\n DOC_REF = origin/man\ndiff --git a/Documentation/callouts.xsl b/Documentation/manpage-base.xsl\nsimilarity index 100%\ncopy from Documentation/callouts.xsl\ncopy to Documentation/manpage-base.xsl\ndiff --git a/Documentation/callouts.xsl b/Documentation/manpage-normal.xsl\nsimilarity index 100%\nrename from Documentation/callouts.xsl\nrename to Documentation/manpage-normal.xsl\n-- \n1.6.2.1.401.gc048\n"},{"id":"109609","messageId":"1238136245-22853-3-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 2/8] Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:43:59Z","receivedAt":"2009-03-27T06:43:59Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"Parametrize the backslash and dot characters that are used to\ngenerate roff control sequences in manpage-base.xsl.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nChanges since \"v1\": In manpage-{normal,1.72}.xsl, use\n  <xsl:import> to incorporate manpage-base.xsl. Take\n  manpage-base.xsl off the xmlto commandline. Thanks, Peff!\n\n  Implementation details in the commit message have been moved to\n  the last patch.\n\n---\n\nStill no change in behavior. Just refactoring here.\n---\n Documentation/manpage-1.72.xsl   |   29 ++++++++++++---------------\n Documentation/manpage-base.xsl   |   39 +++++++++++++++++++------------------\n Documentation/manpage-normal.xsl |   30 ++++++++++++----------------\n 3 files changed, 46 insertions(+), 52 deletions(-)\n\ndiff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl\nindex 4065a3a..e24d26c 100644\n--- a/Documentation/manpage-1.72.xsl\n+++ b/Documentation/manpage-1.72.xsl\n@@ -1,21 +1,18 @@\n-<!-- Based on callouts.xsl. Fixes man page callouts for DocBook 1.72 XSL -->\n-<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n+<!-- manpage-1.72.xsl:\n+     special settings for manpages rendered from asciidoc+docbook\n+     handles peculiarities in docbook-xsl 1.72.0 -->\n+<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n+\t\tversion=\"1.0\">\n \n+<xsl:import href=\"manpage-base.xsl\"/>\n+\n+<!-- these are the special values for the roff control characters\n+     needed for docbook-xsl 1.72.0 -->\n+<xsl:param name=\"git.docbook.backslash\">&#x2593;</xsl:param>\n+<xsl:param name=\"git.docbook.dot\"      >&#x2302;</xsl:param>\n+\n+<!-- these params silence some output from xmlto -->\n <xsl:param name=\"man.output.quietly\" select=\"1\"/>\n <xsl:param name=\"refentry.meta.get.quietly\" select=\"1\"/>\n \n-<xsl:template match=\"co\">\n-\t<xsl:value-of select=\"concat('&#x2593;fB(',substring-after(@id,'-'),')&#x2593;fR')\"/>\n-</xsl:template>\n-<xsl:template match=\"calloutlist\">\n-\t<xsl:text>&#x2302;sp&#10;</xsl:text>\n-\t<xsl:apply-templates/>\n-\t<xsl:text>&#10;</xsl:text>\n-</xsl:template>\n-<xsl:template match=\"callout\">\n-\t<xsl:value-of select=\"concat('&#x2593;fB',substring-after(@arearefs,'-'),'. &#x2593;fR')\"/>\n-\t<xsl:apply-templates/>\n-\t<xsl:text>&#x2302;br&#10;</xsl:text>\n-</xsl:template>\n-\n </xsl:stylesheet>\ndiff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl\nindex 6a361a2..6d3eb19 100644\n--- a/Documentation/manpage-base.xsl\n+++ b/Documentation/manpage-base.xsl\n@@ -1,30 +1,31 @@\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+<!-- manpage-base.xsl:\n+     special formatting for manpages rendered from asciidoc+docbook -->\n+<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n+\t\tversion=\"1.0\">\n+\n+<!-- convert asciidoc callouts to man page format;\n+     git.docbook.backslash and git.docbook.dot params\n+     must be supplied by another XSL file or other means -->\n <xsl:template match=\"co\">\n-\t<xsl:value-of select=\"concat('\\fB(',substring-after(@id,'-'),')\\fR')\"/>\n+\t<xsl:value-of select=\"concat(\n+\t\t\t      $git.docbook.backslash,'fB(',\n+\t\t\t      substring-after(@id,'-'),')',\n+\t\t\t      $git.docbook.backslash,'fR')\"/>\n </xsl:template>\n <xsl:template match=\"calloutlist\">\n-\t<xsl:text>.sp&#10;</xsl:text>\n+\t<xsl:value-of select=\"$git.docbook.dot\"/>\n+\t<xsl:text>sp&#10;</xsl:text>\n \t<xsl:apply-templates/>\n \t<xsl:text>&#10;</xsl:text>\n </xsl:template>\n <xsl:template match=\"callout\">\n-\t<xsl:value-of select=\"concat('\\fB',substring-after(@arearefs,'-'),'. \\fR')\"/>\n+\t<xsl:value-of select=\"concat(\n+\t\t\t      $git.docbook.backslash,'fB',\n+\t\t\t      substring-after(@arearefs,'-'),\n+\t\t\t      '. ',$git.docbook.backslash,'fR')\"/>\n \t<xsl:apply-templates/>\n-\t<xsl:text>.br&#10;</xsl:text>\n-</xsl:template>\n-\n-<!-- sorry, this is not about callouts, but attempts to work around\n- spurious .sp at the tail of the line docbook stylesheets seem to add -->\n-<xsl:template match=\"simpara\">\n-  <xsl:variable name=\"content\">\n-    <xsl:apply-templates/>\n-  </xsl:variable>\n-  <xsl:value-of select=\"normalize-space($content)\"/>\n-  <xsl:if test=\"not(ancestor::authorblurb) and\n-                not(ancestor::personblurb)\">\n-    <xsl:text>&#10;&#10;</xsl:text>\n-  </xsl:if>\n+\t<xsl:value-of select=\"$git.docbook.dot\"/>\n+\t<xsl:text>br&#10;</xsl:text>\n </xsl:template>\n \n </xsl:stylesheet>\ndiff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl\nindex 6a361a2..e36472f 100644\n--- a/Documentation/manpage-normal.xsl\n+++ b/Documentation/manpage-normal.xsl\n@@ -1,21 +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-\t<xsl:value-of select=\"concat('\\fB(',substring-after(@id,'-'),')\\fR')\"/>\n-</xsl:template>\n-<xsl:template match=\"calloutlist\">\n-\t<xsl:text>.sp&#10;</xsl:text>\n-\t<xsl:apply-templates/>\n-\t<xsl:text>&#10;</xsl:text>\n-</xsl:template>\n-<xsl:template match=\"callout\">\n-\t<xsl:value-of select=\"concat('\\fB',substring-after(@arearefs,'-'),'. \\fR')\"/>\n-\t<xsl:apply-templates/>\n-\t<xsl:text>.br&#10;</xsl:text>\n-</xsl:template>\n+<!-- manpage-normal.xsl:\n+     special settings for manpages rendered from asciidoc+docbook\n+     handles anything we want to keep away from docbook-xsl 1.72.0 -->\n+<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n+\t\tversion=\"1.0\">\n+\n+<xsl:import href=\"manpage-base.xsl\"/>\n+\n+<!-- these are the normal values for the roff control characters -->\n+<xsl:param name=\"git.docbook.backslash\">\\</xsl:param>\n+<xsl:param name=\"git.docbook.dot\"\t>.</xsl:param>\n \n-<!-- sorry, this is not about callouts, but attempts to work around\n- spurious .sp at the tail of the line docbook stylesheets seem to add -->\n+<!-- attempt to work around spurious .sp at the tail of the line\n+     that docbook stylesheets seem to add -->\n <xsl:template match=\"simpara\">\n   <xsl:variable name=\"content\">\n     <xsl:apply-templates/>\n-- \n1.6.2.1.401.gc048\n"},{"id":"109611","messageId":"1238136245-22853-4-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:44:00Z","receivedAt":"2009-03-27T06:44:00Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"It seems that the ability to use raw roff codes in asciidoc.conf\nwas eliminated by docbook-xsl 1.72.0 _and later_. Unlike the\n1.72.0-specific XSLT problem, this behavior was not reverted in\nlater releases.\n\nThis patch aims to make it clear that the affected asciidoc\nattribute (flag) can be reasonably used with docbook-xsl versions\nother than 1.72.0.\n\nAlso, document which make variables should be set for various\nversions of asciidoc and docbook-xsl.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nThis has no behavior changes for existing uses (make\nDOCBOOK_XSL_172=Yes), but it enables new functionality\n(ASCIIDOC_NO_ROFF=Yes) by divorcing the roff-avoiding parts of\nasciidoc.conf from the label docbook-xsl-172.\n\nI like the idea of including \"tested with asciidoc/docbook-xsl\nversion info\" in the commit message. It would have been very\nhelpful if all the previous commits to the core documentation\ngeneration infrastructure carried such information.\n---\n Documentation/Makefile      |   29 ++++++++++++++++++++++++++++-\n Documentation/asciidoc.conf |    8 ++++----\n 2 files changed, 32 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex e1562e3..d71760b 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -59,12 +59,39 @@ endif\n -include ../config.mak.autogen\n -include ../config.mak\n \n+#\n+# For asciidoc ...\n+#\t-7.1.2,\tno extra settings are needed.\n+#\t8.0-,\tset ASCIIDOC8.\n+#\n+\n+#\n+# For docbook-xsl ...\n+#\t-1.68.1,\tset ASCIIDOC_NO_ROFF? (based on changelog from 1.73.0)\n+#\t1.69.0-1.71.1,\tno extra settings are needed?\n+#\t1.72.0,\t\tset DOCBOOK_XSL_172.\n+#\t1.73.0-,\tset ASCIIDOC_NO_ROFF\n+#\n+\n+#\n+# If you had been using DOCBOOK_XSL_172 in an attempt to get rid\n+# of 'the \".ft C\" problem' in your generated manpages, and you\n+# instead ended up with weird characters around callouts, try\n+# using ASCIIDOC_NO_ROFF instead (it works fine with ASCIIDOC8).\n+#\n+\n ifdef ASCIIDOC8\n ASCIIDOC_EXTRA += -a asciidoc7compatible\n endif\n ifdef DOCBOOK_XSL_172\n-ASCIIDOC_EXTRA += -a docbook-xsl-172\n+ASCIIDOC_EXTRA += -a git-asciidoc-no-roff\n MANPAGE_XSL = manpage-1.72.xsl\n+else\n+\tifdef ASCIIDOC_NO_ROFF\n+\t# docbook-xsl after 1.72 needs the regular XSL, but will not\n+\t# pass-thru raw roff codes from asciidoc.conf, so turn them off.\n+\tASCIIDOC_EXTRA += -a git-asciidoc-no-roff\n+\tendif\n endif\n \n #\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex 1e735df..ce1b175 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -27,7 +27,7 @@ ifdef::backend-docbook[]\n endif::backend-docbook[]\n \n ifdef::backend-docbook[]\n-ifndef::docbook-xsl-172[]\n+ifndef::git-asciidoc-no-roff[]\n # \"unbreak\" docbook-xsl v1.68 for manpages. v1.69 works with or without this.\n # v1.72 breaks with this because it replaces dots not in roff requests.\n [listingblock]\n@@ -42,9 +42,9 @@ ifdef::doctype-manpage[]\n endif::doctype-manpage[]\n </literallayout>\n {title#}</example>\n-endif::docbook-xsl-172[]\n+endif::git-asciidoc-no-roff[]\n \n-ifdef::docbook-xsl-172[]\n+ifdef::git-asciidoc-no-roff[]\n ifdef::doctype-manpage[]\n # The following two small workarounds insert a simple paragraph after screen\n [listingblock]\n@@ -62,7 +62,7 @@ ifdef::doctype-manpage[]\n </literallayout><simpara></simpara>\n {title#}</para></formalpara>\n endif::doctype-manpage[]\n-endif::docbook-xsl-172[]\n+endif::git-asciidoc-no-roff[]\n endif::backend-docbook[]\n \n ifdef::doctype-manpage[]\n-- \n1.6.2.1.401.gc048\n"},{"id":"109612","messageId":"1238136245-22853-5-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 4/8] Documentation: move quieting params into manpage-base.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:44:01Z","receivedAt":"2009-03-27T06:44:01Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"Move a couple of XSL parameters that act to silence\ninformational/warning messages generated when running xmlto from\nmanpage-1.72.xsl to manpage-base.xsl.\n\nSince unused parameters are silently ignored, there is no problem\nif some version of docbook-xsl does not know about these\nparameters. The only problem might be if a version of docbook-xsl\nuses the parameters for alternate functionality. Since both\nparameters have fairly specific names such a situation is\nunlikely.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nI am not sure why these were only in the -1.72 variant. They\nshould probably be in -base (done by this patch) or in neither\nvariant. If there is a good reason for having it only in -1.72,\nthis patch can be dropped entirely, the rest do not depend on it.\n---\n Documentation/manpage-1.72.xsl |    4 ----\n Documentation/manpage-base.xsl |    4 ++++\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl\nindex e24d26c..b4d315c 100644\n--- a/Documentation/manpage-1.72.xsl\n+++ b/Documentation/manpage-1.72.xsl\n@@ -11,8 +11,4 @@\n <xsl:param name=\"git.docbook.backslash\">&#x2593;</xsl:param>\n <xsl:param name=\"git.docbook.dot\"      >&#x2302;</xsl:param>\n \n-<!-- these params silence some output from xmlto -->\n-<xsl:param name=\"man.output.quietly\" select=\"1\"/>\n-<xsl:param name=\"refentry.meta.get.quietly\" select=\"1\"/>\n-\n </xsl:stylesheet>\ndiff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl\nindex 6d3eb19..a264fa6 100644\n--- a/Documentation/manpage-base.xsl\n+++ b/Documentation/manpage-base.xsl\n@@ -3,6 +3,10 @@\n <xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n \t\tversion=\"1.0\">\n \n+<!-- these params silence some output from xmlto -->\n+<xsl:param name=\"man.output.quietly\" select=\"1\"/>\n+<xsl:param name=\"refentry.meta.get.quietly\" select=\"1\"/>\n+\n <!-- convert asciidoc callouts to man page format;\n      git.docbook.backslash and git.docbook.dot params\n      must be supplied by another XSL file or other means -->\n-- \n1.6.2.1.401.gc048\n"},{"id":"109610","messageId":"1238136245-22853-6-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 5/8] Documentation: move \"spurious .sp\" code into manpage-base.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:44:02Z","receivedAt":"2009-03-27T06:44:02Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"The \"spurious .sp\" code should be independent of docbook-xsl\nversions.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nI do not know why this was only in the non-1.72 variant. Maybe\ndocbook-xsl 1.72.0 did not need it. But it does not seem like it\nwould hurt to push it into the shared XSLT. As before, if there\nis a good reason to keep it out of the -1.72 processing, then\njust drop this patch, none of the rest depend on it.\n---\n Documentation/manpage-base.xsl   |   13 +++++++++++++\n Documentation/manpage-normal.xsl |   13 -------------\n 2 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl\nindex a264fa6..16e2e40 100644\n--- a/Documentation/manpage-base.xsl\n+++ b/Documentation/manpage-base.xsl\n@@ -32,4 +32,17 @@\n \t<xsl:text>br&#10;</xsl:text>\n </xsl:template>\n \n+<!-- attempt to work around spurious .sp at the tail of the line\n+     that docbook stylesheets seem to add -->\n+<xsl:template match=\"simpara\">\n+  <xsl:variable name=\"content\">\n+    <xsl:apply-templates/>\n+  </xsl:variable>\n+  <xsl:value-of select=\"normalize-space($content)\"/>\n+  <xsl:if test=\"not(ancestor::authorblurb) and\n+                not(ancestor::personblurb)\">\n+    <xsl:text>&#10;&#10;</xsl:text>\n+  </xsl:if>\n+</xsl:template>\n+\n </xsl:stylesheet>\ndiff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl\nindex e36472f..a48f5b1 100644\n--- a/Documentation/manpage-normal.xsl\n+++ b/Documentation/manpage-normal.xsl\n@@ -10,17 +10,4 @@\n <xsl:param name=\"git.docbook.backslash\">\\</xsl:param>\n <xsl:param name=\"git.docbook.dot\"\t>.</xsl:param>\n \n-<!-- attempt to work around spurious .sp at the tail of the line\n-     that docbook stylesheets seem to add -->\n-<xsl:template match=\"simpara\">\n-  <xsl:variable name=\"content\">\n-    <xsl:apply-templates/>\n-  </xsl:variable>\n-  <xsl:value-of select=\"normalize-space($content)\"/>\n-  <xsl:if test=\"not(ancestor::authorblurb) and\n-                not(ancestor::personblurb)\">\n-    <xsl:text>&#10;&#10;</xsl:text>\n-  </xsl:if>\n-</xsl:template>\n-\n </xsl:stylesheet>\n-- \n1.6.2.1.401.gc048\n"},{"id":"109608","messageId":"1238136245-22853-7-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 6/8] Documentation: asciidoc.conf: always use <literallayout> for [blocktext]","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:44:03Z","receivedAt":"2009-03-27T06:44:03Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"Make the docbook-xsl-no-raw-roff variant match the\nno-docbook-xsl-no-raw-roff variant in terms of which XML tag is\nused to wrap listing block text (delimited with lines of dashes).\n\ne920b56 (Tweak asciidoc output to work with broken docbook-xsl,\n2006-03-05) says docbook-xsl 1.68 needs <literallayout>. This\n<screen> usages was in the old, 1.72-only section. But since it\nis now the \"roff-less\" section, it probably makes sense to make it\nsymmetric with the \"roff-ful\" section.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nThis is another cleanup to make the two conditional sections more\nsymmetric.\n\nThe only large, remaining asymmetry in the asciidoc.conf\nroff/non-roff parts is the [verseblock] in the non-roff\nsection. Should [verseblock] be pulled out of the\nroff-conditional parts?  Should a [verseblock] section be added\nto the roff-using part?\n---\n Documentation/asciidoc.conf |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex ce1b175..9963f2d 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -49,9 +49,9 @@ ifdef::doctype-manpage[]\n # The following two small workarounds insert a simple paragraph after screen\n [listingblock]\n <example><title>{title}</title>\n-<screen>\n+<literallayout>\n |\n-</screen><simpara></simpara>\n+</literallayout><simpara></simpara>\n {title#}</example>\n \n [verseblock]\n-- \n1.6.2.1.401.gc048\n"},{"id":"109607","messageId":"1238136245-22853-8-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 7/8] Documentation: asciidoc.conf: fix verse block with block titles","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:44:04Z","receivedAt":"2009-03-27T06:44:04Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"No files use the variant of block-title with verse-block, but\nsuch a case would have generated broken docbook XML (<simpara> is\nnot allowed inside <para>). This fixes the potential deviation from\nvalid docbook XML.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nThis is a bugfix for a bug that the documentation currently does\nnot trigger. Drop this patch if this is unwarranted.\n---\n Documentation/asciidoc.conf |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex 9963f2d..dc76e7f 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -59,8 +59,9 @@ ifdef::doctype-manpage[]\n {title%}<literallayout{id? id=\"{id}\"}>\n {title#}<literallayout>\n |\n-</literallayout><simpara></simpara>\n+</literallayout>\n {title#}</para></formalpara>\n+{title%}<simpara></simpara>\n endif::doctype-manpage[]\n endif::git-asciidoc-no-roff[]\n endif::backend-docbook[]\n-- \n1.6.2.1.401.gc048\n"},{"id":"109613","messageId":"1238136245-22853-9-git-send-email-chris_johnsen@pobox.com","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH v2 8/8] Documentation: option to render literal text as bold for manpages","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-27T06:44:05Z","receivedAt":"2009-03-27T06:44:05Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"This allows manpages viewed on a tty to render inline literal\ntext in a manner that is distinct from the surrounding text.\n\nThe initial implementation (pre-mailing-list) of this patch\nincluded a conditional variant of the XSLT code in\nmanpage-base.xsl and use xmlto's --stringparam option to\noptionally enable the functionality. It turns out that\n--stringparam is broken in all versions of xmlto except for the\npre-release, SVN version. Since xmlto is a shell script the patch\nto fix it is simple enough, but I instead opted to use xmlto's\n\"module\" functionality.\n\nTesting done with asciidoc 8.3.1 and docbook-xsl 1.74.0.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nChange since \"v1\": Move dicussion of --stringparam from patch 2\n  to this patch. Deleted a bunch of it in the process. No content\n  changes from the first version.\n\n---\n\nSince dobcook-xsl 1.74.0 seems to introduce using a monospace\nfont for literal text (asciidoc backticks), this patch may not be\nso important for end users that can install their own\ndocbook-xsl.\n\nBut this patch, or something like it, might be useful for\nintroducing some kind of typesetting for literal text in the\nofficial manpages (since it would not require upgrading\ndocbook-xsl). It could probably even be changed/extended to\nprovide monospacing without using a new docbook-xsl.\n\nThe functionality is optional and defaults to \"off\", so there\nprobably is not too much harm in including it, even if it is not\nused for the official manpages.\n---\n Documentation/Makefile                 |    6 +++++-\n Documentation/manpage-bold-literal.xsl |   17 +++++++++++++++++\n 2 files changed, 22 insertions(+), 1 deletions(-)\n create mode 100644 Documentation/manpage-bold-literal.xsl\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex d71760b..1c94531 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -42,6 +42,7 @@ man7dir=$(mandir)/man7\n ASCIIDOC=asciidoc\n ASCIIDOC_EXTRA =\n MANPAGE_XSL = manpage-normal.xsl\n+XMLTO_EXTRA =\n INSTALL?=install\n RM ?= rm -f\n DOC_REF = origin/man\n@@ -93,6 +94,9 @@ else\n \tASCIIDOC_EXTRA += -a git-asciidoc-no-roff\n \tendif\n endif\n+ifdef MAN_BOLD_LITERAL\n+XMLTO_EXTRA += -m manpage-bold-literal.xsl\n+endif\n \n #\n # Please note that there is a minor bug in asciidoc.\n@@ -192,7 +196,7 @@ $(MAN_HTML): %.html : %.txt\n \n %.1 %.5 %.7 : %.xml\n \t$(RM) $@\n-\txmlto -m $(MANPAGE_XSL) man $<\n+\txmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<\n \n %.xml : %.txt\n \t$(RM) $@+ $@\ndiff --git a/Documentation/manpage-bold-literal.xsl b/Documentation/manpage-bold-literal.xsl\nnew file mode 100644\nindex 0000000..608eb5d\n--- /dev/null\n+++ b/Documentation/manpage-bold-literal.xsl\n@@ -0,0 +1,17 @@\n+<!-- manpage-bold-literal.xsl:\n+     special formatting for manpages rendered from asciidoc+docbook -->\n+<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n+\t\tversion=\"1.0\">\n+\n+<!-- render literal text as bold (instead of plain or monospace);\n+     this makes literal text easier to distinguish in manpages\n+     viewed on a tty -->\n+<xsl:template match=\"literal\">\n+\t<xsl:value-of select=\"$git.docbook.backslash\"/>\n+\t<xsl:text>fB</xsl:text>\n+\t<xsl:apply-templates/>\n+\t<xsl:value-of select=\"$git.docbook.backslash\"/>\n+\t<xsl:text>fR</xsl:text>\n+</xsl:template>\n+\n+</xsl:stylesheet>\n-- \n1.6.2.1.401.gc048\n"},{"id":"109768","messageId":"20090329115052.GA31649@coredump.intra.peff.net","threadId":"18584","inReplyTo":"1238136245-22853-1-git-send-email-chris_johnsen@pobox.com","subject":"Re: [PATCH v2 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-29T11:50:52Z","receivedAt":"2009-03-29T11:50:52Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Mar 27, 2009 at 01:43:57AM -0500, Chris Johnsen wrote:\n\n> \"v1\" of this series can be found here: <http://thread.gmane.org/gmane.comp.version-control.git/114417>.\n> \n> Change since \"v1\":\n> \n>   1/8: No content change from \"v1\". This time -C -M was used to\n>        show copy/rename of callouts.xsl (thanks to Peff for\n>        pointing to diff.renames config option).\n> \n>   2/8: Use <xsl:import> instead of xmlto command line to reuse\n>        manpage-base.xsl. In commit message, move discussion of\n>        --stringparm to 8/8.\n> \n>   8/8: No content change from \"v1\" (though context is changed due\n>        to content change in 2/8). In commit message, add some of\n>        --stringparm discussion from \"v1\" 2/8.\n\nThanks. This version (and its output) look sane to me (I am now building\nwith ASCIIDOC_NO_ROFF).\n\n-Peff\n"}]}