From: <ko...@us...> - 2006-07-28 21:20:38
|
Revision: 6118 Author: kosek Date: 2006-07-28 14:20:20 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6118&view=rev Log Message: ----------- Improved handling of relative locations generated files Modified Paths: -------------- trunk/xsl/eclipse/eclipse.xsl trunk/xsl/html/html.xsl Modified: trunk/xsl/eclipse/eclipse.xsl =================================================================== --- trunk/xsl/eclipse/eclipse.xsl 2006-07-26 13:59:05 UTC (rev 6117) +++ trunk/xsl/eclipse/eclipse.xsl 2006-07-28 21:20:20 UTC (rev 6118) @@ -137,7 +137,9 @@ </xsl:variable> <xsl:variable name="href"> - <xsl:call-template name="href.target.with.base.dir"/> + <xsl:call-template name="href.target.with.base.dir"> + <xsl:with-param name="context" select="/"/> <!-- Generate links relative to the location of root file/toc.xml file --> + </xsl:call-template> </xsl:variable> <topic label="{$title}" href="{$href}"> Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2006-07-26 13:59:05 UTC (rev 6117) +++ trunk/xsl/html/html.xsl 2006-07-28 21:20:20 UTC (rev 6118) @@ -80,11 +80,13 @@ </xsl:template> <xsl:template name="href.target.with.base.dir"> + <xsl:param name="context" select="."/> <xsl:param name="object" select="."/> <xsl:if test="$manifest.in.base.dir = 0"> <xsl:value-of select="$base.dir"/> </xsl:if> <xsl:call-template name="href.target"> + <xsl:with-param name="context" select="$context"/> <xsl:with-param name="object" select="$object"/> </xsl:call-template> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2006-08-05 11:03:32
|
Revision: 6133 Author: xmldoc Date: 2006-08-05 04:03:19 -0700 (Sat, 05 Aug 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6133&view=rev Log Message: ----------- Added qanda.nested.in.toc param. Default value is zero. If non-zero, instances of "nested" Qandaentry (ones that are children of Answer elements) are displayed in the TOC. Closes patch 1509018 (from Daniel Leidert). Currently on affects HTML output (no patch for FO output provided). Modified Paths: -------------- trunk/xsl/html/param.ent trunk/xsl/html/param.xweb trunk/xsl/html/qandaset.xsl Added Paths: ----------- trunk/xsl/params/qanda.nested.in.toc.xml Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2006-08-05 10:05:44 UTC (rev 6132) +++ trunk/xsl/html/param.ent 2006-08-05 11:03:19 UTC (rev 6133) @@ -194,6 +194,7 @@ <!ENTITY punct.honorific SYSTEM "../params/punct.honorific.xml"> <!ENTITY qanda.defaultlabel SYSTEM "../params/qanda.defaultlabel.xml"> <!ENTITY qanda.inherit.numeration SYSTEM "../params/qanda.inherit.numeration.xml"> +<!ENTITY qanda.nested.in.toc SYSTEM "../params/qanda.nested.in.toc.xml"> <!ENTITY qandadiv.autolabel SYSTEM "../params/qandadiv.autolabel.xml"> <!ENTITY refentry.generate.name SYSTEM "../params/refentry.generate.name.xml"> <!ENTITY refentry.generate.title SYSTEM "../params/refentry.generate.title.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2006-08-05 10:05:44 UTC (rev 6132) +++ trunk/xsl/html/param.xweb 2006-08-05 11:03:19 UTC (rev 6133) @@ -207,6 +207,7 @@ <reference id="qa"><title>QAndASet</title> &qanda.defaultlabel; &qanda.inherit.numeration; +&qanda.nested.in.toc; </reference> <reference id="links"><title>Linking</title> @@ -678,6 +679,7 @@ <src:fragref linkend="punct.honorific.frag"/> <src:fragref linkend="qanda.defaultlabel.frag"/> <src:fragref linkend="qanda.inherit.numeration.frag"/> +<src:fragref linkend="qanda.nested.in.toc.frag"/> <src:fragref linkend="qandadiv.autolabel.frag"/> <src:fragref linkend="refentry.generate.name.frag"/> <src:fragref linkend="refentry.generate.title.frag"/> Modified: trunk/xsl/html/qandaset.xsl =================================================================== --- trunk/xsl/html/qandaset.xsl 2006-08-05 10:05:44 UTC (rev 6132) +++ trunk/xsl/html/qandaset.xsl 2006-08-05 11:03:19 UTC (rev 6133) @@ -296,8 +296,19 @@ <xsl:value-of select="$firstch"/> </a> </dt> + <xsl:if test="not($qanda.nested.in.toc = 0)"> + <xsl:apply-templates select="following-sibling::answer" mode="qandatoc.mode"/> + </xsl:if> </xsl:template> +<xsl:template match="answer" mode="qandatoc.mode"> + <xsl:if test="child::qandaentry"> + <dd> + <xsl:call-template name="process.qanda.toc"/> + </dd> + </xsl:if> +</xsl:template> + <!-- ==================================================================== --> <xsl:template name="process.qandaset"> Added: trunk/xsl/params/qanda.nested.in.toc.xml =================================================================== --- trunk/xsl/params/qanda.nested.in.toc.xml (rev 0) +++ trunk/xsl/params/qanda.nested.in.toc.xml 2006-08-05 11:03:19 UTC (rev 6133) @@ -0,0 +1,22 @@ +<refentry id="qanda.nested.in.toc"> +<refmeta> +<refentrytitle>qanda.nested.in.toc</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>qanda.nested.in.toc</refname> +<refpurpose>Should nested answer/qandaentry instances appear in TOC?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment id='qanda.nested.in.toc.frag'><xsl:param name="qanda.nested.in.toc" select="0"/></src:fragment> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If true (non-zero), instances of <sgmltag>qandaentry</sgmltag> +that are children of <sgmltag>answer</sgmltag> elements are shown in +the TOC.</para> + +</refsect1> +</refentry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2006-08-15 08:12:53
|
Revision: 6164 Author: bobstayton Date: 2006-08-15 01:12:47 -0700 (Tue, 15 Aug 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6164&view=rev Log Message: ----------- fixed bug #1528002 olinks not handling dbhtml dir Modified Paths: -------------- trunk/xsl/common/olink.xsl trunk/xsl/common/targets.xsl trunk/xsl/html/chunk-common.xsl Modified: trunk/xsl/common/olink.xsl =================================================================== --- trunk/xsl/common/olink.xsl 2006-08-15 05:22:58 UTC (rev 6163) +++ trunk/xsl/common/olink.xsl 2006-08-15 08:12:47 UTC (rev 6164) @@ -532,6 +532,58 @@ </xsl:if> </xsl:template> +<!-- Computes the href of the object containing the olink element --> +<xsl:template name="olink.from.uri"> + <xsl:param name="target.database"/> + <xsl:param name="object" select="NotAnElement"/> + <xsl:param name="object.targetdoc" select="$current.docid"/> + <xsl:param name="object.lang" + select="concat($object/ancestor::*[last()]/@lang, + $object/ancestor::*[last()]/@xml:lang)"/> + + <xsl:variable name="parent.id"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$object"/> + </xsl:call-template> + </xsl:variable> + + <!-- Get the olink key for the parent of olink element --> + <xsl:variable name="from.key"> + <xsl:call-template name="select.olink.key"> + <xsl:with-param name="targetdoc.att" select="$object.targetdoc"/> + <xsl:with-param name="targetptr.att" select="$parent.id"/> + <xsl:with-param name="olink.lang" select="$object.lang"/> + <xsl:with-param name="target.database" select="$target.database"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="from.olink.href"> + <xsl:for-each select="$target.database" > + <xsl:value-of select="key('targetptr-key', $from.key)/@href" /> + </xsl:for-each> + </xsl:variable> + + <xsl:choose> + <!-- we found the olink object --> + <xsl:when test="$from.olink.href != ''"> + <xsl:value-of select="$from.olink.href"/> + </xsl:when> + <xsl:when test="not($object/parent::*)"> + <xsl:value-of select="$from.olink.href"/> + </xsl:when> + <xsl:otherwise> + <!-- recurse upward in current document --> + <xsl:call-template name="olink.from.uri"> + <xsl:with-param name="target.database" select="$target.database"/> + <xsl:with-param name="object" select="$object/parent::*"/> + <xsl:with-param name="object.targetdoc" select="$object.targetdoc"/> + <xsl:with-param name="object.lang" select="$object.lang"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + +</xsl:template> + <xsl:template name="olink.hottext"> <xsl:param name="target.database"/> <xsl:param name="olink.lang" select="''"/> Modified: trunk/xsl/common/targets.xsl =================================================================== --- trunk/xsl/common/targets.xsl 2006-08-15 05:22:58 UTC (rev 6163) +++ trunk/xsl/common/targets.xsl 2006-08-15 08:12:47 UTC (rev 6164) @@ -86,6 +86,7 @@ <xsl:value-of select="$olink.base.uri"/> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$nd"/> + <xsl:with-param name="context" select="NOTANODE"/> </xsl:call-template> </xsl:template> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2006-08-15 05:22:58 UTC (rev 6163) +++ trunk/xsl/html/chunk-common.xsl 2006-08-15 08:12:47 UTC (rev 6164) @@ -571,6 +571,157 @@ <xsl:value-of select="$href"/> </xsl:template> +<!-- Returns the complete olink href value if found --> +<!-- Must take into account any dbhtml dir of the chunk containing the olink --> +<xsl:template name="make.olink.href"> + <xsl:param name="olink.key" select="''"/> + <xsl:param name="target.database"/> + + <xsl:if test="$olink.key != ''"> + <xsl:variable name="target.href" > + <xsl:for-each select="$target.database" > + <xsl:value-of select="key('targetptr-key', $olink.key)/@href" /> + </xsl:for-each> + </xsl:variable> + + <!-- an olink starting point may be in a subdirectory, so need + the "from" reference point to compute a relative path --> + + <xsl:variable name="from.href"> + <xsl:call-template name="olink.from.uri"> + <xsl:with-param name="target.database" select="$target.database"/> + <xsl:with-param name="object" select="."/> + <xsl:with-param name="object.targetdoc" select="$current.docid"/> + </xsl:call-template> + </xsl:variable> + + <!-- If the from.href has directory path, then must "../" upward + to document level --> + <xsl:variable name="upward.from.path"> + <xsl:call-template name="upward.path"> + <xsl:with-param name="path" select="$from.href"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="targetdoc"> + <xsl:value-of select="substring-before($olink.key, '/')"/> + </xsl:variable> + + <!-- Does the target database use a sitemap? --> + <xsl:variable name="use.sitemap"> + <xsl:choose> + <xsl:when test="$target.database//sitemap">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + + <!-- Get the baseuri for this targetptr --> + <xsl:variable name="baseuri" > + <xsl:choose> + <!-- Does the database use a sitemap? --> + <xsl:when test="$use.sitemap != 0" > + <xsl:choose> + <!-- Was current.docid parameter set? --> + <xsl:when test="$current.docid != ''"> + <!-- Was it found in the database? --> + <xsl:variable name="currentdoc.key" > + <xsl:for-each select="$target.database" > + <xsl:value-of select="key('targetdoc-key', + $current.docid)/@targetdoc" /> + </xsl:for-each> + </xsl:variable> + <xsl:choose> + <xsl:when test="$currentdoc.key != ''"> + <xsl:for-each select="$target.database" > + <xsl:call-template name="targetpath" > + <xsl:with-param name="dirnode" + select="key('targetdoc-key', $current.docid)/parent::dir"/> + <xsl:with-param name="targetdoc" select="$targetdoc"/> + </xsl:call-template> + </xsl:for-each > + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Olink error: cannot compute relative </xsl:text> + <xsl:text>sitemap path because $current.docid '</xsl:text> + <xsl:value-of select="$current.docid"/> + <xsl:text>' not found in target database.</xsl:text> + </xsl:message> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Olink warning: cannot compute relative </xsl:text> + <xsl:text>sitemap path without $current.docid parameter</xsl:text> + </xsl:message> + </xsl:otherwise> + </xsl:choose> + <!-- 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:for-each> + </xsl:variable> + <xsl:if test="$docbaseuri != ''" > + <xsl:value-of select="$docbaseuri"/> + </xsl:if> + </xsl:when> + <!-- No database sitemap in use --> + <xsl:otherwise> + <!-- 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:for-each> + </xsl:variable> + <xsl:if test="$docbaseuri != ''" > + <xsl:value-of select="$docbaseuri"/> + </xsl:if> + </xsl:otherwise> + </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> + + <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> +</xsl:template> + +<!-- Computes "../" to reach top --> +<xsl:template name="upward.path"> + <xsl:param name="path" select="''"/> + <xsl:choose> + <!-- Don't bother with absolute uris --> + <xsl:when test="contains($path, ':')"/> + <xsl:when test="starts-with($path, '/')"/> + <xsl:when test="contains($path, '/')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="upward.path"> + <xsl:with-param name="path" select="substring-after($path, '/')"/> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + <!-- ==================================================================== --> <xsl:template name="html.head"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2006-08-22 23:25:08
|
Revision: 6187 Author: xmldoc Date: 2006-08-22 16:24:51 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6187&view=rev Log Message: ----------- Added normalization to object.title.markup.textonly mode, reverted copyright link template in html/chunk-common.xsl to use it, and updated a couple of places in manpages that should have already been using it instead of object.title.markup. Modified Paths: -------------- trunk/xsl/common/gentext.xsl trunk/xsl/html/chunk-common.xsl trunk/xsl/manpages/block.xsl trunk/xsl/manpages/table.xsl Modified: trunk/xsl/common/gentext.xsl =================================================================== --- trunk/xsl/common/gentext.xsl 2006-08-22 12:51:28 UTC (rev 6186) +++ trunk/xsl/common/gentext.xsl 2006-08-22 23:24:51 UTC (rev 6187) @@ -284,7 +284,7 @@ <xsl:variable name="title"> <xsl:apply-templates select="." mode="object.title.markup"/> </xsl:variable> - <xsl:value-of select="$title"/> + <xsl:value-of select="normalize-space($title)"/> </xsl:template> <!-- ============================================================ --> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2006-08-22 12:51:28 UTC (rev 6186) +++ trunk/xsl/html/chunk-common.xsl 2006-08-22 23:24:51 UTC (rev 6187) @@ -1174,11 +1174,9 @@ <xsl:attribute name="href"> <xsl:value-of select="concat('ln-',$id,$html.ext)"/> </xsl:attribute> - <xsl:variable name="contents"> - <xsl:apply-templates select="(//legalnotice)[1]" mode="object.title.markup.textonly"/> - </xsl:variable> <xsl:attribute name="title"> - <xsl:value-of select="normalize-space($contents)"/> + <xsl:apply-templates select="(//legalnotice)[1]" + mode="object.title.markup.textonly"/> </xsl:attribute> </link> <xsl:call-template name="make.legalnotice.head.links"> Modified: trunk/xsl/manpages/block.xsl =================================================================== --- trunk/xsl/manpages/block.xsl 2006-08-22 12:51:28 UTC (rev 6186) +++ trunk/xsl/manpages/block.xsl 2006-08-22 23:24:51 UTC (rev 6187) @@ -211,7 +211,7 @@ <xsl:template name="formal.object.heading"> <xsl:param name="object" select="."/> <xsl:param name="title"> - <bold><xsl:apply-templates select="$object" mode="object.title.markup"/></bold> + <bold><xsl:apply-templates select="$object" mode="object.title.markup.textonly"/></bold> </xsl:param> <xsl:apply-templates mode="bold" select="exsl:node-set($title)"/> </xsl:template> Modified: trunk/xsl/manpages/table.xsl =================================================================== --- trunk/xsl/manpages/table.xsl 2006-08-22 12:51:28 UTC (rev 6186) +++ trunk/xsl/manpages/table.xsl 2006-08-22 23:24:51 UTC (rev 6187) @@ -43,7 +43,7 @@ <xsl:param name="source"/> <xsl:param name="title"> <xsl:if test="local-name(.) = 'table'"> - <xsl:apply-templates select="." mode="object.title.markup"/> + <xsl:apply-templates select="." mode="object.title.markup.textonly"/> </xsl:if> </xsl:param> <!-- * ============================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2006-08-23 12:15:58
|
Revision: 6191 Author: xmldoc Date: 2006-08-23 05:15:23 -0700 (Wed, 23 Aug 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6191&view=rev Log Message: ----------- Added several new HTML parameters for controlling appearance of content on HTML title pages: contrib.inline.enabled: If non-zero (the default), output of the contrib element is displayed as inline content rather than as block content. othercredit.like.author.enabled: If non-zero, output of the othercredit element on titlepages is displayed in the same style as author and editor output. If zero (the default), othercredit output is displayed using a style different than that of author and editor. blurb.on.titlepage.enabled: If non-zero, output from authorblurb and personblurb elements is displayed on title pages. If zero (the default), output from those elements is suppressed on title pages (unless you are using a titlepage customization that causes them to be included). editedby.enabled If non-zero (the default), a localized Edited by heading is displayed above editor names in output of the editor element. Modified Paths: -------------- trunk/xsl/html/param.ent trunk/xsl/html/param.xweb trunk/xsl/html/titlepage.xsl Added Paths: ----------- trunk/xsl/params/blurb.on.titlepage.enabled.xml trunk/xsl/params/contrib.inline.enabled.xml trunk/xsl/params/editedby.enabled.xml trunk/xsl/params/othercredit.like.author.enabled.xml Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2006-08-23 10:19:46 UTC (rev 6190) +++ trunk/xsl/html/param.ent 2006-08-23 12:15:23 UTC (rev 6191) @@ -11,6 +11,7 @@ <!ENTITY base.dir SYSTEM "../params/base.dir.xml"> <!ENTITY biblioentry.item.separator SYSTEM "../params/biblioentry.item.separator.xml"> <!ENTITY bibliography.collection SYSTEM "../params/bibliography.collection.xml"> +<!ENTITY blurb.on.titlepage.enabled SYSTEM "../params/blurb.on.titlepage.enabled.xml"> <!ENTITY bridgehead.in.toc SYSTEM "../params/bridgehead.in.toc.xml"> <!ENTITY callout.defaultcolumn SYSTEM "../params/callout.defaultcolumn.xml"> <!ENTITY callout.graphics SYSTEM "../params/callout.graphics.xml"> @@ -39,6 +40,7 @@ <!ENTITY chunker.output.standalone SYSTEM "../params/chunker.output.standalone.xml"> <!ENTITY citerefentry.link SYSTEM "../params/citerefentry.link.xml"> <!ENTITY collect.xref.targets SYSTEM "../params/collect.xref.targets.xml"> +<!ENTITY contrib.inline.enabled SYSTEM "../params/contrib.inline.enabled.xml"> <!ENTITY css.decoration SYSTEM "../params/css.decoration.xml"> <!ENTITY current.docid SYSTEM "../params/current.docid.xml"> <!ENTITY default.table.width SYSTEM "../params/default.table.width.xml"> @@ -47,6 +49,7 @@ <!ENTITY draft.watermark.image SYSTEM "../params/draft.watermark.image.xml"> <!ENTITY ebnf.table.bgcolor SYSTEM "../params/ebnf.table.bgcolor.xml"> <!ENTITY ebnf.table.border SYSTEM "../params/ebnf.table.border.xml"> +<!ENTITY editedby.enabled SYSTEM "../params/editedby.enabled.xml"> <!ENTITY email.delimiters.enabled SYSTEM "../params/email.delimiters.enabled.xml"> <!ENTITY emphasis.propagates.style SYSTEM "../params/emphasis.propagates.style.xml"> <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml"> @@ -170,6 +173,7 @@ <!ENTITY olink.pubid SYSTEM "../params/olink.pubid.xml"> <!ENTITY olink.resolver SYSTEM "../params/olink.resolver.xml"> <!ENTITY olink.sysid SYSTEM "../params/olink.sysid.xml"> +<!ENTITY othercredit.like.author.enabled SYSTEM "../params/othercredit.like.author.enabled.xml"> <!ENTITY part.autolabel SYSTEM "../params/part.autolabel.xml"> <!ENTITY phrase.propagates.style SYSTEM "../params/phrase.propagates.style.xml"> <!ENTITY pixels.per.inch SYSTEM "../params/pixels.per.inch.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2006-08-23 10:19:46 UTC (rev 6190) +++ trunk/xsl/html/param.xweb 2006-08-23 12:15:23 UTC (rev 6191) @@ -165,11 +165,15 @@ &id.warnings; </reference> -<reference id="meta"><title>Meta/*Info</title> +<reference id="meta"><title>Meta/*Info and Titlepages</title> &inherit.keywords; &make.single.year.ranges; &make.year.ranges; &author.othername.in.middle; +&blurb.on.titlepage.enabled; +&contrib.inline.enabled; +&editedby.enabled; +&othercredit.like.author.enabled; &generate.legalnotice.link; &generate.revhistory.link; &html.head.legalnotice.link.types; @@ -475,6 +479,7 @@ <src:fragref linkend="biblioentry.item.separator.frag"/> <src:fragref linkend="bibliography.collection.frag"/> <src:fragref linkend="bibliography.numbered.frag"/> +<src:fragref linkend="blurb.on.titlepage.enabled.frag"/> <src:fragref linkend="bridgehead.in.toc.frag"/> <src:fragref linkend="callout.defaultcolumn.frag"/> <src:fragref linkend="callout.graphics.extension.frag"/> @@ -497,6 +502,7 @@ <src:fragref linkend="citerefentry.link.frag"/> <src:fragref linkend="collect.xref.targets.frag"/> <src:fragref linkend="component.label.includes.part.label.frag"/> +<src:fragref linkend="contrib.inline.enabled.frag"/> <src:fragref linkend="css.decoration.frag"/> <src:fragref linkend="current.docid.frag"/> <src:fragref linkend="default.float.class.frag"/> @@ -513,6 +519,7 @@ <src:fragref linkend="eclipse.plugin.name.frag"/> <src:fragref linkend="eclipse.plugin.id.frag"/> <src:fragref linkend="eclipse.plugin.provider.frag"/> +<src:fragref linkend="editedby.enabled.frag"/> <src:fragref linkend="email.delimiters.enabled.frag"/> <src:fragref linkend="emphasis.propagates.style.frag"/> <src:fragref linkend="entry.propagates.style.frag"/> @@ -655,6 +662,7 @@ <src:fragref linkend="olink.pubid.frag"/> <src:fragref linkend="olink.resolver.frag"/> <src:fragref linkend="olink.sysid.frag"/> +<src:fragref linkend="othercredit.like.author.enabled.frag"/> <src:fragref linkend="para.propagates.style.frag"/> <src:fragref linkend="part.autolabel.frag"/> <src:fragref linkend="phrase.propagates.style.frag"/> Modified: trunk/xsl/html/titlepage.xsl =================================================================== --- trunk/xsl/html/titlepage.xsl 2006-08-23 10:19:46 UTC (rev 6190) +++ trunk/xsl/html/titlepage.xsl 2006-08-23 12:15:23 UTC (rev 6191) @@ -189,12 +189,33 @@ </span> </xsl:template> -<xsl:template match="author" mode="titlepage.mode"> +<xsl:template match="author|editor" mode="titlepage.mode"> + <xsl:call-template name="credits.div"/> +</xsl:template> + +<xsl:template name="credits.div"> <div class="{name(.)}"> + <xsl:if test="self::editor[position()=1] and not($editedby.enabled = 0)"> + <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4> + </xsl:if> <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3> - <xsl:apply-templates mode="titlepage.mode" select="./contrib"/> + <xsl:if test="not($contrib.inline.enabled = 0)"> + <xsl:apply-templates mode="titlepage.mode" select="./contrib"/> + </xsl:if> <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/> <xsl:apply-templates mode="titlepage.mode" select="./email"/> + <xsl:if test="not($blurb.on.titlepage.enabled = 0)"> + <xsl:choose> + <xsl:when test="$contrib.inline.enabled = 0"> + <xsl:apply-templates mode="titlepage.mode" + select="./contrib|./authorblurb|./personblurb"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="titlepage.mode" + select="./authorblurb|./personblurb"/> + </xsl:otherwise> + </xsl:choose> + </xsl:if> </div> </xsl:template> @@ -284,9 +305,18 @@ </xsl:template> <xsl:template match="contrib" mode="titlepage.mode"> - <span class="{name(.)}"> - <xsl:apply-templates mode="titlepage.mode"/> - </span> + <xsl:choose> + <xsl:when test="not($contrib.inline.enabled = 0)"> + <span class="{name(.)}"> + <xsl:apply-templates mode="titlepage.mode"/> + </span> + </xsl:when> + <xsl:otherwise> + <div class="{name(.)}"> + <p><xsl:apply-templates mode="titlepage.mode"/></p> + </div> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="copyright" mode="titlepage.mode"> @@ -376,15 +406,6 @@ </p> </xsl:template> -<xsl:template match="editor" mode="titlepage.mode"> - <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3> -</xsl:template> - -<xsl:template match="editor[position()=1]" mode="titlepage.mode"> - <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4> - <h3 class="{name(.)}"><xsl:call-template name="person.name"/></h3> -</xsl:template> - <xsl:template match="email" mode="titlepage.mode"> <!-- use the normal e-mail handling code --> <xsl:apply-templates select="."/> @@ -541,6 +562,8 @@ </xsl:template> <xsl:template match="othercredit" mode="titlepage.mode"> +<xsl:choose> + <xsl:when test="not($othercredit.like.author.enabled = 0)"> <xsl:variable name="contrib" select="string(contrib)"/> <xsl:choose> <xsl:when test="contrib"> @@ -567,6 +590,11 @@ <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/> </xsl:otherwise> </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="credits.div"/> + </xsl:otherwise> +</xsl:choose> </xsl:template> <xsl:template match="othercredit" mode="titlepage.othercredits"> Added: trunk/xsl/params/blurb.on.titlepage.enabled.xml =================================================================== --- trunk/xsl/params/blurb.on.titlepage.enabled.xml (rev 0) +++ trunk/xsl/params/blurb.on.titlepage.enabled.xml 2006-08-23 12:15:23 UTC (rev 6191) @@ -0,0 +1,24 @@ +<refentry id="blurb.on.titlepage.enabled"> +<refmeta> +<refentrytitle>blurb.on.titlepage.enabled</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>blurb.on.titlepage.enabled</refname> +<refpurpose>Display personblurb and authorblurb on title pages?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment id='blurb.on.titlepage.enabled.frag'><xsl:param name="blurb.on.titlepage.enabled">0</xsl:param></src:fragment> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero, output from <sgmltag>authorblurb</sgmltag> and +<sgmltag>personblurb</sgmltag> elements is displayed on title +pages. If zero (the default), output from those elements is suppressed +on title pages (unless you are using a titlepage customization that +causes them to be included).</para> + +</refsect1> +</refentry> Property changes on: trunk/xsl/params/blurb.on.titlepage.enabled.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/xsl/params/contrib.inline.enabled.xml =================================================================== --- trunk/xsl/params/contrib.inline.enabled.xml (rev 0) +++ trunk/xsl/params/contrib.inline.enabled.xml 2006-08-23 12:15:23 UTC (rev 6191) @@ -0,0 +1,21 @@ +<refentry id="contrib.inline.enabled"> +<refmeta> +<refentrytitle>contrib.inline.enabled</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>contrib.inline.enabled</refname> +<refpurpose>Display contrib output inline?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment id='contrib.inline.enabled.frag'><xsl:param name="contrib.inline.enabled">1</xsl:param></src:fragment> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero (the default), output of the <sgmltag>contrib</sgmltag> element is +displayed as inline content rather than as block content.</para> + +</refsect1> +</refentry> Property changes on: trunk/xsl/params/contrib.inline.enabled.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/xsl/params/editedby.enabled.xml =================================================================== --- trunk/xsl/params/editedby.enabled.xml (rev 0) +++ trunk/xsl/params/editedby.enabled.xml 2006-08-23 12:15:23 UTC (rev 6191) @@ -0,0 +1,22 @@ +cxb<refentry id="editedby.enabled"> +<refmeta> +<refentrytitle>editedby.enabled</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>editedby.enabled</refname> +<refpurpose>Display “Edited by” heading above editor name?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment id='editedby.enabled.frag'><xsl:param name="editedby.enabled">1</xsl:param></src:fragment> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero (the default), a localized <emphasis +role="bold">Edited by</emphasis> heading is displayed above editor +names in output of the <sgmltag>editor</sgmltag> element.</para> + +</refsect1> +</refentry> Property changes on: trunk/xsl/params/editedby.enabled.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/xsl/params/othercredit.like.author.enabled.xml =================================================================== --- trunk/xsl/params/othercredit.like.author.enabled.xml (rev 0) +++ trunk/xsl/params/othercredit.like.author.enabled.xml 2006-08-23 12:15:23 UTC (rev 6191) @@ -0,0 +1,26 @@ +<refentry id="othercredit.like.author.enabled"> +<refmeta> +<refentrytitle>othercredit.like.author.enabled</refentrytitle> +<refmiscinfo role="type">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>othercredit.like.author.enabled</refname> +<refpurpose>Display othercredit in same style as author?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment id='othercredit.like.author.enabled.frag'><xsl:param name="othercredit.like.author.enabled">0</xsl:param></src:fragment> +</refsynopsisdiv> + +<refsect1><title>Description</title> + +<para>If non-zero, output of the +<sgmltag>othercredit</sgmltag> element on titlepages is displayed in +the same style as <sgmltag>author</sgmltag> and +<sgmltag>editor</sgmltag> output. If zero (the default), +<sgmltag>othercredit</sgmltag> output is displayed using a style +different than that of <sgmltag>author</sgmltag> and +<sgmltag>editor</sgmltag>.</para> + +</refsect1> +</refentry> Property changes on: trunk/xsl/params/othercredit.like.author.enabled.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2006-08-30 06:23:40
|
Revision: 6220 Author: bobstayton Date: 2006-08-29 23:23:19 -0700 (Tue, 29 Aug 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6220&view=rev Log Message: ----------- New modules for supporting indexing extensions. Added Paths: ----------- trunk/xsl/common/autoidx-kimber.xsl trunk/xsl/common/autoidx-kosek.xsl trunk/xsl/html/autoidx-kimber.xsl trunk/xsl/html/autoidx-kosek.xsl Added: trunk/xsl/common/autoidx-kimber.xsl =================================================================== --- trunk/xsl/common/autoidx-kimber.xsl (rev 0) +++ trunk/xsl/common/autoidx-kimber.xsl 2006-08-30 06:23:19 UTC (rev 6220) @@ -0,0 +1,43 @@ +<?xml version="1.0"?> +<!DOCTYPE xsl:stylesheet [ +<!ENTITY primary 'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'> +<!-- Documents using the kimber index method must have a lang attribute --> +<!-- Only one of these should be present in the entity --> + +<!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'> +]> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0" + xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" + exclude-result-prefixes="k"> + +<!-- ******************************************************************** + $Id$ + ******************************************************************** + + This file is part of the DocBook XSL Stylesheet distribution. + See ../README or http://docbook.sf.net/ for copyright + and other information. + + ******************************************************************** --> + +<xsl:param name="kimber.imported"> + <xsl:variable name="vendor" select="system-property('xsl:vendor')"/> + <xsl:choose> + <xsl:when test="not(contains($vendor, 'SAXON '))"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text> + <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text> + </xsl:message> + </xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> +</xsl:param> + + +<!-- The following key used in the kimber indexing method. --> +<xsl:key name="k-group" + match="indexterm" + use="k:getIndexGroupKey(⟨, &primary;)"/> + +</xsl:stylesheet> Property changes on: trunk/xsl/common/autoidx-kimber.xsl ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/xsl/common/autoidx-kosek.xsl =================================================================== --- trunk/xsl/common/autoidx-kosek.xsl (rev 0) +++ trunk/xsl/common/autoidx-kosek.xsl 2006-08-30 06:23:19 UTC (rev 6220) @@ -0,0 +1,150 @@ +<?xml version="1.0"?> +<!DOCTYPE xsl:stylesheet [ +<!ENTITY primary 'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'> + +]> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0" + xmlns:func="http://exslt.org/functions" + xmlns:exslt="http://exslt.org/common" + xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + extension-element-prefixes="func exslt" + exclude-result-prefixes="func exslt i l" + xmlns:i="urn:cz-kosek:functions:index"> + +<!-- ******************************************************************** + $Id$ + ******************************************************************** + + This file is part of the DocBook XSL Stylesheet distribution. + See ../README or http://docbook.sf.net/ for copyright + and other information. + + ******************************************************************** --> + +<xsl:param name="kosek.imported"> + <xsl:variable name="vendor" select="system-property('xsl:vendor')"/> + <xsl:choose> + <xsl:when test="contains($vendor, 'libxslt')"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kosek' index method does not </xsl:text> + <xsl:text>work with the xsltproc XSLT processor.</xsl:text> + </xsl:message> + </xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> +</xsl:param> + +<!-- Returns index group code for given term --> +<func:function name="i:group-index"> + <xsl:param name="term"/> + + <xsl:variable name="letters-rtf"> + <xsl:variable name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:variable> + + <xsl:variable name="local.l10n.letters" + select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:letters)[1]"/> + + <xsl:variable name="l10n.letters" + select="($l10n.xml/l:i18n/l:l10n[@language=$lang]/l:letters)[1]"/> + + <xsl:choose> + <xsl:when test="count($local.l10n.letters) > 0"> + <xsl:copy-of select="$local.l10n.letters"/> + </xsl:when> + <xsl:when test="count($l10n.letters) > 0"> + <xsl:copy-of select="$l10n.letters"/> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>No "</xsl:text> + <xsl:value-of select="$lang"/> + <xsl:text>" localization of index grouping letters exists</xsl:text> + <xsl:choose> + <xsl:when test="$lang = 'en'"> + <xsl:text>.</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>; using "en".</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:message> + + <xsl:copy-of select="($l10n.xml/l:i18n/l:l10n[@language='en']/l:letters)[1]"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="letters" select="exslt:node-set($letters-rtf)/*"/> + + <xsl:variable name="long-letter-index" select="$letters/l:l[. = substring($term,1,2)]/@i"/> + <xsl:variable name="short-letter-index" select="$letters/l:l[. = substring($term,1,1)]/@i"/> + <xsl:variable name="letter-index"> + <xsl:choose> + <xsl:when test="$long-letter-index"> + <xsl:value-of select="$long-letter-index"/> + </xsl:when> + <xsl:when test="$short-letter-index"> + <xsl:value-of select="$short-letter-index"/> + </xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <func:result select="number($letter-index)"/> +</func:function> + +<!-- Return index group letter for given group code --> +<func:function name="i:group-letter"> + <xsl:param name="index"/> + + <xsl:variable name="letters-rtf"> + <xsl:variable name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:variable> + + <xsl:variable name="local.l10n.letters" + select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:letters)[1]"/> + + <xsl:variable name="l10n.letters" + select="($l10n.xml/l:i18n/l:l10n[@language=$lang]/l:letters)[1]"/> + + <xsl:choose> + <xsl:when test="count($local.l10n.letters) > 0"> + <xsl:copy-of select="$local.l10n.letters"/> + </xsl:when> + <xsl:when test="count($l10n.letters) > 0"> + <xsl:copy-of select="$l10n.letters"/> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>No "</xsl:text> + <xsl:value-of select="$lang"/> + <xsl:text>" localization of index grouping letters exists</xsl:text> + <xsl:choose> + <xsl:when test="$lang = 'en'"> + <xsl:text>.</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>; using "en".</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:message> + + <xsl:copy-of select="($l10n.xml/l:i18n/l:l10n[@language='en']/l:letters)[1]"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="letters" select="exslt:node-set($letters-rtf)/*"/> + + <func:result select="$letters/l:l[@i=$index][1]"/> +</func:function> + +<xsl:key name="group-code" + match="indexterm" + use="i:group-index(&primary;)"/> + +</xsl:stylesheet> Property changes on: trunk/xsl/common/autoidx-kosek.xsl ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/xsl/html/autoidx-kimber.xsl =================================================================== --- trunk/xsl/html/autoidx-kimber.xsl (rev 0) +++ trunk/xsl/html/autoidx-kimber.xsl 2006-08-30 06:23:19 UTC (rev 6220) @@ -0,0 +1,159 @@ +<?xml version="1.0"?> +<!DOCTYPE xsl:stylesheet [ + +<!ENTITY primary 'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'> +<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'> +<!ENTITY tertiary 'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'> + +<!-- Documents using the kimber index method must have a lang attribute --> +<!-- Only one of these should be present in the entity --> +<!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'> + +<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) + and ($role = @role or $type = @type or + (string-length($role) = 0 and string-length($type) = 0))'> +]> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" + exclude-result-prefixes="k" + version="1.0"> + +<!-- ******************************************************************** + $Id$ + ******************************************************************** + + This file is part of the XSL DocBook Stylesheet distribution. + See ../README or http://nwalsh.com/docbook/xsl/ for copyright + and other information. + + ******************************************************************** --> + +<!-- ==================================================================== --> +<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen. --> +<!-- ==================================================================== --> +<!-- *** THIS MODULE ONLY WORKS WITH SAXON 6 OR SAXON 8 *** --> +<!-- ==================================================================== --> + + +<xsl:include href="../common/autoidx-kimber.xsl"/> + +<xsl:template name="generate-kimber-index"> + <xsl:param name="scope" select="NOTANODE"/> + + <xsl:variable name="vendor" select="system-property('xsl:vendor')"/> + <xsl:if test="not(contains($vendor, 'SAXON '))"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text> + <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:if test="not(function-available('k:getIndexGroupKey'))"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text> + <xsl:text>Innodata Isogen 
Java extensions for </xsl:text> + <xsl:text>internationalized indexes. 
Install those </xsl:text> + <xsl:text>extensions, or use a different index method.
</xsl:text> + <xsl:text>For more information, see:
</xsl:text> + <xsl:text>http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:variable name="role"> + <xsl:if test="$index.on.role != 0"> + <xsl:value-of select="@role"/> + </xsl:if> + </xsl:variable> + + <xsl:variable name="type"> + <xsl:if test="$index.on.type != 0"> + <xsl:value-of select="@type"/> + </xsl:if> + </xsl:variable> + + <xsl:variable name="terms" + select="//indexterm[count(.|key('k-group', + k:getIndexGroupKey(⟨, &primary;)) + [&scope;][1]) = 1 + and not(@class = 'endofrange')]"/> + + <xsl:variable name="alphabetical" + select="$terms[not(starts-with( + k:getIndexGroupKey(⟨, &primary;), + '#NUMERIC' + ))]"/> + + <xsl:variable name="others" + select="$terms[starts-with( + k:getIndexGroupKey(⟨, &primary;), + '#NUMERIC' + )]"/> + + <div class="index"> + <xsl:if test="$others"> + <div class="indexdev"> + <h3> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'index symbols'"/> + </xsl:call-template> + </h3> + <dl> + <xsl:apply-templates select="$others" + mode="index-symbol-div"> + <xsl:with-param name="scope" select="$scope"/> + <xsl:with-param name="role" select="$role"/> + <xsl:with-param name="type" select="$type"/> + <xsl:sort lang="{⟨}" + select="k:getIndexGroupSortKey(⟨, + k:getIndexGroupKey(⟨, &primary;))"/> + </xsl:apply-templates> + </dl> + </div> + </xsl:if> + + <xsl:apply-templates select="$alphabetical" + mode="index-div-kimber"> + <xsl:with-param name="scope" select="$scope"/> + <xsl:with-param name="role" select="$role"/> + <xsl:with-param name="type" select="$type"/> + <xsl:sort lang="{⟨}" + select="k:getIndexGroupSortKey(⟨, + k:getIndexGroupKey(⟨, &primary;))"/> + </xsl:apply-templates> + </div> + +</xsl:template> + +<xsl:template match="indexterm" mode="index-div-kimber"> + <xsl:param name="scope" select="."/> + <xsl:param name="role" select="''"/> + <xsl:param name="type" select="''"/> + + <xsl:variable name="key" + select="k:getIndexGroupKey(⟨, &primary;)"/> + + <xsl:variable name="label" + select="k:getIndexGroupLabel(⟨, $key)"/> + + <xsl:if test="key('k-group', $label)[&scope;] + [count(.|key('primary', &primary;)[&scope;][1]) = 1]"> + <div class="indexdiv"> + <h3> + <xsl:value-of select="$label"/> + </h3> + <dl> + <xsl:apply-templates select="key('k-group', $key)[&scope;] + [count(.|key('primary', &primary;)[&scope;] + [1])=1]" + mode="index-primary"> + <xsl:sort select="&primary;" lang="{⟨}"/> + <xsl:with-param name="scope" select="$scope"/> + <xsl:with-param name="role" select="$role"/> + <xsl:with-param name="type" select="$type"/> + </xsl:apply-templates> + </dl> + </div> + </xsl:if> +</xsl:template> + +</xsl:stylesheet> Property changes on: trunk/xsl/html/autoidx-kimber.xsl ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/xsl/html/autoidx-kosek.xsl =================================================================== --- trunk/xsl/html/autoidx-kosek.xsl (rev 0) +++ trunk/xsl/html/autoidx-kosek.xsl 2006-08-30 06:23:19 UTC (rev 6220) @@ -0,0 +1,132 @@ +<?xml version="1.0"?> +<!DOCTYPE xsl:stylesheet [ + +<!ENTITY primary 'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'> +<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'> +<!ENTITY tertiary 'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'> + +<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) + and ($role = @role or $type = @type or + (string-length($role) = 0 and string-length($type) = 0))'> +]> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:i="urn:cz-kosek:functions:index" + xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" + xmlns:func="http://exslt.org/functions" + xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" + xmlns:exslt="http://exslt.org/common" + extension-element-prefixes="func exslt" + exclude-result-prefixes="func exslt i l k" + version="1.0"> + +<!-- ******************************************************************** + $Id$ + ******************************************************************** + + This file is part of the XSL DocBook Stylesheet distribution. + See ../README or http://nwalsh.com/docbook/xsl/ for copyright + and other information. + + ******************************************************************** --> + +<!-- ==================================================================== --> +<!-- The "kosek" method contributed by Jirka Kosek. --> + +<xsl:include href="../common/autoidx-kosek.xsl"/> + +<xsl:template name="generate-kosek-index"> + <xsl:param name="scope" select="(ancestor::book|/)[last()]"/> + + <xsl:variable name="vendor" select="system-property('xsl:vendor')"/> + <xsl:if test="contains($vendor, 'libxslt')"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kosek' index method does not </xsl:text> + <xsl:text>work with the xsltproc XSLT processor.</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:if test="contains($vendor, 'Saxonica')"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kosek' index method does not </xsl:text> + <xsl:text>work with the Saxon 8 XSLT processor.</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:if test="not(function-available('exslt:node-set') or + function-available('exslt:nodeSet'))"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text> + <xsl:text>exslt:node-set() function. Use a processor that </xsl:text> + <xsl:text>has it, or use a different index method.</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:if test="not(function-available('i:group-index'))"> + <xsl:message terminate="yes"> + <xsl:text>ERROR: the 'kosek' index method requires the
</xsl:text> + <xsl:text>index extension functions be imported:
</xsl:text> + <xsl:text> xsl:import href="common/autoidx-ng.xsl"</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:variable name="role"> + <xsl:if test="$index.on.role != 0"> + <xsl:value-of select="@role"/> + </xsl:if> + </xsl:variable> + + <xsl:variable name="type"> + <xsl:if test="$index.on.type != 0"> + <xsl:value-of select="@type"/> + </xsl:if> + </xsl:variable> + + <xsl:variable name="terms" + select="//indexterm[count(.|key('group-code', + i:group-index(&primary;)) + [&scope;][1]) = 1 + and not(@class = 'endofrange')]"/> + + <div class="index"> + <xsl:apply-templates select="$terms" mode="index-div-kosek"> + <xsl:with-param name="scope" select="$scope"/> + <xsl:with-param name="role" select="$role"/> + <xsl:with-param name="type" select="$type"/> + <xsl:sort select="i:group-index(&primary;)" data-type="number"/> + </xsl:apply-templates> + </div> +</xsl:template> + +<xsl:template match="indexterm" mode="index-div-kosek"> + <xsl:param name="scope" select="."/> + <xsl:param name="role" select="''"/> + <xsl:param name="type" select="''"/> + + <xsl:variable name="key" + select="i:group-index(&primary;)"/> + + <xsl:variable name="lang"> + <xsl:call-template name="l10n.language"/> + </xsl:variable> + + <xsl:if test="key('group-code', $key)[&scope;] + [count(.|key('primary', &primary;)[&scope;][1]) = 1]"> + <div class="indexdiv"> + <h3> + <xsl:value-of select="i:group-letter($key)"/> + </h3> + <dl> + <xsl:apply-templates select="key('group-code', $key)[&scope;] + [count(.|key('primary', &primary;)[&scope;][1])=1]" + mode="index-primary"> + <xsl:sort select="&primary;" lang="{$lang}"/> + <xsl:with-param name="scope" select="$scope"/> + <xsl:with-param name="role" select="$role"/> + <xsl:with-param name="type" select="$type"/> + </xsl:apply-templates> + </dl> + </div> + </xsl:if> +</xsl:template> + +</xsl:stylesheet> Property changes on: trunk/xsl/html/autoidx-kosek.xsl ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2006-09-18 03:34:19
|
Revision: 6306 http://svn.sourceforge.net/docbook/?rev=6306&view=rev Author: xmldoc Date: 2006-09-17 20:34:03 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Made changes in namespace declarations to prevent xmllint's canonicalizer from treating them as relative namespace URIs. - Changed xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" to xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService"; Saxon accepts either form (see http://www.saxonica.com/documentation/extensibility/functions.html); to Saxon, "the part of the URI before the final '/' is immaterial". - Changed, e.g. xmlns:xverb="com.nwalsh.xalan.Verbatim" to xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"; Xalan accepts either form (see http://xml.apache.org/xalan-j/extensions.html#java-namespace-declare); just as Saxon does, it will "simply use the string to the right of the rightmost forward slash as the Java class name". - Changed xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect" to xmlns:redirect="http://xml.apache.org/xalan/redirect", and adjusted associated code to make the current Xalan redirect spec. (see http://xml.apache.org/xalan-j/apidocs/org/apache/xalan/lib/Redirect.html) Modified Paths: -------------- trunk/xsl/html/autoidx-kimber.xsl trunk/xsl/html/autoidx-kosek.xsl trunk/xsl/html/callout.xsl trunk/xsl/html/chunker.xsl trunk/xsl/html/graphics.xsl trunk/xsl/html/oldchunker.xsl trunk/xsl/html/table.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/html/autoidx-kimber.xsl =================================================================== --- trunk/xsl/html/autoidx-kimber.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/autoidx-kimber.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -14,7 +14,7 @@ (string-length($role) = 0 and string-length($type) = 0))'> ]> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" + xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" exclude-result-prefixes="k" version="1.0"> Modified: trunk/xsl/html/autoidx-kosek.xsl =================================================================== --- trunk/xsl/html/autoidx-kosek.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/autoidx-kosek.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -13,7 +13,7 @@ xmlns:i="urn:cz-kosek:functions:index" xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" xmlns:func="http://exslt.org/functions" - xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" + xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns:exslt="http://exslt.org/common" extension-element-prefixes="func exslt" exclude-result-prefixes="func exslt i l k" Modified: trunk/xsl/html/callout.xsl =================================================================== --- trunk/xsl/html/callout.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/callout.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -1,7 +1,7 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" - xmlns:xverb="com.nwalsh.xalan.Verbatim" + xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" exclude-result-prefixes="sverb xverb lxslt" version='1.0'> Modified: trunk/xsl/html/chunker.xsl =================================================================== --- trunk/xsl/html/chunker.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/chunker.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -1,12 +1,12 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect" + xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:exsl="http://exslt.org/common" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" version="1.0" exclude-result-prefixes="doc" - extension-element-prefixes="saxon xalanredirect lxslt exsl"> + extension-element-prefixes="saxon redirect lxslt exsl"> <!-- ******************************************************************** $Id$ @@ -21,7 +21,7 @@ <!-- ==================================================================== --> <!-- This stylesheet works with XSLT implementations that support --> -<!-- exsl:document, saxon:output, or xalanredirect:write --> +<!-- exsl:document, saxon:output, or Xalan's redirect:write --> <!-- Note: Only Saxon 6.4.2 or later is supported. --> <xsl:param name="chunker.output.method" select="'html'"/> @@ -60,7 +60,7 @@ </xsl:otherwise> </xsl:choose> </xsl:when> - <xsl:when test="element-available('xalanredirect:write')"> + <xsl:when test="element-available('redirect:write')"> <!-- Xalan doesn't make the chunks relative --> <xsl:value-of select="concat($base.dir,$base.name)"/> </xsl:when> @@ -353,11 +353,11 @@ </xsl:choose> </xsl:when> - <xsl:when test="element-available('xalanredirect:write')"> - <!-- Xalan uses xalanredirect --> - <xalanredirect:write file="{$filename}"> + <xsl:when test="element-available('redirect:write')"> + <!-- Xalan uses redirect --> + <redirect:write file="{$filename}"> <xsl:copy-of select="$content"/> - </xalanredirect:write> + </redirect:write> </xsl:when> <xsl:otherwise> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/graphics.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -3,8 +3,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory" xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics" - xmlns:ximg="xaln://com.nwalsh.xalan.ImageIntrinsics" - xmlns:xtext="com.nwalsh.xalan.Text" + xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics" + xmlns:xtext="xalan://com.nwalsh.xalan.Text" xmlns:lxslt="http://xml.apache.org/xslt" exclude-result-prefixes="xlink stext xtext lxslt simg ximg" extension-element-prefixes="stext xtext" Modified: trunk/xsl/html/oldchunker.xsl =================================================================== --- trunk/xsl/html/oldchunker.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/oldchunker.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -1,11 +1,11 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect" + xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" version="1.1" exclude-result-prefixes="doc" - extension-element-prefixes="saxon xalanredirect lxslt"> + extension-element-prefixes="saxon redirect lxslt"> <!-- ******************************************************************** $Id$ @@ -120,10 +120,10 @@ </saxon:output> </xsl:when> <xsl:when test="contains($vendor, 'Apache')"> - <!-- Xalan uses xalanredirect --> - <xalanredirect:write file="{$filename}"> + <!-- Xalan uses redirect --> + <redirect:write file="{$filename}"> <xsl:copy-of select="$content"/> - </xalanredirect:write> + </redirect:write> </xsl:when> <xsl:otherwise> <!-- it doesn't matter since we won't be making chunks... --> @@ -183,10 +183,10 @@ </saxon:output> </xsl:when> <xsl:when test="contains($vendor, 'Apache')"> - <!-- Xalan uses xalanredirect --> - <xalanredirect:write file="{$filename}"> + <!-- Xalan uses redirect --> + <redirect:write file="{$filename}"> <xsl:copy-of select="$content"/> - </xalanredirect:write> + </redirect:write> </xsl:when> <xsl:otherwise> <!-- it doesn't matter since we won't be making chunks... --> Modified: trunk/xsl/html/table.xsl =================================================================== --- trunk/xsl/html/table.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/table.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -2,7 +2,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table" - xmlns:xtbl="com.nwalsh.xalan.Table" + xmlns:xtbl="xalan://com.nwalsh.xalan.Table" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table" exclude-result-prefixes="doc stbl xtbl lxslt ptbl" Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2006-09-18 03:10:56 UTC (rev 6305) +++ trunk/xsl/html/verbatim.xsl 2006-09-18 03:34:03 UTC (rev 6306) @@ -1,7 +1,7 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" - xmlns:xverb="com.nwalsh.xalan.Verbatim" + xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:exsl="http://exslt.org/common" exclude-result-prefixes="sverb xverb lxslt exsl" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2006-11-11 08:58:36
|
Revision: 6396 http://svn.sourceforge.net/docbook/?rev=6396&view=rev Author: bobstayton Date: 2006-11-11 00:58:29 -0800 (Sat, 11 Nov 2006) Log Message: ----------- Add support for info. Modified Paths: -------------- trunk/xsl/html/admon.xsl trunk/xsl/html/autotoc.xsl trunk/xsl/html/biblio.xsl trunk/xsl/html/block.xsl trunk/xsl/html/component.xsl trunk/xsl/html/division.xsl trunk/xsl/html/glossary.xsl trunk/xsl/html/index.xsl trunk/xsl/html/lists.xsl trunk/xsl/html/qandaset.xsl trunk/xsl/html/refentry.xsl trunk/xsl/html/sections.xsl trunk/xsl/html/table.xsl Modified: trunk/xsl/html/admon.xsl =================================================================== --- trunk/xsl/html/admon.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/admon.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -70,9 +70,9 @@ <table border="0"> <xsl:attribute name="summary"> <xsl:value-of select="$admon.type"/> - <xsl:if test="title"> + <xsl:if test="title|info/title"> <xsl:text>: </xsl:text> - <xsl:value-of select="title"/> + <xsl:value-of select="(title|info/title)[1]"/> </xsl:if> </xsl:attribute> <tr> @@ -88,7 +88,7 @@ </td> <th align="left"> <xsl:call-template name="anchor"/> - <xsl:if test="$admon.textlabel != 0 or title"> + <xsl:if test="$admon.textlabel != 0 or title or info/title"> <xsl:apply-templates select="." mode="object.title.markup"/> </xsl:if> </th> @@ -112,7 +112,7 @@ <h3 class="title"> <xsl:call-template name="anchor"/> - <xsl:if test="$admon.textlabel != 0 or title"> + <xsl:if test="$admon.textlabel != 0 or title or info/title"> <xsl:apply-templates select="." mode="object.title.markup"/> </xsl:if> </h3> Modified: trunk/xsl/html/autotoc.xsl =================================================================== --- trunk/xsl/html/autotoc.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/autotoc.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -109,7 +109,7 @@ <xsl:if test="contains($toc.params, 'equation')"> <xsl:call-template name="list.of.titles"> <xsl:with-param name="titles" select="'equation'"/> - <xsl:with-param name="nodes" select=".//equation[title]"/> + <xsl:with-param name="nodes" select=".//equation[title or info/title]"/> </xsl:call-template> </xsl:if> Modified: trunk/xsl/html/biblio.xsl =================================================================== --- trunk/xsl/html/biblio.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/biblio.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -35,6 +35,7 @@ </xsl:template> <xsl:template match="bibliography/bibliographyinfo"></xsl:template> +<xsl:template match="bibliography/info"></xsl:template> <xsl:template match="bibliography/title"></xsl:template> <xsl:template match="bibliography/subtitle"></xsl:template> <xsl:template match="bibliography/titleabbrev"></xsl:template> @@ -63,14 +64,15 @@ <xsl:template match="bibliolist"> <div class="{name(.)}"> <xsl:call-template name="anchor"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> <xsl:apply-templates select="*[not(self::blockinfo) - and not(self::title) - and not(self::titleabbrev) - and not(self::biblioentry) - and not(self::bibliomixed)]"/> + and not(self::info) + and not(self::title) + and not(self::titleabbrev) + and not(self::biblioentry) + and not(self::bibliomixed)]"/> <xsl:apply-templates select="biblioentry|bibliomixed"/> </div> </xsl:template> @@ -92,16 +94,16 @@ <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:apply-templates select="$entry"> - <xsl:with-param name="label" select="$label"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$entry"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$bibliography.numbered != 0"> + <xsl:apply-templates select="$entry"> + <xsl:with-param name="label" select="$label"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$entry"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:message> @@ -113,7 +115,7 @@ <div class="{name(.)}"> <xsl:call-template name="anchor"/> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:text>Error: no bibliography entry: </xsl:text> <xsl:value-of select="$id"/> <xsl:text> found in </xsl:text> @@ -126,10 +128,10 @@ <xsl:otherwise> <div class="{name(.)}"> <xsl:call-template name="anchor"> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliography.mode"/> </p> </div> @@ -152,16 +154,16 @@ <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:apply-templates select="$entry"> - <xsl:with-param name="label" select="$label"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$entry"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$bibliography.numbered != 0"> + <xsl:apply-templates select="$entry"> + <xsl:with-param name="label" select="$label"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$entry"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:message> @@ -173,7 +175,7 @@ <div class="{name(.)}"> <xsl:call-template name="anchor"/> <p> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:text>Error: no bibliography entry: </xsl:text> <xsl:value-of select="$id"/> <xsl:text> found in </xsl:text> @@ -186,10 +188,10 @@ <xsl:otherwise> <div class="{name(.)}"> <xsl:call-template name="anchor"> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <p class="{name(.)}"> - <xsl:copy-of select="$label"/> + <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliomixed.mode"/> </p> </div> Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/block.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -15,7 +15,7 @@ <!-- ==================================================================== --> <!-- What should we do about styling blockinfo? --> -<xsl:template match="blockinfo"> +<xsl:template match="blockinfo|info"> <!-- suppress --> </xsl:template> @@ -106,7 +106,12 @@ </xsl:call-template> </xsl:template> -<xsl:template match="formalpara/title"> +<!-- Only use title from info --> +<xsl:template match="formalpara/info"> + <xsl:apply-templates select="title"/> +</xsl:template> + +<xsl:template match="formalpara/title|formalpara/info/title"> <xsl:variable name="titleStr"> <xsl:apply-templates/> </xsl:variable> @@ -169,7 +174,7 @@ </div> </xsl:template> -<xsl:template match="blockquote/title"> +<xsl:template match="blockquote/title|blockquote/info/title"> <div class="blockquote-title"> <p> <b> @@ -213,7 +218,7 @@ <xsl:template match="abstract/title|sidebar/title"> </xsl:template> -<xsl:template match="sidebar/sidebarinfo"/> +<xsl:template match="sidebar/sidebarinfo|sidebar/info"/> <!-- ==================================================================== --> Modified: trunk/xsl/html/component.xsl =================================================================== --- trunk/xsl/html/component.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/component.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -20,7 +20,7 @@ <xsl:variable name="level"> <xsl:choose> <xsl:when test="ancestor::section"> - <xsl:value-of select="count(ancestor::section)+1"/> + <xsl:value-of select="count(ancestor::section)+1"/> </xsl:when> <xsl:when test="ancestor::sect5">6</xsl:when> <xsl:when test="ancestor::sect4">5</xsl:when> @@ -86,13 +86,15 @@ </div> </xsl:template> -<xsl:template match="dedication/title" mode="titlepage.mode" priority="2"> +<xsl:template match="dedication/title|dedication/info/title" + mode="titlepage.mode" priority="2"> <xsl:call-template name="component.title"> <xsl:with-param name="node" select="ancestor::dedication[1]"/> </xsl:call-template> </xsl:template> -<xsl:template match="dedication/subtitle" mode="titlepage.mode" priority="2"> +<xsl:template match="dedication/subtitle|dedication/info/subtitle" + mode="titlepage.mode" priority="2"> <xsl:call-template name="component.subtitle"> <xsl:with-param name="node" select="ancestor::dedication[1]"/> </xsl:call-template> @@ -185,6 +187,7 @@ </xsl:template> <xsl:template match="preface/docinfo|prefaceinfo"></xsl:template> +<xsl:template match="preface/info"></xsl:template> <xsl:template match="preface/title"></xsl:template> <xsl:template match="preface/titleabbrev"></xsl:template> <xsl:template match="preface/subtitle"></xsl:template> @@ -241,6 +244,7 @@ </xsl:template> <xsl:template match="chapter/docinfo|chapterinfo"></xsl:template> +<xsl:template match="chapter/info"></xsl:template> <xsl:template match="chapter/title"></xsl:template> <xsl:template match="chapter/titleabbrev"></xsl:template> <xsl:template match="chapter/subtitle"></xsl:template> @@ -318,6 +322,7 @@ </xsl:template> <xsl:template match="appendix/docinfo|appendixinfo"></xsl:template> +<xsl:template match="appendix/info"></xsl:template> <xsl:template match="appendix/title"></xsl:template> <xsl:template match="appendix/titleabbrev"></xsl:template> <xsl:template match="appendix/subtitle"></xsl:template> @@ -377,6 +382,7 @@ </xsl:template> <xsl:template match="article/artheader|article/articleinfo"></xsl:template> +<xsl:template match="article/info"></xsl:template> <xsl:template match="article/title"></xsl:template> <xsl:template match="article/titleabbrev"></xsl:template> <xsl:template match="article/subtitle"></xsl:template> Modified: trunk/xsl/html/division.xsl =================================================================== --- trunk/xsl/html/division.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/division.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -32,7 +32,7 @@ <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> + <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> @@ -40,8 +40,8 @@ <xsl:with-param name="toc.params" select="$toc.params"/> <xsl:with-param name="toc"> <xsl:call-template name="set.toc"> - <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> - </xsl:call-template> + <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> + </xsl:call-template> </xsl:with-param> </xsl:call-template> @@ -76,7 +76,7 @@ <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> + <xsl:with-param name="table" select="normalize-space($generate.toc)"/> </xsl:call-template> </xsl:variable> @@ -84,8 +84,8 @@ <xsl:with-param name="toc.params" select="$toc.params"/> <xsl:with-param name="toc"> <xsl:call-template name="division.toc"> - <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> - </xsl:call-template> + <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/> + </xsl:call-template> </xsl:with-param> </xsl:call-template> @@ -94,6 +94,7 @@ </xsl:template> <xsl:template match="book/bookinfo"></xsl:template> +<xsl:template match="book/info"></xsl:template> <xsl:template match="book/title"></xsl:template> <xsl:template match="book/titleabbrev"></xsl:template> <xsl:template match="book/subtitle"></xsl:template> @@ -138,6 +139,7 @@ <xsl:template match="part/docinfo"></xsl:template> <xsl:template match="part/partinfo"></xsl:template> +<xsl:template match="part/info"></xsl:template> <xsl:template match="part/title"></xsl:template> <xsl:template match="part/titleabbrev"></xsl:template> <xsl:template match="part/subtitle"></xsl:template> Modified: trunk/xsl/html/glossary.xsl =================================================================== --- trunk/xsl/html/glossary.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/glossary.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -53,6 +53,7 @@ </xsl:template> <xsl:template match="glossary/glossaryinfo"></xsl:template> +<xsl:template match="glossary/info"></xsl:template> <xsl:template match="glossary/title"></xsl:template> <xsl:template match="glossary/subtitle"></xsl:template> <xsl:template match="glossary/titleabbrev"></xsl:template> @@ -62,7 +63,7 @@ <xsl:template match="glosslist"> <div class="{name(.)}"> <xsl:call-template name="anchor"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> <dl> Modified: trunk/xsl/html/index.xsl =================================================================== --- trunk/xsl/html/index.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/index.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -101,6 +101,8 @@ </xsl:if> </xsl:template> +<xsl:template match="index/indexinfo"></xsl:template> +<xsl:template match="index/info"></xsl:template> <xsl:template match="index/title"></xsl:template> <xsl:template match="index/subtitle"></xsl:template> <xsl:template match="index/titleabbrev"></xsl:template> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/lists.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -918,7 +918,7 @@ <xsl:template match="calloutlist"> <div class="{name(.)}"> <xsl:call-template name="anchor"/> - <xsl:if test="title"> + <xsl:if test="title|info/title"> <xsl:call-template name="formal.object.heading"/> </xsl:if> Modified: trunk/xsl/html/qandaset.xsl =================================================================== --- trunk/xsl/html/qandaset.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/qandaset.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -17,7 +17,7 @@ <!-- ==================================================================== --> <xsl:template match="qandaset"> - <xsl:variable name="title" select="(blockinfo/title|title)[1]"/> + <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/> <xsl:variable name="preamble" select="*[name(.) != 'title' and name(.) != 'titleabbrev' and name(.) != 'qandadiv' @@ -47,7 +47,9 @@ </div> </xsl:template> -<xsl:template match="qandaset/blockinfo/title|qandaset/title"> +<xsl:template match="qandaset/blockinfo/title| + qandaset/info/title| + qandaset/title"> <xsl:variable name="qalevel"> <xsl:call-template name="qanda.section.level"/> </xsl:variable> @@ -59,7 +61,7 @@ </xsl:element> </xsl:template> -<xsl:template match="qandaset/blockinfo"> +<xsl:template match="qandaset/blockinfo|qandaset/info"> <!-- what should this template really do? --> <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/> </xsl:template> @@ -70,10 +72,10 @@ and name(.) != 'qandadiv' and name(.) != 'qandaentry']"/> - <xsl:if test="blockinfo/title|title"> + <xsl:if test="blockinfo/title|info/title|title"> <tr class="qandadiv"> <td align="left" valign="top" colspan="2"> - <xsl:apply-templates select="(blockinfo/title|title)[1]"/> + <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/> </td> </tr> </xsl:if> @@ -109,7 +111,9 @@ <xsl:apply-templates select="qandadiv|qandaentry"/> </xsl:template> -<xsl:template match="qandadiv/blockinfo/title|qandadiv/title"> +<xsl:template match="qandadiv/blockinfo/title| + qandadiv/info/title| + qandadiv/title"> <xsl:variable name="qalevel"> <xsl:call-template name="qandadiv.section.level"/> </xsl:variable> @@ -241,7 +245,9 @@ <dd><xsl:call-template name="process.qanda.toc"/></dd> </xsl:template> -<xsl:template match="qandadiv/blockinfo/title|qandadiv/title" mode="qandatoc.mode"> +<xsl:template match="qandadiv/blockinfo/title| + qandadiv/info/title| + qandadiv/title" mode="qandatoc.mode"> <xsl:variable name="qalevel"> <xsl:call-template name="qandadiv.section.level"/> </xsl:variable> Modified: trunk/xsl/html/refentry.xsl =================================================================== --- trunk/xsl/html/refentry.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/refentry.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -105,6 +105,7 @@ </xsl:template> <xsl:template match="refentry/docinfo|refentry/refentryinfo"></xsl:template> +<xsl:template match="refentry/info"></xsl:template> <xsl:template match="refentrytitle|refname|refdescriptor" mode="title"> <xsl:apply-templates/> @@ -290,10 +291,12 @@ </h4> </xsl:template> -<xsl:template match="refsect1info"></xsl:template> -<xsl:template match="refsect2info"></xsl:template> -<xsl:template match="refsect3info"></xsl:template> +<xsl:template match="refsectioninfo|refsection/info"></xsl:template> +<xsl:template match="refsect1info|refsect1/info"></xsl:template> +<xsl:template match="refsect2info|refsect2/info"></xsl:template> +<xsl:template match="refsect3info|refsect3/info"></xsl:template> + <!-- ==================================================================== --> </xsl:stylesheet> Modified: trunk/xsl/html/sections.xsl =================================================================== --- trunk/xsl/html/sections.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/sections.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -378,35 +378,42 @@ <xsl:template match="section/titleabbrev"></xsl:template> <xsl:template match="section/subtitle"></xsl:template> <xsl:template match="sectioninfo"></xsl:template> +<xsl:template match="section/info"></xsl:template> <xsl:template match="sect1/title"></xsl:template> <xsl:template match="sect1/titleabbrev"></xsl:template> <xsl:template match="sect1/subtitle"></xsl:template> <xsl:template match="sect1info"></xsl:template> +<xsl:template match="sect1/info"></xsl:template> <xsl:template match="sect2/title"></xsl:template> <xsl:template match="sect2/subtitle"></xsl:template> <xsl:template match="sect2/titleabbrev"></xsl:template> <xsl:template match="sect2info"></xsl:template> +<xsl:template match="sect2/info"></xsl:template> <xsl:template match="sect3/title"></xsl:template> <xsl:template match="sect3/subtitle"></xsl:template> <xsl:template match="sect3/titleabbrev"></xsl:template> <xsl:template match="sect3info"></xsl:template> +<xsl:template match="sect3/info"></xsl:template> <xsl:template match="sect4/title"></xsl:template> <xsl:template match="sect4/subtitle"></xsl:template> <xsl:template match="sect4/titleabbrev"></xsl:template> <xsl:template match="sect4info"></xsl:template> +<xsl:template match="sect4/info"></xsl:template> <xsl:template match="sect5/title"></xsl:template> <xsl:template match="sect5/subtitle"></xsl:template> <xsl:template match="sect5/titleabbrev"></xsl:template> <xsl:template match="sect5info"></xsl:template> +<xsl:template match="sect5/info"></xsl:template> <xsl:template match="simplesect/title"></xsl:template> <xsl:template match="simplesect/subtitle"></xsl:template> <xsl:template match="simplesect/titleabbrev"></xsl:template> +<xsl:template match="simplesect/info"></xsl:template> <!-- ==================================================================== --> Modified: trunk/xsl/html/table.xsl =================================================================== --- trunk/xsl/html/table.xsl 2006-11-11 08:46:43 UTC (rev 6395) +++ trunk/xsl/html/table.xsl 2006-11-11 08:58:29 UTC (rev 6396) @@ -455,7 +455,7 @@ <xsl:template match="spanspec"></xsl:template> <xsl:template match="thead|tfoot"> - <xsl:element name="{name(.)}"> + <xsl:element name="{local-name(.)}"> <xsl:if test="@align"> <xsl:attribute name="align"> <xsl:value-of select="@align"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2006-11-11 09:33:55
|
Revision: 6401 http://svn.sourceforge.net/docbook/?rev=6401&view=rev Author: bobstayton Date: 2006-11-11 01:33:44 -0800 (Sat, 11 Nov 2006) Log Message: ----------- replace name() with local-name() in most cases. Modified Paths: -------------- trunk/xsl/html/admon.xsl trunk/xsl/html/biblio.xsl trunk/xsl/html/block.xsl trunk/xsl/html/callout.xsl trunk/xsl/html/component.xsl trunk/xsl/html/division.xsl trunk/xsl/html/ebnf.xsl trunk/xsl/html/footnote.xsl trunk/xsl/html/glossary.xsl trunk/xsl/html/graphics.xsl trunk/xsl/html/index.xsl trunk/xsl/html/info.xsl trunk/xsl/html/inline.xsl trunk/xsl/html/lists.xsl trunk/xsl/html/qandaset.xsl trunk/xsl/html/refentry.xsl trunk/xsl/html/sections.xsl trunk/xsl/html/synop.xsl trunk/xsl/html/task.xsl trunk/xsl/html/titlepage.xsl trunk/xsl/html/verbatim.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/admon.xsl =================================================================== --- trunk/xsl/html/admon.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/admon.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -60,7 +60,7 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$admon.style != ''"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> @@ -103,7 +103,7 @@ </xsl:template> <xsl:template name="nongraphical.admonition"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$admon.style"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> Modified: trunk/xsl/html/biblio.xsl =================================================================== --- trunk/xsl/html/biblio.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/biblio.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -17,7 +17,7 @@ <xsl:template match="bibliography"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -45,13 +45,13 @@ <xsl:template match="bibliodiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates/> </div> </xsl:template> <xsl:template match="bibliodiv/title"> - <h3 class="{name(.)}"> + <h3 class="{local-name(.)}"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> </xsl:call-template> @@ -62,7 +62,7 @@ <!-- ==================================================================== --> <xsl:template match="bibliolist"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> @@ -112,7 +112,7 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <p> <xsl:copy-of select="$label"/> @@ -126,7 +126,7 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> @@ -172,7 +172,7 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <p> <xsl:copy-of select="$label"/> @@ -186,11 +186,11 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> - <p class="{name(.)}"> + <p class="{local-name(.)}"> <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliomixed.mode"/> </p> @@ -245,49 +245,49 @@ </xsl:template> <xsl:template match="address" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artheader|articleinfo|info" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="author" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -298,28 +298,28 @@ </xsl:template> <xsl:template match="authorgroup" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="person.name.list"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomset" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -328,7 +328,7 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> @@ -352,14 +352,14 @@ <!-- ================================================== --> <xsl:template match="bookbiblio" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -375,70 +375,70 @@ </xsl:template> <xsl:template match="collab" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="collabname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confdates" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="conftitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confnum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confsponsor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -447,7 +447,7 @@ <!-- ================================================== --> <xsl:template match="copyright" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Copyright'"/> </xsl:call-template> @@ -480,133 +480,133 @@ <!-- ================================================== --> <xsl:template match="corpauthor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="date" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgdiv" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -617,48 +617,48 @@ </xsl:template> <xsl:template match="productname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -669,48 +669,48 @@ </xsl:template> <xsl:template match="seriesinfo" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="seriesvolnums" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="title" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <i><xsl:apply-templates mode="bibliography.mode"/></i> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -718,7 +718,7 @@ <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliography.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -737,67 +737,67 @@ </xsl:template> <xsl:template match="abstract" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="address" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="author" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorgroup" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -805,7 +805,7 @@ <!-- ================================================== --> <xsl:template match="bibliomset" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -828,13 +828,13 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -850,193 +850,193 @@ <xsl:template match="collab" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="copyright" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpauthor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="date" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="printhistory" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -1046,44 +1046,44 @@ </xsl:template> <xsl:template match="seriesvolnums" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="title" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliomixed.mode"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/block.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -22,7 +22,7 @@ <!-- ==================================================================== --> <xsl:template name="block.object"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> @@ -185,7 +185,7 @@ </xsl:template> <xsl:template match="epigraph"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <xsl:if test="attribution"> <div class="attribution"> @@ -196,13 +196,13 @@ </xsl:template> <xsl:template match="attribution"> - <span class="{name(.)}"><xsl:apply-templates/></span> + <span class="{local-name(.)}"><xsl:apply-templates/></span> </xsl:template> <!-- ==================================================================== --> <xsl:template match="abstract|sidebar"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="title"> @@ -317,7 +317,7 @@ <!-- ==================================================================== --> <xsl:template match="revhistory"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <table border="0" width="100%" summary="Revision history"> <tr> <th align="left" valign="top" colspan="3"> @@ -408,7 +408,7 @@ <!-- ==================================================================== --> <xsl:template match="ackno"> - <p class="{name(.)}"> + <p class="{local-name(.)}"> <xsl:apply-templates/> </p> </xsl:template> Modified: trunk/xsl/html/callout.xsl =================================================================== --- trunk/xsl/html/callout.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/callout.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -50,7 +50,7 @@ <xsl:choose> <xsl:when test="$verbatim/@linenumbering = 'numbered' and $linenumbering.extension != '0'"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf-with-callouts"/> <xsl:with-param name="pi.context" @@ -60,7 +60,7 @@ </div> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:copy-of select="$rtf-with-callouts"/> <xsl:apply-templates select="calloutlist"/> </div> @@ -68,7 +68,7 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates/> </div> </xsl:otherwise> Modified: trunk/xsl/html/component.xsl =================================================================== --- trunk/xsl/html/component.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/component.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -75,7 +75,7 @@ <xsl:template match="dedication" mode="dedication"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -110,7 +110,7 @@ <xsl:template match="colophon"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -139,7 +139,7 @@ <xsl:template match="preface"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -197,7 +197,7 @@ <xsl:template match="chapter"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -258,7 +258,7 @@ <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -332,7 +332,7 @@ <xsl:template match="article"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> Modified: trunk/xsl/html/division.xsl =================================================================== --- trunk/xsl/html/division.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/division.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -17,7 +17,7 @@ <xsl:template match="set"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -59,7 +59,7 @@ <xsl:template match="book"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -104,7 +104,7 @@ <xsl:template match="part"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -147,7 +147,7 @@ <xsl:template match="partintro"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> Modified: trunk/xsl/html/ebnf.xsl =================================================================== --- trunk/xsl/html/ebnf.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/ebnf.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -61,7 +61,7 @@ <xsl:attribute name="border">1</xsl:attribute> </xsl:if> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:attribute name="summary"> <xsl:text>EBNF</xsl:text> @@ -73,7 +73,7 @@ <xsl:if test="title"> <tr> - <th align="left" valign="top" class="{name(.)}"> + <th align="left" valign="top" class="{local-name(.)}"> <xsl:apply-templates select="title"/> </th> </tr> @@ -87,7 +87,7 @@ </xsl:attribute> </xsl:if> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:attribute name="summary">EBNF productions</xsl:attribute> <xsl:apply-templates select="production|productionrecap"/> @@ -312,7 +312,7 @@ </xsl:template> <xsl:template match="constraintdef"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> Modified: trunk/xsl/html/footnote.xsl =================================================================== --- trunk/xsl/html/footnote.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/footnote.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -194,8 +194,8 @@ <xsl:param name="from" select=".."/> <xsl:param name="to" select="."/> <xsl:param name="count" select="0"/> - <xsl:param name="list" select="$from/following::*[name(.)=name($to)] - |$from/descendant-or-self::*[name(.)=name($to)]"/> + <xsl:param name="list" select="$from/following::*[local-name(.)=local-name($to)] + |$from/descendant-or-self::*[local-name(.)=local-name($to)]"/> <xsl:choose> <xsl:when test="not($list)"> @@ -247,13 +247,13 @@ <xsl:template match="footnote" name="process.footnote" mode="process.footnote.mode"> <xsl:choose> <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates/> </div> </xsl:when> <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates select="*[1]" mode="footnote.body.number"/> <xsl:apply-templates select="*[position() > 1]"/> </div> @@ -266,7 +266,7 @@ <xsl:value-of select="local-name(*[1])"/> <xsl:text> unexpected as first child of footnote.</xsl:text> </xsl:message> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates/> </div> </xsl:otherwise> Modified: trunk/xsl/html/glossary.xsl =================================================================== --- trunk/xsl/html/glossary.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/glossary.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -17,7 +17,7 @@ <xsl:template match="glossary"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -61,7 +61,7 @@ <!-- ==================================================================== --> <xsl:template match="glosslist"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> @@ -77,7 +77,7 @@ <xsl:template match="glossdiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> @@ -87,7 +87,7 @@ </xsl:template> <xsl:template match="glossdiv/title"> - <h3 class="{name(.)}"> + <h3 class="{local-name(.)}"> <xsl:apply-templates/> </h3> </xsl:template> @@ -320,7 +320,7 @@ </xsl:message> </xsl:if> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -375,7 +375,7 @@ <xsl:template match="glossdiv" mode="auto-glossary"> <xsl:param name="terms" select="."/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/graphics.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -62,7 +62,7 @@ <!-- ==================================================================== --> <xsl:template match="screenshot"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates/> </div> </xsl:template> @@ -1067,7 +1067,7 @@ <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/> </xsl:variable> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$align != '' "> <xsl:attribute name="align"> <xsl:value-of select="$align"/> @@ -1083,7 +1083,7 @@ </xsl:template> <xsl:template match="inlinemediaobject"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:if test="@id"> <a name="{@id}"/> </xsl:if> @@ -1376,7 +1376,7 @@ <!-- ==================================================================== --> <xsl:template match="caption"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="@align = 'right' or @align = 'left' or @align='center'"> <xsl:attribute name="align"><xsl:value-of select="@align"/></xsl:attribute> Modified: trunk/xsl/html/index.xsl =================================================================== --- trunk/xsl/html/index.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/index.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -24,7 +24,7 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -78,7 +78,7 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -112,7 +112,7 @@ <xsl:template match="indexdiv"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -128,7 +128,7 @@ </xsl:template> <xsl:template match="indexdiv/title"> - <h3 class="{name(.)}"> + <h3 class="{local-name(.)}"> <xsl:apply-templates/> </h3> </xsl:template> Modified: trunk/xsl/html/info.xsl =================================================================== --- trunk/xsl/html/info.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/info.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -23,7 +23,7 @@ <!-- called from named templates in a given mode --> <xsl:template match="corpauthor"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates/> </span> </xsl:template> @@ -31,7 +31,7 @@ <!-- ==================================================================== --> <xsl:template match="jobtitle"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates/> </span> </xsl:template> Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/inline.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -289,7 +289,7 @@ <!-- some special cases --> <xsl:template match="author"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:call-template name="person.name"/> <xsl:call-template name="apply-annotations"/> @@ -297,7 +297,7 @@ </xsl:template> <xsl:template match="editor"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:call-template name="person.name"/> <xsl:call-template name="apply-annotations"/> @@ -305,7 +305,7 @@ </xsl:template> <xsl:template match="othercredit"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:call-template name="person.name"/> <xsl:call-template name="apply-annotations"/> @@ -1092,8 +1092,8 @@ <xsl:otherwise> <xsl:variable name="node" select="$nodelist[$count=position()]"/> <xsl:choose> - <xsl:when test="name($node)='guimenuitem' - or name($node)='guisubmenu'"> + <xsl:when test="local-name($node)='guimenuitem' + or local-name($node)='guisubmenu'"> <xsl:value-of select="$menuchoice.menu.separator"/> </xsl:when> <xsl:otherwise> @@ -1182,14 +1182,14 @@ <!-- ==================================================================== --> <xsl:template match="person"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:apply-templates select="personname"/> </span> </xsl:template> <xsl:template match="personname"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:call-template name="person.name"/> </span> @@ -1198,26 +1198,26 @@ <!-- ==================================================================== --> <xsl:template match="org"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </span> </xsl:template> <xsl:template match="orgname"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates/> </span> </xsl:template> <xsl:template match="orgdiv"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates/> </span> </xsl:template> <xsl:template match="affiliation"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <xsl:apply-templates/> </span> </xsl:template> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/lists.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -15,7 +15,7 @@ <!-- ==================================================================== --> <xsl:template match="itemizedlist"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -135,7 +135,7 @@ </xsl:choose> </xsl:variable> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:if test="title"> @@ -254,7 +254,7 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -475,7 +475,7 @@ </xsl:template> <xsl:template match="simplelist[@type='inline']"> - <span class="{name(.)}"> + <span class="{local-name(.)}"> <!-- if dbchoice PI exists, use that to determine the choice separator --> <!-- (that is, equivalent of "and" or "or" in current locale), or literal --> <!-- value of "choice" otherwise --> @@ -682,7 +682,7 @@ |comment()[not(preceding-sibling::step)] |processing-instruction()[not(preceding-sibling::step)]"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"> <xsl:with-param name="conditional"> <xsl:choose> @@ -775,7 +775,7 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:choose> @@ -916,7 +916,7 @@ <!-- ==================================================================== --> <xsl:template match="calloutlist"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="anchor"/> <xsl:if test="title|info/title"> <xsl:call-template name="formal.object.heading"/> Modified: trunk/xsl/html/qandaset.xsl =================================================================== --- trunk/xsl/html/qandaset.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/qandaset.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -18,10 +18,10 @@ <xsl:template match="qandaset"> <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/> - <xsl:variable name="preamble" select="*[name(.) != 'title' - and name(.) != 'titleabbrev' - and name(.) != 'qandadiv' - and name(.) != 'qandaentry']"/> + <xsl:variable name="preamble" select="*[local-name(.) != 'title' + and local-name(.) != 'titleabbrev' + and local-name(.) != 'qandadiv' + and local-name(.) != 'qandaentry']"/> <xsl:variable name="toc"> <xsl:call-template name="dbhtml-attribute"> <xsl:with-param name="pis" @@ -36,7 +36,7 @@ </xsl:call-template> </xsl:variable> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:apply-templates select="$title"/> <xsl:if test="((contains($toc.params, 'toc') and $toc != '0') or $toc = '1') and not(ancestor::answer and not($qanda.nested.in.toc=0))"> @@ -55,7 +55,7 @@ </xsl:variable> <xsl:element name="h{string(number($qalevel)+1)}"> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:apply-templates/> </xsl:element> @@ -67,10 +67,10 @@ </xsl:template> <xsl:template match="qandadiv"> - <xsl:variable name="preamble" select="*[name(.) != 'title' - and name(.) != 'titleabbrev' - and name(.) != 'qandadiv' - and name(.) != 'qandaentry']"/> + <xsl:variable name="preamble" select="*[local-name(.) != 'title' + and local-name(.) != 'titleabbrev' + and local-name(.) != 'qandadiv' + and local-name(.) != 'qandaentry']"/> <xsl:if test="blockinfo/title|info/title|title"> <tr class="qandadiv"> @@ -120,7 +120,7 @@ <xsl:element name="h{string(number($qalevel)+1)}"> <xsl:attribute name="class"> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> </xsl:attribute> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> @@ -152,7 +152,7 @@ </xsl:choose> </xsl:variable> - <tr class="{name(.)}"> + <tr class="{local-name(.)}"> <td align="left" valign="top"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> @@ -178,10 +178,10 @@ <td align="left" valign="top"> <xsl:choose> <xsl:when test="$deflabel = 'none' and not(label)"> - <b><xsl:apply-templates select="*[name(.) != 'label']"/></b> + <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b> </xsl:when> <xsl:otherwise> - <xsl:apply-templates select="*[name(.) != 'label']"/> + <xsl:apply-templates select="*[local-name(.) != 'label']"/> </xsl:otherwise> </xsl:choose> </td> @@ -201,7 +201,7 @@ </xsl:choose> </xsl:variable> - <tr class="{name(.)}"> + <tr class="{local-name(.)}"> <td align="left" valign="top"> <xsl:call-template name="anchor"/> <xsl:variable name="answer.label"> @@ -214,8 +214,8 @@ </xsl:if> </td> <td align="left" valign="top"> - <xsl:apply-templates select="*[name(.) != 'label' - and name(.) != 'qandaentry']"/> + <xsl:apply-templates select="*[local-name(.) != 'label' + and local-name(.) != 'qandaentry']"/> <!-- * handle nested answer/qandaentry instances --> <!-- * (bug 1509043 from Daniel Leidert) --> <xsl:if test="descendant::question"> @@ -282,7 +282,7 @@ <xsl:template match="question" mode="qandatoc.mode"> <xsl:variable name="firstch"> - <xsl:apply-templates select="(*[name(.)!='label'])[1]"/> + <xsl:apply-templates select="(*[local-name(.)!='label'])[1]"/> </xsl:variable> <xsl:variable name="deflabel"> <xsl:choose> Modified: trunk/xsl/html/refentry.xsl =================================================================== --- trunk/xsl/html/refentry.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/refentry.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -17,7 +17,7 @@ <xsl:template match="reference"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -85,7 +85,7 @@ <xsl:template match="refentry"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -130,7 +130,7 @@ </xsl:template> <xsl:template match="refnamediv"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -206,7 +206,7 @@ </xsl:template> <xsl:template match="refsynopsisdiv"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -238,7 +238,7 @@ </xsl:template> <xsl:template match="refsection|refsect1|refsect2|refsect3"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> Modified: trunk/xsl/html/sections.xsl =================================================================== --- trunk/xsl/html/sections.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/sections.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -19,7 +19,7 @@ <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -99,7 +99,7 @@ <xsl:template match="sect1"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -151,7 +151,7 @@ <xsl:template match="sect2"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -203,7 +203,7 @@ <xsl:template match="sect3"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -255,7 +255,7 @@ <xsl:template match="sect4"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -307,7 +307,7 @@ <xsl:template match="sect5"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -359,7 +359,7 @@ <xsl:template match="simplesect"> <xsl:call-template name="id.warning"/> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> Modified: trunk/xsl/html/synop.xsl =================================================================== --- trunk/xsl/html/synop.xsl 2006-11-11 09:33:19 UTC (rev 6400) +++ trunk/xsl/html/synop.xsl 2006-11-11 09:33:44 UTC (rev 6401) @@ -22,7 +22,7 @@ <!-- ==================================================================== --> <xsl:template match="cmdsynopsis"> - <div class="{name(.)}"> + <div class="{local-name(.)}"> <p> <xsl:call-template name="anchor"/> <xsl:apply-templates/> @@ -155,7 +155,7 @@ </xsl:template> <xsl:template match="funcsynopsisinfo"> - <pre class="{name(.)}"><xsl:apply-templates/></pre> + <pre class="{local-name(.)}"><xsl:apply-templates/></pre> </xsl:template> <!-- ====================================================================== --> @@ -228,7 +228,7 @@ </xsl:template> <xsl:template match="funcdef" mode="kr-nontabular"> - <code class="{name(.)}"> + <code class="{local-name(.)}"> <xsl:apply-templates mode="kr-nontabular"/> <xsl:text>(</xsl:text> </code> @@ -344,7 +344,7 @@ </xsl:template> <xsl:template match="funcdef" mode="kr-tabular"> - <code class="{name(.)}"> + <code class="{local-name(.)}"> <xsl:apply-templates mode="kr-tabular"/> <xsl:text>(</xsl:text> </code> @@ -509,7 +509,7 @@ </xsl:template> <xsl:template match="funcdef" mode="ansi-nontabular"> - <code class="{name(.)}"> + <code class="{local-name(.)}"> <xsl:apply-templates mode="ansi-nontabular"/> <xsl:text>(</xsl:text> </code> @@ -595,7 +595,7 @@ </xsl:template> <xsl:template match="funcdef" mode="ansi-tabular"> - <code class="{name(.)}"> + <code class="{local-name(.)}"> <xsl:apply-templates mode="ansi-tabular"/> <xsl:text>(</xsl:text> </code> @@ -752,7 +752,7 @@ <xsl:otherwise> <xsl:message> <xsl:text>Unrecognized language on </xsl:text> - <xsl:value-of select="name(.)"/> + <xsl:value-of select="local-name(.)"/> <xsl:text>: </xsl:text> <xsl:value-of select="$language"/> <... [truncated message content] |
From: <bob...@us...> - 2006-11-12 08:24:05
|
Revision: 6403 http://svn.sourceforge.net/docbook/?rev=6403&view=rev Author: bobstayton Date: 2006-11-12 00:23:54 -0800 (Sun, 12 Nov 2006) Log Message: ----------- Finish support for @xml:id everywhere @id is used. Modified Paths: -------------- trunk/xsl/html/annotations.xsl trunk/xsl/html/autoidx.xsl trunk/xsl/html/biblio.xsl trunk/xsl/html/callout.xsl trunk/xsl/html/chunk-code.xsl trunk/xsl/html/chunk-common.xsl trunk/xsl/html/chunker.xsl trunk/xsl/html/chunkfast.xsl trunk/xsl/html/formal.xsl trunk/xsl/html/graphics.xsl trunk/xsl/html/html-rtf.xsl trunk/xsl/html/inline.xsl trunk/xsl/html/maketoc.xsl trunk/xsl/html/synop.xsl trunk/xsl/html/table.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/annotations.xsl =================================================================== --- trunk/xsl/html/annotations.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/annotations.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -8,7 +8,7 @@ <xsl:when test="contains($scripts, ' ')"> <script type="text/javascript" src="{substring-before($scripts, ' ')}"/> <xsl:call-template name="add.annotation.links"> - <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/> + <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> @@ -27,18 +27,18 @@ <xsl:variable name="aids"> <xsl:for-each select="//annotation"> <xsl:if test="@annotates=$id - or starts-with(@annotates, concat($id, ' ')) - or contains(@annotates, concat(' ', $id, ' ')) - or substring(@annotates, string-length(@annotates)-3) - = concat(' ', $id)"> - <xsl:value-of select="generate-id()"/> - <xsl:text> </xsl:text> + or starts-with(@annotates, concat($id, ' ')) + or contains(@annotates, concat(' ', $id, ' ')) + or substring(@annotates, string-length(@annotates)-3) + = concat(' ', $id)"> + <xsl:value-of select="generate-id()"/> + <xsl:text> </xsl:text> </xsl:if> </xsl:for-each> <xsl:if test="normalize-space(@annotations) != ''"> <xsl:call-template name="annotations-pointed-to"> - <xsl:with-param name="annotations" - select="normalize-space(@annotations)"/> + <xsl:with-param name="annotations" + select="normalize-space(@annotations)"/> </xsl:call-template> </xsl:if> </xsl:variable> @@ -56,22 +56,22 @@ <xsl:choose> <xsl:when test="contains($annotations, ' ')"> <xsl:variable name='a' - select="key('id', substring-before($annotations, ' '))"/> + select="key('id', substring-before($annotations, ' '))"/> <xsl:if test="$a"> - <xsl:value-of select="generate-id($a)"/> - <xsl:text> </xsl:text> + <xsl:value-of select="generate-id($a)"/> + <xsl:text> </xsl:text> </xsl:if> <xsl:call-template name="annotations-pointed-to"> - <xsl:with-param name="annotations" - select="substring-after($annotations, ' ')"/> + <xsl:with-param name="annotations" + select="substring-after($annotations, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:variable name='a' - select="key('id', $annotations)"/> + select="key('id', $annotations)"/> <xsl:if test="$a"> - <xsl:value-of select="generate-id($a)"/> - <xsl:text> </xsl:text> + <xsl:value-of select="generate-id($a)"/> + <xsl:text> </xsl:text> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -84,15 +84,15 @@ <xsl:when test="contains($gids, ' ')"> <xsl:variable name="gid" select="substring-before($gids, ' ')"/> <xsl:apply-templates select="key('gid', $gid)" - mode="annotation-inline"/> + mode="annotation-inline"/> <xsl:call-template name="apply-annotations-by-gid"> - <xsl:with-param name="gids" - select="substring-after($gids, ' ')"/> + <xsl:with-param name="gids" + select="substring-after($gids, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="key('gid', $gids)" - mode="annotation-inline"/> + mode="annotation-inline"/> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -101,12 +101,12 @@ <xsl:variable name="title"> <xsl:choose> <xsl:when test="title"> - <xsl:value-of select="title"/> + <xsl:value-of select="title"/> </xsl:when> <xsl:otherwise> - <xsl:text>[Annotation #</xsl:text> - <xsl:number count="annotation" level="any" format="1"/> - <xsl:text>]</xsl:text> + <xsl:text>[Annotation #</xsl:text> + <xsl:number count="annotation" level="any" format="1"/> + <xsl:text>]</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -145,7 +145,7 @@ </div> <div class="annotation-close"> <a href="#" onclick="popup_{generate-id(.)}.hidePopup();return false;"> - <img src="{$annotation.graphic.close}" alt="X" border="0"/> + <img src="{$annotation.graphic.close}" alt="X" border="0"/> </a> </div> </div> @@ -155,10 +155,10 @@ <div class="annotation-title"> <xsl:choose> <xsl:when test="title"> - <xsl:apply-templates select="title/node()"/> + <xsl:apply-templates select="title/node()"/> </xsl:when> <xsl:otherwise> - <xsl:text>Annotation</xsl:text> + <xsl:text>Annotation</xsl:text> </xsl:otherwise> </xsl:choose> </div> Modified: trunk/xsl/html/autoidx.xsl =================================================================== --- trunk/xsl/html/autoidx.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/autoidx.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -105,7 +105,7 @@ match="indexterm[see]" use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/> -<xsl:key name="sections" match="*[@id]" use="@id"/> +<xsl:key name="sections" match="*[@id or @xml:id]" use="@id|@xml:id"/> <xsl:template name="generate-index"> @@ -520,8 +520,9 @@ <xsl:value-of select="$title"/> <!-- text only --> </a> - <xsl:if test="key('endofrange', @id)[&scope;]"> - <xsl:apply-templates select="key('endofrange', @id)[&scope;][last()]" + <xsl:variable name="id" select="(@id|@xml:id)[1]"/> + <xsl:if test="key('endofrange', $id)[&scope;]"> + <xsl:apply-templates select="key('endofrange', $id)[&scope;][last()]" mode="reference"> <xsl:with-param name="position" select="position()"/> <xsl:with-param name="scope" select="$scope"/> Modified: trunk/xsl/html/biblio.xsl =================================================================== --- trunk/xsl/html/biblio.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/biblio.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -91,7 +91,8 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> <xsl:choose> @@ -151,7 +152,8 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> <xsl:choose> @@ -224,6 +226,11 @@ <xsl:value-of select="$node/@id"/> <xsl:text>] </xsl:text> </xsl:when> + <xsl:when test="$node/@xml:id"> + <xsl:text>[</xsl:text> + <xsl:value-of select="$node/@xml:id"/> + <xsl:text>] </xsl:text> + </xsl:when> <xsl:otherwise><!-- nop --></xsl:otherwise> </xsl:choose> </xsl:template> Modified: trunk/xsl/html/callout.xsl =================================================================== --- trunk/xsl/html/callout.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/callout.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -93,9 +93,9 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> <xsl:attribute name="href"> Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/chunk-code.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -72,15 +72,15 @@ <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/chunk-common.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -213,8 +213,8 @@ </xsl:when> <!-- if there's no dbhtml filename, and if we're to use IDs as --> <!-- filenames, then use the ID to generate the filename. --> - <xsl:when test="@id and $use.id.as.filename != 0"> - <xsl:value-of select="@id"/> + <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0"> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:value-of select="$html.ext"/> </xsl:when> <xsl:otherwise></xsl:otherwise> Modified: trunk/xsl/html/chunker.xsl =================================================================== --- trunk/xsl/html/chunker.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/chunker.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -104,9 +104,9 @@ <xsl:if test="name(.) != '' and $suppress-context-node-name = 0"> <xsl:text> for </xsl:text> <xsl:value-of select="name(.)"/> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:text>(</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:text>)</xsl:text> </xsl:if> </xsl:if> Modified: trunk/xsl/html/chunkfast.xsl =================================================================== --- trunk/xsl/html/chunkfast.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/chunkfast.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -28,15 +28,15 @@ <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')"> <xsl:variable name="genid" select="generate-id()"/> - <xsl:variable name="div" select="$chunks[@id=$genid]"/> + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', $prevdiv/@id)"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|prevdiv/@xml:id)[1])"/> <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', $nextdiv/@id)"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|prevdiv/@xml:id)[1])"/> <xsl:choose> <xsl:when test="$onechunk != 0 and parent::*"> Modified: trunk/xsl/html/formal.xsl =================================================================== --- trunk/xsl/html/formal.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/formal.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -184,12 +184,10 @@ </xsl:when> <xsl:otherwise> <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:if test="not(@id)"> - <xsl:attribute name="id"> - <xsl:call-template name="object.id"/> - </xsl:attribute> - </xsl:if> + <xsl:copy-of select="@*[not(local-name()='id')]"/> + <xsl:attribute name="id"> + <xsl:call-template name="object.id"/> + </xsl:attribute> <xsl:call-template name="htmlTable"/> </xsl:copy> </xsl:otherwise> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/graphics.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -1011,8 +1011,7 @@ </xsl:choose> </xsl:variable> - <xsl:if test="@id"> - <a name="{@id}"/> + <xsl:call-template name="anchor"/> </xsl:if> <xsl:choose> @@ -1073,9 +1072,7 @@ <xsl:value-of select="$align"/> </xsl:attribute> </xsl:if> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="$object"/> <xsl:apply-templates select="caption"/> @@ -1084,9 +1081,7 @@ <xsl:template match="inlinemediaobject"> <span class="{local-name(.)}"> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:call-template name="select.mediaobject"/> </span> </xsl:template> @@ -1100,9 +1095,7 @@ <!-- ==================================================================== --> <xsl:template match="imageobjectco"> - <xsl:if test="@id"> - <a name="{@id}"/> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="imageobject"/> <xsl:apply-templates select="calloutlist"/> </xsl:template> Modified: trunk/xsl/html/html-rtf.xsl =================================================================== --- trunk/xsl/html/html-rtf.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/html-rtf.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -175,7 +175,8 @@ <xsl:variable name="leading" select="set:leading($nodes,$block)"/> <xsl:variable name="trailing" select="set:trailing($nodes,$block)"/> - <xsl:if test="($wrap/@id and $first = 1) or $leading"> + <xsl:if test="(($wrap/@id or $wrap/@xml:id) + and $first = 1) or $leading"> <xsl:element name="{local-name($wrap)}" namespace="{namespace-uri($wrap)}"> <xsl:for-each select="$wrap/@*"> <xsl:if test="$first != 0 or local-name(.) != 'id'"> @@ -198,7 +199,7 @@ </xsl:when> <xsl:otherwise> - <xsl:if test="($wrap/@id and $first = 1) or $nodes"> + <xsl:if test="(($wrap/@id or $wrap/@xml:id) and $first = 1) or $nodes"> <xsl:element name="{local-name($wrap)}" namespace="{namespace-uri($wrap)}"> <xsl:for-each select="$wrap/@*"> <xsl:if test="$first != 0 or local-name(.) != 'id'"> Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/inline.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -777,9 +777,9 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> @@ -858,14 +858,9 @@ </xsl:when> <xsl:otherwise> <xsl:variable name="id"> - <xsl:choose> - <xsl:when test="$cterm/@id"> - <xsl:value-of select="$cterm/@id"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="generate-id($cterm)"/> - </xsl:otherwise> - </xsl:choose> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$cterm"/> + </xsl:call-template> </xsl:variable> <a href="{$chunkbase}#{$id}"> <xsl:call-template name="inline.italicseq"> @@ -905,9 +900,9 @@ </xsl:when> <xsl:otherwise> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> Modified: trunk/xsl/html/maketoc.xsl =================================================================== --- trunk/xsl/html/maketoc.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/maketoc.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -45,7 +45,10 @@ <xsl:if test="$chunk != 0"> <xsl:call-template name="indent-spaces"/> - <tocentry linkend="{@id}"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <tocentry linkend="{$id}"> <xsl:processing-instruction name="dbhtml"> <xsl:text>filename="</xsl:text> <xsl:value-of select="$filename"/> Modified: trunk/xsl/html/synop.xsl =================================================================== --- trunk/xsl/html/synop.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/synop.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -140,7 +140,10 @@ <xsl:apply-templates select="." mode="synopfragment.number"/> </xsl:variable> <p> - <a name="{@id}"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <a name="{$id}"> <xsl:text>(</xsl:text> <xsl:value-of select="$snum"/> <xsl:text>)</xsl:text> Modified: trunk/xsl/html/table.xsl =================================================================== --- trunk/xsl/html/table.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/table.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -877,7 +877,8 @@ </xsl:attribute> </xsl:if> - <xsl:if test="not(preceding-sibling::*) and ancestor::row/@id"> + <xsl:if test="not(preceding-sibling::*) and + (ancestor::row[1]/@id or ancestor::row[1]/@xml:id)"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select="ancestor::row[1]"/> </xsl:call-template> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2006-11-12 08:23:21 UTC (rev 6402) +++ trunk/xsl/html/xref.xsl 2006-11-12 08:23:54 UTC (rev 6403) @@ -254,6 +254,8 @@ <xsl:choose> <xsl:when test="(@name and count(@*) = 1) or (@id and count(@*) = 1) + or (@xml:id and count(@*) = 1) + or (@xml:id and @name and count(@*) = 2) or (@id and @name and count(@*) = 2)"> <xsl:message>suppress anchor</xsl:message> <!-- suppress the whole thing --> @@ -266,7 +268,8 @@ <xsl:copy/> </xsl:when> <xsl:otherwise> - <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message> + <xsl:message>removing <xsl:value-of + select="local-name(.)"/></xsl:message> </xsl:otherwise> </xsl:choose> </xsl:for-each> @@ -279,11 +282,12 @@ <xsl:copy> <xsl:for-each select="@*"> <xsl:choose> - <xsl:when test="name(.) != 'id'"> + <xsl:when test="local-name(.) != 'id'"> <xsl:copy/> </xsl:when> <xsl:otherwise> - <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message> + <xsl:message>removing <xsl:value-of + select="local-name(.)"/></xsl:message> </xsl:otherwise> </xsl:choose> </xsl:for-each> @@ -308,7 +312,7 @@ <xsl:text>Don't know what gentext to create for xref to: "</xsl:text> <xsl:value-of select="name(.)"/> <xsl:text>", ("</xsl:text> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> <xsl:text>")</xsl:text> </xsl:message> </xsl:if> @@ -465,8 +469,9 @@ <xsl:choose> <xsl:when test="string(.) = ''"> <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="id" select="@id"/> - <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/> + <xsl:variable name="id" select="(@id|@xml:id)[1]"/> + <xsl:variable name="entry" select="$bib/bibliography/ + *[@id=$id or @xml:id="$id][1]"/> <xsl:choose> <xsl:when test="$entry"> <xsl:choose> @@ -478,7 +483,7 @@ <xsl:apply-templates select="$entry/*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id:@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -489,7 +494,7 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id:@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -503,7 +508,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id:@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -864,7 +869,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id:@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> <xsl:text>]</xsl:text> @@ -903,9 +908,7 @@ </xsl:call-template> <a> - <xsl:if test="@id"> - <xsl:attribute name="name"><xsl:value-of select="@id"/></xsl:attribute> - </xsl:if> + <xsl:call-template name="anchor"/> <xsl:if test="$a.target"> <xsl:attribute name="target"><xsl:value-of select="$a.target"/></xsl:attribute> @@ -986,9 +989,9 @@ <xsl:param name="url" select="@url"/> <xsl:variable name="link"> <a> - <xsl:if test="@id"> + <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> - <xsl:value-of select="@id"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:attribute> </xsl:if> <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute> @@ -1198,7 +1201,8 @@ <xsl:variable name="node-href"> <xsl:choose> <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline//*[@id=$localinfo]"/> + <xsl:variable name="node" select="$outline// + *[@id=$localinfo or @xml:id=$localinfo]"/> <xsl:value-of select="$node/@href"/> </xsl:when> <xsl:otherwise> @@ -1210,7 +1214,8 @@ <xsl:variable name="node-xref"> <xsl:choose> <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline//*[@id=$localinfo]"/> + <xsl:variable name="node" select="$outline// + *[@id=$localinfo or @xml:id=$localinfo]"/> <xsl:copy-of select="$node/xref"/> </xsl:when> <xsl:otherwise> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2006-11-12 09:15:13
|
Revision: 6405 http://svn.sourceforge.net/docbook/?rev=6405&view=rev Author: bobstayton Date: 2006-11-12 01:14:57 -0800 (Sun, 12 Nov 2006) Log Message: ----------- Fix syntax errors. Modified Paths: -------------- trunk/xsl/html/graphics.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2006-11-12 08:24:40 UTC (rev 6404) +++ trunk/xsl/html/graphics.xsl 2006-11-12 09:14:57 UTC (rev 6405) @@ -1012,7 +1012,6 @@ </xsl:variable> <xsl:call-template name="anchor"/> - </xsl:if> <xsl:choose> <xsl:when test="@format='linespecific'"> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2006-11-12 08:24:40 UTC (rev 6404) +++ trunk/xsl/html/xref.xsl 2006-11-12 09:14:57 UTC (rev 6405) @@ -471,7 +471,7 @@ <xsl:variable name="bib" select="document($bibliography.collection,.)"/> <xsl:variable name="id" select="(@id|@xml:id)[1]"/> <xsl:variable name="entry" select="$bib/bibliography/ - *[@id=$id or @xml:id="$id][1]"/> + *[@id=$id or @xml:id=$id][1]"/> <xsl:choose> <xsl:when test="$entry"> <xsl:choose> @@ -483,7 +483,7 @@ <xsl:apply-templates select="$entry/*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="(@id:@xml:id)[1]"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -494,7 +494,7 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <xsl:value-of select="(@id:@xml:id)[1]"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:when> @@ -508,7 +508,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="(@id:@xml:id)[1]"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -869,7 +869,7 @@ <xsl:apply-templates select="*[1]"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="(@id:@xml:id)[1]"/> + <xsl:value-of select="(@id|@xml:id)[1]"/> </xsl:otherwise> </xsl:choose> <xsl:text>]</xsl:text> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2006-11-18 09:00:50
|
Revision: 6434 http://svn.sourceforge.net/docbook/?rev=6434&view=rev Author: bobstayton Date: 2006-11-18 01:00:48 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Convert all class attributes to use the class.attribute mode so class names can be customized more easily. Modified Paths: -------------- trunk/xsl/html/admon.xsl trunk/xsl/html/biblio.xsl trunk/xsl/html/block.xsl trunk/xsl/html/callout.xsl trunk/xsl/html/chunk-code.xsl trunk/xsl/html/component.xsl trunk/xsl/html/division.xsl trunk/xsl/html/ebnf.xsl trunk/xsl/html/footnote.xsl trunk/xsl/html/glossary.xsl trunk/xsl/html/graphics.xsl trunk/xsl/html/index.xsl trunk/xsl/html/info.xsl trunk/xsl/html/lists.xsl trunk/xsl/html/math.xsl trunk/xsl/html/qandaset.xsl trunk/xsl/html/refentry.xsl trunk/xsl/html/sections.xsl trunk/xsl/html/synop.xsl trunk/xsl/html/task.xsl trunk/xsl/html/titlepage.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/html/admon.xsl =================================================================== --- trunk/xsl/html/admon.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/admon.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -60,7 +60,8 @@ </xsl:call-template> </xsl:variable> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$admon.style != ''"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> @@ -103,7 +104,8 @@ </xsl:template> <xsl:template name="nongraphical.admonition"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$admon.style"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> Modified: trunk/xsl/html/biblio.xsl =================================================================== --- trunk/xsl/html/biblio.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/biblio.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -17,7 +17,8 @@ <xsl:template match="bibliography"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -45,13 +46,15 @@ <xsl:template match="bibliodiv"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:template> <xsl:template match="bibliodiv/title"> - <h3 class="{local-name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> </xsl:call-template> @@ -62,7 +65,8 @@ <!-- ==================================================================== --> <xsl:template match="bibliolist"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> @@ -113,7 +117,8 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <p> <xsl:copy-of select="$label"/> @@ -127,7 +132,8 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> @@ -174,7 +180,8 @@ <xsl:text> found in </xsl:text> <xsl:value-of select="$bibliography.collection"/> </xsl:message> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <p> <xsl:copy-of select="$label"/> @@ -188,11 +195,13 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> - <p class="{local-name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliomixed.mode"/> </p> @@ -252,49 +261,56 @@ </xsl:template> <xsl:template match="address" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artheader|articleinfo|info" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="author" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -305,28 +321,32 @@ </xsl:template> <xsl:template match="authorgroup" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name.list"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="bibliomset" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -335,7 +355,8 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> @@ -359,14 +380,16 @@ <!-- ================================================== --> <xsl:template match="bookbiblio" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -382,70 +405,80 @@ </xsl:template> <xsl:template match="collab" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="collabname" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confdates" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="conftitle" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confnum" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="confsponsor" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -454,7 +487,8 @@ <!-- ================================================== --> <xsl:template match="copyright" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Copyright'"/> </xsl:call-template> @@ -487,133 +521,152 @@ <!-- ================================================== --> <xsl:template match="corpauthor" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="date" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="orgdiv" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -624,48 +677,55 @@ </xsl:template> <xsl:template match="productname" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -676,48 +736,55 @@ </xsl:template> <xsl:template match="seriesinfo" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="seriesvolnums" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="title" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <i><xsl:apply-templates mode="bibliography.mode"/></i> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -725,7 +792,8 @@ <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliography.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -744,67 +812,78 @@ </xsl:template> <xsl:template match="abstract" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="address" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="author" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorgroup" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -812,7 +891,8 @@ <!-- ================================================== --> <xsl:template match="bibliomset" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -835,13 +915,15 @@ <!-- ================================================== --> <xsl:template match="biblioset" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -857,193 +939,225 @@ <xsl:template match="collab" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="copyright" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpauthor" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="date" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="printhistory" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productname" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -1053,44 +1167,51 @@ </xsl:template> <xsl:template match="seriesvolnums" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="title" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliomixed.mode"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/block.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -22,7 +22,8 @@ <!-- ==================================================================== --> <xsl:template name="block.object"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> @@ -138,7 +139,8 @@ <!-- ==================================================================== --> <xsl:template match="blockquote"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@lang or @xml:lang"> <xsl:call-template name="language.attribute"/> </xsl:if> @@ -166,7 +168,8 @@ </table> </xsl:when> <xsl:otherwise> - <blockquote class="{local-name(.)}"> + <blockquote> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </blockquote> </xsl:otherwise> @@ -185,7 +188,8 @@ </xsl:template> <xsl:template match="epigraph"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <xsl:if test="attribution"> <div class="attribution"> @@ -196,13 +200,17 @@ </xsl:template> <xsl:template match="attribution"> - <span class="{local-name(.)}"><xsl:apply-templates/></span> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates/> + </span> </xsl:template> <!-- ==================================================================== --> <xsl:template match="abstract|sidebar"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="title"> @@ -317,7 +325,8 @@ <!-- ==================================================================== --> <xsl:template match="revhistory"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <table border="0" width="100%" summary="Revision history"> <tr> <th align="left" valign="top" colspan="3"> @@ -408,7 +417,8 @@ <!-- ==================================================================== --> <xsl:template match="ackno"> - <p class="{local-name(.)}"> + <p> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </p> </xsl:template> Modified: trunk/xsl/html/callout.xsl =================================================================== --- trunk/xsl/html/callout.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/callout.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -50,7 +50,8 @@ <xsl:choose> <xsl:when test="$verbatim/@linenumbering = 'numbered' and $linenumbering.extension != '0'"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf-with-callouts"/> <xsl:with-param name="pi.context" @@ -60,7 +61,8 @@ </div> </xsl:when> <xsl:otherwise> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$rtf-with-callouts"/> <xsl:apply-templates select="calloutlist"/> </div> @@ -68,7 +70,8 @@ </xsl:choose> </xsl:when> <xsl:otherwise> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:otherwise> Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/chunk-code.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -50,7 +50,8 @@ <xsl:choose> <xsl:when test="$chunk != 0"> - <cf:div class="{local-name(.)}" id="{generate-id()}"> + <cf:div id="{generate-id()}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*" mode="find.chunks"/> </cf:div> </xsl:when> Modified: trunk/xsl/html/component.xsl =================================================================== --- trunk/xsl/html/component.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/component.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -75,7 +75,8 @@ <xsl:template match="dedication" mode="dedication"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -110,7 +111,8 @@ <xsl:template match="colophon"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -139,7 +141,8 @@ <xsl:template match="preface"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -197,7 +200,8 @@ <xsl:template match="chapter"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -258,7 +262,8 @@ <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -332,7 +337,8 @@ <xsl:template match="article"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> Modified: trunk/xsl/html/division.xsl =================================================================== --- trunk/xsl/html/division.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/division.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -17,7 +17,8 @@ <xsl:template match="set"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -59,7 +60,8 @@ <xsl:template match="book"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -104,7 +106,8 @@ <xsl:template match="part"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -147,7 +150,8 @@ <xsl:template match="partintro"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> Modified: trunk/xsl/html/ebnf.xsl =================================================================== --- trunk/xsl/html/ebnf.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/ebnf.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -54,7 +54,7 @@ <table width="100%" cellpadding="5"> <xsl:if test="$ebnf.table.bgcolor != ''"> <xsl:attribute name="bgcolor"> - <xsl:value-of select="$ebnf.table.bgcolor"/> + <xsl:value-of select="$ebnf.table.bgcolor"/> </xsl:attribute> </xsl:if> <xsl:if test="$ebnf.table.border != 0"> @@ -66,32 +66,33 @@ <xsl:attribute name="summary"> <xsl:text>EBNF</xsl:text> <xsl:if test="title"> - <xsl:text> for </xsl:text> - <xsl:value-of select="title"/> + <xsl:text> for </xsl:text> + <xsl:value-of select="title"/> </xsl:if> </xsl:attribute> <xsl:if test="title"> <tr> - <th align="left" valign="top" class="{local-name(.)}"> - <xsl:apply-templates select="title"/> - </th> + <th align="left" valign="top"> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="title"/> + </th> </tr> </xsl:if> <tr> <td> - <table border="0" width="99%" cellpadding="0"> - <xsl:if test="$ebnf.table.bgcolor != ''"> - <xsl:attribute name="bgcolor"> - <xsl:value-of select="$ebnf.table.bgcolor"/> - </xsl:attribute> - </xsl:if> - <xsl:attribute name="class"> - <xsl:value-of select="local-name(.)"/> - </xsl:attribute> - <xsl:attribute name="summary">EBNF productions</xsl:attribute> - <xsl:apply-templates select="production|productionrecap"/> - </table> + <table border="0" width="99%" cellpadding="0"> + <xsl:if test="$ebnf.table.bgcolor != ''"> + <xsl:attribute name="bgcolor"> + <xsl:value-of select="$ebnf.table.bgcolor"/> + </xsl:attribute> + </xsl:if> + <xsl:attribute name="class"> + <xsl:value-of select="local-name(.)"/> + </xsl:attribute> + <xsl:attribute name="summary">EBNF productions</xsl:attribute> + <xsl:apply-templates select="production|productionrecap"/> + </table> </td> </tr> </table> @@ -111,20 +112,20 @@ </td> <td align="right" valign="top" width="10%"> <xsl:choose> - <xsl:when test="$recap"> - <a> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="."/> - </xsl:call-template> - </xsl:attribute> - <xsl:apply-templates select="lhs"/> - </a> - </xsl:when> - <xsl:otherwise> + <xsl:when test="$recap"> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="."/> + </xsl:call-template> + </xsl:attribute> + <xsl:apply-templates select="lhs"/> + </a> + </xsl:when> + <xsl:otherwise> <xsl:call-template name="anchor"/> - <xsl:apply-templates select="lhs"/> - </xsl:otherwise> + <xsl:apply-templates select="lhs"/> + </xsl:otherwise> </xsl:choose> </td> <td valign="top" width="5%" align="center"> @@ -136,13 +137,13 @@ </td> <td align="left" valign="top" width="30%"> <xsl:choose> - <xsl:when test="rhs/lineannotation|constraint"> + <xsl:when test="rhs/lineannotation|constraint"> <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/> <xsl:apply-templates select="constraint"/> - </xsl:when> - <xsl:otherwise> - <xsl:text> </xsl:text> - </xsl:otherwise> + </xsl:when> + <xsl:otherwise> + <xsl:text> </xsl:text> + </xsl:otherwise> </xsl:choose> </td> </tr> @@ -206,14 +207,14 @@ <xsl:when test="*|text()"><!--nop--></xsl:when> <xsl:otherwise> <xsl:if test="$linkend = ''"> - <xsl:message> - <xsl:text>Non-terminals with no content must point to </xsl:text> - <xsl:text>production elements in the current document.</xsl:text> - </xsl:message> - <xsl:message> - <xsl:text>Invalid xpointer for empty nt: </xsl:text> - <xsl:value-of select="@def"/> - </xsl:message> + <xsl:message> + <xsl:text>Non-terminals with no content must point to </xsl:text> + <xsl:text>production elements in the current document.</xsl:text> + </xsl:message> + <xsl:message> + <xsl:text>Invalid xpointer for empty nt: </xsl:text> + <xsl:value-of select="@def"/> + </xsl:message> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -221,14 +222,14 @@ <xsl:variable name="href"> <xsl:choose> <xsl:when test="$linkend != ''"> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$target"/> + </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:value-of select="@def"/> + <xsl:value-of select="@def"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -236,19 +237,19 @@ <a href="{$href}"> <xsl:choose> <xsl:when test="*|text()"> - <xsl:apply-templates/> + <xsl:apply-templates/> </xsl:when> <xsl:otherwise> - <xsl:choose> - <xsl:when test="$linkend != ''"> - <xsl:variable name="targets" select="key('id',$linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:apply-templates select="$target/lhs"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$linkend != ''"> + <xsl:variable name="targets" select="key('id',$linkend)"/> + <xsl:variable name="target" select="$targets[1]"/> + <xsl:apply-templates select="$target/lhs"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>???</xsl:text> + </xsl:otherwise> + </xsl:choose> </xsl:otherwise> </xsl:choose> </a> @@ -294,8 +295,8 @@ <xsl:variable name="targets" select="key('id',@linkend)"/> <xsl:variable name="target" select="$targets[1]"/> <xsl:if test="$target/@role"> - <xsl:value-of select="$target/@role"/> - <xsl:text>: </xsl:text> + <xsl:value-of select="$target/@role"/> + <xsl:text>: </xsl:text> </xsl:if> </xsl:otherwise> </xsl:choose> @@ -312,7 +313,8 @@ </xsl:template> <xsl:template match="constraintdef"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> Modified: trunk/xsl/html/footnote.xsl =================================================================== --- trunk/xsl/html/footnote.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/footnote.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -247,13 +247,15 @@ <xsl:template match="footnote" name="process.footnote" mode="process.footnote.mode"> <xsl:choose> <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:when> <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*[1]" mode="footnote.body.number"/> <xsl:apply-templates select="*[position() > 1]"/> </div> @@ -266,7 +268,8 @@ <xsl:value-of select="local-name(*[1])"/> <xsl:text> unexpected as first child of footnote.</xsl:text> </xsl:message> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:otherwise> Modified: trunk/xsl/html/glossary.xsl =================================================================== --- trunk/xsl/html/glossary.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/glossary.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -17,7 +17,8 @@ <xsl:template match="glossary"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -61,7 +62,8 @@ <!-- ==================================================================== --> <xsl:template match="glosslist"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> @@ -77,7 +79,8 @@ <xsl:template match="glossdiv"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> @@ -87,7 +90,8 @@ </xsl:template> <xsl:template match="glossdiv/title"> - <h3 class="{local-name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </h3> </xsl:template> @@ -320,7 +324,8 @@ </xsl:message> </xsl:if> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -375,7 +380,8 @@ <xsl:template match="glossdiv" mode="auto-glossary"> <xsl:param name="terms" select="."/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/graphics.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -62,7 +62,8 @@ <!-- ==================================================================== --> <xsl:template match="screenshot"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </div> </xsl:template> @@ -1065,7 +1066,8 @@ <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/> </xsl:variable> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$align != '' "> <xsl:attribute name="align"> <xsl:value-of select="$align"/> @@ -1079,7 +1081,8 @@ </xsl:template> <xsl:template match="inlinemediaobject"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:call-template name="select.mediaobject"/> </span> @@ -1368,7 +1371,8 @@ <!-- ==================================================================== --> <xsl:template match="caption"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@align = 'right' or @align = 'left' or @align='center'"> <xsl:attribute name="align"><xsl:value-of select="@align"/></xsl:attribute> Modified: trunk/xsl/html/index.xsl =================================================================== --- trunk/xsl/html/index.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/index.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -24,7 +24,8 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -78,7 +79,8 @@ <xsl:call-template name="id.warning"/> <xsl:if test="count(*)>0 or $generate.index != '0'"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -112,7 +114,8 @@ <xsl:template match="indexdiv"> <xsl:call-template name="id.warning"/> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -128,7 +131,8 @@ </xsl:template> <xsl:template match="indexdiv/title"> - <h3 class="{local-name(.)}"> + <h3> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </h3> </xsl:template> Modified: trunk/xsl/html/info.xsl =================================================================== --- trunk/xsl/html/info.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/info.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -23,7 +23,8 @@ <!-- called from named templates in a given mode --> <xsl:template match="corpauthor"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> @@ -31,7 +32,8 @@ <!-- ==================================================================== --> <xsl:template match="jobtitle"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> </span> </xsl:template> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2006-11-18 08:34:23 UTC (rev 6433) +++ trunk/xsl/html/lists.xsl 2006-11-18 09:00:48 UTC (rev 6434) @@ -15,7 +15,8 @@ <!-- ==================================================================== --> <xsl:template match="itemizedlist"> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -135,7 +136,8 @@ </xsl:choose> </xsl:variable> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> @@ -254,7 +256,8 @@ </xsl:call-template> </xsl:variable> - <div class="{local-name(.)}"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -475,7 +478,8 @@ </xsl:template> <xsl:template match="simplelist[@type='inline']"> - <span class="{local-name(.)}"> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> <!-- if dbchoice PI exists, use ... [truncated message content] |
From: <bob...@us...> - 2006-11-18 20:10:35
|
Revision: 6439 http://svn.sourceforge.net/docbook/?rev=6439&view=rev Author: bobstayton Date: 2006-11-18 12:10:32 -0800 (Sat, 18 Nov 2006) Log Message: ----------- *.propagates.style now handled in class.attribute mode. Modified Paths: -------------- trunk/xsl/html/block.xsl trunk/xsl/html/footnote.xsl trunk/xsl/html/inline.xsl trunk/xsl/html/lists.xsl trunk/xsl/html/table.xsl Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2006-11-18 09:30:23 UTC (rev 6438) +++ trunk/xsl/html/block.xsl 2006-11-18 20:10:32 UTC (rev 6439) @@ -59,9 +59,9 @@ <p> <xsl:call-template name="dir"/> <xsl:if test="$class != ''"> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="$class"/> + </xsl:apply-templates> </xsl:if> <xsl:copy-of select="$content"/> </p> @@ -83,9 +83,9 @@ <!-- see also listitem/simpara in lists.xsl --> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> @@ -373,9 +373,9 @@ <xsl:for-each select="$revauthor"> <xsl:apply-templates select="."/> <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> + <xsl:text>, </xsl:text> + </xsl:if> + </xsl:for-each> </td> </xsl:otherwise> </xsl:choose> Modified: trunk/xsl/html/footnote.xsl =================================================================== --- trunk/xsl/html/footnote.xsl 2006-11-18 09:30:23 UTC (rev 6438) +++ trunk/xsl/html/footnote.xsl 2006-11-18 20:10:32 UTC (rev 6439) @@ -119,9 +119,9 @@ </xsl:variable> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <sup> <xsl:text>[</xsl:text> Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2006-11-18 09:30:23 UTC (rev 6438) +++ trunk/xsl/html/inline.xsl 2006-11-18 20:10:32 UTC (rev 6439) @@ -705,9 +705,9 @@ <span> <xsl:choose> <xsl:when test="@role and $emphasis.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:when> <xsl:otherwise> <xsl:attribute name="class"> @@ -768,9 +768,9 @@ <xsl:call-template name="language.attribute"/> </xsl:if> <xsl:if test="@role and $phrase.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="dir"/> <xsl:call-template name="anchor"/> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2006-11-18 09:30:23 UTC (rev 6438) +++ trunk/xsl/html/lists.xsl 2006-11-18 20:10:32 UTC (rev 6439) @@ -346,9 +346,9 @@ <xsl:otherwise> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> @@ -1015,9 +1015,9 @@ <xsl:otherwise> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:call-template name="anchor"/> Modified: trunk/xsl/html/table.xsl =================================================================== --- trunk/xsl/html/table.xsl 2006-11-18 09:30:23 UTC (rev 6438) +++ trunk/xsl/html/table.xsl 2006-11-18 20:10:32 UTC (rev 6439) @@ -815,9 +815,9 @@ </xsl:if> <xsl:if test="$entry.propagates.style != 0 and @role"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> </xsl:if> <xsl:if test="$show.revisionflag and @revisionflag"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2007-01-04 09:55:43
|
Revision: 6462 http://svn.sourceforge.net/docbook/?rev=6462&view=rev Author: bobstayton Date: 2007-01-04 01:55:38 -0800 (Thu, 04 Jan 2007) Log Message: ----------- Add support for qanda.in.toc to add qandaentry questions to document TOC. Modified Paths: -------------- trunk/xsl/html/autotoc.xsl trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Modified: trunk/xsl/html/autotoc.xsl =================================================================== --- trunk/xsl/html/autotoc.xsl 2007-01-04 09:50:53 UTC (rev 6461) +++ trunk/xsl/html/autotoc.xsl 2007-01-04 09:55:38 UTC (rev 6462) @@ -32,6 +32,8 @@ <xsl:param name="toc.title.p" select="true()"/> <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/> + <xsl:variable name="nodes.plus" select="$nodes | qandaset"/> + <xsl:variable name="toc.title"> <xsl:if test="$toc.title.p"> <p> @@ -63,16 +65,33 @@ </xsl:if> </xsl:when> <xsl:otherwise> - <xsl:if test="$nodes"> - <div class="toc"> - <xsl:copy-of select="$toc.title"/> - <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates select="$nodes" mode="toc"> - <xsl:with-param name="toc-context" select="$toc-context"/> - </xsl:apply-templates> - </xsl:element> - </div> - </xsl:if> + <xsl:choose> + <xsl:when test="$qanda.in.toc != 0"> + <xsl:if test="$nodes.plus"> + <div class="toc"> + <xsl:copy-of select="$toc.title"/> + <xsl:element name="{$toc.list.type}"> + <xsl:apply-templates select="$nodes.plus" mode="toc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:element> + </div> + </xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:if test="$nodes"> + <div class="toc"> + <xsl:copy-of select="$toc.title"/> + <xsl:element name="{$toc.list.type}"> + <xsl:apply-templates select="$nodes" mode="toc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:element> + </div> + </xsl:if> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> </xsl:choose> </xsl:template> @@ -199,11 +218,22 @@ <xsl:param name="toc-context" select="."/> <xsl:param name="nodes" select="NOT-AN-ELEMENT"/> + <xsl:variable name="nodes.plus" select="$nodes | qandaset"/> + <xsl:variable name="subtoc"> <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates mode="toc" select="$nodes"> - <xsl:with-param name="toc-context" select="$toc-context"/> - </xsl:apply-templates> + <xsl:choose> + <xsl:when test="$qanda.in.toc != 0"> + <xsl:apply-templates mode="toc" select="$nodes.plus"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="toc" select="$nodes"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> </xsl:element> </xsl:variable> @@ -261,13 +291,17 @@ <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> <xsl:if test="$toc.listitem.type = 'li' - and $toc.section.depth > $depth and count($nodes)>0 + and $toc.section.depth > $depth and + ( ($qanda.in.toc = 0 and count($nodes)>0) or + ($qanda.in.toc != 0 and count($nodes.plus)>0) ) and $toc.max.depth > $depth.from.context"> <xsl:copy-of select="$subtoc.list"/> </xsl:if> </xsl:element> <xsl:if test="$toc.listitem.type != 'li' - and $toc.section.depth > $depth and count($nodes)>0 + and $toc.section.depth > $depth and + ( ($qanda.in.toc = 0 and count($nodes)>0) or + ($qanda.in.toc != 0 and count($nodes.plus)>0) ) and $toc.max.depth > $depth.from.context"> <xsl:copy-of select="$subtoc.list"/> </xsl:if> @@ -617,5 +651,18 @@ </xsl:element> </xsl:template> +<!-- Used only if qanda.in.toc parameter is non-zero --> +<xsl:template match="qandaset" mode="toc"> + <xsl:param name="toc-context" select="."/> + <xsl:call-template name="subtoc"> + <xsl:with-param name="toc-context" select="$toc-context"/> + <xsl:with-param name="nodes" select="qandadiv | qandaentry"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="qandadiv|qandaentry" mode="toc"> + <xsl:apply-templates select="." mode="qandatoc.mode"/> +</xsl:template> + </xsl:stylesheet> Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2007-01-04 09:50:53 UTC (rev 6461) +++ trunk/xsl/html/param.ent 2007-01-04 09:55:38 UTC (rev 6462) @@ -200,6 +200,7 @@ <!ENTITY profile.vendor SYSTEM "../params/profile.vendor.xml"> <!ENTITY punct.honorific SYSTEM "../params/punct.honorific.xml"> <!ENTITY qanda.defaultlabel SYSTEM "../params/qanda.defaultlabel.xml"> +<!ENTITY qanda.in.toc SYSTEM "../params/qanda.in.toc.xml"> <!ENTITY qanda.inherit.numeration SYSTEM "../params/qanda.inherit.numeration.xml"> <!ENTITY qanda.nested.in.toc SYSTEM "../params/qanda.nested.in.toc.xml"> <!ENTITY qandadiv.autolabel SYSTEM "../params/qandadiv.autolabel.xml"> @@ -301,3 +302,4 @@ <!ENTITY id.warnings SYSTEM "../params/id.warnings.xml"> <!ENTITY index.method SYSTEM "../params/index.method.xml"> <!ENTITY reference.autolabel SYSTEM "../params/reference.autolabel.xml"> +<!ENTITY glossary.sort SYSTEM "../params/glossary.sort.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2007-01-04 09:50:53 UTC (rev 6461) +++ trunk/xsl/html/param.xweb 2007-01-04 09:55:38 UTC (rev 6462) @@ -187,6 +187,7 @@ <reference id="qa"><title>QAndASet</title> &qanda.defaultlabel; &qanda.inherit.numeration; +&qanda.in.toc; &qanda.nested.in.toc; </reference> @@ -239,6 +240,7 @@ &glossterm.auto.link; &firstterm.only.link; &glossary.collection; +&glossary.sort; &glossentry.show.acronym; </reference> @@ -521,6 +523,7 @@ <src:fragref linkend="generate.section.toc.level.frag"/> <src:fragref linkend="generate.toc.frag"/> <src:fragref linkend="glossary.collection.frag"/> +<src:fragref linkend="glossary.sort.frag"/> <src:fragref linkend="glossentry.show.acronym.frag"/> <src:fragref linkend="glossterm.auto.link.frag"/> <src:fragref linkend="graphic.default.extension.frag"/> @@ -671,6 +674,7 @@ <src:fragref linkend="punct.honorific.frag"/> <src:fragref linkend="qanda.defaultlabel.frag"/> <src:fragref linkend="qanda.inherit.numeration.frag"/> +<src:fragref linkend="qanda.in.toc.frag"/> <src:fragref linkend="qanda.nested.in.toc.frag"/> <src:fragref linkend="qandadiv.autolabel.frag"/> <src:fragref linkend="refentry.generate.name.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2007-02-15 08:02:03
|
Revision: 6612 http://svn.sourceforge.net/docbook/?rev=6612&view=rev Author: bobstayton Date: 2007-02-15 00:02:00 -0800 (Thu, 15 Feb 2007) Log Message: ----------- Add call to class.attribute to <a> output elements so they can have a class value too. Modified Paths: -------------- trunk/xsl/html/inline.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2007-02-14 09:30:38 UTC (rev 6611) +++ trunk/xsl/html/inline.xsl 2007-02-15 08:02:00 UTC (rev 6612) @@ -82,6 +82,8 @@ <xsl:otherwise> <a> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> @@ -116,6 +118,7 @@ <!-- otherwise it's a URI --> <xsl:otherwise> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:value-of select="$xhref"/> </xsl:attribute> @@ -139,6 +142,7 @@ </xsl:call-template> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> @@ -664,6 +668,7 @@ <xsl:choose> <xsl:when test="$citerefentry.link != '0'"> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="generate.citerefentry.link"/> </xsl:attribute> @@ -874,6 +879,7 @@ <xsl:choose> <xsl:when test="$target"> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> <xsl:value-of select="(@id|@xml:id)[1]"/> @@ -960,6 +966,7 @@ </xsl:call-template> </xsl:variable> <a href="{$chunkbase}#{$id}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="inline.italicseq"> <xsl:with-param name="content" select="$content"/> </xsl:call-template> @@ -997,6 +1004,7 @@ </xsl:when> <xsl:otherwise> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> <xsl:value-of select="(@id|@xml:id)[1]"/> @@ -1133,6 +1141,7 @@ <xsl:text><</xsl:text> </xsl:if> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:text>mailto:</xsl:text> <xsl:value-of select="."/> @@ -1233,6 +1242,7 @@ <xsl:text>[</xsl:text> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2007-02-14 09:30:38 UTC (rev 6611) +++ trunk/xsl/html/xref.xsl 2007-02-15 08:02:00 UTC (rev 6612) @@ -154,11 +154,13 @@ <xsl:value-of select="@endterm"/> </xsl:message> <a href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:text>???</xsl:text> </a> </xsl:when> <xsl:otherwise> <a href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="$etarget" mode="endterm"/> </a> </xsl:otherwise> @@ -167,6 +169,7 @@ <xsl:when test="$target/@xreflabel"> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> @@ -190,6 +193,7 @@ </xsl:if> <a href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="$target/title or $target/*/title"> <xsl:attribute name="title"> <xsl:apply-templates select="$target" mode="xref-title"/> @@ -944,6 +948,7 @@ <xsl:param name="url" select="@url"/> <xsl:variable name="link"> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> <xsl:value-of select="(@id|@xml:id)[1]"/> @@ -1068,7 +1073,8 @@ <xsl:choose> <xsl:when test="$href != ''"> - <a href="{$href}" class="olink"> + <a href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:copy-of select="$hottext"/> </a> <xsl:copy-of select="$olink.page.citation"/> @@ -1125,7 +1131,8 @@ <xsl:choose> <xsl:when test="$href != ''"> - <a href="{$href}" class="olink"> + <a href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="olink.hottext"/> </a> </xsl:when> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2007-02-15 08:16:26
|
Revision: 6613 http://svn.sourceforge.net/docbook/?rev=6613&view=rev Author: bobstayton Date: 2007-02-15 00:16:11 -0800 (Thu, 15 Feb 2007) Log Message: ----------- Add call to class.attribute on output <a>. Modified Paths: -------------- trunk/xsl/html/annotations.xsl trunk/xsl/html/autoidx.xsl trunk/xsl/html/callout.xsl trunk/xsl/html/footnote.xsl trunk/xsl/html/glossary.xsl Modified: trunk/xsl/html/annotations.xsl =================================================================== --- trunk/xsl/html/annotations.xsl 2007-02-15 08:02:00 UTC (rev 6612) +++ trunk/xsl/html/annotations.xsl 2007-02-15 08:16:11 UTC (rev 6613) @@ -113,6 +113,7 @@ <a href="#annot-{generate-id(.)}" title="{$title}" name="anch-{generate-id(.)}" id="anch-{generate-id(.)}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="onClick"> <xsl:text>popup_</xsl:text> <xsl:value-of select="generate-id(.)"/> @@ -145,6 +146,7 @@ </div> <div class="annotation-close"> <a href="#" onclick="popup_{generate-id(.)}.hidePopup();return false;"> + <xsl:apply-templates select="." mode="class.attribute"/> <img src="{$annotation.graphic.close}" alt="X" border="0"/> </a> </div> Modified: trunk/xsl/html/autoidx.xsl =================================================================== --- trunk/xsl/html/autoidx.xsl 2007-02-15 08:02:00 UTC (rev 6612) +++ trunk/xsl/html/autoidx.xsl 2007-02-15 08:16:11 UTC (rev 6613) @@ -461,6 +461,7 @@ </xsl:when> <xsl:otherwise> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:variable name="title"> <xsl:choose> <xsl:when test="§ion;/titleabbrev and $index.prefer.titleabbrev != 0"> @@ -509,6 +510,7 @@ <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target[1]"/> @@ -531,6 +533,7 @@ <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target[1]"/> Modified: trunk/xsl/html/callout.xsl =================================================================== --- trunk/xsl/html/callout.xsl 2007-02-15 08:02:00 UTC (rev 6612) +++ trunk/xsl/html/callout.xsl 2007-02-15 08:16:11 UTC (rev 6613) @@ -96,6 +96,7 @@ <xsl:choose> <xsl:when test="$target"> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> <xsl:value-of select="(@id|@xml:id)[1]"/> Modified: trunk/xsl/html/footnote.xsl =================================================================== --- trunk/xsl/html/footnote.xsl 2007-02-15 08:02:00 UTC (rev 6612) +++ trunk/xsl/html/footnote.xsl 2007-02-15 08:16:11 UTC (rev 6613) @@ -28,6 +28,7 @@ <sup> <xsl:text>[</xsl:text> <a name="{$name}" href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="." mode="footnote.number"/> </a> <xsl:text>]</xsl:text> @@ -37,6 +38,7 @@ <sup> <xsl:text>[</xsl:text> <a name="{$name}" href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="." mode="footnote.number"/> </a> <xsl:text>]</xsl:text> @@ -57,6 +59,7 @@ <sup> <xsl:text>[</xsl:text> <a href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="$footnote" mode="footnote.number"/> </a> <xsl:text>]</xsl:text> @@ -126,6 +129,7 @@ <sup> <xsl:text>[</xsl:text> <a name="{$name}" href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/> </a> @@ -154,6 +158,7 @@ <sup> <xsl:text>[</xsl:text> <a name="{$name}" href="{$href}"> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/> </a> Modified: trunk/xsl/html/glossary.xsl =================================================================== --- trunk/xsl/html/glossary.xsl 2007-02-15 08:02:00 UTC (rev 6612) +++ trunk/xsl/html/glossary.xsl 2007-02-15 08:16:11 UTC (rev 6613) @@ -248,6 +248,7 @@ <xsl:choose> <xsl:when test="$target"> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> @@ -309,6 +310,7 @@ <xsl:choose> <xsl:when test="$target"> <a> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2007-02-28 18:08:19
|
Revision: 6660 http://svn.sourceforge.net/docbook/?rev=6660&view=rev Author: bobstayton Date: 2007-02-28 10:08:17 -0800 (Wed, 28 Feb 2007) Log Message: ----------- Refactored the chunking modules to move all named templates to chunk-common.xsl and all match templates to chunk-code.xsl, in order to enable better chunk customization. See the comments in chunk.xsl for more details. Modified Paths: -------------- trunk/xsl/html/chunk-code.xsl trunk/xsl/html/chunk-common.xsl trunk/xsl/html/chunk.xsl trunk/xsl/html/manifest.xsl Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2007-02-27 01:13:50 UTC (rev 6659) +++ trunk/xsl/html/chunk-code.xsl 2007-02-28 18:08:17 UTC (rev 6660) @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" @@ -3,6 +4,6 @@ xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" - version="1.0" - exclude-result-prefixes="exsl cf ng db"> + exclude-result-prefixes="exsl cf ng db" + version="1.0"> <!-- ******************************************************************** @@ -18,454 +19,375 @@ <!-- ==================================================================== --> -<xsl:param name="onechunk" select="0"/> -<xsl:param name="refentry.separator" select="0"/> -<xsl:param name="chunk.fast" select="0"/> -<xsl:key name="genid" match="*" use="generate-id()"/> - -<!-- ==================================================================== --> - -<xsl:variable name="chunk.hierarchy"> - <xsl:if test="$chunk.fast != 0"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"> - <xsl:message>Computing chunks...</xsl:message> - <xsl:apply-templates select="/*" mode="find.chunks"/> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Fast chunking requires exsl:node-set(). </xsl:text> - <xsl:text>Using "slow" chunking.</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> - </xsl:if> -</xsl:variable> - -<xsl:template match="*" mode="find.chunks"> - <xsl:variable name="chunk"> +<xsl:template match="*" mode="chunk-filename"> + <!-- returns the filename of a chunk --> + <xsl:variable name="ischunk"> <xsl:call-template name="chunk"/> </xsl:variable> - <xsl:choose> - <xsl:when test="$chunk != 0"> - <cf:div id="{generate-id()}"> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:apply-templates select="*" mode="find.chunks"/> - </cf:div> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="*" mode="find.chunks"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> + <xsl:variable name="fn"> + <xsl:apply-templates select="." mode="recursive-chunk-filename"/> + </xsl:variable> -<!-- ==================================================================== --> + <!-- + <xsl:message> + <xsl:value-of select="$ischunk"/> + <xsl:text> (</xsl:text> + <xsl:value-of select="local-name(.)"/> + <xsl:text>) </xsl:text> + <xsl:value-of select="$fn"/> + <xsl:text>, </xsl:text> + <xsl:call-template name="dbhtml-dir"/> + </xsl:message> + --> -<xsl:template name="process-chunk-element"> - <xsl:param name="content"> - <xsl:apply-imports/> - </xsl:param> + <!-- 2003-11-25 by ndw: + The following test used to read test="$ischunk != 0 and $fn != ''" + I've removed the ischunk part of the test so that href.to.uri and + href.from.uri will be fully qualified even if the source or target + isn't a chunk. I *think* that if $fn != '' then it's appropriate + to put the directory on the front, even if the element isn't a + chunk. I could be wrong. --> - <xsl:choose> - <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')"> - <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> - <xsl:variable name="genid" select="generate-id()"/> + <xsl:if test="$fn != ''"> + <xsl:call-template name="dbhtml-dir"/> + </xsl:if> - <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> - - <xsl:variable name="prevdiv" - select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> - <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> - - <xsl:variable name="nextdiv" - select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> - <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> - - <xsl:choose> - <xsl:when test="$onechunk != 0 and parent::*"> - <xsl:copy-of select="$content"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="process-chunk"> - <xsl:with-param name="prev" select="$prev"/> - <xsl:with-param name="next" select="$next"/> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$onechunk != 0 and not(parent::*)"> - <xsl:call-template name="chunk-all-sections"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$onechunk != 0"> - <xsl:copy-of select="$content"/> - </xsl:when> - <xsl:when test="$chunk.first.sections = 0"> - <xsl:call-template name="chunk-first-section-with-parent"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="chunk-all-sections"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> + <xsl:value-of select="$fn"/> + <!-- You can't add the html.ext here because dbhtml filename= may already --> + <!-- have added it. It really does have to be handled in the recursive template --> </xsl:template> -<xsl:template name="process-chunk"> - <xsl:param name="prev" select="."/> - <xsl:param name="next" select="."/> - <xsl:param name="content"> - <xsl:apply-imports/> - </xsl:param> +<xsl:template match="*" mode="recursive-chunk-filename"> + <xsl:param name="recursive" select="false()"/> + <!-- returns the filename of a chunk --> <xsl:variable name="ischunk"> <xsl:call-template name="chunk"/> </xsl:variable> - <xsl:variable name="chunkfn"> - <xsl:if test="$ischunk='1'"> - <xsl:apply-templates mode="chunk-filename" select="."/> - </xsl:if> + <xsl:variable name="dbhtml-filename"> + <xsl:call-template name="dbhtml-filename"/> </xsl:variable> - <xsl:if test="$ischunk='0'"> - <xsl:message> - <xsl:text>Error </xsl:text> - <xsl:value-of select="name(.)"/> - <xsl:text> is not a chunk!</xsl:text> - </xsl:message> - </xsl:if> - <xsl:variable name="filename"> - <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.dir" select="$base.dir"/> - <xsl:with-param name="base.name" select="$chunkfn"/> - </xsl:call-template> + <xsl:choose> + <xsl:when test="$dbhtml-filename != ''"> + <xsl:value-of select="$dbhtml-filename"/> + </xsl:when> + <!-- if this is the root element, use the root.filename --> + <xsl:when test="not(parent::*) and $root.filename != ''"> + <xsl:value-of select="$root.filename"/> + <xsl:value-of select="$html.ext"/> + </xsl:when> + <!-- Special case --> + <xsl:when test="self::legalnotice and $generate.legalnotice.link != 0"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + <xsl:value-of select="concat('ln-',$id,$html.ext)"/> + </xsl:when> + <!-- if there's no dbhtml filename, and if we're to use IDs as --> + <!-- filenames, then use the ID to generate the filename. --> + <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0"> + <xsl:value-of select="(@id|@xml:id)[1]"/> + <xsl:value-of select="$html.ext"/> + </xsl:when> + <xsl:otherwise></xsl:otherwise> + </xsl:choose> </xsl:variable> - <xsl:call-template name="write.chunk"> - <xsl:with-param name="filename" select="$filename"/> - <xsl:with-param name="content"> - <xsl:call-template name="chunk-element-content"> - <xsl:with-param name="prev" select="$prev"/> - <xsl:with-param name="next" select="$next"/> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:with-param> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> -</xsl:template> + <xsl:choose> + <xsl:when test="$ischunk='0'"> + <!-- if called on something that isn't a chunk, walk up... --> + <xsl:choose> + <xsl:when test="count(parent::*)>0"> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="$recursive"/> + </xsl:apply-templates> + </xsl:when> + <!-- unless there is no up, in which case return "" --> + <xsl:otherwise></xsl:otherwise> + </xsl:choose> + </xsl:when> -<xsl:template name="chunk-first-section-with-parent"> - <xsl:param name="content"> - <xsl:apply-imports/> - </xsl:param> + <xsl:when test="not($recursive) and $filename != ''"> + <!-- if this chunk has an explicit name, use it --> + <xsl:value-of select="$filename"/> + </xsl:when> - <!-- These xpath expressions are really hairy. The trick is to pick sections --> - <!-- that are not first children and are not the children of first children --> + <xsl:when test="self::set"> + <xsl:value-of select="$root.filename"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - <!-- Break these variables into pieces to work around - http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6063 --> + <xsl:when test="self::book"> + <xsl:text>bk</xsl:text> + <xsl:number level="any" format="01"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - <xsl:variable name="prev-v1" - select="(ancestor::sect1[$chunk.section.depth > 0 - and preceding-sibling::sect1][1] + <xsl:when test="self::article"> + <xsl:if test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:if> - |ancestor::sect2[$chunk.section.depth > 1 - and preceding-sibling::sect2 - and parent::sect1[preceding-sibling::sect1]][1] + <xsl:text>ar</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |ancestor::sect3[$chunk.section.depth > 2 - and preceding-sibling::sect3 - and parent::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::preface"> + <xsl:if test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:if> - |ancestor::sect4[$chunk.section.depth > 3 - and preceding-sibling::sect4 - and parent::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:text>pr</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |ancestor::sect5[$chunk.section.depth > 4 - and preceding-sibling::sect5 - and parent::sect4[preceding-sibling::sect4] - and ancestor::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::chapter"> + <xsl:if test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:if> - |ancestor::section[$chunk.section.depth > count(ancestor::section) - and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/> + <xsl:text>ch</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - <xsl:variable name="prev-v2" - select="(preceding::sect1[$chunk.section.depth > 0 - and preceding-sibling::sect1][1] + <xsl:when test="self::appendix"> + <xsl:if test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:if> - |preceding::sect2[$chunk.section.depth > 1 - and preceding-sibling::sect2 - and parent::sect1[preceding-sibling::sect1]][1] + <xsl:text>ap</xsl:text> + <xsl:number level="any" format="a" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |preceding::sect3[$chunk.section.depth > 2 - and preceding-sibling::sect3 - and parent::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::part"> + <xsl:choose> + <xsl:when test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> - |preceding::sect4[$chunk.section.depth > 3 - and preceding-sibling::sect4 - and parent::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:text>pt</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |preceding::sect5[$chunk.section.depth > 4 - and preceding-sibling::sect5 - and parent::sect4[preceding-sibling::sect4] - and ancestor::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::reference"> + <xsl:choose> + <xsl:when test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> - |preceding::section[$chunk.section.depth > count(ancestor::section) - and preceding-sibling::section - and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/> + <xsl:text>rn</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - <xsl:variable name="prev" - select="(preceding::book[1] - |preceding::preface[1] - |preceding::chapter[1] - |preceding::appendix[1] - |preceding::part[1] - |preceding::reference[1] - |preceding::refentry[1] - |preceding::colophon[1] - |preceding::article[1] - |preceding::bibliography[parent::article or parent::book or parent::part][1] - |preceding::glossary[parent::article or parent::book or parent::part][1] - |preceding::index[$generate.index != 0] - [parent::article or parent::book or parent::part][1] - |preceding::setindex[$generate.index != 0][1] - |ancestor::set - |ancestor::book[1] - |ancestor::preface[1] - |ancestor::chapter[1] - |ancestor::appendix[1] - |ancestor::part[1] - |ancestor::reference[1] - |ancestor::article[1] - |$prev-v1 - |$prev-v2)[last()]"/> + <xsl:when test="self::refentry"> + <xsl:choose> + <xsl:when test="parent::reference"> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> - <xsl:variable name="next-v1" - select="(following::sect1[$chunk.section.depth > 0 - and preceding-sibling::sect1][1] + <xsl:text>re</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |following::sect2[$chunk.section.depth > 1 - and preceding-sibling::sect2 - and parent::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::colophon"> + <xsl:choose> + <xsl:when test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> - |following::sect3[$chunk.section.depth > 2 - and preceding-sibling::sect3 - and parent::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:text>co</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |following::sect4[$chunk.section.depth > 3 - and preceding-sibling::sect4 - and parent::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::sect1 + or self::sect2 + or self::sect3 + or self::sect4 + or self::sect5 + or self::section"> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + <xsl:text>s</xsl:text> + <xsl:number format="01"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |following::sect5[$chunk.section.depth > 4 - and preceding-sibling::sect5 - and parent::sect4[preceding-sibling::sect4] - and ancestor::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::bibliography"> + <xsl:choose> + <xsl:when test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> - |following::section[$chunk.section.depth > count(ancestor::section) - and preceding-sibling::section - and not(ancestor::section[not(preceding-sibling::section)])][1])[1]"/> + <xsl:text>bi</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - <xsl:variable name="next-v2" - select="(descendant::sect1[$chunk.section.depth > 0 - and preceding-sibling::sect1][1] + <xsl:when test="self::glossary"> + <xsl:choose> + <xsl:when test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> - |descendant::sect2[$chunk.section.depth > 1 - and preceding-sibling::sect2 - and parent::sect1[preceding-sibling::sect1]][1] + <xsl:text>go</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |descendant::sect3[$chunk.section.depth > 2 - and preceding-sibling::sect3 - and parent::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::index"> + <xsl:choose> + <xsl:when test="/set"> + <!-- in a set, make sure we inherit the right book info... --> + <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*"> + <xsl:with-param name="recursive" select="true()"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> - |descendant::sect4[$chunk.section.depth > 3 - and preceding-sibling::sect4 - and parent::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:text>ix</xsl:text> + <xsl:number level="any" format="01" from="book"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |descendant::sect5[$chunk.section.depth > 4 - and preceding-sibling::sect5 - and parent::sect4[preceding-sibling::sect4] - and ancestor::sect3[preceding-sibling::sect3] - and ancestor::sect2[preceding-sibling::sect2] - and ancestor::sect1[preceding-sibling::sect1]][1] + <xsl:when test="self::setindex"> + <xsl:text>si</xsl:text> + <xsl:number level="any" format="01" from="set"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:when> - |descendant::section[$chunk.section.depth > count(ancestor::section) - and preceding-sibling::section - and not(ancestor::section[not(preceding-sibling::section)])])[1]"/> - - <xsl:variable name="next" - select="(following::book[1] - |following::preface[1] - |following::chapter[1] - |following::appendix[1] - |following::part[1] - |following::reference[1] - |following::refentry[1] - |following::colophon[1] - |following::bibliography[parent::article or parent::book or parent::part][1] - |following::glossary[parent::article or parent::book or parent::part][1] - |following::index[$generate.index != 0] - [parent::article or parent::book or parent::part][1] - |following::article[1] - |following::setindex[$generate.index != 0][1] - |descendant::book[1] - |descendant::preface[1] - |descendant::chapter[1] - |descendant::appendix[1] - |descendant::article[1] - |descendant::bibliography[parent::article or parent::book or parent::part][1] - |descendant::glossary[parent::article or parent::book or parent::part][1] - |descendant::index[$generate.index != 0] - [parent::article or parent::book or parent::part][1] - |descendant::colophon[1] - |descendant::setindex[$generate.index != 0][1] - |descendant::part[1] - |descendant::reference[1] - |descendant::refentry[1] - |$next-v1 - |$next-v2)[1]"/> - - <xsl:call-template name="process-chunk"> - <xsl:with-param name="prev" select="$prev"/> - <xsl:with-param name="next" select="$next"/> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> + <xsl:otherwise> + <xsl:text>chunk-filename-error-</xsl:text> + <xsl:value-of select="name(.)"/> + <xsl:number level="any" format="01" from="set"/> + <xsl:if test="not($recursive)"> + <xsl:value-of select="$html.ext"/> + </xsl:if> + </xsl:otherwise> + </xsl:choose> </xsl:template> -<xsl:template name="chunk-all-sections"> - <xsl:param name="content"> - <xsl:apply-imports/> - </xsl:param> +<!-- ==================================================================== --> - <xsl:variable name="prev-v1" - select="(preceding::sect1[$chunk.section.depth > 0][1] - |preceding::sect2[$chunk.section.depth > 1][1] - |preceding::sect3[$chunk.section.depth > 2][1] - |preceding::sect4[$chunk.section.depth > 3][1] - |preceding::sect5[$chunk.section.depth > 4][1] - |preceding::section[$chunk.section.depth > count(ancestor::section)][1])[last()]"/> - <xsl:variable name="prev-v2" - select="(ancestor::sect1[$chunk.section.depth > 0][1] - |ancestor::sect2[$chunk.section.depth > 1][1] - |ancestor::sect3[$chunk.section.depth > 2][1] - |ancestor::sect4[$chunk.section.depth > 3][1] - |ancestor::sect5[$chunk.section.depth > 4][1] - |ancestor::section[$chunk.section.depth > count(ancestor::section)][1])[last()]"/> - <xsl:variable name="prev" - select="(preceding::book[1] - |preceding::preface[1] - |preceding::chapter[1] - |preceding::appendix[1] - |preceding::part[1] - |preceding::reference[1] - |preceding::refentry[1] - |preceding::colophon[1] - |preceding::article[1] - |preceding::bibliography[parent::article or parent::book or parent::part][1] - |preceding::glossary[parent::article or parent::book or parent::part][1] - |preceding::index[$generate.index != 0] - [parent::article or parent::book or parent::part][1] - |preceding::setindex[$generate.index != 0][1] - |ancestor::set - |ancestor::book[1] - |ancestor::preface[1] - |ancestor::chapter[1] - |ancestor::appendix[1] - |ancestor::part[1] - |ancestor::reference[1] - |ancestor::article[1] - |$prev-v1 - |$prev-v2)[last()]"/> +<xsl:template match="processing-instruction('dbhtml')"> + <!-- nop --> +</xsl:template> - <xsl:variable name="next-v1" - select="(following::sect1[$chunk.section.depth > 0][1] - |following::sect2[$chunk.section.depth > 1][1] - |following::sect3[$chunk.section.depth > 2][1] - |following::sect4[$chunk.section.depth > 3][1] - |following::sect5[$chunk.section.depth > 4][1] - |following::section[$chunk.section.depth > count(ancestor::section)][1])[1]"/> +<!-- ==================================================================== --> - <xsl:variable name="next-v2" - select="(descendant::sect1[$chunk.section.depth > 0][1] - |descendant::sect2[$chunk.section.depth > 1][1] - |descendant::sect3[$chunk.section.depth > 2][1] - |descendant::sect4[$chunk.section.depth > 3][1] - |descendant::sect5[$chunk.section.depth > 4][1] - |descendant::section[$chunk.section.depth - > count(ancestor::section)][1])[1]"/> - <xsl:variable name="next" - select="(following::book[1] - |following::preface[1] - |following::chapter[1] - |following::appendix[1] - |following::part[1] - |following::reference[1] - |following::refentry[1] - |following::colophon[1] - |following::bibliography[parent::article or parent::book or parent::part][1] - |following::glossary[parent::article or parent::book or parent::part][1] - |following::index[$generate.index != 0] - [parent::article or parent::book][1] - |following::article[1] - |following::setindex[$generate.index != 0][1] - |descendant::book[1] - |descendant::preface[1] - |descendant::chapter[1] - |descendant::appendix[1] - |descendant::article[1] - |descendant::bibliography[parent::article or parent::book][1] - |descendant::glossary[parent::article or parent::book or parent::part][1] - |descendant::index[$generate.index != 0] - [parent::article or parent::book][1] - |descendant::colophon[1] - |descendant::setindex[$generate.index != 0][1] - |descendant::part[1] - |descendant::reference[1] - |descendant::refentry[1] - |$next-v1 - |$next-v2)[1]"/> +<xsl:template match="*" mode="find.chunks"> + <xsl:variable name="chunk"> + <xsl:call-template name="chunk"/> + </xsl:variable> - <xsl:call-template name="process-chunk"> - <xsl:with-param name="prev" select="$prev"/> - <xsl:with-param name="next" select="$next"/> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> + <xsl:choose> + <xsl:when test="$chunk != 0"> + <cf:div id="{generate-id()}"> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="*" mode="find.chunks"/> + </cf:div> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="*" mode="find.chunks"/> + </xsl:otherwise> + </xsl:choose> </xsl:template> -<!-- ==================================================================== --> - <xsl:template match="/"> <xsl:choose> <!-- include extra test for Xalan quirk --> @@ -599,436 +521,6 @@ </xsl:if> </xsl:template> -<!-- ==================================================================== --> - -<xsl:template name="make.lots"> - <xsl:param name="toc.params" select="''"/> - <xsl:param name="toc"/> - - <xsl:variable name="lots"> - <xsl:if test="contains($toc.params, 'toc')"> - <xsl:copy-of select="$toc"/> - </xsl:if> - - <xsl:if test="contains($toc.params, 'figure')"> - <xsl:choose> - <xsl:when test="$chunk.separate.lots != '0'"> - <xsl:call-template name="make.lot.chunk"> - <xsl:with-param name="type" select="'figure'"/> - <xsl:with-param name="lot"> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'figure'"/> - <xsl:with-param name="nodes" select=".//figure"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'figure'"/> - <xsl:with-param name="nodes" select=".//figure"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - - <xsl:if test="contains($toc.params, 'table')"> - <xsl:choose> - <xsl:when test="$chunk.separate.lots != '0'"> - <xsl:call-template name="make.lot.chunk"> - <xsl:with-param name="type" select="'table'"/> - <xsl:with-param name="lot"> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'table'"/> - <xsl:with-param name="nodes" select=".//table"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'table'"/> - <xsl:with-param name="nodes" select=".//table"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - - <xsl:if test="contains($toc.params, 'example')"> - <xsl:choose> - <xsl:when test="$chunk.separate.lots != '0'"> - <xsl:call-template name="make.lot.chunk"> - <xsl:with-param name="type" select="'example'"/> - <xsl:with-param name="lot"> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'example'"/> - <xsl:with-param name="nodes" select=".//example"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'example'"/> - <xsl:with-param name="nodes" select=".//example"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - - <xsl:if test="contains($toc.params, 'equation')"> - <xsl:choose> - <xsl:when test="$chunk.separate.lots != '0'"> - <xsl:call-template name="make.lot.chunk"> - <xsl:with-param name="type" select="'equation'"/> - <xsl:with-param name="lot"> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'equation'"/> - <xsl:with-param name="nodes" select=".//equation"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'equation'"/> - <xsl:with-param name="nodes" select=".//equation"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - - <xsl:if test="contains($toc.params, 'procedure')"> - <xsl:choose> - <xsl:when test="$chunk.separate.lots != '0'"> - <xsl:call-template name="make.lot.chunk"> - <xsl:with-param name="type" select="'procedure'"/> - <xsl:with-param name="lot"> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'procedure'"/> - <xsl:with-param name="nodes" select=".//procedure[title]"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="list.of.titles"> - <xsl:with-param name="titles" select="'procedure'"/> - <xsl:with-param name="nodes" select=".//procedure[title]"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - </xsl:variable> - - <xsl:if test="string($lots) != ''"> - <xsl:choose> - <xsl:when test="$chunk.tocs.and.lots != 0 and not(parent::*)"> - <xsl:call-template name="write.chunk"> - <xsl:with-param name="filename"> - <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.dir" select="$base.dir"/> - <xsl:with-param name="base.name"> - <xsl:call-template name="dbhtml-dir"/> - <xsl:apply-templates select="." mode="recursive-chunk-filename"> - <xsl:with-param name="recursive" select="true()"/> - </xsl:apply-templates> - <xsl:text>-toc</xsl:text> - <xsl:value-of select="$html.ext"/> - </xsl:with-param> - </xsl:call-template> - </xsl:with-param> - <xsl:with-param name="content"> - <xsl:call-template name="chunk-element-content"> - <xsl:with-param name="prev" select="/foo"/> - <xsl:with-param name="next" select="/foo"/> - <xsl:with-param name="nav.context" select="'toc'"/> - <xsl:with-param name="content"> - <xsl:if test="$chunk.tocs.and.lots.has.title != 0"> - <h1> - <xsl:apply-templates select="." mode="object.title.markup"/> - </h1> - </xsl:if> - <xsl:copy-of select="$lots"/> - </xsl:with-param> - </xsl:call-template> - </xsl:with-param> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$lots"/> - </xsl:otherwise> - </xsl:choose> - </xsl:if> -</xsl:template> - -<xsl:template name="make.lot.chunk"> - <xsl:param name="type" select="''"/> - <xsl:param name="lot"/> - - <xsl:if test="string($lot) != ''"> - <xsl:variable name="filename"> - <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.dir" select="$base.dir"/> - <xsl:with-param name="base.name"> - <xsl:call-template name="dbhtml-dir"/> - <xsl:value-of select="$type"/> - <xsl:text>-toc</xsl:text> - <xsl:value-of select="$html.ext"/> - </xsl:with-param> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="href"> - <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.name"> - <xsl:call-template name="dbhtml-dir"/> - <xsl:value-of select="$type"/> - <xsl:text>-toc</xsl:text> - <xsl:value-of select="$html.ext"/> - </xsl:with-param> - </xsl:call-template> - </xsl:variable> - - <xsl:call-template name="write.chunk"> - <xsl:with-param name="filename" select="$filename"/> - <xsl:with-param name="content"> - <xsl:call-template name="chunk-element-content"> - <xsl:with-param name="prev" select="/foo"/> - <xsl:with-param name="next" select="/foo"/> - <xsl:with-param name="nav.context" select="'toc'"/> - <xsl:with-param name="content"> - <xsl:copy-of select="$lot"/> - </xsl:with-param> - </xsl:call-template> - </xsl:with-param> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> - <!-- And output a link to this file --> - <div> - <xsl:attribute name="class"> - <xsl:text>ListofTitles</xsl:text> - </xsl:attribute> - <a href="{$href}"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key"> - <xsl:choose> - <xsl:when test="$type='table'">ListofTables</xsl:when> - <xsl:when test="$type='figure'">ListofFigures</xsl:when> - <xsl:when test="$type='equation'">ListofEquations</xsl:when> - <xsl:when test="$type='example'">ListofExamples</xsl:when> - <xsl:when test="$type='procedure'">ListofProcedures</xsl:when> - <xsl:otherwise>ListofUnknown</xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:call-template> - </a> - </div> - </xsl:if> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template name="in.other.chunk"> - <xsl:param name="chunk" select="."/> - <xsl:param name="node" select="."/> - - <xsl:variable name="is.chunk"> - <xsl:call-template name="chunk"> - <xsl:with-param name="node" select="$node"/> - </xsl:call-template> - </xsl:variable> - -<!-- - <xsl:message> - <xsl:text>in.other.chunk: </xsl:text> - <xsl:value-of select="name($chunk)"/> - <xsl:text> </xsl:text> - <xsl:value-of select="name($node)"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$chunk = $node"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$is.chunk"/> - </xsl:message> ---> - - <xsl:choose> - <xsl:when test="$chunk = $node">0</xsl:when> - <xsl:when test="$is.chunk = 1">1</xsl:when> - <xsl:when test="count($node) = 0">0</xsl:when> - <xsl:otherwise> - <xsl:call-template name="in.other.chunk"> - <xsl:with-param name="chunk" select="$chunk"/> - <xsl:with-param name="node" select="$node/parent::*"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="count.footnotes.in.this.chunk"> - <xsl:param name="node" select="."/> - <xsl:param name="footnotes" select="$node//footnote"/> - <xsl:param name="count" select="0"/> - -<!-- - <xsl:message> - <xsl:text>count.footnotes.in.this.chunk: </xsl:text> - <xsl:value-of select="name($node)"/> - </xsl:message> ---> - - <xsl:variable name="in.other.chunk"> - <xsl:call-template name="in.other.chunk"> - <xsl:with-param name="chunk" select="$node"/> - <xsl:with-param name="node" select="$footnotes[1]"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <xsl:when test="count($footnotes) = 0"> - <xsl:value-of select="$count"/> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$in.other.chunk != 0"> - <xsl:call-template name="count.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="footnotes" - select="$footnotes[position() > 1]"/> - <xsl:with-param name="count" select="$count"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$footnotes[1]/ancestor::table - |$footnotes[1]/ancestor::informaltable"> - <xsl:call-template name="count.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="footnotes" - select="$footnotes[position() > 1]"/> - <xsl:with-param name="count" select="$count"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="count.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="footnotes" - select="$footnotes[position() > 1]"/> - <xsl:with-param name="count" select="$count + 1"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="process.footnotes.in.this.chunk"> - <xsl:param name="node" select="."/> - <xsl:param name="footnotes" select="$node//footnote"/> - -<!-- - <xsl:message>process.footnotes.in.this.chunk</xsl:message> ---> - - <xsl:variable name="in.other.chunk"> - <xsl:call-template name="in.other.chunk"> - <xsl:with-param name="chunk" select="$node"/> - <xsl:with-param name="node" select="$footnotes[1]"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <xsl:when test="count($footnotes) = 0"> - <!-- nop --> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$in.other.chunk != 0"> - <xsl:call-template name="process.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="footnotes" - select="$footnotes[position() > 1]"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$footnotes[1]/ancestor::table - |$footnotes[1]/ancestor::informaltable"> - <xsl:call-template name="process.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="footnotes" - select="$footnotes[position() > 1]"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$footnotes[1]" - mode="process.footnote.mode"/> - <xsl:call-template name="process.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="footnotes" - select="$footnotes[position() > 1]"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="process.footnotes"> - <xsl:variable name="footnotes" select=".//footnote"/> - <xsl:variable name="fcount"> - <xsl:call-template name="count.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="."/> - <xsl:with-param name="footnotes" select="$footnotes"/> - </xsl:call-template> - </xsl:variable> - -<!-- - <xsl:message> - <xsl:value-of select="name(.)"/> - <xsl:text> fcount: </xsl:text> - <xsl:value-of select="$fcount"/> - </xsl:message> ---> - - <!-- Only bother to do this if there's at least one non-table footnote --> - <xsl:if test="$fcount > 0"> - <div class="footnotes"> - <br/> - <hr width="100" align="left"/> - <xsl:call-template name="process.footnotes.in.this.chunk"> - <xsl:with-param name="node" select="."/> - <xsl:with-param name="footnotes" select="$footnotes"/> - </xsl:call-template> - </div> - </xsl:if> - - <!-- FIXME: When chunking, only the annotations actually used - in this chunk should be referenced. I don't think it - does any harm to reference them all, but it adds - unnecessary bloat to each chunk. --> - <xsl:if test="$annotation.support != 0 and //annotation"> - <div class="annotation-list"> - <div class="annotation-nocss"> - <p>The following annotations are from this essay. You are seeing - them here because your browser doesn’t support the user-interface - techniques used to make them appear as ‘popups’ on modern browsers.</p> - </div> - - <xsl:apply-templates select="//annotation" - mode="annotation-popup"/> - </div> - </xsl:if> -</xsl:template> - -<xsl:template name="process.chunk.footnotes"> - <xsl:variable name="is.chunk"> - <xsl:call-template name="chunk"/> - </xsl:variable> - <xsl:if test="$is.chunk = 1"> - <xsl:call-template name="process.footnotes"/> - </xsl:if> -</xsl:template> - -<!-- ====================================================================== --> - <!-- Resolve xml:base attributes --> <xsl:template match="@fileref"> <!-- need a check for absolute urls --> @@ -1054,4 +546,89 @@ </xsl:choose> </xsl:template> +<!-- ==================================================================== --> +<xsl:template match="set|book|part|preface|chapter|appendix + |article + |reference|refentry + |sect1|sect2|sect3|sect4|sect5 + |section + |book/glossary|article/glossary|part/glossary + |book/bibliography|article/bibliography|part/bibliography + |colophon" + mode="enumerate-files"> + <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable> + <xsl:if test="$ischunk='1'"> + <xsl:call-template name="make-relative-filename"> + <xsl:with-param name="base.dir"> + <xsl:if test="$manifest.in.base.dir = 0"> + <xsl:value-of select="$base.dir"/> + </xsl:if> + </xsl:with-param> + <xsl:with-param name="base.name"> + <xsl:apply-templates mode="chunk-filename" select="."/> + </xsl:with-param> + </xsl:call-template> + <xsl:text> </xsl:text> + </xsl:if> + <xsl:apply-templates select="*" mode="enumerate-files"/> +</xsl:template> + +<xsl:template match="book/index|article/index|part/index" + mode="enumerate-files"> + <xsl:if test="$htmlhelp.output != 1"> + <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable> + <xsl:if test="$ischunk='1'"> + <xsl:call-template name="make-relative-filename"> + <xsl:with-param name="base.dir"> + <xsl:if test="$manifest.in.base.dir = 0"> + <xsl:value-of select="$base.dir"/> + </xsl:if> + </xsl:with-param> + <xsl:with-param name="base.name"> + <xsl:apply-templates mode="chunk-filename" select="."/> + </xsl:with-param> + </xsl:call-template> + <xsl:text> </xsl:text> + </xsl:if> + <xsl:apply-templates select="*" mode="enumerate-files"/> + </xsl:if> +</xsl:template> + +<xsl:template match="legalnotice" mode="enumerate-files"> + <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> + <xsl:if test="$generate.legalnotice.link != 0"> + <xsl:call-template name="make-relative-filename"> + <xsl:with-param name="base.dir"> + <xsl:if test="$manifest.in.base.dir = 0"> + <xsl:value-of select="$base.dir"/> + </xsl:if> + </xsl:with-param> + <xsl:with-param name="base.name"> + <xsl:apply-templates mode="chunk-filename" select="."/> + </xsl:with-param> + </xsl:call-template> + <xsl:text> </xsl:text> + </xsl:if> +</xsl:template> + +<xsl:template match="mediaobject[imageobject] | inlinemediaobject[imageobject]" mode="enumerate-files"> + <xsl:variable name="longdesc.uri"> + <xsl:call-template name="longdesc.uri"> + <xsl:with-param name="mediaobject" + select="."/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="mediaobject" select="."/> + + <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]"> + <xsl:call-template name="longdesc.uri"> + <xsl:with-param name="mediaobject" select="$mediaobject"/> + </xsl:call-template> + <xsl:text> </xsl:text> + </xsl:if> +</xsl:template> + +<xsl:template match="text()" mode="enumerate-files"> +</xsl:template> + </xsl:stylesheet> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2007-02-27 01:13:50 UTC (rev 6659) +++ trunk/xsl/html/chunk-common.xsl 2007-02-28 18:08:17 UTC (rev 6660) @@ -1,6 +1,10 @@ -<?xml version="1.0"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> + xmlns:exsl="http://exslt.org/common" + xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" + xmlns:ng="http://docbook.org/docbook-ng" + xmlns:db="http://docbook.org/ns/docbook" + version="1.0" + exclude-result-prefixes="exsl cf ng db"> <!-- ******************************************************************** $Id$ @@ -14,6 +18,866 @@ <!-- ==================================================================== --> +<xsl:param name="onechunk" select="0"/> +<xsl:param name="refentry.separator" select="0"/> +<xsl:param name="chunk.fast" select="0"/> + +<xsl:key name="genid" match="*" use="generate-id()"/> + +<!-- ==================================================================== --> + +<xsl:variable name="chunk.hierarchy"> + <xsl:if test="$chunk.fast != 0"> + <xsl:choose> + <xsl:when test="function-available('exsl:node-set')"> + <xsl:message>Computing chunks...</xsl:message> + <xsl:apply-templates select="/*" mode="find.chunks"/> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Fast chunking requires exsl:node-set(). </xsl:text> + <xsl:text>Using "slow" chunking.</xsl:text> + </xsl:message> + </xsl:otherwise> + </xsl:choose> + </xsl:if> +</xsl:variable> + +<!-- ==================================================================== --> + +<xsl:template name="process-chunk-element"> + <xsl:param name="content"> + <xsl:apply-imports/> + </xsl:param> + + <xsl:choose> + <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')"> + <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> + <xsl:variable name="genid" select="generate-id()"/> + + <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> + + <xsl:variable name="prevdiv" + select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/> + <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/> + + <xsl:variable name="nextdiv" + select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/> + <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/> + + <xsl:choose> + <xsl:when test="$onechunk != 0 and parent::*"> + <xsl:copy-of select="$content"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="process-chunk"> + <xsl:with-param name="prev" select="$prev"/> + <xsl:with-param name="next" select="$next"/> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:choose> + <xsl:when test="$onechunk != 0 and not(parent::*)"> + <xsl:call-template name="chunk-all-sections"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$onechunk != 0"> + <xsl:copy-of select="$content"/> + </xsl:when> + <xsl:when test="$chunk.first.sections = 0"> + <xsl:call-template name="chunk-first-section-with-parent"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="chunk-all-sections"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="process-chunk"> + <xsl:param name="prev" select="."/> + <xsl:param name="next" select="."/> + <xsl:param name="content"> + <xsl:apply-imports/> + </xsl:param> + + <xsl:variable name="ischunk"> + <xsl:call-template name="chunk"/> + </xsl:variable> + + <xsl:variable name="chunkfn"> + <xsl:if test="$ischunk='1'"> + <xsl:apply-templates mode="chunk-filename" select="."/> + </xsl:if> + </xsl:variable> + + <xsl:if test="$ischunk='0'"> + <xsl:message> + <xsl:text>Error </xsl:text> + <xsl:value-of select="name(.)"/> + <xsl:text> is not a chunk!</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:variable name="filename"> + <xsl:call-template name="make-relative-filename"> + <xsl:with-param name="base.dir" select="$base.dir"/> + <xsl:with-param name="base.name" select="$chunkfn"/> + </xsl:call-template> + </xsl:variable> + + <xsl:call-template name="write.chunk"> + <xsl:with-param name="filename" select="$filename"/> + <xsl:with-param name="content"> + <xsl:call-template name="chunk-element-content"> + <xsl:with-param name="prev" select="$prev"/> + <xsl:with-param name="next" select="$next"/> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:with-param> + <xsl:with-param name="quiet" select="$chunk.quietly"/> + </xsl:call-template> +</xsl:template> + +<xsl:template name="chunk-first-section-with-parent"> + <xsl:param name="content"> + <xsl:apply-imports/> + </xsl:param> + + <!-- These xpath expressions are really hairy. The trick is to pick sections --> + <!-- that are not first children and are not the children of first children --> + + <!-- Break these variables into pieces to work around + http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6063 --> + + <xsl:variable name="prev-v1" + select="(ancestor::sect1[$chunk.section.depth > 0 + and preceding-sibling::sect1][1] + + |ancestor::sect2[$chunk.section.depth > 1 + and preceding-sibling::sect2 + and parent::sect1[preceding-sibling::sect1]][1] + + |ancestor::sect3[$chunk.section.depth > 2 + and preceding-sibling::sect3 + and parent::sect2[preceding-sibling::sect2] + and ancestor::sect1[preceding-sibling::sect1]][1] + + |ancestor::sect4[$chunk.section.depth > 3 + and preceding-sibling::sect4 + and parent::sect3[preceding-sibling::sect3] + and ancestor::sect2[preceding-sibling::sect2] + and ancestor::sect1[preceding-sibling::sect1]][1] + + ... [truncated message content] |
From: <bob...@us...> - 2007-04-14 20:01:00
|
Revision: 6776 http://svn.sourceforge.net/docbook/?rev=6776&view=rev Author: bobstayton Date: 2007-04-14 13:00:58 -0700 (Sat, 14 Apr 2007) Log Message: ----------- Add support for xlink olinks. Modified Paths: -------------- trunk/xsl/html/inline.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2007-04-14 19:53:44 UTC (rev 6775) +++ trunk/xsl/html/inline.xsl 2007-04-14 20:00:58 UTC (rev 6776) @@ -55,6 +55,17 @@ </xsl:choose> </xsl:variable> + <!-- Is it an olink ? --> + <xsl:variable name="is.olink"> + <xsl:choose> + <!-- If xlink:role="http://docbook.org/xlink/role/olink" --> + <!-- and if the href contains # --> + <xsl:when test="contains($xhref,'#') and + @xlink:role = $xolink.role">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:choose> <xsl:when test="$is.idref = 1"> @@ -115,6 +126,12 @@ </xsl:choose> </xsl:when> + <xsl:when test="$is.olink = 1"> + <xsl:call-template name="olink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:when> + <!-- otherwise it's a URI --> <xsl:otherwise> <a> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2007-04-14 19:53:44 UTC (rev 6775) +++ trunk/xsl/html/xref.xsl 2007-04-14 20:00:58 UTC (rev 6776) @@ -16,6 +16,10 @@ ******************************************************************** --> +<!-- Use internal variable for olink xlink role for consistency --> +<xsl:variable + name="xolink.role">http://docbook.org/xlink/role/olink</xsl:variable> + <!-- ==================================================================== --> <xsl:template match="anchor"> @@ -981,6 +985,8 @@ </xsl:template> <xsl:template match="olink" name="olink"> + <!-- olink content may be passed in from xlink olink --> + <xsl:param name="content" select="NOTANELEMENT"/> <xsl:call-template name="anchor"/> @@ -988,10 +994,34 @@ <xsl:choose> <!-- olinks resolved by stylesheet and target database --> - <xsl:when test="@targetdoc or @targetptr" > - <xsl:variable name="targetdoc.att" select="@targetdoc"/> - <xsl:variable name="targetptr.att" select="@targetptr"/> + <xsl:when test="@targetdoc or @targetptr or + (@xlink:role=$xolink.role and + contains(@xlink:href, '#') )" > + <xsl:variable name="targetdoc.att"> + <xsl:choose> + <xsl:when test="@targetdoc != ''"> + <xsl:value-of select="@targetdoc"/> + </xsl:when> + <xsl:when test="@xlink:role=$xolink.role and + contains(@xlink:href, '#')" > + <xsl:value-of select="substring-before(@xlink:href, '#')"/> + </xsl:when> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="targetptr.att"> + <xsl:choose> + <xsl:when test="@targetptr != ''"> + <xsl:value-of select="@targetptr"/> + </xsl:when> + <xsl:when test="@xlink:role=$xolink.role and + contains(@xlink:href, '#')" > + <xsl:value-of select="substring-after(@xlink:href, '#')"/> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:variable name="olink.lang"> <xsl:call-template name="l10n.language"> <xsl:with-param name="xref-context" select="true()"/> @@ -1047,11 +1077,18 @@ </xsl:variable> <xsl:variable name="hottext"> - <xsl:call-template name="olink.hottext"> - <xsl:with-param name="target.database" select="$target.database"/> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - </xsl:call-template> + <xsl:choose> + <xsl:when test="$content"> + <xsl:copy-of select="$content"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="olink.hottext"> + <xsl:with-param name="olink.key" select="$olink.key"/> + <xsl:with-param name="olink.lang" select="$olink.lang"/> + <xsl:with-param name="target.database" select="$target.database"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> </xsl:variable> <xsl:variable name="olink.docname.citation"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2007-04-19 01:01:22
|
Revision: 6789 http://svn.sourceforge.net/docbook/?rev=6789&view=rev Author: bobstayton Date: 2007-04-18 18:01:21 -0700 (Wed, 18 Apr 2007) Log Message: ----------- Add support for new profiling attributes audience and wordsize. Modified Paths: -------------- trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2007-04-19 01:00:35 UTC (rev 6788) +++ trunk/xsl/html/param.ent 2007-04-19 01:01:21 UTC (rev 6789) @@ -184,6 +184,7 @@ <!ENTITY process.empty.source.toc SYSTEM "../params/process.empty.source.toc.xml"> <!ENTITY process.source.toc SYSTEM "../params/process.source.toc.xml"> <!ENTITY profile.arch SYSTEM "../params/profile.arch.xml"> +<!ENTITY profile.audience SYSTEM "../params/profile.audience.xml"> <!ENTITY profile.attribute SYSTEM "../params/profile.attribute.xml"> <!ENTITY profile.condition SYSTEM "../params/profile.condition.xml"> <!ENTITY profile.conformance SYSTEM "../params/profile.conformance.xml"> @@ -198,6 +199,7 @@ <!ENTITY profile.userlevel SYSTEM "../params/profile.userlevel.xml"> <!ENTITY profile.value SYSTEM "../params/profile.value.xml"> <!ENTITY profile.vendor SYSTEM "../params/profile.vendor.xml"> +<!ENTITY profile.wordsize SYSTEM "../params/profile.wordsize.xml"> <!ENTITY punct.honorific SYSTEM "../params/punct.honorific.xml"> <!ENTITY qanda.defaultlabel SYSTEM "../params/qanda.defaultlabel.xml"> <!ENTITY qanda.in.toc SYSTEM "../params/qanda.in.toc.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2007-04-19 01:00:35 UTC (rev 6788) +++ trunk/xsl/html/param.xweb 2007-04-19 01:01:21 UTC (rev 6789) @@ -342,6 +342,7 @@ url="http://docbook.sourceforge.net/projects/xsl/doc/tools/profiling.html">http://docbook.sourceforge.net/projects/xsl/doc/tools/profiling.html</ulink>.</para> </partintro> &profile.arch; +&profile.audience; &profile.condition; &profile.conformance; &profile.lang; @@ -353,6 +354,7 @@ &profile.status; &profile.userlevel; &profile.vendor; +&profile.wordsize; &profile.attribute; &profile.value; &profile.separator; @@ -665,6 +667,7 @@ <src:fragref linkend="process.empty.source.toc.frag"/> <src:fragref linkend="process.source.toc.frag"/> <src:fragref linkend="profile.arch.frag"/> +<src:fragref linkend="profile.audience.frag"/> <src:fragref linkend="profile.attribute.frag"/> <src:fragref linkend="profile.condition.frag"/> <src:fragref linkend="profile.conformance.frag"/> @@ -679,6 +682,7 @@ <src:fragref linkend="profile.userlevel.frag"/> <src:fragref linkend="profile.value.frag"/> <src:fragref linkend="profile.vendor.frag"/> +<src:fragref linkend="profile.wordsize.frag"/> <src:fragref linkend="punct.honorific.frag"/> <src:fragref linkend="qanda.defaultlabel.frag"/> <src:fragref linkend="qanda.inherit.numeration.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-01 08:32:00
|
Revision: 6920 http://svn.sourceforge.net/docbook/?rev=6920&view=rev Author: xmldoc Date: 2007-07-01 01:31:52 -0700 (Sun, 01 Jul 2007) Log Message: ----------- When we are chunking long descriptions for mediaobject instances into separate HTML output files, and use.id.as.filename is non-zero, if a mediaobject has an ID, use that ID as the basename for the long-description file (otherwise, we generate an ID for it and use that ID as the basename for the file). The parallels the recent change made to cause IDs for legalnotice instances to be used as basenames for legalnotice chunks. Also, made some minor refinements to the recent changes for legalnotice chunk handling. Modified Paths: -------------- trunk/xsl/html/chunk-code.xsl trunk/xsl/html/graphics.xsl Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2007-06-30 12:08:27 UTC (rev 6919) +++ trunk/xsl/html/chunk-code.xsl 2007-07-01 08:31:52 UTC (rev 6920) @@ -82,9 +82,9 @@ <xsl:value-of select="$html.ext"/> </xsl:when> <!-- Special case --> - <xsl:when test="self::legalnotice and $generate.legalnotice.link != 0"> + <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)"> <xsl:choose> - <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0"> + <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)"> <!-- * if this legalnotice has an ID, then go ahead and use --> <!-- * just the value of that ID as the basename for the file --> <!-- * (that is, without prepending an "ln-" too it) --> @@ -93,7 +93,7 @@ </xsl:when> <xsl:otherwise> <!-- * otherwise, if this legalnotice does not have an ID, --> - <!-- * then we generate one an ID... --> + <!-- * then we generate an ID... --> <xsl:variable name="id"> <xsl:call-template name="object.id"/> </xsl:variable> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2007-06-30 12:08:27 UTC (rev 6919) +++ trunk/xsl/html/graphics.xsl 2007-07-01 08:31:52 UTC (rev 6920) @@ -1224,14 +1224,8 @@ <xsl:template name="longdesc.uri"> <xsl:param name="mediaobject" select="."/> - <xsl:if test="$html.longdesc"> <xsl:if test="$mediaobject/textobject[not(phrase)]"> - <xsl:variable name="image-id"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="$mediaobject"/> - </xsl:call-template> - </xsl:variable> <xsl:variable name="dbhtml.dir"> <xsl:call-template name="dbhtml-dir"/> </xsl:variable> @@ -1247,8 +1241,31 @@ </xsl:otherwise> </xsl:choose> </xsl:with-param> - <xsl:with-param name="base.name" - select="concat('ld-',$image-id,$html.ext)"/> + <xsl:with-param name="base.name"> + <xsl:choose> + <xsl:when test=" + $mediaobject/@*[local-name() = 'id'] + and not($use.id.as.filename = 0)"> + <!-- * if this mediaobject has an ID, then we use the --> + <!-- * value of that ID as basename for the "longdesc" --> + <!-- * file (that is, without prepending an "ld-" too it) --> + <xsl:value-of select="$mediaobject/@*[local-name() = 'id']"/> + <xsl:value-of select="$html.ext"/> + </xsl:when> + <xsl:otherwise> + <!-- * otherwise, if this mediaobject does not have an --> + <!-- * ID, then we generate an ID... --> + <xsl:variable name="image-id"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$mediaobject"/> + </xsl:call-template> + </xsl:variable> + <!-- * ...and then we take that generated ID, prepend an --> + <!-- * "ld-" to it, and use that as the basename for the file --> + <xsl:value-of select="concat('ld-',$image-id,$html.ext)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:with-param> </xsl:call-template> </xsl:variable> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-04 04:42:19
|
Revision: 6942 http://svn.sourceforge.net/docbook/?rev=6942&view=rev Author: xmldoc Date: 2007-07-03 21:42:17 -0700 (Tue, 03 Jul 2007) Log Message: ----------- Initial reorganization of HTML PI processing mechanism. Modified Paths: -------------- trunk/xsl/html/chunk-code.xsl trunk/xsl/html/chunktoc.xsl trunk/xsl/html/pi.xsl Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2007-07-04 04:01:12 UTC (rev 6941) +++ trunk/xsl/html/chunk-code.xsl 2007-07-04 04:42:17 UTC (rev 6942) @@ -68,7 +68,7 @@ </xsl:variable> <xsl:variable name="dbhtml-filename"> - <xsl:call-template name="dbhtml-filename"/> + <xsl:call-template name="pi.dbhtml_filename"/> </xsl:variable> <xsl:variable name="filename"> Modified: trunk/xsl/html/chunktoc.xsl =================================================================== --- trunk/xsl/html/chunktoc.xsl 2007-07-04 04:01:12 UTC (rev 6941) +++ trunk/xsl/html/chunktoc.xsl 2007-07-04 04:42:17 UTC (rev 6942) @@ -49,8 +49,8 @@ <xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/> <xsl:variable name="filename"> - <xsl:call-template name="dbhtml-filename"> - <xsl:with-param name="pis" select="$chunk/processing-instruction('dbhtml')"/> + <xsl:call-template name="pi.dbhtml_filename"> + <xsl:with-param name="node" select="$chunk"/> </xsl:call-template> </xsl:variable> Modified: trunk/xsl/html/pi.xsl =================================================================== --- trunk/xsl/html/pi.xsl 2007-07-04 04:01:12 UTC (rev 6941) +++ trunk/xsl/html/pi.xsl 2007-07-04 04:42:17 UTC (rev 6942) @@ -12,33 +12,108 @@ ******************************************************************** --> -<xsl:template match="processing-instruction()"> +<doc:reference xmlns=""> +<referenceinfo> +<releaseinfo role="meta"> +$Id$ +</releaseinfo> +<authorgroup> + <author> + <orgname>The DocBook Project Development Team</orgname> + </author> +</authorgroup> +<copyright> + <year>2007</year> + <holder>The DocBook Project</holder> +</copyright> +</referenceinfo> +<title>HTML Processing Instruction Reference</title> + +<partintro id="partintro"> +<title>Introduction</title> + +<para>This is generated reference documentation for all + user-specifiable processing instructions (PIs) in the DocBook + XSL stylesheets for HTML output. + <note> + <para>You add these PIs at particular points in a document to + cause specific “exceptions” to formatting/output behavior. To + make global changes in formatting/output behavior across an + entire document, it’s better to do it by setting an + appropriate stylesheet parameter (if there is one).</para> + </note> +</para> +</partintro> +</doc:reference> + +<!-- ==================================================================== --> + +<xsl:template name="pi.dbhtml_dir"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'dir'"/> + </xsl:call-template> </xsl:template> -<xsl:template match="processing-instruction('dbhtml')"> - <!-- nop --> +<xsl:template name="pi.dbhtml_filename"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'filename'"/> + </xsl:call-template> </xsl:template> +<xsl:template name="pi.dbfunclist"> + <xsl:variable name="funcsynopses" select="..//funcsynopsis"/> + <xsl:if test="count($funcsynopses)<1"> + <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text> + </xsl:message> + </xsl:if> + <dl> + <xsl:call-template name="process.funcsynopsis.list"> + <xsl:with-param name="funcsynopses" select="$funcsynopses"/> + </xsl:call-template> + </dl> +</xsl:template> + +<xsl:template name="pi.dbcmdlist"> + <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/> + <xsl:if test="count($cmdsynopses)<1"> + <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text> + </xsl:message> + </xsl:if> + <dl> + <xsl:call-template name="process.cmdsynopsis.list"> + <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/> + </xsl:call-template> + </dl> +</xsl:template> + <!-- ==================================================================== --> <xsl:template name="dbhtml-attribute"> + <!-- * dbhtml-attribute is an interal utility template for retrieving --> + <!-- * pseudo-attributes/parameters from PIs --> <xsl:param name="pis" select="processing-instruction('dbhtml')"/> <xsl:param name="attribute">filename</xsl:param> - <xsl:call-template name="pi-attribute"> <xsl:with-param name="pis" select="$pis"/> <xsl:with-param name="attribute" select="$attribute"/> </xsl:call-template> </xsl:template> -<xsl:template name="dbhtml-filename"> - <xsl:param name="pis" select="./processing-instruction('dbhtml')"/> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$pis"/> - <xsl:with-param name="attribute">filename</xsl:with-param> - </xsl:call-template> +<!-- ==================================================================== --> + +<xsl:template match="processing-instruction()"> </xsl:template> +<xsl:template match="processing-instruction('dbhtml')"> + <!-- nop --> +</xsl:template> + +<!-- ==================================================================== --> + <!-- <xsl:template name="dbhtml-dir"> <xsl:param name="pis" select="./processing-instruction('dbhtml')"/> @@ -63,9 +138,8 @@ </xsl:variable> <xsl:variable name="path"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute">dir</xsl:with-param> + <xsl:call-template name="pi.dbhtml_dir"> + <xsl:with-param name="node" select="$context"/> </xsl:call-template> </xsl:variable> @@ -90,6 +164,9 @@ <!-- ==================================================================== --> +<xsl:template match="processing-instruction('dbcmdlist')"> + <xsl:call-template name="pi.dbcmdlist"/> +</xsl:template> <xsl:template name="process.cmdsynopsis.list"> <xsl:param name="cmdsynopses"/><!-- empty node list by default --> <xsl:param name="count" select="1"/> @@ -130,23 +207,11 @@ </xsl:choose> </xsl:template> -<xsl:template match="processing-instruction('dbcmdlist')"> - <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/> +<!-- ==================================================================== --> - <xsl:if test="count($cmdsynopses)<1"> - <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text> - </xsl:message> - </xsl:if> - - <dl> - <xsl:call-template name="process.cmdsynopsis.list"> - <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/> - </xsl:call-template> - </dl> +<xsl:template match="processing-instruction('dbfunclist')"> + <xsl:call-template name="pi.dbfunclist"/> </xsl:template> - -<!-- ==================================================================== --> - <xsl:template name="process.funcsynopsis.list"> <xsl:param name="funcsynopses"/><!-- empty node list by default --> <xsl:param name="count" select="1"/> @@ -187,21 +252,6 @@ </xsl:choose> </xsl:template> -<xsl:template match="processing-instruction('dbfunclist')"> - <xsl:variable name="funcsynopses" select="..//funcsynopsis"/> - - <xsl:if test="count($funcsynopses)<1"> - <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text> - </xsl:message> - </xsl:if> - - <dl> - <xsl:call-template name="process.funcsynopsis.list"> - <xsl:with-param name="funcsynopses" select="$funcsynopses"/> - </xsl:call-template> - </dl> -</xsl:template> - <!-- ==================================================================== --> <!-- Copy well-formed external HTML content to the output. --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-04 06:06:55
|
Revision: 6943 http://svn.sourceforge.net/docbook/?rev=6943&view=rev Author: xmldoc Date: 2007-07-03 23:06:53 -0700 (Tue, 03 Jul 2007) Log Message: ----------- Consolidated all PIs for graphics and lists into wrapper templates in one place (html/pi.xsl) and added embedded doc for all of them. May have made some flubs in copying over, so this change may break some graphics and list handling. Modified Paths: -------------- trunk/xsl/html/graphics.xsl trunk/xsl/html/lists.xsl trunk/xsl/html/pi.xsl Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2007-07-04 04:42:17 UTC (rev 6942) +++ trunk/xsl/html/graphics.xsl 2007-07-04 06:06:53 UTC (rev 6943) @@ -248,11 +248,8 @@ </xsl:variable> <xsl:variable name="img.src.path.pi"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'img.src.path'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_img.src.path"> + <xsl:with-param name="node" select=".."/> </xsl:variable> <xsl:variable name="filename.for.graphicsize"> @@ -641,10 +638,8 @@ </xsl:variable> <xsl:variable name="bgcolor"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'background-color'"/> + <xsl:call-template name="pi.dbhtml_background-color"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2007-07-04 04:42:17 UTC (rev 6942) +++ trunk/xsl/html/lists.xsl 2007-07-04 06:06:53 UTC (rev 6943) @@ -211,11 +211,7 @@ <xsl:template match="variablelist"> <xsl:variable name="pi-presentation"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-presentation'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-presentation"/> </xsl:variable> <xsl:variable name="presentation"> @@ -233,27 +229,15 @@ </xsl:variable> <xsl:variable name="list-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-width"/> </xsl:variable> <xsl:variable name="term-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'term-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_term-width"/> </xsl:variable> <xsl:variable name="table-summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <div> @@ -370,18 +354,14 @@ <xsl:template match="varlistentry" mode="varlist-table"> <xsl:variable name="presentation"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'term-presentation'"/> + <xsl:call-template name="pi.dbhtml_term-presentation"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> <xsl:variable name="separator"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'term-separator'"/> + <xsl:call-template name="pi.dbhtml_term-separator"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> <tr> @@ -795,11 +775,7 @@ <xsl:template match="segmentedlist"> <xsl:variable name="presentation"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-presentation'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-presentation"/> </xsl:variable> <div> @@ -868,19 +844,11 @@ <xsl:template match="segmentedlist" mode="seglist-table"> <xsl:variable name="table-summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <xsl:variable name="list-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-width"> </xsl:variable> <xsl:apply-templates select="title"/> Modified: trunk/xsl/html/pi.xsl =================================================================== --- trunk/xsl/html/pi.xsl 2007-07-04 04:42:17 UTC (rev 6942) +++ trunk/xsl/html/pi.xsl 2007-07-04 06:06:53 UTC (rev 6943) @@ -64,6 +64,232 @@ </xsl:call-template> </xsl:template> +<xsl:template name="pi.dbhtml_img.src.path"> + <!-- * called on parent of graphic, inlinegraphic, imagedata, or videodata --> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'img.src.path'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_background-color" xmlns=""> +<refpurpose>Sets background color for an image</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml background-color</tag> PI before or + after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>, + <tag>imagedata</tag>, or <tag>videodata</tag> element) as a + sibling to the element, to set a background color for the + image.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml background-color="<replaceable>color</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>background-color="<replaceable>color</replaceable>"</term> + <listitem> + <para>FIXME: A color value? [In hex, as a name, or what?]</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_background-color"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'background-color'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_list-presentation" xmlns=""> +<refpurpose>Specifies presentation style for a variablelist or + segmentedlist</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml list-presentation</tag> PI as a child of + a <tag>variablelist</tag> or <tag>segmentedlist</tag> to + control the presentation style for the list (to cause it, for + example, to be displayed as a table).</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml list-presentation="list"|"table"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>list-presentation="list"</term> + <listitem> + <para>Displays the list as a list</para> + </listitem> + </varlistentry> + <varlistentry><term>list-presentation="table"</term> + <listitem> + <para>Displays the list as a table</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_list-presentation"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'list-presentation'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_list-width" xmlns=""> +<refpurpose>Specifies the width of a variablelist or simplelist</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml list-width</tag> PI as a child of a + <tag>variablelist</tag> or a <tag>simplelist</tag> presented + as a table, to specify the output width.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml list-width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>list-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the ouytput width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_list-width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'list-width'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_term-presentation" xmlns=""> +<refpurpose>Sets character formatting for terms in a variablelist</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml term-presentation</tag> PI as a child + of a <tag>variablelist</tag> to set character formatting for + the <tag>term</tag> output of the list.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml term-presentation="bold"|"italic"|"bold-italic"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>term-presentation="<replaceable>bold</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in bold</para> + </listitem> + </varlistentry> + <varlistentry><term>term-presentation="<replaceable>italic</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in italic</para> + </listitem> + </varlistentry> + <varlistentry><term>term-presentation="<replaceable>bold-italic</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in bold-italic</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_term-presentation"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'term-presentation'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_term-separator" xmlns=""> +<refpurpose>Specifies the separator text shown after term + instances in output of variablelist</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml term-separator</tag> PI as a child + of a <tag>variablelist</tag> to specify the separator text + output after each <tag>term</tag>.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml term-separator="<replaceable>text</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>term-separator="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_term-separator"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'term-separator'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_table-summary" xmlns=""> +<refpurpose>Specifies the text of the summary attribute for table + output of a variablelist or segmentedlist</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml table-summary</tag> PI as a child + of a <tag>variablelist</tag> or <tag>segmentedlist</tag> to + specify the text for the HTML <literal>summary</literal> + attribute in the output HTML table.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the summary text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_table-summary"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'table-summary'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_term-width" xmlns=""> +<refpurpose>Specifies the term width for a variablelist</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml term-width</tag> PI as a child of a + <tag>variablelist</tag> to specify the width for + <tag>term</tag> output.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the term width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_term-width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'term-width'"/> + </xsl:call-template> +</xsl:template> + <xsl:template name="pi.dbfunclist"> <xsl:variable name="funcsynopses" select="..//funcsynopsis"/> <xsl:if test="count($funcsynopses)<1"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-04 08:41:59
|
Revision: 6944 http://svn.sourceforge.net/docbook/?rev=6944&view=rev Author: xmldoc Date: 2007-07-04 01:41:53 -0700 (Wed, 04 Jul 2007) Log Message: ----------- Consolidated all PIs for qandaset into wrapper templates in one place (html/pi.xsl) and added embedded doc for all of them. May have made some flubs in copying over, so this change may break some qandaset handling. Modified Paths: -------------- trunk/xsl/html/pi.xsl trunk/xsl/html/qandaset.xsl Modified: trunk/xsl/html/pi.xsl =================================================================== --- trunk/xsl/html/pi.xsl 2007-07-04 06:06:53 UTC (rev 6943) +++ trunk/xsl/html/pi.xsl 2007-07-04 08:41:53 UTC (rev 6944) @@ -102,6 +102,93 @@ </xsl:call-template> </xsl:template> +<doc:pi name="dbhtml_cellpadding" xmlns=""> +<refpurpose>Specifies the value of the cellpadding attribute in table + output of a qandaset</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml cellpadding</tag> PI as a child + of a <tag>qandaset</tag> to specify the value for the HTML + <literal>cellpadding</literal> attribute in the output HTML + table.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml cellpadding="<replaceable>number</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>cellpadding="<replaceable>number</replaceable>"</term> + <listitem> + <para>Specifies the cellpadding</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_cellpadding"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'cellpadding'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_cellspacing" xmlns=""> +<refpurpose>Specifies the value of the cellspacing attribute in table + output of a qandaset</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml cellspacing</tag> PI as a child + of a <tag>qandaset</tag> to specify the value for the HTML + <literal>cellspacing</literal> attribute in the output HTML + table.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml cellspacing="<replaceable>number</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>cellspacing="<replaceable>number</replaceable>"</term> + <listitem> + <para>Specifies the cellspacing</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_cellspacing"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'cellspacing'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_label-width" xmlns=""> +<refpurpose>Specifies the label width for a qandaset</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml label-width</tag> PI as a child of a + <tag>qandaset</tag> to specify the width of labels.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml label-width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>label-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the label width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_label-width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'label-width'"/> + </xsl:call-template> +</xsl:template> + <doc:pi name="dbhtml_list-presentation" xmlns=""> <refpurpose>Specifies presentation style for a variablelist or segmentedlist</refpurpose> @@ -165,6 +252,37 @@ </xsl:call-template> </xsl:template> +<doc:pi name="dbhtml_table-summary" xmlns=""> +<refpurpose>Specifies the text of the summary attribute for table + output of a variablelist, segmentedlist, or qandaset</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml table-summary</tag> PI as a child + of a <tag>variablelist</tag>, <tag>segmentedlist</tag>, or + <tag>qandaset</tag> to specify the text for the HTML + <literal>summary</literal> attribute in the output HTML + table.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the summary text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> +</doc:pi> +<xsl:template name="pi.dbhtml_table-summary"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'table-summary'"/> + </xsl:call-template> +</xsl:template> + <doc:pi name="dbhtml_term-presentation" xmlns=""> <refpurpose>Sets character formatting for terms in a variablelist</refpurpose> <refdescription> @@ -232,61 +350,65 @@ </xsl:call-template> </xsl:template> -<doc:pi name="dbhtml_table-summary" xmlns=""> -<refpurpose>Specifies the text of the summary attribute for table - output of a variablelist or segmentedlist</refpurpose> +<doc:pi name="dbhtml_term-width" xmlns=""> +<refpurpose>Specifies the term width for a variablelist</refpurpose> <refdescription> - <para>Use the <tag>dbhtml table-summary</tag> PI as a child - of a <tag>variablelist</tag> or <tag>segmentedlist</tag> to - specify the text for the HTML <literal>summary</literal> - attribute in the output HTML table.</para> + <para>Use the <tag>dbhtml term-width</tag> PI as a child of a + <tag>variablelist</tag> to specify the width for + <tag>term</tag> output.</para> </refdescription> <refsynopsisdiv> - <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis> + <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> <refparameter> <variablelist> - <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term> + <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> <listitem> - <para>Specifies the summary text (zero or more characters)</para> + <para>FIXME: Specifies the term width (in what units?)</para> </listitem> </varlistentry> </variablelist> </refparameter> </doc:pi> -<xsl:template name="pi.dbhtml_table-summary"> +<xsl:template name="pi.dbhtml_term-width"> <xsl:param name="node" select="."/> <xsl:call-template name="dbhtml-attribute"> <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> + <xsl:with-param name="attribute" select="'term-width'"/> </xsl:call-template> </xsl:template> -<doc:pi name="dbhtml_term-width" xmlns=""> -<refpurpose>Specifies the term width for a variablelist</refpurpose> +<doc:pi name="dbhtml_toc" xmlns=""> +<refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose> <refdescription> - <para>Use the <tag>dbhtml term-width</tag> PI as a child of a - <tag>variablelist</tag> to specify the width for - <tag>term</tag> output.</para> + <para>Use the <tag>dbhtml toc</tag> PI as a child of a + <tag>qandaset</tag> to specify whether a table of contents + (TOC) is generated for the <tag>qandaset</tag>.</para> </refdescription> <refsynopsisdiv> - <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis> + <synopsis><tag class="xmlpi">dbhtml toc="0"|"1"</tag></synopsis> </refsynopsisdiv> <refparameter> <variablelist> - <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> + <varlistentry><term>toc="0"</term> <listitem> - <para>FIXME: Specifies the term width (in what units?)</para> + <para>If zero, no TOC is generated</para> </listitem> </varlistentry> + <varlistentry><term>toc="1"</term> + <listitem> + <para>If <code>1</code> (or any non-zero value), + a TOC is generated</para> + </listitem> + </varlistentry> </variablelist> </refparameter> </doc:pi> -<xsl:template name="pi.dbhtml_term-width"> +<xsl:template name="pi.dbhtml_toc"> <xsl:param name="node" select="."/> <xsl:call-template name="dbhtml-attribute"> <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'term-width'"/> + <xsl:with-param name="attribute" select="'toc'"/> </xsl:call-template> </xsl:template> Modified: trunk/xsl/html/qandaset.xsl =================================================================== --- trunk/xsl/html/qandaset.xsl 2007-07-04 06:06:53 UTC (rev 6943) +++ trunk/xsl/html/qandaset.xsl 2007-07-04 08:41:53 UTC (rev 6944) @@ -23,11 +23,7 @@ and local-name(.) != 'qandadiv' and local-name(.) != 'qandaentry']"/> <xsl:variable name="toc"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'toc'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_toc"/> </xsl:variable> <xsl:variable name="toc.params"> @@ -86,11 +82,7 @@ </xsl:if> <xsl:variable name="toc"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'toc'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_toc"/> </xsl:variable> <xsl:variable name="toc.params"> @@ -336,35 +328,19 @@ <xsl:template name="process.qandaset"> <xsl:variable name="label-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'label-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_label-width"/> </xsl:variable> <xsl:variable name="table-summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <xsl:variable name="cellpadding"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'cellpadding'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_cellpadding"/> </xsl:variable> <xsl:variable name="cellspacing"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'cellspacing'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_cellspacing"/> </xsl:variable> <table border="0" summary="Q and A Set"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-04 10:22:00
|
Revision: 6946 http://svn.sourceforge.net/docbook/?rev=6946&view=rev Author: xmldoc Date: 2007-07-04 03:21:57 -0700 (Wed, 04 Jul 2007) Log Message: ----------- Added a verbatim PI that I missed in last commit. Modified Paths: -------------- trunk/xsl/html/pi.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/html/pi.xsl =================================================================== --- trunk/xsl/html/pi.xsl 2007-07-04 10:17:17 UTC (rev 6945) +++ trunk/xsl/html/pi.xsl 2007-07-04 10:21:57 UTC (rev 6946) @@ -377,6 +377,39 @@ </xsl:call-template> </xsl:template> +<doc:pi name="dbhtml_linenumbering.width" xmlns=""> +<refpurpose>Specifies the width set aside for line numbers in + output of verbatim environments</refpurpose> +<refdescription> + <para>Use the <tag>dbhtml linenumbering.width</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the width set aside for line numbers.</para> +</refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> +<refparameter> + <variablelist> + <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> +</refparameter> + <refsee role="params"> + <para><parameter>linenumbering.width</parameter></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_linenumbering.width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'linenumbering.width'"/> + </xsl:call-template> +</xsl:template> + <doc:pi name="dbhtml_list-width" xmlns=""> <refpurpose>Specifies the width of a variablelist or simplelist</refpurpose> <refdescription> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2007-07-04 10:17:17 UTC (rev 6945) +++ trunk/xsl/html/verbatim.xsl 2007-07-04 10:21:57 UTC (rev 6946) @@ -198,10 +198,8 @@ </xsl:variable> <xsl:variable name="pi.linenumbering.width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="$pi.context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'linenumbering.width'"/> + <xsl:call-template name="pi.dbhtml_linenumbering.width"> + <xsl:with-param name="node" select="$pi.context"/> </xsl:call-template> </xsl:variable> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-04 10:36:14
|
Revision: 6945 http://svn.sourceforge.net/docbook/?rev=6945&view=rev Author: xmldoc Date: 2007-07-04 03:17:17 -0700 (Wed, 04 Jul 2007) Log Message: ----------- Consolidated all PIs for HTML synopsis and verbatim stuff into wrapper templates in the "master" pi list (html/pi.xsl) and added embedded doc for all of them. May have made some flubs in copying over, so this change may break some synopsis and verbatim handling. Note: Also added refsee@role=params instances so that we can link to the corresponding global params (if any) for each PI. Modified Paths: -------------- trunk/xsl/html/pi.xsl trunk/xsl/html/synop.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/html/pi.xsl =================================================================== --- trunk/xsl/html/pi.xsl 2007-07-04 08:41:53 UTC (rev 6944) +++ trunk/xsl/html/pi.xsl 2007-07-04 10:17:17 UTC (rev 6945) @@ -13,37 +13,37 @@ ******************************************************************** --> <doc:reference xmlns=""> -<referenceinfo> -<releaseinfo role="meta"> -$Id$ -</releaseinfo> -<authorgroup> - <author> - <orgname>The DocBook Project Development Team</orgname> - </author> -</authorgroup> -<copyright> - <year>2007</year> - <holder>The DocBook Project</holder> -</copyright> -</referenceinfo> -<title>HTML Processing Instruction Reference</title> + <referenceinfo> + <releaseinfo role="meta"> + $Id$ + </releaseinfo> + <authorgroup> + <author> + <orgname>The DocBook Project Development Team</orgname> + </author> + </authorgroup> + <copyright> + <year>2007</year> + <holder>The DocBook Project</holder> + </copyright> + </referenceinfo> + <title>HTML Processing Instruction Reference</title> -<partintro id="partintro"> -<title>Introduction</title> + <partintro id="partintro"> + <title>Introduction</title> -<para>This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for HTML output. - <note> - <para>You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one).</para> - </note> -</para> -</partintro> + <para>This is generated reference documentation for all + user-specifiable processing instructions (PIs) in the DocBook + XSL stylesheets for HTML output. + <note> + <para>You add these PIs at particular points in a document to + cause specific “exceptions” to formatting/output behavior. To + make global changes in formatting/output behavior across an + entire document, it’s better to do it by setting an + appropriate stylesheet parameter (if there is one).</para> + </note> + </para> + </partintro> </doc:reference> <!-- ==================================================================== --> @@ -73,26 +73,26 @@ </xsl:template> <doc:pi name="dbhtml_background-color" xmlns=""> -<refpurpose>Sets background color for an image</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml background-color</tag> PI before or - after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>, - <tag>imagedata</tag>, or <tag>videodata</tag> element) as a - sibling to the element, to set a background color for the - image.</para> -</refdescription> + <refpurpose>Sets background color for an image</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml background-color</tag> PI before or + after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>, + <tag>imagedata</tag>, or <tag>videodata</tag> element) as a + sibling to the element, to set a background color for the + image.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml background-color="<replaceable>color</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>background-color="<replaceable>color</replaceable>"</term> - <listitem> - <para>FIXME: A color value? [In hex, as a name, or what?]</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>background-color="<replaceable>color</replaceable>"</term> + <listitem> + <para>An HTML color value</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbhtml_background-color"> <xsl:param name="node" select="."/> @@ -103,26 +103,29 @@ </xsl:template> <doc:pi name="dbhtml_cellpadding" xmlns=""> -<refpurpose>Specifies the value of the cellpadding attribute in table - output of a qandaset</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml cellpadding</tag> PI as a child - of a <tag>qandaset</tag> to specify the value for the HTML - <literal>cellpadding</literal> attribute in the output HTML - table.</para> -</refdescription> + <refpurpose>Specifies the value of the cellpadding attribute in table + output of a qandaset</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml cellpadding</tag> PI as a child + of a <tag>qandaset</tag> to specify the value for the HTML + <literal>cellpadding</literal> attribute in the output HTML + table.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml cellpadding="<replaceable>number</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>cellpadding="<replaceable>number</replaceable>"</term> - <listitem> - <para>Specifies the cellpadding</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>cellpadding="<replaceable>number</replaceable>"</term> + <listitem> + <para>Specifies the cellpadding</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>html.cellpadding</parameter></para> + </refsee> </doc:pi> <xsl:template name="pi.dbhtml_cellpadding"> <xsl:param name="node" select="."/> @@ -133,26 +136,29 @@ </xsl:template> <doc:pi name="dbhtml_cellspacing" xmlns=""> -<refpurpose>Specifies the value of the cellspacing attribute in table - output of a qandaset</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml cellspacing</tag> PI as a child - of a <tag>qandaset</tag> to specify the value for the HTML - <literal>cellspacing</literal> attribute in the output HTML - table.</para> -</refdescription> + <refpurpose>Specifies the value of the cellspacing attribute in table + output of a qandaset</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml cellspacing</tag> PI as a child + of a <tag>qandaset</tag> to specify the value for the HTML + <literal>cellspacing</literal> attribute in the output HTML + table.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml cellspacing="<replaceable>number</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>cellspacing="<replaceable>number</replaceable>"</term> - <listitem> - <para>Specifies the cellspacing</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>cellspacing="<replaceable>number</replaceable>"</term> + <listitem> + <para>Specifies the cellspacing</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>html.cellspacing</parameter></para> + </refsee> </doc:pi> <xsl:template name="pi.dbhtml_cellspacing"> <xsl:param name="node" select="."/> @@ -162,24 +168,61 @@ </xsl:call-template> </xsl:template> +<doc:pi name="dbhtml_funcsynopsis-style" xmlns=""> + <refpurpose>Specifies presentation style for a funcsynopsis</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml funcsynopsis-style</tag> PI as a child of + a <tag>funcprototype</tag> or anywhere within a funcprototype + control the presentation style for the <tag>funcsynopsis</tag> + in output.</para> + </refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml funcsynopsis-style="kr"|"ansi"</tag></synopsis> + </refsynopsisdiv> + <refparameter> + <variablelist> + <varlistentry><term>funcsynopsis-style="kr"</term> + <listitem> + <para>Displays the <tag>funcprototype</tag> in K&R style</para> + </listitem> + </varlistentry> + <varlistentry><term>funcsynopsis-style="ansi"</term> + <listitem> + <para>Displays the <tag>funcprototype</tag> in ANSI style</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>funcsynopsis.style</parameter></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_funcsynopsis-style"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'funcsynopsis-style'"/> + </xsl:call-template> +</xsl:template> + <doc:pi name="dbhtml_label-width" xmlns=""> -<refpurpose>Specifies the label width for a qandaset</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml label-width</tag> PI as a child of a - <tag>qandaset</tag> to specify the width of labels.</para> -</refdescription> + <refpurpose>Specifies the label width for a qandaset</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml label-width</tag> PI as a child of a + <tag>qandaset</tag> to specify the width of labels.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml label-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>label-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the label width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>label-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the label width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbhtml_label-width"> <xsl:param name="node" select="."/> @@ -189,32 +232,142 @@ </xsl:call-template> </xsl:template> +<doc:pi name="dbhtml_linenumbering.everyNth" xmlns=""> + <refpurpose>Specifies the interval at which lines are numbered in + output of verbatim environments</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml linenumbering.everyNth</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the interval at which lines are numbered.</para> + </refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter> + <variablelist> + <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term> + <listitem> + <para>FIXME: Specifies numbering interval; a number is + output before every <replaceable>N</replaceable>th line</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>linenumbering.everyNth</parameter></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_linenumbering.everyNth"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_linenumbering.separator" xmlns=""> + <refpurpose>Specifies the separator text used between line numbers + and content in output of verbatim environments</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml linenumbering.separator</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the separator text output between the line numbers and content.</para> + </refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter> + <variablelist> + <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>linenumbering.separator</parameter></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_linenumbering.separator"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'linenumbering.separator'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi name="dbhtml_linenumbering.width" xmlns=""> + <refpurpose>Specifies the width set aside for line numbers in + output of verbatim environments</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml linenumbering.width</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the width set aside for line numbers.</para> + </refdescription> + <refsynopsisdiv> + <synopsis><tag class="xmlpi">dbhtml linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter> + <variablelist> + <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>linenumbering.width</parameter></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_linenumbering.width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'linenumbering.width'"/> + </xsl:call-template> +</xsl:template> + <doc:pi name="dbhtml_list-presentation" xmlns=""> -<refpurpose>Specifies presentation style for a variablelist or - segmentedlist</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml list-presentation</tag> PI as a child of - a <tag>variablelist</tag> or <tag>segmentedlist</tag> to - control the presentation style for the list (to cause it, for - example, to be displayed as a table).</para> -</refdescription> + <refpurpose>Specifies presentation style for a variablelist or + segmentedlist</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml list-presentation</tag> PI as a child of + a <tag>variablelist</tag> or <tag>segmentedlist</tag> to + control the presentation style for the list (to cause it, for + example, to be displayed as a table).</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml list-presentation="list"|"table"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>list-presentation="list"</term> + <refparameter> + <variablelist> + <varlistentry><term>list-presentation="list"</term> + <listitem> + <para>Displays the list as a list</para> + </listitem> + </varlistentry> + <varlistentry><term>list-presentation="table"</term> + <listitem> + <para>Displays the list as a table</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <itemizedlist> <listitem> - <para>Displays the list as a list</para> + <para><parameter>variablelist.as.table</parameter></para> </listitem> - </varlistentry> - <varlistentry><term>list-presentation="table"</term> <listitem> - <para>Displays the list as a table</para> + <para><parameter>segmentedlist.as.table</parameter></para> </listitem> - </varlistentry> - </variablelist> -</refparameter> + </itemizedlist> + </refsee> </doc:pi> <xsl:template name="pi.dbhtml_list-presentation"> <xsl:param name="node" select="."/> @@ -225,24 +378,24 @@ </xsl:template> <doc:pi name="dbhtml_list-width" xmlns=""> -<refpurpose>Specifies the width of a variablelist or simplelist</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml list-width</tag> PI as a child of a - <tag>variablelist</tag> or a <tag>simplelist</tag> presented - as a table, to specify the output width.</para> -</refdescription> + <refpurpose>Specifies the width of a variablelist or simplelist</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml list-width</tag> PI as a child of a + <tag>variablelist</tag> or a <tag>simplelist</tag> presented + as a table, to specify the output width.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml list-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>list-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the ouytput width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>list-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the ouytput width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbhtml_list-width"> <xsl:param name="node" select="."/> @@ -253,27 +406,27 @@ </xsl:template> <doc:pi name="dbhtml_table-summary" xmlns=""> -<refpurpose>Specifies the text of the summary attribute for table - output of a variablelist, segmentedlist, or qandaset</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml table-summary</tag> PI as a child - of a <tag>variablelist</tag>, <tag>segmentedlist</tag>, or - <tag>qandaset</tag> to specify the text for the HTML - <literal>summary</literal> attribute in the output HTML - table.</para> -</refdescription> + <refpurpose>Specifies the text of the summary attribute for table + output of a variablelist, segmentedlist, or qandaset</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml table-summary</tag> PI as a child + of a <tag>variablelist</tag>, <tag>segmentedlist</tag>, or + <tag>qandaset</tag> to specify the text for the HTML + <literal>summary</literal> attribute in the output HTML + table.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term> - <listitem> - <para>Specifies the summary text (zero or more characters)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the summary text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbhtml_table-summary"> <xsl:param name="node" select="."/> @@ -284,34 +437,37 @@ </xsl:template> <doc:pi name="dbhtml_term-presentation" xmlns=""> -<refpurpose>Sets character formatting for terms in a variablelist</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml term-presentation</tag> PI as a child - of a <tag>variablelist</tag> to set character formatting for - the <tag>term</tag> output of the list.</para> -</refdescription> + <refpurpose>Sets character formatting for terms in a variablelist</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml term-presentation</tag> PI as a child + of a <tag>variablelist</tag> to set character formatting for + the <tag>term</tag> output of the list.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml term-presentation="bold"|"italic"|"bold-italic"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>term-presentation="<replaceable>bold</replaceable>"</term> - <listitem> - <para>Specifies that terms are displayed in bold</para> - </listitem> - </varlistentry> - <varlistentry><term>term-presentation="<replaceable>italic</replaceable>"</term> - <listitem> - <para>Specifies that terms are displayed in italic</para> - </listitem> - </varlistentry> - <varlistentry><term>term-presentation="<replaceable>bold-italic</replaceable>"</term> - <listitem> - <para>Specifies that terms are displayed in bold-italic</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>term-presentation="<replaceable>bold</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in bold</para> + </listitem> + </varlistentry> + <varlistentry><term>term-presentation="<replaceable>italic</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in italic</para> + </listitem> + </varlistentry> + <varlistentry><term>term-presentation="<replaceable>bold-italic</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in bold-italic</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>variablelist.term.separator</parameter></para> + </refsee> </doc:pi> <xsl:template name="pi.dbhtml_term-presentation"> <xsl:param name="node" select="."/> @@ -322,25 +478,28 @@ </xsl:template> <doc:pi name="dbhtml_term-separator" xmlns=""> -<refpurpose>Specifies the separator text shown after term - instances in output of variablelist</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml term-separator</tag> PI as a child - of a <tag>variablelist</tag> to specify the separator text - output after each <tag>term</tag>.</para> -</refdescription> + <refpurpose>Specifies the separator text shown among term + instances in a multi-term varlistentry</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml term-separator</tag> PI as a child + of a <tag>variablelist</tag> to specify the separator text + among <tag>term</tag> instances.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml term-separator="<replaceable>text</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>term-separator="<replaceable>text</replaceable>"</term> - <listitem> - <para>Specifies the text (zero or more characters)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>term-separator="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>variablelist.term.separator</parameter></para> + </refsee> </doc:pi> <xsl:template name="pi.dbhtml_term-separator"> <xsl:param name="node" select="."/> @@ -351,24 +510,24 @@ </xsl:template> <doc:pi name="dbhtml_term-width" xmlns=""> -<refpurpose>Specifies the term width for a variablelist</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml term-width</tag> PI as a child of a - <tag>variablelist</tag> to specify the width for - <tag>term</tag> output.</para> -</refdescription> + <refpurpose>Specifies the term width for a variablelist</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml term-width</tag> PI as a child of a + <tag>variablelist</tag> to specify the width for + <tag>term</tag> output.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the term width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>FIXME: Specifies the term width (in what units?)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbhtml_term-width"> <xsl:param name="node" select="."/> @@ -379,30 +538,30 @@ </xsl:template> <doc:pi name="dbhtml_toc" xmlns=""> -<refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose> -<refdescription> - <para>Use the <tag>dbhtml toc</tag> PI as a child of a - <tag>qandaset</tag> to specify whether a table of contents - (TOC) is generated for the <tag>qandaset</tag>.</para> -</refdescription> + <refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose> + <refdescription> + <para>Use the <tag>dbhtml toc</tag> PI as a child of a + <tag>qandaset</tag> to specify whether a table of contents + (TOC) is generated for the <tag>qandaset</tag>.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbhtml toc="0"|"1"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>toc="0"</term> - <listitem> - <para>If zero, no TOC is generated</para> - </listitem> - </varlistentry> - <varlistentry><term>toc="1"</term> - <listitem> - <para>If <code>1</code> (or any non-zero value), - a TOC is generated</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>toc="0"</term> + <listitem> + <para>If zero, no TOC is generated</para> + </listitem> + </varlistentry> + <varlistentry><term>toc="1"</term> + <listitem> + <para>If <code>1</code> (or any non-zero value), + a TOC is generated</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbhtml_toc"> <xsl:param name="node" select="."/> Modified: trunk/xsl/html/synop.xsl =================================================================== --- trunk/xsl/html/synop.xsl 2007-07-04 08:41:53 UTC (rev 6944) +++ trunk/xsl/html/synop.xsl 2007-07-04 10:17:17 UTC (rev 6945) @@ -179,10 +179,8 @@ <xsl:template match="funcprototype"> <xsl:variable name="html-style"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="ancestor::funcsynopsis//processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'funcsynopsis-style'"/> + <xsl:call-template name="pi.dbhtml_funcsynopsis-style"> + <xsl:with-param name="node" select="ancestor::funcsynopsis/descendant-or-self::*"/> </xsl:call-template> </xsl:variable> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2007-07-04 08:41:53 UTC (rev 6944) +++ trunk/xsl/html/verbatim.xsl 2007-07-04 10:17:17 UTC (rev 6945) @@ -186,18 +186,14 @@ <!-- Extract the <?dbhtml linenumbering.*?> PI values --> <xsl:variable name="pi.linenumbering.everyNth"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="$pi.context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/> + <xsl:call-template name="pi.dbhtml_linenumbering.everyNth"> + <xsl:with-param name="node" select="$pi.context"/> </xsl:call-template> </xsl:variable> <xsl:variable name="pi.linenumbering.separator"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" - select="$pi.context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'linenumbering.separator'"/> + <xsl:call-template name="pi.dbhtml_linenumbering.separator"> + <xsl:with-param name="node" select="$pi.context"/> </xsl:call-template> </xsl:variable> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |