{"thread":{"id":"18502","subject":"[PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl","startedAt":"2009-03-24T08:04:18Z","lastAt":"2009-03-26T18:49:02Z","messageCount":25,"participants":["Chris Johnsen","Jeff King","Junio C Hamano","Michael J Gruber"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"109171","messageId":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":null,"subject":"[PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:18Z","receivedAt":"2009-03-24T08:04:18Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"I had a go at wrangling with the documentation generation tools\nto fix a couple of issues that I had noticed.\n\nFirst, I could never get reasonable output for generated\nmanpages.  I have asciidoc 8.3.1 and docbook-xsl 1.74.0 on my\nsystem. They chew through the documentation OK, but I was never\nsure which flags I should use with them.\n\nASCIIDOC8 never seemed to do much (I was probably not looking in\nthe right places), but I decided to leave it enabled since it is\nentirely outside the scope of the git code/configuration.\n\nThe other variable was DOCBOOK_XSL_172, and no matter which way I\nturned it, I always got flawed output. If I set it, I would get\nfunky characters in the callout sections. If I unset it, I would\nget \".ft C\" and \".ft\" bracketing literal blocks.\n\nSecond, the inline literal text of both the official and my\ngenerated manpages was indistinguishable from the surrounding\ntext when viewing manpages in a terminal. It turns out the\nofficial manpages end up with no markup for inline literal\ntext. The ones I generated did have some markup, but it was\nflagged as monospace text, which is not all that distinguishable\nfrom the normal, roman text when viewing through a terminal.\n\nSo I set about trying to solve these problems along with the\nmeta-problem of code duplication between callouts.xsl and\nmanpage-1.72.xsl.\n\nThe following series is my attempt to\n\n  eliminate the XSLT code duplication,\n\n  tease apart the uses of the \"1.72\" label that apply only to\n    docbook-xsl 1.72 and those that also apply to some other\n    versions of docbook-xsl,\n\n  unify some of the items that look like they were applied to\n    only one side of various \"1.72\" configurations but still\n    seemed applicable to the other,\n\n  fix a mostly unrelated, small, latent bug in asciidoc.conf,\n\n  and provide an option to differentiate inline literal text when\n    viewed on a terminal.\n\n  Documentation/Makefile                 |   37 ++++++++++++++++++++++--\n  Documentation/asciidoc.conf            |   15 +++++----\n  Documentation/callouts.xsl             |   30 --------------------\n  Documentation/manpage-1.72.xsl         |   28 ++++++------------\n  Documentation/manpage-base.xsl         |   48 ++++++++++++++++++++++++++++++++\n  Documentation/manpage-bold-literal.xsl |   17 +++++++++++\n  Documentation/manpage-normal.xsl       |   12 ++++++++\n  7 files changed, 129 insertions(+), 58 deletions(-)\n\n-- \nChris\n"},{"id":"109167","messageId":"1237881866-5497-2-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:19Z","receivedAt":"2009-03-24T08:04:19Z","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       |   30 ------------------------------\n Documentation/manpage-base.xsl   |   30 ++++++++++++++++++++++++++++++\n Documentation/manpage-normal.xsl |   30 ++++++++++++++++++++++++++++++\n 4 files changed, 61 insertions(+), 31 deletions(-)\n delete mode 100644 Documentation/callouts.xsl\n create mode 100644 Documentation/manpage-base.xsl\n create mode 100644 Documentation/manpage-normal.xsl\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/callouts.xsl\ndeleted file mode 100644\nindex 6a361a2..0000000\n--- a/Documentation/callouts.xsl\n+++ /dev/null\n@@ -1,30 +0,0 @@\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-\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-</xsl:template>\n-\n-</xsl:stylesheet>\ndiff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl\nnew file mode 100644\nindex 0000000..6a361a2\n--- /dev/null\n+++ b/Documentation/manpage-base.xsl\n@@ -0,0 +1,30 @@\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+\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+</xsl:template>\n+\n+</xsl:stylesheet>\ndiff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl\nnew file mode 100644\nindex 0000000..6a361a2\n--- /dev/null\n+++ b/Documentation/manpage-normal.xsl\n@@ -0,0 +1,30 @@\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+\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+</xsl:template>\n+\n+</xsl:stylesheet>\n-- \n1.6.2.1.214.ge986c\n"},{"id":"109168","messageId":"1237881866-5497-3-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 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-24T08:04:20Z","receivedAt":"2009-03-24T08:04:20Z","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\nThe code reuse is achieved through the Makefile's invocation of\nxmlto, where the -base and either -normal or -1.72 \"modules\" are\ncombined to render the manpages. xmlto's module system works by\nconstructing a temporary XSLT stylesheet that <xsl:import>s the\nmain docbook-xsl file and then <xsl:includes> all the modules\nspecified on the command line. Because of a technical detail of\nXSLT (<http://www.w3.org/TR/xslt#top-level-variables>), we need\nto be sure that each param is bound only once across all the\nmodules that will be used in a single xmlto invocation.\n\nThe initial implementation used an explicit <xsl:import> to\nachieve a layering effect that allowed default param values and\noverride param values. That worked fine until one of the final\nfeatures of this series needed to supply override param values\nvia  the --stringparam option of xmlto. It turns out that\n--stringparam is broken in all but the pre-release version of\nxmlto. Since xmlto is a shell script the patch to fix it is\nsimple enough, but I instead opted to use xmlto's \"module\"\nfunctionality to achieve the XSLT stylesheet reuse.\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\nStill no change in behavior. Just refactoring here.\n---\n Documentation/Makefile           |    2 +-\n Documentation/manpage-1.72.xsl   |   28 +++++++++++---------------\n Documentation/manpage-base.xsl   |   39 +++++++++++++++++++------------------\n Documentation/manpage-normal.xsl |   29 +++++++++++----------------\n 4 files changed, 45 insertions(+), 53 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex e1562e3..1b5ff36 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -165,7 +165,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) -m manpage-base.xsl man $<\n \n %.xml : %.txt\n \t$(RM) $@+ $@\ndiff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl\nindex 4065a3a..06d4485 100644\n--- a/Documentation/manpage-1.72.xsl\n+++ b/Documentation/manpage-1.72.xsl\n@@ -1,21 +1,17 @@\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+     must be used with manpage-base.xsl\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+<!-- 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..be0afc9 100644\n--- a/Documentation/manpage-normal.xsl\n+++ b/Documentation/manpage-normal.xsl\n@@ -1,21 +1,16 @@\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+     must be used with manpage-base.xsl\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+<!-- 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.214.ge986c\n"},{"id":"109169","messageId":"1237881866-5497-4-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:21Z","receivedAt":"2009-03-24T08:04:21Z","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 1b5ff36..11b26aa 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.214.ge986c\n"},{"id":"109170","messageId":"1237881866-5497-5-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 4/8] Documentation: move quieting params into manpage-base.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:22Z","receivedAt":"2009-03-24T08:04:22Z","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 06d4485..8b815cd 100644\n--- a/Documentation/manpage-1.72.xsl\n+++ b/Documentation/manpage-1.72.xsl\n@@ -10,8 +10,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.214.ge986c\n"},{"id":"109172","messageId":"1237881866-5497-6-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 5/8] Documentation: move \"spurious .sp\" code into manpage-base.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:23Z","receivedAt":"2009-03-24T08:04:23Z","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 be0afc9..0412722 100644\n--- a/Documentation/manpage-normal.xsl\n+++ b/Documentation/manpage-normal.xsl\n@@ -9,17 +9,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.214.ge986c\n"},{"id":"109174","messageId":"1237881866-5497-7-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 6/8] Documentation: asciidoc.conf: always use <literallayout> for [blocktext]","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:24Z","receivedAt":"2009-03-24T08:04:24Z","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.214.ge986c\n"},{"id":"109173","messageId":"1237881866-5497-8-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 7/8] Documentation: asciidoc.conf: fix verse block with block titles","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:25Z","receivedAt":"2009-03-24T08:04:25Z","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.214.ge986c\n"},{"id":"109175","messageId":"1237881866-5497-9-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 8/8] Documentation: option to render literal text as bold for manpages","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T08:04:26Z","receivedAt":"2009-03-24T08:04:26Z","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\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\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 11b26aa..238ff83 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) -m manpage-base.xsl man $<\n+\txmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) -m manpage-base.xsl 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.214.ge986c\n"},{"id":"109182","messageId":"20090324085147.GA1799@coredump.intra.peff.net","threadId":"18502","inReplyTo":"1237881866-5497-2-git-send-email-chris_johnsen@pobox.com","subject":"Re: [PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-24T08:51:47Z","receivedAt":"2009-03-24T08:51:47Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 24, 2009 at 03:04:19AM -0500, Chris Johnsen wrote:\n\n>  Documentation/Makefile           |    2 +-\n>  Documentation/callouts.xsl       |   30 ------------------------------\n>  Documentation/manpage-base.xsl   |   30 ++++++++++++++++++++++++++++++\n>  Documentation/manpage-normal.xsl |   30 ++++++++++++++++++++++++++++++\n>  4 files changed, 61 insertions(+), 31 deletions(-)\n>  delete mode 100644 Documentation/callouts.xsl\n>  create mode 100644 Documentation/manpage-base.xsl\n>  create mode 100644 Documentation/manpage-normal.xsl\n\nThis is definitely a good change, though it would also be fine to\nactually munge the contents in the same patch rather than duplicate them\n(i.e., actually _split_ callouts.xsl instead of copying it to two\nplaces).\n\nI think it would have been much easier to read, though, by turning on\nrename detection in format-patch (i.e., \"-M\"). That yields:\n\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.459.g5b99e\n"},{"id":"109183","messageId":"20090324085751.GB1799@coredump.intra.peff.net","threadId":"18502","inReplyTo":"1237881866-5497-3-git-send-email-chris_johnsen@pobox.com","subject":"Re: [PATCH 2/8] Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-24T08:57:51Z","receivedAt":"2009-03-24T08:57:51Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 24, 2009 at 03:04:20AM -0500, Chris Johnsen wrote:\n\n> +<!-- manpage-1.72.xsl:\n> +     special settings for manpages rendered from asciidoc+docbook\n> +     must be used with manpage-base.xsl\n> +     handles peculiarities in docbook-xsl 1.72.0 -->\n\nHmm. I'm not sure I understood all of the issues you ran into that you\nmentioned in the commit message (but trust me, having tried to do\nanything with docbook, I can sympathize with the frustration you\nprobably felt), so maybe I am missing something. But is it not possible\nto <xsl:include> manpage-base here, rather than a comment saying \"Make\nsure you have already included it\"?\n\n-Peff\n"},{"id":"109188","messageId":"20090324090440.GC1799@coredump.intra.peff.net","threadId":"18502","inReplyTo":"1237881866-5497-4-git-send-email-chris_johnsen@pobox.com","subject":"Re: [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-24T09:04:40Z","receivedAt":"2009-03-24T09:04:40Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 24, 2009 at 03:04:21AM -0500, Chris Johnsen wrote:\n\n> It seems that the ability to use raw roff codes in asciidoc.conf\n> was eliminated by docbook-xsl 1.72.0 _and later_. Unlike the\n> 1.72.0-specific XSLT problem, this behavior was not reverted in\n> later releases.\n> \n> This patch aims to make it clear that the affected asciidoc\n> attribute (flag) can be reasonably used with docbook-xsl versions\n> other than 1.72.0.\n\nGreat, this looks like a definite improvement. Should we be respecting\nmore DOCBOOK_XSL_* variables than just 172, then? I.e.,:\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\nDOCBOOK_XSL_173, etc?\n\nI don't know that we need to cover _every_ version, but if we can have\nspecific knobs for individual features (like ASCIIDOC_NO_ROFF), then\nmaybe it makes sense to aggregate the settings for those knobs for a few\ncommon versions.\n\n-Peff\n"},{"id":"109193","messageId":"20090324091836.GD1799@coredump.intra.peff.net","threadId":"18502","inReplyTo":"1237881866-5497-5-git-send-email-chris_johnsen@pobox.com","subject":"Re: [PATCH 4/8] Documentation: move quieting params into manpage-base.xsl","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-24T09:18:36Z","receivedAt":"2009-03-24T09:18:36Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 24, 2009 at 03:04:22AM -0500, Chris Johnsen wrote:\n\n> I am not sure why these were only in the -1.72 variant. They\n> should probably be in -base (done by this patch) or in neither\n> variant. If there is a good reason for having it only in -1.72,\n> this patch can be dropped entirely, the rest do not depend on it.\n\nDigging through the archive, it is hard to say. The original patch\nmentions DOCBOOK_XSL_172 as if callouts.xsl were already doing this, but\nI don't see any evidence that it ever did.\n\nDefinitely an improvement, IMHO. I wonder if we also want to consider\nmaking the \"make\" output a little nicer to Documentation/Makefile,\nsimilar to how the main Makefiles just prints \"CC\".\n\n-Peff\n"},{"id":"109234","messageId":"B1EF04D8-8423-4794-BEFF-908C1B3DEC31@pobox.com","threadId":"18502","inReplyTo":"20090324085147.GA1799@coredump.intra.peff.net","subject":"Re: [PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T19:36:52Z","receivedAt":"2009-03-24T19:36:52Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"On 2009 Mar 24, at 03:51, Jeff King wrote:\n> On Tue, Mar 24, 2009 at 03:04:19AM -0500, Chris Johnsen wrote:\n>\n>>  Documentation/Makefile           |    2 +-\n>>  Documentation/callouts.xsl       |   30  \n>> ------------------------------\n>>  Documentation/manpage-base.xsl   |   30 ++++++++++++++++++++++++++ \n>> ++++\n>>  Documentation/manpage-normal.xsl |   30 ++++++++++++++++++++++++++ \n>> ++++\n>>  4 files changed, 61 insertions(+), 31 deletions(-)\n>>  delete mode 100644 Documentation/callouts.xsl\n>>  create mode 100644 Documentation/manpage-base.xsl\n>>  create mode 100644 Documentation/manpage-normal.xsl\n>\n> This is definitely a good change, though it would also be fine to\n> actually munge the contents in the same patch rather than duplicate  \n> them\n> (i.e., actually _split_ callouts.xsl instead of copying it to two\n> places).\n>\n> I think it would have been much easier to read, though, by turning on\n> rename detection in format-patch (i.e., \"-M\"). That yields:\n\n\nThank you for looking at these. I will incorporate your feedback and  \nresend in a couple of days.\n\nI used -C -M in some early diffs to make sure it would \"compress\"  \nlike that, but I failed to do so for the final send-email.\n\n-- \nChris\n"},{"id":"109235","messageId":"B7D7397E-7B3C-4124-92F1-D3A6FBA7DF1A@pobox.com","threadId":"18502","inReplyTo":"20090324085751.GB1799@coredump.intra.peff.net","subject":"Re: [PATCH 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-24T19:42:01Z","receivedAt":"2009-03-24T19:42:01Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"On 2009 Mar 24, at 03:57, Jeff King wrote:\n> On Tue, Mar 24, 2009 at 03:04:20AM -0500, Chris Johnsen wrote:\n>\n>> +<!-- manpage-1.72.xsl:\n>> +     special settings for manpages rendered from asciidoc+docbook\n>> +     must be used with manpage-base.xsl\n>> +     handles peculiarities in docbook-xsl 1.72.0 -->\n>\n> Hmm. I'm not sure I understood all of the issues you ran into that you\n> mentioned in the commit message (but trust me, having tried to do\n> anything with docbook, I can sympathize with the frustration you\n> probably felt), so maybe I am missing something. But is it not  \n> possible\n> to <xsl:include> manpage-base here, rather than a comment saying \"Make\n> sure you have already included it\"?\n\n\nRight. I went overboard with reworking the XSLT into \"modules\" for  \nxmlto.\n\n-- \nChris\n"},{"id":"109236","messageId":"B70DE0F1-8CDA-46FC-9EF8-41B0FAC39631@pobox.com","threadId":"18502","inReplyTo":"20090324090440.GC1799@coredump.intra.peff.net","subject":"Re: [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-24T19:48:52Z","receivedAt":"2009-03-24T19:48:52Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"On 2009 Mar 24, at 04:04, Jeff King wrote:\n> On Tue, Mar 24, 2009 at 03:04:21AM -0500, Chris Johnsen wrote:\n>\n>> It seems that the ability to use raw roff codes in asciidoc.conf\n>> was eliminated by docbook-xsl 1.72.0 _and later_. Unlike the\n>> 1.72.0-specific XSLT problem, this behavior was not reverted in\n>> later releases.\n>>\n>> This patch aims to make it clear that the affected asciidoc\n>> attribute (flag) can be reasonably used with docbook-xsl versions\n>> other than 1.72.0.\n>\n> Great, this looks like a definite improvement. Should we be respecting\n> more DOCBOOK_XSL_* variables than just 172, then? I.e.,:\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> DOCBOOK_XSL_173, etc?\n>\n> I don't know that we need to cover _every_ version, but if we can have\n> specific knobs for individual features (like ASCIIDOC_NO_ROFF), then\n> maybe it makes sense to aggregate the settings for those knobs for  \n> a few\n> common versions.\n\n\nI am not opposed to providing more version-specific controls, but I  \nam not sure which versions are important enough to justify their own  \nvariables. Are you indicating that 1.73 is important enough because  \nit was a \"return to sanity\" after 1.72?\n\nThe versions I listed in the comments were just the ones that the  \ntools' documentation described as needing one adjustment or another.  \nI thought the comments would be an easy way to start tracking which  \nversions were \"interesting\".\n\n-- \nChris\n"},{"id":"109309","messageId":"1237954900-21161-1-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"20090324091836.GD1799@coredump.intra.peff.net","subject":"[PATCH 1/2] Documentation/Makefile: make most operations \"quiet\"","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-25T04:21:39Z","receivedAt":"2009-03-25T04:21:39Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"This adapts the \"quiet make\" implementation from the main\nMakefile.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n---\n\nThere is a small conflict if this is applied on top of my\n\"docbook-xsl/asciidoc\" cleanup. Just add the $(XMLTO_EXTRAS) back\ninto the command line given in this version.\n---\n Documentation/Makefile |   81 +++++++++++++++++++++++++++++++----------------\n 1 files changed, 53 insertions(+), 28 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 144ec32..3f9bc01 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -76,6 +76,31 @@ endif\n # yourself - yes, all 6 characters of it!\n #\n \n+QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir\n+QUIET_SUBDIR1  =\n+\n+ifneq ($(findstring $(MAKEFLAGS),w),w)\n+PRINT_DIR = --no-print-directory\n+else # \"make -w\"\n+NO_SUBDIR = :\n+endif\n+\n+ifneq ($(findstring $(MAKEFLAGS),s),s)\n+ifndef V\n+\tQUIET_ASCIIDOC\t= @echo '   ' ASCIIDOC $@;\n+\tQUIET_XMLTO\t= @echo '   ' XMLTO $@;\n+\tQUIET_DB2TEXI\t= @echo '   ' DB2TEXI $@;\n+\tQUIET_MAKEINFO\t= @echo '   ' MAKEINFO $@;\n+\tQUIET_DBLATEX\t= @echo '   ' DBLATEX $@;\n+\tQUIET_GEN\t= @echo '   ' GEN $@;\n+\tQUIET_STDERR\t= 2> /dev/null\n+\tQUIET_SUBDIR0\t= +@subdir=\n+\tQUIET_SUBDIR1\t= ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \\\n+\t\t\t  $(MAKE) $(PRINT_DIR) -C $$subdir\n+\texport V\n+endif\n+endif\n+\n all: html man\n \n html: $(DOC_HTML)\n@@ -119,7 +144,7 @@ install-html: html\n \tsh ./install-webdoc.sh $(DESTDIR)$(htmldir)\n \n ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE\n-\t$(MAKE) -C ../ GIT-VERSION-FILE\n+\t$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE\n \n -include ../GIT-VERSION-FILE\n \n@@ -127,8 +152,8 @@ install-html: html\n # Determine \"include::\" file references in asciidoc files.\n #\n doc.dep : $(wildcard *.txt) build-docdep.perl\n-\t$(RM) $@+ $@\n-\t$(PERL_PATH) ./build-docdep.perl >$@+\n+\t$(QUIET_GEN)$(RM) $@+ $@ && \\\n+\t$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \\\n \tmv $@+ $@\n \n -include doc.dep\n@@ -146,8 +171,8 @@ cmds_txt = cmds-ancillaryinterrogators.txt \\\n $(cmds_txt): cmd-list.made\n \n cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)\n-\t$(RM) $@\n-\t$(PERL_PATH) ./cmd-list.perl ../command-list.txt\n+\t$(QUIET_GEN)$(RM) $@ && \\\n+\t$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \\\n \tdate >$@\n \n clean:\n@@ -158,30 +183,30 @@ clean:\n \t$(RM) $(cmds_txt) *.made\n \n $(MAN_HTML): %.html : %.txt\n-\t$(RM) $@+ $@\n+\t$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \\\n \t$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \\\n-\t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<\n+\t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \\\n \tmv $@+ $@\n \n %.1 %.5 %.7 : %.xml\n-\t$(RM) $@\n+\t$(QUIET_XMLTO)$(RM) $@ && \\\n \txmlto -m $(MANPAGE_XSL) man $<\n \n %.xml : %.txt\n-\t$(RM) $@+ $@\n+\t$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \\\n \t$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \\\n-\t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<\n+\t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \\\n \tmv $@+ $@\n \n user-manual.xml: user-manual.txt user-manual.conf\n-\t$(ASCIIDOC) -b docbook -d book $<\n+\t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b docbook -d book $<\n \n technical/api-index.txt: technical/api-index-skel.txt \\\n-\ttechnical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))\n+\t$(QUIET_GEN)technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) && \\\n \tcd technical && sh ./api-index.sh\n \n $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt\n-\t$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \\\n+\t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \\\n \t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt\n \n XSLT = docbook.xsl\n@@ -191,46 +216,46 @@ user-manual.html: user-manual.xml\n \txsltproc $(XSLTOPTS) -o $@ $(XSLT) $<\n \n git.info: user-manual.texi\n-\t$(MAKEINFO) --no-split -o $@ user-manual.texi\n+\t$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi\n \n user-manual.texi: user-manual.xml\n-\t$(RM) $@+ $@\n+\t$(QUIET_DB2TEXI)$(RM) $@+ $@ && \\\n \t$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout | \\\n-\t\t$(PERL_PATH) fix-texi.perl >$@+\n+\t\t$(PERL_PATH) fix-texi.perl >$@+ && \\\n \tmv $@+ $@\n \n user-manual.pdf: user-manual.xml\n-\t$(RM) $@+ $@\n-\t$(DBLATEX) -o $@+ -p /etc/asciidoc/dblatex/asciidoc-dblatex.xsl -s /etc/asciidoc/dblatex/asciidoc-dblatex.sty $<\n+\t$(QUIET_DBLATEX)$(RM) $@+ $@ && \\\n+\t$(DBLATEX) -o $@+ -p /etc/asciidoc/dblatex/asciidoc-dblatex.xsl -s /etc/asciidoc/dblatex/asciidoc-dblatex.sty $< && \\\n \tmv $@+ $@\n \n gitman.texi: $(MAN_XML) cat-texi.perl\n-\t$(RM) $@+ $@\n+\t$(QUIET_DB2TEXI)$(RM) $@+ $@ && \\\n \t($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \\\n-\t\t--to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+\n+\t\t--to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+ && \\\n \tmv $@+ $@\n \n gitman.info: gitman.texi\n-\t$(MAKEINFO) --no-split --no-validate $*.texi\n+\t$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi\n \n $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml\n-\t$(RM) $@+ $@\n-\t$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+\n+\t$(QUIET_DB2TEXI)$(RM) $@+ $@ && \\\n+\t$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \\\n \tmv $@+ $@\n \n howto-index.txt: howto-index.sh $(wildcard howto/*.txt)\n-\t$(RM) $@+ $@\n-\tsh ./howto-index.sh $(wildcard howto/*.txt) >$@+\n+\t$(QUIET_GEN)$(RM) $@+ $@ && \\\n+\tsh ./howto-index.sh $(wildcard howto/*.txt) >$@+ && \\\n \tmv $@+ $@\n \n $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt\n-\t$(ASCIIDOC) -b xhtml11 $*.txt\n+\t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 $*.txt\n \n WEBDOC_DEST = /pub/software/scm/git/docs\n \n $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt\n-\t$(RM) $@+ $@\n-\tsed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+\n+\t$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \\\n+\tsed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+ && \\\n \tmv $@+ $@\n \n install-webdoc : html\n-- \n1.6.2.1.315.g33192\n"},{"id":"109310","messageId":"1237954900-21161-2-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"1237954900-21161-1-git-send-email-chris_johnsen@pobox.com","subject":"[PATCH 2/2] Documentation/Makefile: break up texi pipeline","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-25T04:21:40Z","receivedAt":"2009-03-25T04:21:40Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"Most shells define the exit value of a pipeline as the exit value\nof the last process. For each texi rule, run the DOCBOOK2X_TEXI\ntool and the \"fixup\" script in their own non-pipeline commands so\nthat make will notice an error exit code.\n\nSigned-off-by: Chris Johnsen <chris_johnsen@pobox.com>\n\n---\n\nThis textually depends on my \"quiet doc gen\" patch as it modifies\na couple of the same lines.\n---\n Documentation/Makefile |   11 +++++++----\n 1 files changed, 7 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 3f9bc01..372a2cc 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -177,7 +177,7 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)\n \n clean:\n \t$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7\n-\t$(RM) *.texi *.texi+ git.info gitman.info\n+\t$(RM) *.texi *.texi+ *.texi++ git.info gitman.info\n \t$(RM) howto-index.txt howto/*.html doc.dep\n \t$(RM) technical/api-*.html technical/api-index.txt\n \t$(RM) $(cmds_txt) *.made\n@@ -220,8 +220,9 @@ git.info: user-manual.texi\n \n user-manual.texi: user-manual.xml\n \t$(QUIET_DB2TEXI)$(RM) $@+ $@ && \\\n-\t$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout | \\\n-\t\t$(PERL_PATH) fix-texi.perl >$@+ && \\\n+\t$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \\\n+\t$(PERL_PATH) fix-texi.perl <$@++ >$@+ && \\\n+\trm $@++ && \\\n \tmv $@+ $@\n \n user-manual.pdf: user-manual.xml\n@@ -232,7 +233,9 @@ user-manual.pdf: user-manual.xml\n gitman.texi: $(MAN_XML) cat-texi.perl\n \t$(QUIET_DB2TEXI)$(RM) $@+ $@ && \\\n \t($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \\\n-\t\t--to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+ && \\\n+\t\t--to-stdout $(xml) &&) true) > $@++\n+\t$(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \\\n+\trm $@++ && \\\n \tmv $@+ $@\n \n gitman.info: gitman.texi\n-- \n1.6.2.1.315.g33192\n"},{"id":"109313","messageId":"20090325042842.GB15498@coredump.intra.peff.net","threadId":"18502","inReplyTo":"1237954900-21161-1-git-send-email-chris_johnsen@pobox.com","subject":"Re: [PATCH 1/2] Documentation/Makefile: make most operations \"quiet\"","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-25T04:28:42Z","receivedAt":"2009-03-25T04:28:42Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 24, 2009 at 11:21:39PM -0500, Chris Johnsen wrote:\n\n>  technical/api-index.txt: technical/api-index-skel.txt \\\n> -\ttechnical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))\n> +\t$(QUIET_GEN)technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) && \\\n>  \tcd technical && sh ./api-index.sh\n\nWhat's going on here? The line you remove is part of the dependencies,\nbut you replace it with a line of build instructions (and make barfs, of\ncourse).\n\n-Peff\n"},{"id":"109330","messageId":"1237974919-3020-1-git-send-email-chris_johnsen@pobox.com","threadId":"18502","inReplyTo":"20090325042842.GB15498@coredump.intra.peff.net","subject":"Re: [PATCH 1/2] Documentation/Makefile: make most operations \"quiet\"","fromName":"Chris Johnsen","fromEmail":"chris_johnsen@pobox.com","sentAt":"2009-03-25T09:55:19Z","receivedAt":"2009-03-25T09:55:19Z","isPatch":true,"sender":{"key":"chris_johnsen@pobox.com","avatar":"https://avatars.githubusercontent.com/u/107071?v=4"},"body":"On 2009 Mar 24, at 23:28, Jeff King wrote:\n> On Tue, Mar 24, 2009 at 11:21:39PM -0500, Chris Johnsen wrote:\n>\n> >  technical/api-index.txt: technical/api-index-skel.txt \\\n> > -\ttechnical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))\n> > +\t$(QUIET_GEN)technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) && \\\n> >  \tcd technical && sh ./api-index.sh\n>\n> What's going on here? The line you remove is part of the dependencies,\n> but you replace it with a line of build instructions (and make barfs, of\n> course).\n\nYes, I botched that one. The QUIET_GEN should have been on the\nnext line. Thanks for catching it. I fixed it along with error\npropagation and initially-also-botched \"&& chaining\" for\ngitman.texi. I also added QUIET_XSLTPROC for user-manual.html.\n\nI tested the man, html, info, and git-add.texi targets\n(previously I only ran man and info targets; git-add.texi\nexercises a rule not otherwise used in the usual targets).\n\nAn interdiff from \"v1\" to what I have now follows (it include\nparts that would be in 1/2 and 2/2 from \"v1\").\n\n-- >8 --\n Documentation/Makefile |    9 +++++----\n 1 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git c/Documentation/Makefile w/Documentation/Makefile\nindex 373a2cc..d145372 100644\n--- c/Documentation/Makefile\n+++ w/Documentation/Makefile\n@@ -92,6 +92,7 @@ ifndef V\n \tQUIET_DB2TEXI\t= @echo '   ' DB2TEXI $@;\n \tQUIET_MAKEINFO\t= @echo '   ' MAKEINFO $@;\n \tQUIET_DBLATEX\t= @echo '   ' DBLATEX $@;\n+\tQUIET_XSLTPROC\t= @echo '   ' XSLTPROC $@;\n \tQUIET_GEN\t= @echo '   ' GEN $@;\n \tQUIET_STDERR\t= 2> /dev/null\n \tQUIET_SUBDIR0\t= +@subdir=\n@@ -202,8 +203,8 @@ user-manual.xml: user-manual.txt user-manual.conf\n \t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b docbook -d book $<\n \n technical/api-index.txt: technical/api-index-skel.txt \\\n-\t$(QUIET_GEN)technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) && \\\n-\tcd technical && sh ./api-index.sh\n+\ttechnical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))\n+\t$(QUIET_GEN)cd technical && sh ./api-index.sh\n \n $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt\n \t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \\\n@@ -213,7 +214,7 @@ XSLT = docbook.xsl\n XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css\n \n user-manual.html: user-manual.xml\n-\txsltproc $(XSLTOPTS) -o $@ $(XSLT) $<\n+\t$(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<\n \n git.info: user-manual.texi\n \t$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi\n@@ -233,7 +234,7 @@ user-manual.pdf: user-manual.xml\n gitman.texi: $(MAN_XML) cat-texi.perl\n \t$(QUIET_DB2TEXI)$(RM) $@+ $@ && \\\n \t($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \\\n-\t\t--to-stdout $(xml) &&) true) > $@++\n+\t\t--to-stdout $(xml) &&) true) > $@++ && \\\n \t$(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \\\n \trm $@++ && \\\n \tmv $@+ $@\n"},{"id":"109504","messageId":"7vvdpwpsm1.fsf@gitster.siamese.dyndns.org","threadId":"18502","inReplyTo":"1237881866-5497-1-git-send-email-chris_johnsen@pobox.com","subject":"Re: [PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-26T08:59:18Z","receivedAt":"2009-03-26T08:59:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Chris Johnsen <chris_johnsen@pobox.com> writes:\n\n> I had a go at wrangling with the documentation generation tools\n> to fix a couple of issues that I had noticed.\n\nThanks.  I noticed that between you and Jeff there were some more\nimprovements discussed, but I tried this round (queued in 'pu') and the\nresults lost those infamous \".ft\", which is very good ;-)\n\nI also noticed you have a two-patch series to quiet the documentation\nbuilding procedure, but didn't queue after seeing you had \"oops\".\n\nI am looking forward to seeing v2 of both series.  Thanks.\n\nAnd thanks, Jeff, for helping to get these series into shape.\n"},{"id":"109509","messageId":"20090326094051.GA14292@coredump.intra.peff.net","threadId":"18502","inReplyTo":"B1EF04D8-8423-4794-BEFF-908C1B3DEC31@pobox.com","subject":"Re: [PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-26T09:40:52Z","receivedAt":"2009-03-26T09:40:52Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 24, 2009 at 02:36:52PM -0500, Chris Johnsen wrote:\n\n> Thank you for looking at these. I will incorporate your feedback and  \n> resend in a couple of days.\n\nGreat, thanks.\n\n> I used -C -M in some early diffs to make sure it would \"compress\" like \n> that, but I failed to do so for the final send-email.\n\nFWIW, I just set diff.renames in my git repo so I don't have to remember\n(the only reason not to generate renames for format-patch is if the\nrecipient is not using git to apply -- but it is a pretty safe\nassumption that people here are using git).\n\n-Peff\n"},{"id":"109510","messageId":"20090326094322.GB14292@coredump.intra.peff.net","threadId":"18502","inReplyTo":"B70DE0F1-8CDA-46FC-9EF8-41B0FAC39631@pobox.com","subject":"Re: [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-26T09:43:22Z","receivedAt":"2009-03-26T09:43:22Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 24, 2009 at 02:48:52PM -0500, Chris Johnsen wrote:\n\n> I am not opposed to providing more version-specific controls, but I am not \n> sure which versions are important enough to justify their own variables. \n> Are you indicating that 1.73 is important enough because it was a \"return \n> to sanity\" after 1.72?\n\nNo, mainly because it is what is shipped in the last version of Debian,\nwhich means it is a major enough version that there will be a lot of\npeople using it.\n\nBut let's just start with adding the tweakable knobs (which your series\nis already doing), and see in what ways they need to be tweaked for\npopular platforms before going overboard.\n\n-Peff\n"},{"id":"109551","messageId":"7vocvop6x2.fsf@gitster.siamese.dyndns.org","threadId":"18502","inReplyTo":"20090326094322.GB14292@coredump.intra.peff.net","subject":"Re: [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-26T16:47:53Z","receivedAt":"2009-03-26T16:47:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Tue, Mar 24, 2009 at 02:48:52PM -0500, Chris Johnsen wrote:\n>\n>> I am not opposed to providing more version-specific controls, but I am not \n>> sure which versions are important enough to justify their own variables. \n>> Are you indicating that 1.73 is important enough because it was a \"return \n>> to sanity\" after 1.72?\n>\n> No, mainly because it is what is shipped in the last version of Debian,\n> which means it is a major enough version that there will be a lot of\n> people using it.\n>\n> But let's just start with adding the tweakable knobs (which your series\n> is already doing), and see in what ways they need to be tweaked for\n> popular platforms before going overboard.\n\nWhen I was trying out the series yesterday, I was wondering if this is\nsomething we can autodetect.\n\nOutput from \"asciidoc --version\" is easily machine parsable for giving\nasciidoc7compatible aka ASCIIDOC8, but I couldn't come up with anything\nsimpler than probing a few hardcoded paths under /usr/share/sgml; that\napproach is unacceptable because would not work if your stylesheets are in\nsomewhere we do not know about.  Ideally, we should be able to ask the\ntools we invoke (e.g. xmlto) to get that information.\n"},{"id":"109560","messageId":"49CBCE1E.8070408@drmicha.warpmail.net","threadId":"18502","inReplyTo":"7vocvop6x2.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2009-03-26T18:49:02Z","receivedAt":"2009-03-26T18:49:02Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 26.03.2009 17:47:\n> Jeff King <peff@peff.net> writes:\n> \n>> On Tue, Mar 24, 2009 at 02:48:52PM -0500, Chris Johnsen wrote:\n>>\n>>> I am not opposed to providing more version-specific controls, but I am not \n>>> sure which versions are important enough to justify their own variables. \n>>> Are you indicating that 1.73 is important enough because it was a \"return \n>>> to sanity\" after 1.72?\n>>\n>> No, mainly because it is what is shipped in the last version of Debian,\n>> which means it is a major enough version that there will be a lot of\n>> people using it.\n>>\n>> But let's just start with adding the tweakable knobs (which your series\n>> is already doing), and see in what ways they need to be tweaked for\n>> popular platforms before going overboard.\n> \n> When I was trying out the series yesterday, I was wondering if this is\n> something we can autodetect.\n> \n> Output from \"asciidoc --version\" is easily machine parsable for giving\n> asciidoc7compatible aka ASCIIDOC8, but I couldn't come up with anything\n> simpler than probing a few hardcoded paths under /usr/share/sgml; that\n> approach is unacceptable because would not work if your stylesheets are in\n> somewhere we do not know about.  Ideally, we should be able to ask the\n> tools we invoke (e.g. xmlto) to get that information.\n\nMaybe run asciidoc/xmlto on a minimal test file and check the output?\n\"autoconf lite\", so to say.\n\nMichael\n"}]}