Added UTF-8 as default encoding.

Replaced xmlto command by xsltproc.
Added reference for the GPL appendix.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@574 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -3,6 +3,9 @@
  * src/utils.c, src/document.c, src/callbacks.c:
    Moved document related functions from utils.c to document.c.
    Keep cursor position when replacing tabs by spaces.
+ * doc/geany.xsl: Added UTF-8 as default encoding.
+ * doc/Makefile.am: Replaced xmlto command by xsltproc.
+ * doc/geany.docbook: Added reference for the GPL appendix.
 
 
 2006-07-16  Enrico Tröger  <enrico.troeger@uvena.de>

doc/Makefile.am

@@ -15,12 +15,7 @@ geany.txt:
 htmldoc: geany.docbook
 	if [ geany.docbook -nt "./html/index.html" ]; then \
 		$(mkinstalldirs) html; \
-		# hack for my local system to generate documentation in UTF-8 charset \
-		if [ `hostname` = "ukio" ]; then \
-			LC_CTYPE=de_DE.utf8@euro xmlto -x geany.xsl -o html/ xhtml geany.docbook; \
-		else \
-			xmlto -x geany.xsl -o html/ xhtml geany.docbook; \
-		fi; \
+		xsltproc --nonet --xinclude -o html/ geany.xsl geany.docbook; \
 		test -f html/geany.css || cp geany.css html/; \
 	fi
 

doc/geany.docbook

@@ -7,7 +7,7 @@
 <!ENTITY appurl "http://geany.uvena.de">
 <!ENTITY deburl "http://debian.uvena.de">
 <!ENTITY author_mail "enrico.troeger@uvena.de">
-<!ENTITY date "July 01, 2006">
+<!ENTITY date "July 17, 2006">
 <!ENTITY legal SYSTEM "geany_gpl.docbook">
 <!ENTITY scikeybinding SYSTEM "scikeybinding.docbook">
 ]>
@@ -16,7 +16,7 @@
 	<bookinfo>
 		<author>
 			<firstname>Enrico</firstname>
-			<surname>Troeger</surname>
+			<surname>Tröger</surname>
 			<address><email>&author_mail;</email></address>
 		</author>
 		<author>
@@ -37,7 +37,7 @@
 				This document is distributed under the terms of the GNU General Public License as published by the Free
 				Software Foundation; either version 2 of the License, or (at your option) any later version.
 				A copy of this license can be found in the file COPYING included with the source code of this
-				program and in the appendix of this document.
+				program and see <xref linkend="geany-gpl"/>.
 			</para>
 		</legalnotice>
 		<title>
@@ -91,7 +91,7 @@
 				<application>&app;</application> is distributed under the terms of the GNU General Public License as published
 				by the Free	Software Foundation; either version 2 of the License, or (at your option) any later version.
 				A copy of this license can be found in the file COPYING included with the source code of this
-				program and in the appendix A of this document.
+				program or see <xref linkend="geany-gpl"/>.
 			</para>
 			<para>
 				The included Scintilla library (found in the subdirectory scintilla/) has its own
@@ -846,10 +846,9 @@
 			<para>
 				<application>&app;</application> supports the default keyboard shortcuts for the
 				Scintilla editing widget. For a list of these commands, see
-				<!-- <xref linkend="scikeybinding"/> (outside this doc!) -->
-				the "Scintilla keyboard commands" appendix.
-				The Scintilla keyboard shortcuts will be
-				overridden by any custom keybindings with the same keyboard shortcut.
+				<xref linkend="scikeybinding"/>.
+				The Scintilla keyboard shortcuts will be overridden by any custom keybindings
+				with the same keyboard shortcut.
 			</para>
 			<para>
 				For all actions listed below you can define your own keybindings. Open the Preferences
@@ -1488,7 +1487,7 @@
 							<row>
 								<entry>initial</entry>
 								<entry>The developer's initials, e.g. "ET" for
-									   Enrico Troeger or "JFD" for John Foobar Doe.</entry>
+									   Enrico Tröger or "JFD" for John Foobar Doe.</entry>
 								<entry>filetypes, file header, function description, ChangeLog entry</entry>
 							</row>
 							<row>

doc/geany.xsl

@@ -8,6 +8,7 @@
 
 <!-- Use stylesheet -->
 <xsl:param name="html.stylesheet" select="'geany.css'"/>
+<xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
 
 </xsl:stylesheet>