bk commit - mysqldoc@docsrva tree (paul:1.3309)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3309 05/08/17 14:52:32 paul@stripped +2 -0
  Set chunker and HTML Help file encoding per
  language.

  xsl.d/mysql-html-help.xsl
    1.4 05/08/17 14:52:28 paul@stripped +29 -1
    Set chunker and HTML Help file encoding per
    language.

  DocsX/Makefile
    1.75 05/08/17 14:52:28 paul@stripped +0 -19
    Delete unneeded target rule.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.74/DocsX/Makefile	2005-08-13 21:45:34 -05:00
+++ 1.75/DocsX/Makefile	2005-08-17 14:52:28 -05:00
@@ -387,25 +387,6 @@
 
 .PRECIOUS: %.html-help.d
 
-# Special rule for Japanese. This is an attempt to get Shift_JIS
-# encoding for the output to see if we get better CHM results.
-
-#.PRECIOUS: %.ja.html-help.d
-
-#%.ja.html-help.d: %.ja-prepped.xml $(XSL_DIR)/mysql-html-help-shift-jis.xsl
-#	-$(RM) -r $@/
-#	mkdir $@/
-#	$(XSLTPROC) \
-#		--stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*.ja` \
-#		--output $@/ \
-#		$(XSL_DIR)/mysql-html-help-shift-jis.xsl \
-#		$<
-#	if [ `expr "$@" : 'manual\.'` -gt 0 ]; then \
-#		$(RM) -r $@/Images; \
-#		mkdir $@/Images; \
-#		cp Images/*.gif Images/*.jpg Images/*.png $@/Images; \
-#	fi
-
 %.html-help.d: %-prepped.xml $(XSL_DIR)/mysql-html-help.xsl
 	-$(RM) -r $@/
 	mkdir $@/

--- 1.3/xsl.d/mysql-html-help.xsl	2005-02-19 12:30:58 -06:00
+++ 1.4/xsl.d/mysql-html-help.xsl	2005-08-17 14:52:28 -05:00
@@ -12,7 +12,35 @@
 <xsl:param name="section.autolabel" select="1"/>
 <xsl:param name="section.label.includes.component.label" select="1"/>
 <xsl:param name="chunk.quietly" select="1"/>
-<xsl:param name="chunker.output.encoding" select="'utf-8'"/>
+
+<!--
+  Choose HTML Help encoding based on value of first "lang" attribute
+  in document.  The basic idea for this came from:
+  http://www.dpawson.co.uk/docbook/styling/htmlhelp.html
+-->
+
+<xsl:param name="htmlhelp.encoding">
+  <xsl:choose>
+    <xsl:when test="substring(//*/@lang[1],1,2) = 'ja'">Shift_JIS</xsl:when>
+    <xsl:when test="substring(//*/@lang[1],1,2) = 'ru'">koi8-r</xsl:when>
+    <xsl:otherwise>windows-1252</xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<xsl:param name="chunker.output.encoding">
+  <xsl:choose>
+    <xsl:when test="substring(//*/@lang[1],1,2) = 'ja'">Shift_JIS</xsl:when>
+    <xsl:when test="substring(//*/@lang[1],1,2) = 'ru'">koi8-r</xsl:when>
+    <xsl:otherwise>windows-1252</xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<!--
+  Don't show root element in TOC; this causes chapter list display
+  in the index panel without having to open the TOC.
+-->
+
+<xsl:param name="htmlhelp.hhc.show.root" select="0"/>
 
 <!-- strip remark elements -->
 <xsl:template match="remark" />