techtonik Wed Nov 10 15:38:09 2004 EDT
Modified files: /phpdoc/xsl htmlhelp.xsl Log: fix overescaping in HHC caused by chunking HH files in html mode http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.15&r2=1.16&ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.15 phpdoc/xsl/htmlhelp.xsl:1.16 --- phpdoc/xsl/htmlhelp.xsl:1.15 Tue Nov 9 08:02:05 2004 +++ phpdoc/xsl/htmlhelp.xsl Wed Nov 10 15:38:09 2004 @@ -3,7 +3,7 @@ HTML Help specific stylesheet - $Id: htmlhelp.xsl,v 1.15 2004/11/09 13:02:05 techtonik Exp $ + $Id: htmlhelp.xsl,v 1.16 2004/11/10 20:38:09 techtonik Exp $ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -308,6 +308,43 @@ </xsl:call-template> </xsl:template> +<!-- [Temporarily also until it will be discussed in docbook-apps about features operating + in html mode - is it neccesary to escape attributes which are already escaped in sources] --> +<!-- Do not escape titles since we are operating in html mode --> +<xsl:template match="part|reference|preface|chapter|bibliography|appendix|article|glossary" + mode="hhc"> + <xsl:variable name="title"> + <xsl:if test="$htmlhelp.autolabel=1"> + <xsl:variable name="label.markup"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:if test="normalize-space($label.markup)"> + <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/> + </xsl:if> + </xsl:if> + <xsl:apply-templates select="." mode="title.markup"/> + </xsl:variable> + <xsl:variable name="href"> + <xsl:call-template name="href.target.with.base.dir"/> + </xsl:variable> + + <xsl:text> + </xsl:text> + <li><object type="text/sitemap"> + <param name="Name" value="{normalize-space($title)}"/> + <param name="Local" value="{$href}"/> + </object></li> + <xsl:text> + </xsl:text> + + <xsl:if test="reference|preface|chapter|appendix|refentry|section|sect1|bibliodiv"> + <ul> + <xsl:apply-templates + select="reference|preface|chapter|appendix|refentry|section|sect1|bibliodiv" + mode="hhc"/> + </ul> + </xsl:if> +</xsl:template> <!-- <xsl:param name="htmlhelp.only" select="1"/> @@ -454,7 +491,6 @@ </xsl:template> - <!-- *************** HH HTML MARKUP CUSTOMIZATIONS **************** --> <!-- output formal object titles enclosed in <h3> tags -->