From: Robert S. <bob...@us...> - 2004-08-26 18:30:20
|
Update of /cvsroot/docbook/xsl/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31681 Modified Files: labels.xsl Log Message: Added component.label.includes.part.label parameter to appendices and other component elements. Index: labels.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/common/labels.xsl,v retrieving revision 1.29 retrieving revision 1.30 diff -u -U2 -r1.29 -r1.30 --- labels.xsl 26 Aug 2004 08:43:39 -0000 1.29 +++ labels.xsl 26 Aug 2004 18:30:10 -0000 1.30 @@ -71,4 +71,16 @@ </xsl:when> <xsl:when test="$preface.autolabel != 0"> + <xsl:if test="$component.label.includes.part.label != 0 and + ancestor::part"> + <xsl:variable name="part.label"> + <xsl:apply-templates select="ancestor::part" + mode="label.markup"/> + </xsl:variable> + <xsl:if test="$part.label != ''"> + <xsl:value-of select="$part.label"/> + <xsl:apply-templates select="ancestor::part" + mode="intralabel.punctuation"/> + </xsl:if> + </xsl:if> <xsl:choose> <xsl:when test="$label.from.part != 0 and ancestor::part"> @@ -89,18 +101,18 @@ </xsl:when> <xsl:when test="$chapter.autolabel != 0"> + <xsl:if test="$component.label.includes.part.label != 0 and + ancestor::part"> + <xsl:variable name="part.label"> + <xsl:apply-templates select="ancestor::part" + mode="label.markup"/> + </xsl:variable> + <xsl:if test="$part.label != ''"> + <xsl:value-of select="$part.label"/> + <xsl:apply-templates select="ancestor::part" + mode="intralabel.punctuation"/> + </xsl:if> + </xsl:if> <xsl:choose> <xsl:when test="$label.from.part != 0 and ancestor::part"> - <xsl:if test="$component.label.includes.part.label != 0 and - ancestor::part"> - <xsl:variable name="part.label"> - <xsl:apply-templates select="ancestor::part" - mode="label.markup"/> - </xsl:variable> - <xsl:if test="$part.label != ''"> - <xsl:value-of select="$part.label"/> - <xsl:apply-templates select="ancestor::part" - mode="intralabel.punctuation"/> - </xsl:if> - </xsl:if> <xsl:number from="part" count="chapter" format="1" level="any"/> </xsl:when> @@ -119,4 +131,16 @@ </xsl:when> <xsl:when test="$appendix.autolabel != 0"> + <xsl:if test="$component.label.includes.part.label != 0 and + ancestor::part"> + <xsl:variable name="part.label"> + <xsl:apply-templates select="ancestor::part" + mode="label.markup"/> + </xsl:variable> + <xsl:if test="$part.label != ''"> + <xsl:value-of select="$part.label"/> + <xsl:apply-templates select="ancestor::part" + mode="intralabel.punctuation"/> + </xsl:if> + </xsl:if> <xsl:choose> <xsl:when test="$label.from.part != 0 and ancestor::part"> |