From: Robert S. <bob...@us...> - 2005-11-07 18:32:06
|
Update of /cvsroot/docbook/xsl/fo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1346 Modified Files: xref.xsl Log Message: Fixed 'nopage' option in xrefstyle. Index: xref.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/xref.xsl,v retrieving revision 1.61 retrieving revision 1.62 diff -u -U2 -r1.61 -r1.62 --- xref.xsl 25 Sep 2005 01:58:16 -0000 1.61 +++ xref.xsl 7 Nov 2005 18:31:55 -0000 1.62 @@ -105,14 +105,21 @@ <!-- Add standard page reference? --> - <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:') - and (contains($xrefstyle, 'page') - or contains($xrefstyle, 'Page'))) - and ( $insert.xref.page.number = 'yes' - or $insert.xref.page.number = '1') - or local-name($target) = 'para'"> - <xsl:apply-templates select="$target" mode="page.citation"> - <xsl:with-param name="id" select="@linkend"/> - </xsl:apply-templates> - </xsl:if> + <xsl:choose> + <!-- negative xrefstyle in instance turns it off --> + <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') + and contains($xrefstyle, 'nopage')"> + </xsl:when> + <!-- positive xrefstyle already handles it --> + <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:') + and (contains($xrefstyle, 'page') + or contains($xrefstyle, 'Page'))) + and ( $insert.xref.page.number = 'yes' + or $insert.xref.page.number = '1') + or local-name($target) = 'para'"> + <xsl:apply-templates select="$target" mode="page.citation"> + <xsl:with-param name="id" select="@linkend"/> + </xsl:apply-templates> + </xsl:when> + </xsl:choose> </xsl:template> |