{"thread":{"id":"21587","subject":"[PATCH todo] dodoc: detect doctype-xsl version before making docs","startedAt":"2009-11-12T02:31:39Z","lastAt":"2009-11-15T10:09:57Z","messageCount":2,"participants":["Jonathan Nieder","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"127408","messageId":"20091112023139.GA1627@progeny.tock","threadId":"21587","inReplyTo":null,"subject":"[PATCH todo] dodoc: detect doctype-xsl version before making docs","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2009-11-12T02:31:39Z","receivedAt":"2009-11-12T02:31:39Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"The manpages in the man branch of git.git appear to have acquired\nthe dreaded escaped .ft disease when the docbook-xsl toolchain\nwas upgraded to v1.74.3.\n---\nIt is hard work avoiding escaped nroff directives in output. I am a\nbit confused at what happened here, since docbook-xsl v1.73.2 should\nhave required the same settings.\n\nThese changes are untested, unfortunately. I hope they can be of some\nhelp nevertheless.\n\n dodoc.sh | 13 +++++++++++++\n 1 files changed, 13 insertions(+), 0 deletions(-)\n\ndiff --git a/dodoc.sh b/dodoc.sh\nindex 5cbc269..bf49710 100755\n--- a/dodoc.sh\n+++ b/dodoc.sh\n@@ -77,6 +77,19 @@ asciidoc' 8'.*)\n \texport ASCIIDOC8 ;;\n esac\n \n+db_version_file=/usr/share/xml/docbook/stylesheet/nwalsh/VERSION\n+case \"$(grep \"\" \"$db_version_file\" 2>/dev/null)\" in\n+*1.72*)\n+\tDOCBOOK_XSL_172=YesPlease\n+\texport DOCBOOK_XSL_172 ;;\n+*1.69.[1-9]* | *1.70* | *1.71.0*)\n+\tDOCBOOK_SUPPRESS_SP=YesPlease\n+\texport DOCBOOK_SUPPRESS_SP ;;\n+*1.7[3-9]* | *1.6[0-8]*)\n+\tASCIIDOC_NO_ROFF=YesPlease\n+\texport ASCIIDOC_NO_ROFF ;;\n+esac\n+\n make >./:html.log 2>&1 \\\n \t-C Documentation -j 2 \\\n \tWEBDOC_DEST=\"$DOCREPO/doc-html-inst\" install-webdoc || exit\n-- \n1.6.5.2\n"},{"id":"127600","messageId":"7vy6m8m74a.fsf@alter.siamese.dyndns.org","threadId":"21587","inReplyTo":"20091112023139.GA1627@progeny.tock","subject":"Re: [PATCH todo] dodoc: detect doctype-xsl version before making docs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-11-15T10:09:57Z","receivedAt":"2009-11-15T10:09:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> The manpages in the man branch of git.git appear to have acquired\n> the dreaded escaped .ft disease when the docbook-xsl toolchain\n> was upgraded to v1.74.3.\n> ---\n> It is hard work avoiding escaped nroff directives in output. I am a\n> bit confused at what happened here, since docbook-xsl v1.73.2 should\n> have required the same settings.\n>\n> These changes are untested, unfortunately. I hope they can be of some\n> help nevertheless.\n>\n> dodoc.sh | 13 +++++++++++++\n> 1 files changed, 13 insertions(+), 0 deletions(-)\n>\n> diff --git a/dodoc.sh b/dodoc.sh\n> index 5cbc269..bf49710 100755\n> --- a/dodoc.sh\n> +++ b/dodoc.sh\n> @@ -77,6 +77,19 @@ asciidoc' 8'.*)\n> \texport ASCIIDOC8 ;;\n> esac\n> \n> +db_version_file=/usr/share/xml/docbook/stylesheet/nwalsh/VERSION\n> +case \"$(grep \"\" \"$db_version_file\" 2>/dev/null)\" in\n\nThanks, but there seem to be no such file on FC11. In /etc/xml/catalog,\nI see:\n\n\n\nUnfortunately this seems highly distro dependent. On my near-by Debian\nbox, /etc/xml/docbook-xsl.xml has\n\n \n\nand the _catalog_ file has comment v1.73.2 (or whatever) and also\n\n \n\nFor now I simply will give up to be portable and adjust the script for the\nreality on k.org machine that is used to auto-generate the documentation.\n"}]}