{"thread":{"id":"11843","subject":"man pages are littered with .ft C and others","startedAt":"2008-02-02T17:25:00Z","lastAt":"2008-02-05T09:59:50Z","messageCount":11,"participants":["Adam Flott","Geert Bosch","Jakub Narebski","Junio C Hamano","Jonas Fonseca"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"67147","messageId":"alpine.DEB.1.00.0802021055180.21831@an.sumeria","threadId":"11843","inReplyTo":null,"subject":"man pages are littered with .ft C and others","fromName":"Adam Flott","fromEmail":"adam@npjh.com","sentAt":"2008-02-02T17:25:00Z","receivedAt":"2008-02-02T17:25:00Z","isPatch":false,"sender":{"key":"adam@npjh.com","avatar":"https://gravatar.com/avatar/b1499b03b4ec6de9607c0cc5c57de362b328a9cf646277f8f77b12f80c0e6228?d=mp&s=160"},"body":"I do remember at one point the man pages looking correctly (just tested\nv1.5.3.8 and it shows the same problem). Therefore it is probably\nsome package I'm missing on my system.\n\nAnd now, I see this scattered all over:\n\nFor example:\n\n .ft C\n $ git checkout master \\fB(1)\\fR\n $ git checkout master~2 Makefile \\fB(2)\\fR\n $ rm -f hello.c\n $ git checkout hello.c \\fB(3)\\fR\n .ft\n\nSeems that \"------------\" and , and a few others aren't being\ntranslated. Note: I'm not at all familiar with the layout of man pages\nso I have no idea how to fix it or even diagnose it further.\n\n\nVersion info:\nup to date Kubuntu 7.10\n\nasciidoc/gutsy uptodate 8.2.1-2\ndocbook-dsssl/gutsy uptodate 1.79-4\ndocbook-utils/gutsy uptodate 0.6.14-1\ndocbook-xml/gutsy uptodate 4.5-4\ndocbook-xsl-doc-html/gutsy uptodate 1.72.0.dfsg.1-2\ndocbook-xsl/gutsy uptodate 1.72.0.dfsg.1-2\nxmlto/gutsy uptodate 0.0.18-5.1build1\n\n\nAnyone else seeing this?\n\n\nAdam\n"},{"id":"67148","messageId":"79B19ABE-C310-472D-84C9-7D95670F25DD@adacore.com","threadId":"11843","inReplyTo":"alpine.DEB.1.00.0802021055180.21831@an.sumeria","subject":"Re: man pages are littered with .ft C and others","fromName":"Geert Bosch","fromEmail":"bosch@adacore.com","sentAt":"2008-02-02T17:46:20Z","receivedAt":"2008-02-02T17:46:20Z","isPatch":false,"sender":{"key":"bosch@adacore.com","avatar":null},"body":"On Feb 2, 2008, at 12:25, Adam Flott wrote:\n> I do remember at one point the man pages looking correctly (just \n> tested\n> v1.5.3.8 and it shows the same problem). Therefore it is probably\n> some package I'm missing on my system.\n>\n> And now, I see this scattered all over:\n>\n> For example:\n>\n> .ft C\n> $ git checkout master \\fB(1)\\fR\n> $ git checkout master~2 Makefile \\fB(2)\\fR\n> $ rm -f hello.c\n> $ git checkout hello.c \\fB(3)\\fR\n> .ft\n>\n> Seems that \"------------\" and , and a few others aren't being\n> translated.\n(...)\n> Anyone else seeing this?\nYes, I'm seeing this on mac as well.\n\n-geert\n"},{"id":"67155","messageId":"m34pcr6vnm.fsf@localhost.localdomain","threadId":"11843","inReplyTo":"alpine.DEB.1.00.0802021055180.21831@an.sumeria","subject":"Re: man pages are littered with .ft C and others","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-02-02T18:49:41Z","receivedAt":"2008-02-02T18:49:41Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Adam Flott writes:\n\n> I do remember at one point the man pages looking correctly (just tested\n> v1.5.3.8 and it shows the same problem). Therefore it is probably\n> some package I'm missing on my system.\n\nOr perhaps lack of configuration during build.\n\nI have simply build git from original source RPM; this SRPM\ndoes not use pre-compiled manpages (as it could), neither uses\nconfigure to do autodetection of features (which might have\ndetected and fixed some build configuration needed).\n\nMakefile has ASCIIDOC8 (set automatically by configure)\nand DOCBOOK_XSL_172 (which is not autodetected).\n \n> And now, I see this scattered all over:\n> \n> For example:\n> \n> .ft C\n> $ git checkout master \\fB(1)\\fR\n> $ git checkout master~2 Makefile \\fB(2)\\fR\n> $ rm -f hello.c\n> $ git checkout hello.c \\fB(3)\\fR\n> .ft\n> \n> Seems that \"------------\" and , and a few others aren't being\n> translated. Note: I'm not at all familiar with the layout of man pages\n> so I have no idea how to fix it or even diagnose it further.\n\nI see the same error in manpages, for example in git-diff-tree(1)\n\n Example:\n\n .ft C\n :100644 100644 5be4a4...... 000000...... M file.c\n .ft\n\n> Version info:\n> up to date Kubuntu 7.10\n\nOld Aurox Linux 11.1 (based on Fedora Core 4 + some updates)\n\n> asciidoc/gutsy uptodate 8.2.1-2\n> docbook-dsssl/gutsy uptodate 1.79-4\n> docbook-utils/gutsy uptodate 0.6.14-1\n> docbook-xml/gutsy uptodate 4.5-4\n> docbook-xsl-doc-html/gutsy uptodate 1.72.0.dfsg.1-2\n> docbook-xsl/gutsy uptodate 1.72.0.dfsg.1-2\n> xmlto/gutsy uptodate 0.0.18-5.1build1\n\nasciidoc-7.1.2-2.fc3.rf\ndocbook-dtds-1.0-26\ndocbook-style-dsssl-1.79-1\ndocbook-style-xsl-1.68.1-1\ndocbook-utils-0.6.14-4\ndocbook-utils-pdf-0.6.14-4\nxmlto-0.0.18-6\n \n$ asciidoc --version\nasciidoc 7.1.2\n$ xmlto --version\nxmlto version 0.0.18\n\n>From VERSION file in docbook-style-xsl:\n\n DocBook\n XSL Stylesheets\n 1.68.1\n\n> Anyone else seeing this?\n\nI'm also seeing this.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"67196","messageId":"7vejbuxwpu.fsf@gitster.siamese.dyndns.org","threadId":"11843","inReplyTo":"m34pcr6vnm.fsf@localhost.localdomain","subject":"Re: man pages are littered with .ft C and others","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-03T08:36:45Z","receivedAt":"2008-02-03T08:36:45Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski writes:\n\n> I see the same error in manpages, for example in git-diff-tree(1)\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458\n\nrings a bell?\n"},{"id":"67205","messageId":"200802031139.48752.jnareb@gmail.com","threadId":"11843","inReplyTo":"7vejbuxwpu.fsf@gitster.siamese.dyndns.org","subject":"Re: man pages are littered with .ft C and others","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-02-03T10:39:47Z","receivedAt":"2008-02-03T10:39:47Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano wrote:\n> Jakub Narebski writes:\n>> \n>> I see the same error in manpages, for example in git-diff-tree(1)\n> \n> http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458\n> \n> rings a bell?\n\nYou mean:\n\nJulian Phillips:\n> Are you using docbook xsl 1.72? There are known problems building the \n> manpages with that version. 1.71 works, and 1.73 should work when it get \n> released.\n\nNo, I am using docbook-style-xsl-1.68.1-1, and compiling git from RPM.\nBesids, I have different set of problems; only with literal blocks.\nSo while DOCBOOK_XSL_172 is not set... let me check...\n\nHmmm...\n\nBefore\n$ man git-diff-tree\n\n Example:\n\n .ft C\n :100644 100644 5be4a4...... 000000...... M file.c\n .ft\n\n$ make DOCBOOK_XSL_172=YesPlease doc\n$ man Documentation/git-diff-tree.1\n\n Example:\n\n :100644 100644 5be4a4...... 000000...... M file.cWhen -z option is\n not used, TAB, LF, and backslash characters in pathnames are repre-\n sented as \\t, \\n, and \\\\, respectively.\n\nSo setting DOCBOOK_XSL_172 while it fixes the bug (even if docbook-xsl\nis version 1.68.1, not 1.72), but introduces another.\n\nUnfortunately I don't know enough about AsciiDoc, DocBook and XML\ntoolchain to even *try* to fix this issue.\n\n\nP.S. Alternate soution would be for SRPM to contain pre-compiled\nmanpages, and not require asciidoc and its toolchain to provide\nmanpages.\n-- \nJakub Narebski\nPoland\n"},{"id":"67439","messageId":"20080204220120.GA23798@diku.dk","threadId":"11843","inReplyTo":"200802031139.48752.jnareb@gmail.com","subject":"Re: man pages are littered with .ft C and others","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2008-02-04T22:01:20Z","receivedAt":"2008-02-04T22:01:20Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Jakub Narebski wrote Sun, Feb 03, 2008:\n> Junio C Hamano wrote:\n> > Jakub Narebski writes:\n> >\n> > [From] http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458\n> Julian Phillips:\n> > Are you using docbook xsl 1.72? There are known problems building the \n> > manpages with that version. 1.71 works, and 1.73 should work when it get \n> > released.\n\nI was able to solve this problem with this patch, which adds a XSL file\nused specifically for DOCBOOK_XSL_172=YesPlease and where dots and\nbackslashes are escaped properly so they won't be substituted to the\nwrong thing further down the \"DocBook XSL pipeline\". Doing the escaping\nin the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end\nthis part of the manpage nightmare.\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 7a32546..43781fb 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -45,6 +45,7 @@ man7dir=$(mandir)/man7\n \n ASCIIDOC=asciidoc\n ASCIIDOC_EXTRA =\n+MANPAGE_XSL = callouts.xsl\n INSTALL?=install\n RM ?= rm -f\n DOC_REF = origin/man\n@@ -65,6 +66,7 @@ ASCIIDOC_EXTRA += -a asciidoc7compatible\n endif\n ifdef DOCBOOK_XSL_172\n ASCIIDOC_EXTRA += -a docbook-xsl-172\n+MANPAGE_XSL = manpage-1.72.xsl\n endif\n \n #\n@@ -159,7 +161,7 @@ $(MAN_HTML): %.html : %.txt\n \n %.1 %.5 %.7 : %.xml\n \t$(RM) $@\n-\txmlto -m callouts.xsl man $<\n+\txmlto -m $(MANPAGE_XSL) man $<\n \n %.xml : %.txt\n \t$(RM) $@+ $@\ndiff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl\nnew file mode 100644\nindex 0000000..fe3cd72\n--- /dev/null\n+++ b/Documentation/manpage-1.72.xsl\n@@ -0,0 +1,17 @@\n+\n+\n+\n+\t\n+\n+\n+\t⌂sp \n+\t\n+\t \n+\n+\n+\t\n+\t\n+\t⌂br \n+\n+\n+\n\n> Besids, I have different set of problems; only with literal blocks.\n> So while DOCBOOK_XSL_172 is not set... let me check...\n> \n> Hmmm...\n> \n> Before\n> $ man git-diff-tree\n> \n> Example:\n> \n> .ft C\n> :100644 100644 5be4a4...... 000000...... M file.c\n> .ft\n> \n> $ make DOCBOOK_XSL_172=YesPlease doc\n> $ man Documentation/git-diff-tree.1\n> \n> Example:\n> \n> :100644 100644 5be4a4...... 000000...... M file.cWhen -z option is\n> not used, TAB, LF, and backslash characters in pathnames are repre-\n> sented as \\t, \\n, and \\\\, respectively.\n> \n> So setting DOCBOOK_XSL_172 while it fixes the bug (even if docbook-xsl\n> is version 1.68.1, not 1.72), but introduces another.\n> \n> Unfortunately I don't know enough about AsciiDoc, DocBook and XML\n> toolchain to even *try* to fix this issue.\n\nI have no idea what this could be. The literallayout block is\noverwritten in Documentation/asciidoc.conf unless when DOCBOOK_XSL_172\nis set. Newer AsciiDoc installations seem to use a different set of\nDocBook tags than what is overwritten by git's asciidoc.conf.\n\n-- \nJonas Fonseca\n"},{"id":"67447","messageId":"200802050026.22262.jnareb@gmail.com","threadId":"11843","inReplyTo":"20080204220120.GA23798@diku.dk","subject":"Re: man pages are littered with .ft C and others","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-02-04T23:26:21Z","receivedAt":"2008-02-04T23:26:21Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Mon, 4 Feb 2008, Jonas Fonseca wrote:\n> Jakub Narebski wrote Sun, Feb 03, 2008:\n> > Junio C Hamano wrote:\n> > > Jakub Narebski writes:\n> > >\n> > > [From] http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458\n> > Julian Phillips:\n> > > Are you using docbook xsl 1.72? There are known problems building the \n> > > manpages with that version. 1.71 works, and 1.73 should work when it get \n> > > released.\n> \n> I was able to solve this problem with this patch, which adds a XSL file\n> used specifically for DOCBOOK_XSL_172=YesPlease and where dots and\n> backslashes are escaped properly so they won't be substituted to the\n> wrong thing further down the \"DocBook XSL pipeline\". Doing the escaping\n> in the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end\n> this part of the manpage nightmare.\n\nI have applied this patch, and it makes manpages worse, not better.\nI use DocBook XSL version 1.68.1\n\n[...]\n> > Besids, I have different set of problems; only with literal blocks.\n> > So while DOCBOOK_XSL_172 is not set... let me check...\n> > \n> > Hmmm...\n> > \n> > Before\n> > $ man git-diff-tree\n> > \n> > Example:\n> > \n> > .ft C\n> > :100644 100644 5be4a4...... 000000...... M file.c\n> > .ft\n> > \n> > $ make DOCBOOK_XSL_172=YesPlease doc\n> > $ man Documentation/git-diff-tree.1\n> > \n> > Example:\n> > \n> > :100644 100644 5be4a4...... 000000...... M file.cWhen -z option is\n> > not used, TAB, LF, and backslash characters in pathnames are repre-\n> > sented as \\t, \\n, and \\\\, respectively.\n> > \n> > So setting DOCBOOK_XSL_172 while it fixes the bug (even if docbook-xsl\n> > is version 1.68.1, not 1.72), but introduces another.\n> > \n> > Unfortunately I don't know enough about AsciiDoc, DocBook and XML\n> > toolchain to even *try* to fix this issue.\n> \n> I have no idea what this could be. The literallayout block is\n> overwritten in Documentation/asciidoc.conf unless when DOCBOOK_XSL_172\n> is set. Newer AsciiDoc installations seem to use a different set of\n> DocBook tags than what is overwritten by git's asciidoc.conf.\n\nNow I have in git-diff-tree(1), result of (after applying above patch)\n$ man Documentation/git-diff-tree.1\n\n git-diff-files [...]\n compares the index and the files on the filesystem.\n\n An output line is formatted this way:\n\n in-place edit :100644 100644 bcd1234... 0123456... M file0\n copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2\n rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3\n create :000000 100644 0000000... 1234567... A file4 delete\n :100644 000000 1234567... 0000000... D file5 unmerged :000000\n 000000 0000000... 0000000... U file6That is, from the left to the\n right:\n\n[...]\n\n Example:\n\n :100644 100644 5be4a4...... 000000...... M file.cWhen -z option is\n not used, TAB, LF, and backslash characters in pathnames are repre-\n sented as \\t, \\n, and \\\\, respectively.\n\n\nCompare this to output of \"man git-diff-tree\", same situation, compiled\nfrom SRPM, without any aditional options:\n\n git-diff-files [...]\n compares the index and the files on the filesystem.\n\n An output line is formatted this way:\n\n .ft C\n in-place edit :100644 100644 bcd1234... 0123456... M file0\n copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2\n rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3\n create :000000 100644 0000000... 1234567... A file4\n delete :100644 000000 1234567... 0000000... D file5\n unmerged :000000 000000 0000000... 0000000... U file6\n .ft\n\n That is, from the left to the right:\n\n[...]\n\n Example:\n\n .ft C\n :100644 100644 5be4a4...... 000000...... M file.c\n .ft\n\n When -z option is not used, TAB, LF, and backslash characters in pathnames\n are represented as \\t, \\n, and \\\\, respectively.\n\n\nHTH.\n\nP.S. writing subset of AsciiDoc in Perl, which would write manpages, HTML\nand perhaps info/texinfo files directly, without fragile xmlto toolchain,\nlooks better and better...\n\n$ asciidoc --version\nasciidoc 7.1.2\n$ rpm -qa docbook* \ndocbook-utils-0.6.14-4\ndocbook-style-xsl-1.68.1-1\ndocbook-style-dsssl-1.79-1\ndocbook-utils-pdf-0.6.14-4\ndocbook-dtds-1.0-26\n$ xmlto --version\nxmlto version 0.0.18\n-- \nJakub Narebski\nPoland\n"},{"id":"67449","messageId":"20080205000048.GA28020@diku.dk","threadId":"11843","inReplyTo":"200802050026.22262.jnareb@gmail.com","subject":"Re: man pages are littered with .ft C and others","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2008-02-05T00:00:48Z","receivedAt":"2008-02-05T00:00:48Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Jakub Narebski wrote Tue, Feb 05, 2008:\n> On Mon, 4 Feb 2008, Jonas Fonseca wrote:\n> > Jakub Narebski wrote Sun, Feb 03, 2008:\n> > > Junio C Hamano wrote:\n> > > > Jakub Narebski writes:\n> > > >\n> > > > [From] http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458\n> > > Julian Phillips:\n> > > > Are you using docbook xsl 1.72? There are known problems building the \n> > > > manpages with that version. 1.71 works, and 1.73 should work when it get \n> > > > released.\n> > \n> > I was able to solve this problem with this patch, which adds a XSL file\n> > used specifically for DOCBOOK_XSL_172=YesPlease and where dots and\n> > backslashes are escaped properly so they won't be substituted to the\n> > wrong thing further down the \"DocBook XSL pipeline\". Doing the escaping\n> > in the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end\n> > this part of the manpage nightmare.\n> \n> I have applied this patch, and it makes manpages worse, not better.\n> I use DocBook XSL version 1.68.1\n\nOK, I might have been a bit unclear, but the patch was not intended for\nyou but for users of version 1.72+. ;)\n\n> P.S. writing subset of AsciiDoc in Perl, which would write manpages, HTML\n> and perhaps info/texinfo files directly, without fragile xmlto toolchain,\n> looks better and better...\n\nBut not as easy as just pulling the documentation branches.\n\n-- \nJonas Fonseca\n"},{"id":"67451","messageId":"7vd4rci6vn.fsf@gitster.siamese.dyndns.org","threadId":"11843","inReplyTo":"20080205000048.GA28020@diku.dk","subject":"Re: man pages are littered with .ft C and others","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-05T00:28:28Z","receivedAt":"2008-02-05T00:28:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonas Fonseca writes:\n\n> Jakub Narebski wrote Tue, Feb 05, 2008:\n>\n>> P.S. writing subset of AsciiDoc in Perl, which would write manpages, HTML\n>> and perhaps info/texinfo files directly, without fragile xmlto toolchain,\n>> looks better and better...\n>\n> But not as easy as just pulling the documentation branches.\n\nBut your approach has a small flaw of chicken-and-egg problem\n;-).\n"},{"id":"67464","messageId":"200802050221.21647.jnareb@gmail.com","threadId":"11843","inReplyTo":"200802050026.22262.jnareb@gmail.com","subject":"Re: man pages are littered with .ft C and others","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-02-05T01:21:20Z","receivedAt":"2008-02-05T01:21:20Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Jakub Narebski wrote:\n\n> I have applied this patch, and it makes manpages worse, not better.\n> I use DocBook XSL version 1.68.1\n\nSorry, I must have had run \"make doc\" without \"make clean\" first.\nOf course patch doesn't change anything for pre 1.72, and marked\nas such.\n\nOne again, I'm sory for the confusion.\n\nThe old .ft C... .ft error remains.\n-- \nJakub Narebski\nPoland\n"},{"id":"67496","messageId":"7vy79zbu5l.fsf@gitster.siamese.dyndns.org","threadId":"11843","inReplyTo":"20080204220120.GA23798@diku.dk","subject":"Re: man pages are littered with .ft C and others","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-05T09:59:50Z","receivedAt":"2008-02-05T09:59:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonas Fonseca writes:\n\n> I was able to solve this problem with this patch, which adds a XSL file\n> used specifically for DOCBOOK_XSL_172=YesPlease and where dots and\n> backslashes are escaped properly so they won't be substituted to the\n> wrong thing further down the \"DocBook XSL pipeline\". Doing the escaping\n> in the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end\n> this part of the manpage nightmare.\n\nI checked this with 1.71, 1.69 and 1.72 (with DOCBOOK_XSL_172).\nIt seems not to regress.\n\nApplied to 'master'. Thanks.\n"}]}