From: Norman W. <nw...@us...> - 2001-11-29 17:56:55
|
Update of /cvsroot/docbook/xsl/fo In directory usw-pr-cvs1:/tmp/cvs-serv29365 Modified Files: xep.xsl Log Message: Fix it the right way: always test for top-level elements Index: xep.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/xep.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** xep.xsl 2001/11/29 16:55:16 1.4 --- xep.xsl 2001/11/29 17:56:51 1.5 *************** *** 65,83 **** </xsl:variable> ! <!-- ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! --> ! ! <xsl:if test="book"> ! <xsl:apply-templates select="book" ! mode="xep.outline"/> ! </xsl:if> ! ! <!-- ! </rx:bookmark> ! --> </xsl:template> --- 65,87 ---- </xsl:variable> ! <xsl:choose> ! <xsl:when test="parent::*"> ! <xsl:if test="book"> ! <xsl:apply-templates select="book" ! mode="xep.outline"/> ! </xsl:if> ! </xsl:when> ! <xsl:otherwise> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! <xsl:if test="book"> ! <xsl:apply-templates select="book" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> ! </xsl:otherwise> ! </xsl:choose> </xsl:template> *************** *** 92,101 **** <xsl:choose> ! <xsl:when test="parent::set"> <rx:bookmark internal-destination="{$id}"> <rx:bookmark-label> <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> </rx:bookmark-label> - <xsl:if test="part|preface|chapter|appendix"> <xsl:apply-templates select="part|preface|chapter|appendix" --- 96,104 ---- <xsl:choose> ! <xsl:when test="parent::*"> <rx:bookmark internal-destination="{$id}"> <rx:bookmark-label> <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> </rx:bookmark-label> <xsl:if test="part|preface|chapter|appendix"> <xsl:apply-templates select="part|preface|chapter|appendix" *************** *** 122,135 **** </xsl:variable> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> - <xsl:if test="chapter|appendix|preface|reference"> - <xsl:apply-templates select="chapter|appendix|preface|reference" - mode="xep.outline"/> - </xsl:if> - </rx:bookmark> </xsl:template> --- 125,148 ---- </xsl:variable> ! <xsl:choose> ! <xsl:when test="parent::*"> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! <xsl:if test="chapter|appendix|preface|reference"> ! <xsl:apply-templates select="chapter|appendix|preface|reference" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> ! </xsl:when> ! <xsl:otherwise> ! <xsl:if test="chapter|appendix|preface|reference"> ! <xsl:apply-templates select="chapter|appendix|preface|reference" ! mode="xep.outline"/> ! </xsl:if> ! </xsl:otherwise> ! </xsl:choose> </xsl:template> *************** *** 143,157 **** <xsl:apply-templates select="." mode="title.markup"/> </xsl:variable> - - <rx:bookmark internal-destination="{$id}"> - <rx:bookmark-label> - <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> - </rx:bookmark-label> ! <xsl:if test="section|sect1"> ! <xsl:apply-templates select="section|sect1" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> </xsl:template> --- 156,179 ---- <xsl:apply-templates select="." mode="title.markup"/> </xsl:variable> ! <xsl:choose> ! <xsl:when test="parent::*"> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! <xsl:if test="section|sect1"> ! <xsl:apply-templates select="section|sect1" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> ! </xsl:when> ! <xsl:otherwise> ! <xsl:if test="section|sect1"> ! <xsl:apply-templates select="section|sect1" ! mode="xep.outline"/> ! </xsl:if> ! </xsl:otherwise> ! </xsl:choose> </xsl:template> *************** *** 165,179 **** <xsl:apply-templates select="." mode="title.markup"/> </xsl:variable> - - <rx:bookmark internal-destination="{$id}"> - <rx:bookmark-label> - <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> - </rx:bookmark-label> ! <xsl:if test="section|sect2|sect3|sect4|sect5"> ! <xsl:apply-templates select="section|sect2|sect3|sect4|sect5" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> </xsl:template> --- 187,210 ---- <xsl:apply-templates select="." mode="title.markup"/> </xsl:variable> ! <xsl:choose> ! <xsl:when test="parent::*"> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! <xsl:if test="section|sect2|sect3|sect4|sect5"> ! <xsl:apply-templates select="section|sect2|sect3|sect4|sect5" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> ! </xsl:when> ! <xsl:otherwise> ! <xsl:if test="section|sect2|sect3|sect4|sect5"> ! <xsl:apply-templates select="section|sect2|sect3|sect4|sect5" ! mode="xep.outline"/> ! </xsl:if> ! </xsl:otherwise> ! </xsl:choose> </xsl:template> *************** *** 188,198 **** </xsl:variable> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! </rx:bookmark> </xsl:template> ! <!-- Added missing template for "article" --> <xsl:template match="article" mode="xep.outline"> --- 219,236 ---- </xsl:variable> ! <xsl:choose> ! <xsl:when test="parent::*"> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! </rx:bookmark> ! </xsl:when> ! <xsl:otherwise> <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </xsl:otherwise> ! </xsl:choose> </xsl:template> ! <xsl:template match="article" mode="xep.outline"> *************** *** 204,221 **** <xsl:apply-templates select="." mode="title.markup"/> </xsl:variable> - - <rx:bookmark internal-destination="{$id}"> - <rx:bookmark-label> - <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> - </rx:bookmark-label> ! <xsl:if test="section|sect1|appendix|bibliography|glossary|index"> ! <xsl:apply-templates select="section|sect1|appendix|bibliography|glossary|index" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> </xsl:template> - - <xsl:template match="title" mode="xep.outline"> --- 242,266 ---- <xsl:apply-templates select="." mode="title.markup"/> </xsl:variable> ! <xsl:choose> ! <xsl:when test="parent::*"> ! <rx:bookmark internal-destination="{$id}"> ! <rx:bookmark-label> ! <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/> ! </rx:bookmark-label> ! <xsl:if test="section|sect1|appendix|bibliography|glossary|index"> ! <xsl:apply-templates select="section|sect1|appendix|bibliography|glossary|index" ! mode="xep.outline"/> ! </xsl:if> ! </rx:bookmark> ! </xsl:when> ! <xsl:otherwise> ! <xsl:if test="section|sect1|appendix|bibliography|glossary|index"> ! <xsl:apply-templates select="section|sect1|appendix|bibliography|glossary|index" ! mode="xep.outline"/> ! </xsl:if> ! </xsl:otherwise> ! </xsl:choose> </xsl:template> <xsl:template match="title" mode="xep.outline"> |