diff options
Diffstat (limited to 'html')
| -rw-r--r-- | html/admon.xsl | 6 | ||||
| -rw-r--r-- | html/autoidx.xsl | 4 | ||||
| -rw-r--r-- | html/autotoc.xsl | 32 | ||||
| -rw-r--r-- | html/block.xsl | 19 | ||||
| -rw-r--r-- | html/chunk-common.xsl | 64 | ||||
| -rw-r--r-- | html/chunker.xsl | 10 | ||||
| -rw-r--r-- | html/component.xsl | 3 | ||||
| -rw-r--r-- | html/docbook.xsl | 139 | ||||
| -rw-r--r-- | html/ebnf.xsl | 6 | ||||
| -rw-r--r-- | html/footnote.xsl | 23 | ||||
| -rw-r--r-- | html/formal.xsl | 34 | ||||
| -rw-r--r-- | html/glossary.xsl | 12 | ||||
| -rw-r--r-- | html/graphics.xsl | 53 | ||||
| -rw-r--r-- | html/highlight.xsl | 12 | ||||
| -rw-r--r-- | html/htmltbl.xsl | 5 | ||||
| -rw-r--r-- | html/inline.xsl | 22 | ||||
| -rw-r--r-- | html/param.xml | 187 | ||||
| -rw-r--r-- | html/param.xsl | 10 | ||||
| -rw-r--r-- | html/profile-chunk-code.xsl | 6 | ||||
| -rw-r--r-- | html/profile-docbook.xsl | 114 | ||||
| -rw-r--r-- | html/verbatim.xsl | 4 | ||||
| -rw-r--r-- | html/xref.xsl | 118 |
22 files changed, 481 insertions, 402 deletions
diff --git a/html/admon.xsl b/html/admon.xsl index 192f679..7e1e33a 100644 --- a/html/admon.xsl +++ b/html/admon.xsl @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: admon.xsl 9352 2012-05-12 23:17:11Z bobstayton $ + $Id: admon.xsl 9728 2013-03-08 00:16:41Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -63,7 +63,7 @@ <div> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> - <xsl:if test="$admon.style != ''"> + <xsl:if test="$admon.style != '' and $make.clean.html = 0"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> </xsl:attribute> @@ -113,7 +113,7 @@ <xsl:with-param name="inherit" select="1"/> </xsl:call-template> <xsl:call-template name="id.attribute"/> - <xsl:if test="$admon.style"> + <xsl:if test="$admon.style != '' and $make.clean.html = 0"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> </xsl:attribute> diff --git a/html/autoidx.xsl b/html/autoidx.xsl index 10844d3..c33996b 100644 --- a/html/autoidx.xsl +++ b/html/autoidx.xsl @@ -10,7 +10,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: autoidx.xsl 9376 2012-05-24 18:32:40Z bobstayton $ + $Id: autoidx.xsl 9707 2013-01-21 17:18:44Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -598,7 +598,7 @@ <xsl:apply-templates select="." mode="class.attribute"/> <xsl:variable name="title"> <xsl:choose> - <xsl:when test="§ion;/titleabbrev and $index.prefer.titleabbrev != 0"> + <xsl:when test="$index.prefer.titleabbrev != 0"> <xsl:apply-templates select="§ion;" mode="titleabbrev.markup"/> </xsl:when> <xsl:otherwise> diff --git a/html/autotoc.xsl b/html/autotoc.xsl index e39ae26..864ea79 100644 --- a/html/autotoc.xsl +++ b/html/autotoc.xsl @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: autotoc.xsl 9295 2012-04-19 19:05:29Z bobstayton $ + $Id: autotoc.xsl 9692 2012-12-16 02:31:34Z dcramer $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -68,6 +68,11 @@ <div class="toc"> <xsl:copy-of select="$toc.title"/> <xsl:element name="{$toc.list.type}"> + <xsl:call-template name="toc.list.attributes"> + <xsl:with-param name="toc-context" select="$toc-context"/> + <xsl:with-param name="toc.title.p" select="$toc.title.p"/> + <xsl:with-param name="nodes" select="$nodes"/> + </xsl:call-template> <xsl:call-template name="manual-toc"> <xsl:with-param name="tocentry" select="$tocentry/*[1]"/> </xsl:call-template> @@ -82,6 +87,11 @@ <div class="toc"> <xsl:copy-of select="$toc.title"/> <xsl:element name="{$toc.list.type}"> + <xsl:call-template name="toc.list.attributes"> + <xsl:with-param name="toc-context" select="$toc-context"/> + <xsl:with-param name="toc.title.p" select="$toc.title.p"/> + <xsl:with-param name="nodes" select="$nodes"/> + </xsl:call-template> <xsl:apply-templates select="$nodes.plus" mode="toc"> <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:apply-templates> @@ -94,6 +104,11 @@ <div class="toc"> <xsl:copy-of select="$toc.title"/> <xsl:element name="{$toc.list.type}"> + <xsl:call-template name="toc.list.attributes"> + <xsl:with-param name="toc-context" select="$toc-context"/> + <xsl:with-param name="toc.title.p" select="$toc.title.p"/> + <xsl:with-param name="nodes" select="$nodes"/> + </xsl:call-template> <xsl:apply-templates select="$nodes" mode="toc"> <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:apply-templates> @@ -107,6 +122,14 @@ </xsl:choose> </xsl:template> +<xsl:template name="toc.list.attributes"> + <xsl:param name="toc-context" select="."/> + <xsl:param name="toc.title.p" select="true()"/> + <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/> + + <xsl:attribute name="class">toc</xsl:attribute> +</xsl:template> + <xsl:template name="make.lots"> <xsl:param name="toc.params" select="''"/> <xsl:param name="toc"/> @@ -591,6 +614,8 @@ <xsl:template name="manual-toc"> <xsl:param name="toc-context" select="."/> <xsl:param name="tocentry"/> + <xsl:param name="toc.title.p" select="true()"/> + <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/> <!-- be careful, we don't want to change the current document to the other tree! --> @@ -618,6 +643,11 @@ <xsl:if test="$tocentry/*"> <xsl:element name="{$toc.list.type}"> + <xsl:call-template name="toc.list.attributes"> + <xsl:with-param name="toc-context" select="$toc-context"/> + <xsl:with-param name="toc.title.p" select="$toc.title.p"/> + <xsl:with-param name="nodes" select="$nodes"/> + </xsl:call-template> <xsl:call-template name="manual-toc"> <xsl:with-param name="tocentry" select="$tocentry/*[1]"/> </xsl:call-template> diff --git a/html/block.xsl b/html/block.xsl index bff561e..bbb7367 100644 --- a/html/block.xsl +++ b/html/block.xsl @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: block.xsl 9353 2012-05-12 23:24:54Z bobstayton $ + $Id: block.xsl 9667 2012-11-26 23:10:44Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -249,7 +249,7 @@ <!-- ==================================================================== --> -<xsl:template match="abstract|sidebar"> +<xsl:template match="sidebar"> <div> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="id.attribute"/> @@ -264,6 +264,21 @@ <xsl:template match="sidebar/sidebarinfo|sidebar/info"/> +<xsl:template match="abstract"> + <div> + <xsl:call-template name="common.html.attributes"/> + <xsl:call-template name="anchor"/> + <xsl:call-template name="formal.object.heading"> + <xsl:with-param name="title"> + <xsl:apply-templates select="." mode="title.markup"> + <xsl:with-param name="allow-anchors" select="'1'"/> + </xsl:apply-templates> + </xsl:with-param> + </xsl:call-template> + <xsl:apply-templates/> + </div> +</xsl:template> + <!-- ==================================================================== --> <xsl:template match="msgset"> diff --git a/html/chunk-common.xsl b/html/chunk-common.xsl index c65dbac..693dc03 100644 --- a/html/chunk-common.xsl +++ b/html/chunk-common.xsl @@ -7,7 +7,7 @@ exclude-result-prefixes="exsl cf ng db"> <!-- ******************************************************************** - $Id: chunk-common.xsl 9362 2012-05-12 23:41:56Z bobstayton $ + $Id: chunk-common.xsl 9717 2013-01-25 18:13:36Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -896,9 +896,10 @@ </xsl:when> <xsl:when test="$css.decoration != 0"> <xsl:attribute name="style"> - <xsl:value-of select="concat('width:100; align:', + <xsl:value-of select="concat('width:100; text-align:', $direction.align.start, - ';')"/> + ';', + 'margin-', $direction.align.start, ': 0')"/> </xsl:attribute> </xsl:when> <xsl:otherwise> @@ -1292,7 +1293,7 @@ <xsl:variable name="currentdoc.key" > <xsl:for-each select="$target.database" > <xsl:value-of select="key('targetdoc-key', - $current.docid)/@targetdoc" /> + $current.docid)[1]/@targetdoc" /> </xsl:for-each> </xsl:variable> <xsl:choose> @@ -1300,7 +1301,7 @@ <xsl:for-each select="$target.database" > <xsl:call-template name="targetpath" > <xsl:with-param name="dirnode" - select="key('targetdoc-key', $current.docid)/parent::dir"/> + select="key('targetdoc-key', $current.docid)[1]/parent::dir"/> <xsl:with-param name="targetdoc" select="$targetdoc"/> </xsl:call-template> </xsl:for-each > @@ -1325,7 +1326,7 @@ <!-- In either case, add baseuri from its document entry--> <xsl:variable name="docbaseuri"> <xsl:for-each select="$target.database" > - <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri" /> + <xsl:value-of select="key('targetdoc-key', $targetdoc)[1]/@baseuri" /> </xsl:for-each> </xsl:variable> <xsl:if test="$docbaseuri != ''" > @@ -1337,7 +1338,7 @@ <!-- Just use any baseuri from its document entry --> <xsl:variable name="docbaseuri"> <xsl:for-each select="$target.database" > - <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri" /> + <xsl:value-of select="key('targetdoc-key', $targetdoc)[1]/@baseuri" /> </xsl:for-each> </xsl:variable> <xsl:if test="$docbaseuri != ''" > @@ -1347,24 +1348,41 @@ </xsl:choose> </xsl:variable> - <!-- Form the href information --> - <xsl:if test="not(contains($baseuri, ':'))"> - <!-- if not an absolute uri, add upward path from olink chunk --> - <xsl:value-of select="$upward.from.path"/> - </xsl:if> + <!-- Is this olink to be active? --> + <xsl:variable name="active.olink"> + <xsl:choose> + <xsl:when test="$activate.external.olinks = 0"> + <xsl:choose> + <xsl:when test="$current.docid = ''">1</xsl:when> + <xsl:when test="$targetdoc = ''">1</xsl:when> + <xsl:when test="$targetdoc = $current.docid">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> + </xsl:variable> - <xsl:if test="$baseuri != ''"> - <xsl:value-of select="$baseuri"/> - <xsl:if test="substring($target.href,1,1) != '#'"> - <!--xsl:text>/</xsl:text--> + <xsl:if test="$active.olink != 0"> + <!-- Form the href information --> + <xsl:if test="not(contains($baseuri, ':'))"> + <!-- if not an absolute uri, add upward path from olink chunk --> + <xsl:value-of select="$upward.from.path"/> + </xsl:if> + + <xsl:if test="$baseuri != ''"> + <xsl:value-of select="$baseuri"/> + <xsl:if test="substring($target.href,1,1) != '#'"> + <!--xsl:text>/</xsl:text--> + </xsl:if> + </xsl:if> + <!-- optionally turn off frag for PDF references --> + <xsl:if test="not($insert.olink.pdf.frag = 0 and + translate(substring($baseuri, string-length($baseuri) - 3), + 'PDF', 'pdf') = '.pdf' + and starts-with($target.href, '#') )"> + <xsl:value-of select="$target.href"/> </xsl:if> - </xsl:if> - <!-- optionally turn off frag for PDF references --> - <xsl:if test="not($insert.olink.pdf.frag = 0 and - translate(substring($baseuri, string-length($baseuri) - 3), - 'PDF', 'pdf') = '.pdf' - and starts-with($target.href, '#') )"> - <xsl:value-of select="$target.href"/> </xsl:if> </xsl:if> </xsl:template> diff --git a/html/chunker.xsl b/html/chunker.xsl index c6d01b2..785c4f7 100644 --- a/html/chunker.xsl +++ b/html/chunker.xsl @@ -9,7 +9,7 @@ extension-element-prefixes="saxon redirect lxslt exsl"> <!-- ******************************************************************** - $Id: chunker.xsl 9147 2011-11-12 00:05:44Z bobstayton $ + $Id: chunker.xsl 9656 2012-10-29 18:09:53Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -60,13 +60,13 @@ <!-- put Saxon first to work around a bug in libxslt --> <xsl:when test="element-available('saxon:output')"> <!-- Saxon doesn't make the chunks relative --> - <xsl:value-of select="concat($chunk.base.dir,$base.name)"/> + <xsl:value-of select="concat($base.dir,$base.name)"/> </xsl:when> <xsl:when test="element-available('exsl:document')"> <!-- EXSL document does make the chunks relative, I think --> <xsl:choose> <xsl:when test="count(parent::*) = 0"> - <xsl:value-of select="concat($chunk.base.dir,$base.name)"/> + <xsl:value-of select="concat($base.dir,$base.name)"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="$base.name"/> @@ -75,7 +75,7 @@ </xsl:when> <xsl:when test="element-available('redirect:write')"> <!-- Xalan doesn't make the chunks relative --> - <xsl:value-of select="concat($chunk.base.dir,$base.name)"/> + <xsl:value-of select="concat($base.dir,$base.name)"/> </xsl:when> <xsl:otherwise> <xsl:message terminate="yes"> @@ -438,7 +438,7 @@ <xsl:with-param name="method" select="$method"/> <xsl:with-param name="encoding" select="$encoding"/> <xsl:with-param name="indent" select="'no'"/> - <xsl:with-param name="omit-xml-declaration" select="'no'"/> + <xsl:with-param name="omit-xml-declaration" select="'yes'"/> <xsl:with-param name="standalone" select="'no'"/> <xsl:with-param name="doctype-public"/> <xsl:with-param name="doctype-system"/> diff --git a/html/component.xsl b/html/component.xsl index ef6af71..6ef4926 100644 --- a/html/component.xsl +++ b/html/component.xsl @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: component.xsl 9356 2012-05-12 23:33:15Z bobstayton $ + $Id: component.xsl 9500 2012-07-15 23:24:21Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -42,7 +42,6 @@ <xsl:element name="h{$level+1}"> <xsl:attribute name="class">title</xsl:attribute> - <xsl:call-template name="id.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="conditional" select="0"/> diff --git a/html/docbook.xsl b/html/docbook.xsl index 64fa19f..d3ce9d4 100644 --- a/html/docbook.xsl +++ b/html/docbook.xsl @@ -12,7 +12,7 @@ indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl 9396 2012-06-02 21:56:19Z bobstayton $ + $Id: docbook.xsl 9605 2012-09-18 10:48:54Z tom_schr $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -125,18 +125,84 @@ </xsl:if> </xsl:template> +<xsl:template name="head.content.base"> + <xsl:param name="node" select="."/> + <base href="{$html.base}"/> +</xsl:template> + +<xsl:template name="head.content.abstract"> + <xsl:param name="node" select="."/> + <xsl:variable name="info" select="(articleinfo + |bookinfo + |prefaceinfo + |chapterinfo + |appendixinfo + |sectioninfo + |sect1info + |sect2info + |sect3info + |sect4info + |sect5info + |referenceinfo + |refentryinfo + |partinfo + |info + |docinfo)[1]"/> + <xsl:if test="$info and $info/abstract"> + <meta name="description"> + <xsl:attribute name="content"> + <xsl:for-each select="$info/abstract[1]/*"> + <xsl:value-of select="normalize-space(.)"/> + <xsl:if test="position() < last()"> + <xsl:text> </xsl:text> + </xsl:if> + </xsl:for-each> + </xsl:attribute> + </meta> + </xsl:if> +</xsl:template> + +<xsl:template name="head.content.link.made"> + <xsl:param name="node" select="."/> + + <link rev="made" href="{$link.mailto.url}"/> +</xsl:template> + +<xsl:template name="head.content.generator"> + <xsl:param name="node" select="."/> + <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> +</xsl:template> + +<xsl:template name="head.content.style"> + <xsl:param name="node" select="."/> + <style type="text/css"><xsl:text> +body { background-image: url('</xsl:text> +<xsl:value-of select="$draft.watermark.image"/><xsl:text>'); + background-repeat: no-repeat; + background-position: top left; + /* The following properties make the watermark "fixed" on the page. */ + /* I think that's just a bit too distracting for the reader... */ + /* background-attachment: fixed; */ + /* background-position: center center; */ + }</xsl:text> + </style> +</xsl:template> + <xsl:template name="head.content"> <xsl:param name="node" select="."/> <xsl:param name="title"> <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/> </xsl:param> - <title> - <xsl:copy-of select="$title"/> - </title> + <xsl:call-template name="user.head.title"> + <xsl:with-param name="title" select="$title"/> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> <xsl:if test="$html.base != ''"> - <base href="{$html.base}"/> + <xsl:call-template name="head.content.base"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> <!-- Insert links to CSS files or insert literal style elements --> @@ -155,58 +221,28 @@ </xsl:if> <xsl:if test="$link.mailto.url != ''"> - <link rev="made" - href="{$link.mailto.url}"/> + <xsl:call-template name="head.content.link.made"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> - <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> + <xsl:call-template name="head.content.generator"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> <xsl:if test="$generate.meta.abstract != 0"> - <xsl:variable name="info" select="(articleinfo - |bookinfo - |prefaceinfo - |chapterinfo - |appendixinfo - |sectioninfo - |sect1info - |sect2info - |sect3info - |sect4info - |sect5info - |referenceinfo - |refentryinfo - |partinfo - |info - |docinfo)[1]"/> - <xsl:if test="$info and $info/abstract"> - <meta name="description"> - <xsl:attribute name="content"> - <xsl:for-each select="$info/abstract[1]/*"> - <xsl:value-of select="normalize-space(.)"/> - <xsl:if test="position() < last()"> - <xsl:text> </xsl:text> - </xsl:if> - </xsl:for-each> - </xsl:attribute> - </meta> - </xsl:if> + <xsl:call-template name="head.content.abstract"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> <xsl:if test="($draft.mode = 'yes' or ($draft.mode = 'maybe' and ancestor-or-self::*[@status][1]/@status = 'draft')) and $draft.watermark.image != ''"> - <style type="text/css"><xsl:text> -body { background-image: url('</xsl:text> -<xsl:value-of select="$draft.watermark.image"/><xsl:text>'); - background-repeat: no-repeat; - background-position: top left; - /* The following properties make the watermark "fixed" on the page. */ - /* I think that's just a bit too distracting for the reader... */ - /* background-attachment: fixed; */ - /* background-position: center center; */ - }</xsl:text> - </style> + <xsl:call-template name="head.content.style"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> <xsl:apply-templates select="." mode="head.keywords.content"/> </xsl:template> @@ -337,6 +373,15 @@ body { background-image: url('</xsl:text> <!-- This must not output any element content! --> </xsl:template> +<xsl:template name="user.head.title"> + <xsl:param name="node" select="."/> + <xsl:param name="title"/> + + <title> + <xsl:copy-of select="$title"/> + </title> +</xsl:template> + <xsl:template name="user.head.content"> <xsl:param name="node" select="."/> </xsl:template> diff --git a/html/ebnf.xsl b/html/ebnf.xsl index 352a135..f6cbe54 100644 --- a/html/ebnf.xsl +++ b/html/ebnf.xsl @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: ebnf.xsl 9358 2012-05-12 23:37:10Z bobstayton $ + $Id: ebnf.xsl 9664 2012-11-07 20:02:17Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,7 +17,7 @@ <doc:reference xmlns=""> <referenceinfo> <releaseinfo role="meta"> -$Id: ebnf.xsl 9358 2012-05-12 23:37:10Z bobstayton $ +$Id: ebnf.xsl 9664 2012-11-07 20:02:17Z bobstayton $ </releaseinfo> <author><surname>Walsh</surname> <firstname>Norman</firstname></author> @@ -107,7 +107,7 @@ to be incomplete. Don't forget to read the source, too :-)</para> <tr> <td align="{$direction.align.start}" valign="top" width="3%"> <xsl:text>[</xsl:text> - <xsl:number count="production" level="any"/> + <xsl:apply-templates select="." mode="label.markup"/> <xsl:text>]</xsl:text> </td> <td align="{$direction.align.end}" valign="top" width="10%"> diff --git a/html/footnote.xsl b/html/footnote.xsl index b665490..9a4e3c3 100644 --- a/html/footnote.xsl +++ b/html/footnote.xsl @@ -5,7 +5,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: footnote.xsl 9361 2012-05-12 23:39:44Z bobstayton $ + $Id: footnote.xsl 9665 2012-11-08 14:26:20Z kosek $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -19,23 +19,29 @@ The footnote text is handled in name="process.footnote". The footnote marker gets an id of @id, while the footnote text gets an id of #ftn.@id. They cross link to each other. --> <xsl:template match="footnote"> - <xsl:variable name="href"> - <xsl:text>#ftn.</xsl:text> + <xsl:variable name="name"> <xsl:call-template name="object.id"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> </xsl:variable> + <xsl:variable name="href"> + <xsl:text>#ftn.</xsl:text> + <xsl:value-of select="$name"/> + </xsl:variable> <a href="{$href}"> <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:if test="$generate.id.attributes = 0"> + <xsl:attribute name="name"> + <xsl:value-of select="$name"/> + </xsl:attribute> + </xsl:if> + <sup> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="id.attribute"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> - <xsl:call-template name="anchor"> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> <xsl:text>[</xsl:text> <xsl:apply-templates select="." mode="footnote.number"/> <xsl:text>]</xsl:text> @@ -259,9 +265,10 @@ linkend/id: <xsl:value-of select="@linkend"/> </xsl:when> <xsl:when test="$css.decoration != 0"> <xsl:attribute name="style"> - <xsl:value-of select="concat('width:100; align:', + <xsl:value-of select="concat('width:100; text-align:', $direction.align.start, - ';')"/> + ';', + 'margin-', $direction.align.start, ': 0')"/> </xsl:attribute> </xsl:when> <xsl:otherwise> diff --git a/html/formal.xsl b/html/formal.xsl index b9a55e9..2e80c96 100644 --- a/html/formal.xsl +++ b/html/formal.xsl @@ -3,7 +3,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: formal.xsl 9297 2012-04-22 03:56:16Z bobstayton $ + $Id: formal.xsl 9501 2012-07-16 00:14:50Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -206,13 +206,15 @@ </xsl:when> <xsl:otherwise> <!-- do not use xsl:copy because of XHTML's needs --> - <xsl:element name="table" namespace=""> - <xsl:apply-templates select="@*" mode="htmlTableAtt"/> - <xsl:attribute name="id"> - <xsl:call-template name="object.id"/> - </xsl:attribute> - <xsl:call-template name="htmlTable"/> - </xsl:element> + <div> + <xsl:call-template name="generate.class.attribute"/> + <xsl:call-template name="id.attribute"/> + <xsl:call-template name="anchor"/> + <xsl:element name="table" namespace=""> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> + <xsl:call-template name="htmlTable"/> + </xsl:element> + </div> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -430,13 +432,15 @@ <xsl:call-template name="informal.object"/> </xsl:when> <xsl:otherwise> - <xsl:element name="table" namespace=""> - <xsl:apply-templates select="@*" mode="htmlTableAtt"/> - <xsl:attribute name="id"> - <xsl:call-template name="object.id"/> - </xsl:attribute> - <xsl:call-template name="htmlTable"/> - </xsl:element> + <div> + <xsl:call-template name="generate.class.attribute"/> + <xsl:call-template name="id.attribute"/> + <xsl:call-template name="anchor"/> + <xsl:element name="table" namespace=""> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> + <xsl:call-template name="htmlTable"/> + </xsl:element> + </div> </xsl:otherwise> </xsl:choose> </xsl:template> diff --git a/html/glossary.xsl b/html/glossary.xsl index 5fc2db2..6f49312 100644 --- a/html/glossary.xsl +++ b/html/glossary.xsl @@ -9,7 +9,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: glossary.xsl 9364 2012-05-12 23:43:04Z bobstayton $ + $Id: glossary.xsl 9709 2013-01-22 18:56:09Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -242,7 +242,12 @@ GlossEntry ::= </xsl:template> <xsl:template match="glossentry/glossterm"> - <xsl:apply-templates/> + <span> + <xsl:apply-templates select="." mode="common.html.attributes"/> + <xsl:call-template name="id.attribute"/> + <xsl:call-template name="anchor"/> + <xsl:apply-templates/> + </span> <xsl:if test="following-sibling::glossterm">, </xsl:if> </xsl:template> @@ -318,6 +323,9 @@ GlossEntry ::= <xsl:template match="glossentry/glossdef"> <dd> + <xsl:apply-templates select="." mode="common.html.attributes"/> + <xsl:call-template name="id.attribute"/> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/> <xsl:if test="glossseealso"> <p> diff --git a/html/graphics.xsl b/html/graphics.xsl index da5bf9a..ce0e6ed 100644 --- a/html/graphics.xsl +++ b/html/graphics.xsl @@ -11,7 +11,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: graphics.xsl 9367 2012-05-12 23:46:35Z bobstayton $ + $Id: graphics.xsl 9710 2013-01-22 19:34:18Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -77,10 +77,17 @@ <div> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="id.attribute"/> + <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> </xsl:template> +<xsl:template match="screenshot/title"> + <xsl:call-template name="formal.object.heading"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> +</xsl:template> + <xsl:template match="screeninfo"> </xsl:template> @@ -388,7 +395,7 @@ <xsl:with-param name="em.size" select="$points.per.em"/> </xsl:call-template> </xsl:variable> - <xsl:value-of select="$cwidth.in.points div 72.0 * $pixels.per.inch * $scale"/> + <xsl:value-of select="round($cwidth.in.points div 72.0 * $pixels.per.inch * $scale)"/> </xsl:if> </xsl:variable> @@ -455,7 +462,7 @@ <xsl:with-param name="em.size" select="$points.per.em"/> </xsl:call-template> </xsl:variable> - <xsl:value-of select="$cdepth.in.points div 72.0 * $pixels.per.inch * $scale"/> + <xsl:value-of select="round($cdepth.in.points div 72.0 * $pixels.per.inch * $scale)"/> </xsl:if> </xsl:variable> @@ -657,7 +664,10 @@ valign: <xsl:value-of select="@valign"/></xsl:message> <xsl:copy-of select="$alt"/> </xsl:when> <xsl:when test="ancestor::figure"> - <xsl:value-of select="normalize-space(ancestor::figure/title)"/> + <xsl:variable name="fig.title"> + <xsl:apply-templates select="ancestor::figure/title/node()"/> + </xsl:variable> + <xsl:value-of select="normalize-space($fig.title)"/> </xsl:when> </xsl:choose> </xsl:with-param> @@ -1055,8 +1065,12 @@ valign: <xsl:value-of select="@valign"/></xsl:message> </xsl:choose> </xsl:attribute> </xsl:if> + + <xsl:call-template name="extension.process.image.attributes"/> </xsl:template> +<xsl:template name="extension.process.image.attributes"/> + <!-- ==================================================================== --> <xsl:template match="graphic"> @@ -1273,7 +1287,14 @@ valign: <xsl:value-of select="@valign"/></xsl:message> <xsl:call-template name="process.image"> <xsl:with-param name="alt"> - <xsl:apply-templates select="$phrases[not(@role) or @role!='tex'][1]"/> + <xsl:choose> + <xsl:when test="ancestor::mediaobject/alt"> + <xsl:apply-templates select="ancestor::mediaobject/alt"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$phrases[not(@role) or @role!='tex'][1]"/> + </xsl:otherwise> + </xsl:choose> </xsl:with-param> <xsl:with-param name="longdesc"> <xsl:call-template name="write.longdesc"> @@ -1416,6 +1437,10 @@ valign: <xsl:value-of select="@valign"/></xsl:message> <!-- ==================================================================== --> +<xsl:template match="mediaobject/alt"> + <xsl:apply-templates/> +</xsl:template> + <xsl:template match="videoobject"> <xsl:apply-templates select="videodata"/> </xsl:template> @@ -1424,7 +1449,14 @@ valign: <xsl:value-of select="@valign"/></xsl:message> <xsl:call-template name="process.image"> <xsl:with-param name="tag" select="'embed'"/> <xsl:with-param name="alt"> - <xsl:apply-templates select="(../../textobject/phrase)[1]"/> + <xsl:choose> + <xsl:when test="ancestor::mediaobject/alt"> + <xsl:apply-templates select="ancestor::mediaobject/alt"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="(ancestor::mediaobject/textobject/phrase)[1]"/> + </xsl:otherwise> + </xsl:choose> </xsl:with-param> </xsl:call-template> </xsl:template> @@ -1439,7 +1471,14 @@ valign: <xsl:value-of select="@valign"/></xsl:message> <xsl:call-template name="process.image"> <xsl:with-param name="tag" select="'embed'"/> <xsl:with-param name="alt"> - <xsl:apply-templates select="(../../textobject/phrase)[1]"/> + <xsl:choose> + <xsl:when test="ancestor::mediaobject/alt"> + <xsl:apply-templates select="ancestor::mediaobject/alt"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="(ancestor::mediaobject/textobject/phrase)[1]"/> + </xsl:otherwise> + </xsl:choose> </xsl:with-param> </xsl:call-template> </xsl:template> diff --git a/html/highlight.xsl b/html/highlight.xsl index f7307a4..0579f75 100644 --- a/html/highlight.xsl +++ b/html/highlight.xsl @@ -1,7 +1,7 @@ <?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xslthl="http://xslthl.sf.net" exclude-result-prefixes="xslthl" version="1.0">
<!-- ********************************************************************
- $Id: highlight.xsl 8911 2010-09-28 17:02:06Z abdelazer $
+ $Id: highlight.xsl 9725 2013-02-28 14:49:03Z kosek $
********************************************************************
This file is part of the XSL DocBook Stylesheet distribution.
@@ -47,12 +47,10 @@ <xsl:apply-templates mode="xslthl"/>
</span>
</xsl:template>
- <xsl:template match="xslthl:html" mode="xslthl">
- <strong>
- <em style="color: red">
- <xsl:apply-templates mode="xslthl"/>
- </em>
- </strong>
+ <xsl:template match='xslthl:html' mode="xslthl">
+ <span class="hl-html" style="color: navy; font-weight: bold">
+ <xsl:apply-templates mode="xslthl"/>
+ </span>
</xsl:template>
<xsl:template match="xslthl:xslt" mode="xslthl">
<strong style="color: #0066FF">
diff --git a/html/htmltbl.xsl b/html/htmltbl.xsl index e21712b..3e31235 100644 --- a/html/htmltbl.xsl +++ b/html/htmltbl.xsl @@ -3,7 +3,7 @@ version="1.0"> <!-- ******************************************************************** - $Id: htmltbl.xsl 9140 2011-10-30 03:42:11Z bobstayton $ + $Id: htmltbl.xsl 9501 2012-07-16 00:14:50Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -17,9 +17,6 @@ <xsl:template match="table" mode="htmlTable"> <xsl:element name="table" namespace=""> <xsl:apply-templates select="@*" mode="htmlTableAtt"/> - <xsl:attribute name="id"> - <xsl:call-template name="object.id"/> - </xsl:attribute> <xsl:call-template name="htmlTable"/> </xsl:element> </xsl:template> diff --git a/html/inline.xsl b/html/inline.xsl index a5799c6..b79ea19 100644 --- a/html/inline.xsl +++ b/html/inline.xsl @@ -10,7 +10,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: inline.xsl 9297 2012-04-22 03:56:16Z bobstayton $ + $Id: inline.xsl 9663 2012-11-06 19:09:16Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -558,14 +558,14 @@ <xsl:template match="function/parameter" priority="2"> <xsl:call-template name="inline.italicmonoseq"/> - <xsl:if test="following-sibling::*"> + <xsl:if test="$function.parens != 0 and following-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> </xsl:template> <xsl:template match="function/replaceable" priority="2"> <xsl:call-template name="inline.italicmonoseq"/> - <xsl:if test="following-sibling::*"> + <xsl:if test="$function.parens != 0 and following-sibling::*"> <xsl:text>, </xsl:text> </xsl:if> </xsl:template> @@ -607,7 +607,21 @@ </xsl:template> <xsl:template match="keycap"> - <xsl:call-template name="inline.boldseq"/> + <xsl:choose> + <xsl:when test="@function and normalize-space(.) = ''"> + <xsl:call-template name="inline.boldseq"> + <xsl:with-param name="content"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'keycap'"/> + <xsl:with-param name="name" select="@function"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="inline.boldseq"/> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="keycode"> diff --git a/html/param.xml b/html/param.xml index 97b0f00..e065049 100644 --- a/html/param.xml +++ b/html/param.xml @@ -3,7 +3,7 @@ <info> <title>HTML Parameter Reference</title> <releaseinfo role="meta"> -$Id: param.xweb 9333 2012-05-06 19:41:03Z dcramer $ +$Id: param.xweb 9658 2012-10-29 22:28:34Z bobstayton $ </releaseinfo> <author> <personname> @@ -4837,6 +4837,71 @@ values are still supported and mapped to 'no' and 'yes', respectively. </refsection> </refentry> +<refentry version="5.0" xml:id="activate.external.olinks"> +<refmeta> +<refentrytitle>activate.external.olinks</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>activate.external.olinks</refname> +<refpurpose>Make external olinks into active links</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<programlisting xml:id="activate.external.olinks.frag"> +<xsl:param name="activate.external.olinks" select="1"></xsl:param> +</programlisting> +</refsynopsisdiv> + +<refsection><info><title>Description</title></info> + +<para>If <parameter>activate.external.olinks</parameter> is nonzero +(the default), then any olinks that reference another document +become active links that can be clicked on to follow the link. +If the parameter is set to zero, then external olinks +will have the appropriate link text generated, but the link is +not made active. Olinks to destinations in +the current document remain active.</para> + +<para>To make an external olink active for HTML +outputs, the link text is wrapped in an <tag>a</tag> +element with an <tag>href</tag> attribute. To +make an external olink active for FO outputs, the link text is +wrapped in an <tag>fo:basic-link</tag> element with an +<tag>external-destination</tag> attribute.</para> + +<para>This parameter is useful when you need external olinks +to resolve but not be clickable. For example, if documents +in a collection are available independently of each other, +then having active links between them could lead to +unresolved links when a given target document is missing.</para> + +<para>The epub stylesheets set this parameter to zero by default +because there is no standard linking mechanism between Epub documents.</para> + +<para>If external links are made inactive, you should +consider setting the +stylesheet parameter <parameter>olink.doctitle</parameter> +to <literal>yes</literal>. That will append the external document's +title to the link text, making it easier for the user to +locate the other document.</para> + +<para>An olink is considered external when the +<parameter>current.docid</parameter> stylesheet parameter +is set to some value, and the olink's <tag>targetdoc</tag> +attribute has a different value. If the two values +match, then the link is considered internal. If the +<parameter>current.docid</parameter> parameter is blank, or +the <tag>olink</tag> element does not have a <tag>targetdoc</tag> attribute, +then the link is considered to be internal and will become +an active link.</para> + +<para>See also <parameter>olink.doctitle</parameter>, +<parameter>prefer.internal.olink</parameter>.</para> + +</refsection> +</refentry> + <refentry version="5.0" xml:id="olink.debug"> <refmeta> <refentrytitle>olink.debug</refentrytitle> @@ -5244,114 +5309,6 @@ on anchors generated for <tag>ulink</tag>s.</para> </refsection> </refentry> -<refentry version="5.0" xml:id="olink.fragid"> -<refmeta> -<refentrytitle>olink.fragid</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> -</refmeta> -<refnamediv> -<refname>olink.fragid</refname> -<refpurpose>Names the fragment identifier portion of an OLink resolver query</refpurpose> -</refnamediv> -<refsynopsisdiv> -<programlisting xml:id="olink.fragid.frag"> -<xsl:param name="olink.fragid">fragid=</xsl:param> -</programlisting> -</refsynopsisdiv> -<refsection><info><title>Description</title></info> -<para>The fragment identifier portion of an <tag>olink</tag> target.</para> -</refsection> -</refentry> - -<refentry version="5.0" xml:id="olink.outline.ext"> -<refmeta> -<refentrytitle>olink.outline.ext</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> -</refmeta> -<refnamediv> -<refname>olink.outline.ext</refname> -<refpurpose>The extension of OLink outline files</refpurpose> -</refnamediv> - -<refsynopsisdiv> -<programlisting xml:id="olink.outline.ext.frag"> -<xsl:param name="olink.outline.ext">.olink</xsl:param> -</programlisting> -</refsynopsisdiv> - -<refsection><info><title>Description</title></info> - -<para>The extension to be expected for OLink outline files</para> -<para>Bob has this parameter as dead. Please don't use</para> - -</refsection> -</refentry> - -<refentry version="5.0" xml:id="olink.pubid"> -<refmeta> -<refentrytitle>olink.pubid</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> -</refmeta> -<refnamediv> -<refname>olink.pubid</refname> -<refpurpose>Names the public identifier portion of an OLink resolver query</refpurpose> -</refnamediv> - -<refsynopsisdiv> -<programlisting xml:id="olink.pubid.frag"> -<xsl:param name="olink.pubid">pubid</xsl:param> -</programlisting> -</refsynopsisdiv> - -<refsection><info><title>Description</title></info> - -<para/> - -</refsection> -</refentry> - -<refentry version="5.0" xml:id="olink.sysid"> -<refmeta> -<refentrytitle>olink.sysid</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> -</refmeta> -<refnamediv> -<refname>olink.sysid</refname> -<refpurpose>Names the system identifier portion of an OLink resolver query</refpurpose> -</refnamediv> - -<refsynopsisdiv> -<programlisting xml:id="olink.sysid.frag"> -<xsl:param name="olink.sysid">sysid</xsl:param> -</programlisting> -</refsynopsisdiv> - -<refsection><info><title>Description</title></info> - -<para>FIXME</para> - -</refsection> -</refentry> - -<refentry version="5.0" xml:id="olink.resolver"> -<refmeta> -<refentrytitle>olink.resolver</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> -</refmeta> -<refnamediv> -<refname>olink.resolver</refname> -<refpurpose>The root name of the OLink resolver (usually a script)</refpurpose> -</refnamediv> -<refsynopsisdiv> -<programlisting xml:id="olink.resolver.frag"> - <xsl:param name="olink.resolver">/cgi-bin/olink</xsl:param> -</programlisting> -</refsynopsisdiv> -<refsection><info><title>Description</title></info> -<para>FIXME:</para> -</refsection> -</refentry> - </reference> <reference xml:id="xrefs"><title>Cross References</title> <refentry version="5.0" xml:id="collect.xref.targets"> @@ -10623,7 +10580,7 @@ configure the name of the file that is redirected to. <refsynopsisdiv> <programlisting xml:id="webhelp.include.search.tab.frag"> -<xsl:param name="webhelp.include.search.tab">true</xsl:param> +<xsl:param name="webhelp.include.search.tab">1</xsl:param> </programlisting> </refsynopsisdiv> @@ -10957,7 +10914,7 @@ to be treated as case insensitive".</para> The value is normally taken from the gentext file for the lang attribute of the document's root element, using the key name 'writing-mode' to look it up in the gentext file. -But the param can also be +But this param can also be set on the command line to override that gentext value. </para> <para>Accepted values are: @@ -11018,7 +10975,7 @@ around all these parameters.</para> <xsl:stylesheet exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** - $Id: param.xweb 9333 2012-05-06 19:41:03Z dcramer $ + $Id: param.xweb 9658 2012-10-29 22:28:34Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -11028,6 +10985,7 @@ around all these parameters.</para> ******************************************************************** --> <src:fragref linkend="abstract.notitle.enabled.frag"></src:fragref> +<src:fragref linkend="activate.external.olinks.frag"></src:fragref> <src:fragref linkend="admon.graphics.extension.frag"></src:fragref> <src:fragref linkend="admon.graphics.frag"></src:fragref> <src:fragref linkend="admon.graphics.path.frag"></src:fragref> @@ -11239,13 +11197,8 @@ around all these parameters.</para> <src:fragref linkend="olink.base.uri.frag"></src:fragref> <src:fragref linkend="olink.debug.frag"></src:fragref> <src:fragref linkend="olink.doctitle.frag"></src:fragref> -<src:fragref linkend="olink.fragid.frag"></src:fragref> <src:fragref linkend="olink.lang.fallback.sequence.frag"></src:fragref> -<src:fragref linkend="olink.outline.ext.frag"></src:fragref> <src:fragref linkend="olink.properties.frag"></src:fragref> -<src:fragref linkend="olink.pubid.frag"></src:fragref> -<src:fragref linkend="olink.resolver.frag"></src:fragref> -<src:fragref linkend="olink.sysid.frag"></src:fragref> <src:fragref linkend="othercredit.like.author.enabled.frag"></src:fragref> <src:fragref linkend="para.propagates.style.frag"></src:fragref> <src:fragref linkend="part.autolabel.frag"></src:fragref> diff --git a/html/param.xsl b/html/param.xsl index 4ef913d..e42f4b0 100644 --- a/html/param.xsl +++ b/html/param.xsl @@ -3,7 +3,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <!-- ******************************************************************** - $Id: param.xweb 9333 2012-05-06 19:41:03Z dcramer $ + $Id: param.xweb 9658 2012-10-29 22:28:34Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -13,6 +13,7 @@ ******************************************************************** --> <xsl:param name="abstract.notitle.enabled" select="0"/> +<xsl:param name="activate.external.olinks" select="1"/> <xsl:param name="admon.graphics.extension">.png</xsl:param> <xsl:param name="admon.graphics" select="0"/> <xsl:param name="admon.graphics.path">images/</xsl:param> @@ -317,15 +318,10 @@ set toc,title <xsl:param name="olink.base.uri"/> <xsl:param name="olink.debug" select="0"/> <xsl:param name="olink.doctitle">no</xsl:param> -<xsl:param name="olink.fragid">fragid=</xsl:param> <xsl:param name="olink.lang.fallback.sequence"/> -<xsl:param name="olink.outline.ext">.olink</xsl:param> <xsl:attribute-set name="olink.properties"> <xsl:attribute name="show-destination">replace</xsl:attribute> </xsl:attribute-set> -<xsl:param name="olink.pubid">pubid</xsl:param> - <xsl:param name="olink.resolver">/cgi-bin/olink</xsl:param> -<xsl:param name="olink.sysid">sysid</xsl:param> <xsl:param name="othercredit.like.author.enabled">0</xsl:param> <xsl:param name="para.propagates.style" select="1"/> <xsl:param name="part.autolabel">I</xsl:param> @@ -424,7 +420,7 @@ set toc,title <xsl:param name="webhelp.base.dir">docs</xsl:param> <xsl:param name="webhelp.common.dir">../common/</xsl:param> <xsl:param name="webhelp.default.topic">index.html</xsl:param> -<xsl:param name="webhelp.include.search.tab">true</xsl:param> +<xsl:param name="webhelp.include.search.tab">1</xsl:param> <xsl:param name="webhelp.indexer.language">en</xsl:param> <xsl:param name="webhelp.start.filename">index.html</xsl:param> <xsl:param name="webhelp.tree.cookie.id" select="concat( 'treeview-', count(//node()) )"/> diff --git a/html/profile-chunk-code.xsl b/html/profile-chunk-code.xsl index 7cb0cf7..196eac3 100644 --- a/html/profile-chunk-code.xsl +++ b/html/profile-chunk-code.xsl @@ -441,7 +441,7 @@ <xsl:choose> <xsl:when test="$rootid != ''"> <xsl:choose> - <xsl:when test="count($profiled-nodes//*[@id=$rootid]) = 0"> + <xsl:when test="count($profiled-nodes//*[@id=$rootid or @xml:id=$rootid]) = 0"> <xsl:message terminate="yes"> <xsl:text>ID '</xsl:text> <xsl:value-of select="$rootid"/> @@ -453,9 +453,9 @@ <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/> </xsl:if> <xsl:if test="$collect.xref.targets != 'only'"> - <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="process.root"/> + <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid or @xml:id=$rootid]" mode="process.root"/> <xsl:if test="$tex.math.in.alt != ''"> - <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="collect.tex.math"/> + <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid or @xml:id=$rootid]" mode="collect.tex.math"/> </xsl:if> <xsl:if test="$generate.manifest != 0"> <xsl:call-template name="generate.manifest"> diff --git a/html/profile-docbook.xsl b/html/profile-docbook.xsl index 8be9e14..0e1b024 100644 --- a/html/profile-docbook.xsl +++ b/html/profile-docbook.xsl @@ -6,7 +6,7 @@ <xsl:output method="html" encoding="ISO-8859-1" indent="no"/> <!-- ******************************************************************** - $Id: docbook.xsl 9396 2012-06-02 21:56:19Z bobstayton $ + $Id: docbook.xsl 9605 2012-09-18 10:48:54Z tom_schr $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -119,18 +119,69 @@ </xsl:if> </xsl:template> +<xsl:template name="head.content.base"> + <xsl:param name="node" select="."/> + <base href="{$html.base}"/> +</xsl:template> + +<xsl:template name="head.content.abstract"> + <xsl:param name="node" select="."/> + <xsl:variable name="info" select="(articleinfo |bookinfo |prefaceinfo |chapterinfo |appendixinfo |sectioninfo |sect1info |sect2info |sect3info |sect4info |sect5info |referenceinfo |refentryinfo |partinfo |info |docinfo)[1]"/> + <xsl:if test="$info and $info/abstract"> + <meta name="description"> + <xsl:attribute name="content"> + <xsl:for-each select="$info/abstract[1]/*"> + <xsl:value-of select="normalize-space(.)"/> + <xsl:if test="position() < last()"> + <xsl:text> </xsl:text> + </xsl:if> + </xsl:for-each> + </xsl:attribute> + </meta> + </xsl:if> +</xsl:template> + +<xsl:template name="head.content.link.made"> + <xsl:param name="node" select="."/> + + <link rev="made" href="{$link.mailto.url}"/> +</xsl:template> + +<xsl:template name="head.content.generator"> + <xsl:param name="node" select="."/> + <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> +</xsl:template> + +<xsl:template name="head.content.style"> + <xsl:param name="node" select="."/> + <style type="text/css"><xsl:text> +body { background-image: url('</xsl:text> +<xsl:value-of select="$draft.watermark.image"/><xsl:text>'); + background-repeat: no-repeat; + background-position: top left; + /* The following properties make the watermark "fixed" on the page. */ + /* I think that's just a bit too distracting for the reader... */ + /* background-attachment: fixed; */ + /* background-position: center center; */ + }</xsl:text> + </style> +</xsl:template> + <xsl:template name="head.content"> <xsl:param name="node" select="."/> <xsl:param name="title"> <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/> </xsl:param> - <title> - <xsl:copy-of select="$title"/> - </title> + <xsl:call-template name="user.head.title"> + <xsl:with-param name="title" select="$title"/> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> <xsl:if test="$html.base != ''"> - <base href="{$html.base}"/> + <xsl:call-template name="head.content.base"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> <!-- Insert links to CSS files or insert literal style elements --> @@ -149,39 +200,25 @@ </xsl:if> <xsl:if test="$link.mailto.url != ''"> - <link rev="made" href="{$link.mailto.url}"/> + <xsl:call-template name="head.content.link.made"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> - <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/> + <xsl:call-template name="head.content.generator"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> <xsl:if test="$generate.meta.abstract != 0"> - <xsl:variable name="info" select="(articleinfo |bookinfo |prefaceinfo |chapterinfo |appendixinfo |sectioninfo |sect1info |sect2info |sect3info |sect4info |sect5info |referenceinfo |refentryinfo |partinfo |info |docinfo)[1]"/> - <xsl:if test="$info and $info/abstract"> - <meta name="description"> - <xsl:attribute name="content"> - <xsl:for-each select="$info/abstract[1]/*"> - <xsl:value-of select="normalize-space(.)"/> - <xsl:if test="position() < last()"> - <xsl:text> </xsl:text> - </xsl:if> - </xsl:for-each> - </xsl:attribute> - </meta> - </xsl:if> + <xsl:call-template name="head.content.abstract"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> <xsl:if test="($draft.mode = 'yes' or ($draft.mode = 'maybe' and ancestor-or-self::*[@status][1]/@status = 'draft')) and $draft.watermark.image != ''"> - <style type="text/css"><xsl:text> -body { background-image: url('</xsl:text> -<xsl:value-of select="$draft.watermark.image"/><xsl:text>'); - background-repeat: no-repeat; - background-position: top left; - /* The following properties make the watermark "fixed" on the page. */ - /* I think that's just a bit too distracting for the reader... */ - /* background-attachment: fixed; */ - /* background-position: center center; */ - }</xsl:text> - </style> + <xsl:call-template name="head.content.style"> + <xsl:with-param name="node" select="$node"/> + </xsl:call-template> </xsl:if> <xsl:apply-templates select="." mode="head.keywords.content"/> </xsl:template> @@ -316,6 +353,15 @@ var popup_</xsl:text> <!-- This must not output any element content! --> </xsl:template> +<xsl:template name="user.head.title"> + <xsl:param name="node" select="."/> + <xsl:param name="title"/> + + <title> + <xsl:copy-of select="$title"/> + </title> +</xsl:template> + <xsl:template name="user.head.content"> <xsl:param name="node" select="."/> </xsl:template> @@ -369,7 +415,7 @@ Used by docbook.xsl, chunk-code.xsl and chunkfast.xsl --> <xsl:choose> <xsl:when test="$rootid != ''"> <xsl:choose> - <xsl:when test="count($profiled-nodes//*[@id=$rootid]) = 0"> + <xsl:when test="count($profiled-nodes//*[@id=$rootid or @xml:id=$rootid]) = 0"> <xsl:message terminate="yes"> <xsl:text>ID '</xsl:text> <xsl:value-of select="$rootid"/> @@ -381,9 +427,9 @@ Used by docbook.xsl, chunk-code.xsl and chunkfast.xsl --> <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/> </xsl:if> <xsl:if test="$collect.xref.targets != 'only'"> - <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="process.root"/> + <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid or @xml:id=$rootid]" mode="process.root"/> <xsl:if test="$tex.math.in.alt != ''"> - <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="collect.tex.math"/> + <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid or @xml:id=$rootid]" mode="collect.tex.math"/> </xsl:if> </xsl:if> </xsl:otherwise> diff --git a/html/verbatim.xsl b/html/verbatim.xsl index 2d99e1d..7db9a9c 100644 --- a/html/verbatim.xsl +++ b/html/verbatim.xsl @@ -8,7 +8,7 @@ version='1.0'> <!-- ******************************************************************** - $Id: verbatim.xsl 9297 2012-04-22 03:56:16Z bobstayton $ + $Id: verbatim.xsl 9589 2012-09-02 20:52:15Z tom_schr $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -380,7 +380,7 @@ </xsl:when> <xsl:when test="$listings[1]/@continuation='continues'"> <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" select="listings[position() > 1]"/> + <xsl:with-param name="listings" select="$listings[position() > 1]"/> <xsl:with-param name="number" select="$number + $lines"/> </xsl:call-template> </xsl:when> 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"/> |