diff options
Diffstat (limited to 'fo/xref.xsl')
| -rw-r--r-- | fo/xref.xsl | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/fo/xref.xsl b/fo/xref.xsl index 90d609c..8210d56 100644 --- a/fo/xref.xsl +++ b/fo/xref.xsl @@ -7,7 +7,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: xref.xsl 9286 2012-04-19 10:10:58Z bobstayton $ + $Id: xref.xsl 9723 2013-02-06 13:08:06Z kosek $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -318,7 +318,7 @@ |constraintdef|formalpara|glossdiv|important|indexdiv |itemizedlist|legalnotice|lot|msg|msgexplan|msgmain |msgrel|msgset|msgsub|note|orderedlist|partintro - |productionset|qandadiv|refsynopsisdiv|segmentedlist + |productionset|qandadiv|refsynopsisdiv|screenshot|segmentedlist |set|setindex|sidebar|tip|toc|variablelist|warning" mode="xref-to"> <xsl:param name="referrer"/> @@ -987,7 +987,7 @@ <!-- * and the value of its content is not a URL that is the same as --> <!-- * URL it links to, and if ulink.show is non-zero. --> <xsl:choose> - <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)"> + <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote) and not(ancestor::*[@floatstyle='before'])"> <!-- * ulink.show and ulink.footnote are both non-zero; that --> <!-- * means we display the URL as a footnote (instead of inline) --> <fo:footnote> @@ -1098,8 +1098,6 @@ <!-- olink content may be passed in from xlink olink --> <xsl:param name="content" select="NOTANELEMENT"/> - <xsl:variable name="localinfo" select="@localinfo"/> - <xsl:choose> <!-- olinks resolved by stylesheet and target database --> <xsl:when test="@targetdoc or @targetptr or @@ -1342,14 +1340,6 @@ </xsl:template> -<xsl:template name="olink.outline"> - <xsl:param name="outline.base.uri"/> - <xsl:param name="localinfo"/> - <xsl:param name="return" select="href"/> - - <xsl:message terminate="yes">Fatal error: olink.outline template: what is this supposed to do?</xsl:message> -</xsl:template> - <!-- ==================================================================== --> <xsl:template name="title.xref"> @@ -1441,9 +1431,8 @@ <xsl:param name="title"/> <xsl:choose> - <!-- FIXME: what about the case where titleabbrev is inside the info? --> - <xsl:when test="$purpose = 'xref' and titleabbrev"> - <xsl:apply-templates select="." mode="titleabbrev.markup"/> + <xsl:when test="$purpose = 'xref'"> + <xsl:copy-of select="$title"/> </xsl:when> <xsl:otherwise> <xsl:copy-of select="$title"/> |