diff options
Diffstat (limited to 'html/xref.xsl')
| -rw-r--r-- | html/xref.xsl | 118 |
1 files changed, 14 insertions, 104 deletions
diff --git a/html/xref.xsl b/html/xref.xsl index 7069501..0f8ab2b 100644 --- a/html/xref.xsl +++ b/html/xref.xsl @@ -7,7 +7,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: xref.xsl 9365 2012-05-12 23:43:49Z bobstayton $ + $Id: xref.xsl 9713 2013-01-22 22:08:30Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -358,7 +358,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"/> @@ -1047,8 +1047,6 @@ <xsl:call-template name="anchor"/> - <xsl:variable name="localinfo" select="@localinfo"/> - <xsl:choose> <!-- olinks resolved by stylesheet and target database --> <xsl:when test="@targetdoc or @targetptr or @@ -1186,56 +1184,20 @@ </xsl:when> - <!-- Or use old olink mechanism --> <xsl:otherwise> - <xsl:variable name="href"> - <xsl:choose> - <xsl:when test="@linkmode"> - <!-- use the linkmode to get the base URI, use localinfo as fragid --> - <xsl:variable name="modespec" select="key('id',@linkmode)"/> - <xsl:if test="count($modespec) != 1 - or local-name($modespec) != 'modespec'"> - <xsl:message>Warning: olink linkmode pointer is wrong.</xsl:message> - </xsl:if> - <xsl:value-of select="$modespec"/> - <xsl:if test="@localinfo"> - <xsl:text>#</xsl:text> - <xsl:value-of select="@localinfo"/> - </xsl:if> - </xsl:when> - <xsl:when test="@type = 'href'"> - <xsl:call-template name="olink.outline"> - <xsl:with-param name="outline.base.uri" - select="unparsed-entity-uri(@targetdocent)"/> - <xsl:with-param name="localinfo" select="@localinfo"/> - <xsl:with-param name="return" select="'href'"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$olink.resolver"/> - <xsl:text>?</xsl:text> - <xsl:value-of select="$olink.sysid"/> - <xsl:value-of select="unparsed-entity-uri(@targetdocent)"/> - <!-- XSL gives no access to the public identifier (grumble...) --> - <xsl:if test="@localinfo"> - <xsl:text>&</xsl:text> - <xsl:value-of select="$olink.fragid"/> - <xsl:value-of select="@localinfo"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:choose> - <xsl:when test="$href != ''"> - <a href="{$href}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="id.attribute"/> - <xsl:call-template name="olink.hottext"/> - </a> + <xsl:when test="@linkmode or @targetdocent or @localinfo"> + <!-- old olink mechanism --> + <xsl:message> + <xsl:text>ERROR: olink using obsolete attributes </xsl:text> + <xsl:text>@linkmode, @targetdocent, @localinfo are </xsl:text> + <xsl:text>not supported.</xsl:text> + </xsl:message> </xsl:when> <xsl:otherwise> - <xsl:call-template name="olink.hottext"/> + <xsl:message> + <xsl:text>ERROR: olink is missing linking attributes.</xsl:text> + </xsl:message> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -1246,57 +1208,6 @@ <!-- no-op in HTML --> </xsl:template> - -<xsl:template name="olink.outline"> - <xsl:param name="outline.base.uri"/> - <xsl:param name="localinfo"/> - <xsl:param name="return" select="href"/> - - <xsl:variable name="outline-file" - select="concat($outline.base.uri, - $olink.outline.ext)"/> - - <xsl:variable name="outline" select="document($outline-file,.)/div"/> - - <xsl:variable name="node-href"> - <xsl:choose> - <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline// - *[@id=$localinfo or @xml:id=$localinfo]"/> - <xsl:value-of select="$node/@href"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$outline/@href"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="node-xref"> - <xsl:choose> - <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline// - *[@id=$localinfo or @xml:id=$localinfo]"/> - <xsl:copy-of select="$node/xref"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$outline/xref"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$return = 'href'"> - <xsl:value-of select="$node-href"/> - </xsl:when> - <xsl:when test="$return = 'xref'"> - <xsl:value-of select="$node-xref"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$node-xref"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - <!-- ==================================================================== --> <xsl:template name="xref.xreflabel"> @@ -1329,9 +1240,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"/> |