threads / patch / 9193

patchMark user-manual as UTF-8

Subject: [PATCH/RFH] Mark user-manual as UTF-8

## tl;dr

5 messages between Jul 24, 2007 and Jul 24, 2007. Diffs are folded; open one to read it.

replies: 4people: 5as markdown or json

Junio C Hamano· Jul 24, 2007, 07:46 UTC · lore

There have been several complaints against k.org's user-manual page. The document is generated in ISO-8859-1 by the xsltproc toolchain (I suspect this is because released docbook.xsl we use has xsl:output element that says the output is ISO-8859-1) but server delivers it with "charset=UTF-8", and all h*ll breaks loose.

This attempts to force UTF-8 on the generating end.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 * I have to warn that I do not really think I know what I am
   doing, but this seems to "work for me".
 Documentation/Makefile    |    2 +-
 Documentation/docbook.xsl |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/docbook.xsl
Show changes to 2 files +6 −1

Documentation/Makefile, Documentation/docbook.xsl

diff --git a/Documentation/Makefile b/Documentation/Makefile
index b062757..3bc5357 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -131,7 +131,7 @@ clean:
 user-manual.xml: user-manual.txt user-manual.conf
 	$(ASCIIDOC) -b docbook -d book $<
 
-XSLT = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
+XSLT = docbook.xsl
 XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
 
 user-manual.html: user-manual.xml
diff --git a/Documentation/docbook.xsl b/Documentation/docbook.xsl
new file mode 100644
index 0000000..9a6912c
--- /dev/null
+++ b/Documentation/docbook.xsl
@@ -0,0 +1,5 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		version='1.0'>
+ <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+ <xsl:output method="html" encoding="UTF-8" indent="no" />
+</xsl:stylesheet>
Jeff King· Jul 24, 2007, 08:53 UTC · re: Junio C Hamano · lore

Re: [PATCH/RFH] Mark user-manual as UTF-8

On Tue, Jul 24, 2007 at 12:46:35AM -0700, Junio C Hamano wrote:
> This attempts to force UTF-8 on the generating end.
> [...]
>  * I have to warn that I do not really think I know what I am
>    doing, but this seems to "work for me".

I'm by no means a docbook expert, but I think what you've done is sane. Supposedly there is an xsl:param "chunker.output.encoding" which would let you do the same thing from the xsltproc command line, but I can't seem to get it to work (and I don't know enough about xsl to even begin figuring out why).

-Peff
Wincent Colaiuta· Jul 24, 2007, 10:36 UTC · re: Junio C Hamano · lore

Re: [PATCH/RFH] Mark user-manual as UTF-8

El 24/7/2007, a las 9:46, Junio C Hamano escribió:
Show 8 quoted lines
> There have been several complaints against k.org's user-manual
> page.  The document is generated in ISO-8859-1 by the xsltproc
> toolchain (I suspect this is because released docbook.xsl we use
> has xsl:output element that says the output is ISO-8859-1) but
> server delivers it with "charset=UTF-8", and all h*ll breaks
> loose.
>
> This attempts to force UTF-8 on the generating end.

Thanks for doing this, Junio. I was one of the people who reported this (although never saw my mail get through to the list).

Funnily, enough, about an hour after you posted your patch another email ("git documentation - user manual html version has wierd [sic] characters all over the place") was posted to the list...

Cheers, Wincent

Thierry Parmentelat· Jul 24, 2007, 10:45 UTC · re: Wincent Colaiuta · lore

Re: [PATCH/RFH] Mark user-manual as UTF-8

Hi there - I'm the wierd guy :-)
I've just reloaded the page and the weird stuff has gone.
Wincent Colaiuta wrote:
Show 20 quoted lines
> El 24/7/2007, a las 9:46, Junio C Hamano escribió:
>
>> There have been several complaints against k.org's user-manual
>> page.  The document is generated in ISO-8859-1 by the xsltproc
>> toolchain (I suspect this is because released docbook.xsl we use
>> has xsl:output element that says the output is ISO-8859-1) but
>> server delivers it with "charset=UTF-8", and all h*ll breaks
>> loose.
>>
>> This attempts to force UTF-8 on the generating end.
>
> Thanks for doing this, Junio. I was one of the people who reported 
> this (although never saw my mail get through to the list).
>
> Funnily, enough, about an hour after you posted your patch another 
> email ("git documentation - user manual html version has wierd [sic] 
> characters all over the place") was posted to the list...
>
> Cheers,
> Wincent
J. Bruce Fields· Jul 24, 2007, 14:50 UTC · re: Junio C Hamano · lore

Re: [PATCH/RFH] Mark user-manual as UTF-8

On Tue, Jul 24, 2007 at 12:46:35AM -0700, Junio C Hamano wrote:
Show 8 quoted lines
> There have been several complaints against k.org's user-manual
> page.  The document is generated in ISO-8859-1 by the xsltproc
> toolchain (I suspect this is because released docbook.xsl we use
> has xsl:output element that says the output is ISO-8859-1) but
> server delivers it with "charset=UTF-8", and all h*ll breaks
> loose.
> 
> This attempts to force UTF-8 on the generating end.

Thanks for looking into this! I've seen what I assume is the same problem sporadically before and been unsuccesful at finding the source....

--b.

← back to recent threads