From: <bob...@us...> - 2008-12-15 22:21:19
|
Revision: 8177 http://docbook.svn.sourceforge.net/docbook/?rev=8177&view=rev Author: bobstayton Date: 2008-12-15 22:21:16 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Add support for writing.mode to set text direction and alignment based on document locale. Modified Paths: -------------- trunk/xsl/html/docbook.xsl trunk/xsl/html/html.xsl trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Modified: trunk/xsl/html/docbook.xsl =================================================================== --- trunk/xsl/html/docbook.xsl 2008-12-15 22:13:54 UTC (rev 8176) +++ trunk/xsl/html/docbook.xsl 2008-12-15 22:21:16 UTC (rev 8177) @@ -120,6 +120,9 @@ <xsl:attribute name="link">#0000FF</xsl:attribute> <xsl:attribute name="vlink">#840084</xsl:attribute> <xsl:attribute name="alink">#0000FF</xsl:attribute> + <xsl:if test="starts-with($writing.mode, 'rl')"> + <xsl:attribute name="dir">rtl</xsl:attribute> + </xsl:if> </xsl:template> <xsl:template name="head.content"> Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2008-12-15 22:13:54 UTC (rev 8176) +++ trunk/xsl/html/html.xsl 2008-12-15 22:21:16 UTC (rev 8177) @@ -12,6 +12,33 @@ ******************************************************************** --> +<!-- These variables set the alignment value for HTML output based on + the writing-mode specified in the gentext file for the document's lang. --> + +<xsl:variable name="direction.align.start"> + <xsl:choose> + <xsl:when test="starts-with($writing.mode, 'lr')">left</xsl:when> + <xsl:when test="starts-with($writing.mode, 'rl')">right</xsl:when> + <xsl:otherwise>left</xsl:otherwise> + </xsl:choose> +</xsl:variable> + +<xsl:variable name="direction.align.end"> + <xsl:choose> + <xsl:when test="starts-with($writing.mode, 'lr')">right</xsl:when> + <xsl:when test="starts-with($writing.mode, 'rl')">left</xsl:when> + <xsl:otherwise>right</xsl:otherwise> + </xsl:choose> +</xsl:variable> + +<xsl:variable name="direction.mode"> + <xsl:choose> + <xsl:when test="starts-with($writing.mode, 'lr')">ltr</xsl:when> + <xsl:when test="starts-with($writing.mode, 'rl')">rtl</xsl:when> + <xsl:otherwise>ltr</xsl:otherwise> + </xsl:choose> +</xsl:variable> + <!-- The generate.html.title template is currently used for generating HTML --> <!-- "title" attributes for some inline elements only, but not for any --> <!-- block elements. It is called in eleven places in the inline.xsl --> Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2008-12-15 22:13:54 UTC (rev 8176) +++ trunk/xsl/html/param.ent 2008-12-15 22:21:16 UTC (rev 8177) @@ -308,3 +308,4 @@ <!ENTITY reference.autolabel SYSTEM "../params/reference.autolabel.xml"> <!ENTITY glossary.sort SYSTEM "../params/glossary.sort.xml"> <!ENTITY javahelp.encoding SYSTEM "../params/javahelp.encoding.xml"> +<!ENTITY writing.mode SYSTEM "../params/writing.mode.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2008-12-15 22:13:54 UTC (rev 8176) +++ trunk/xsl/html/param.xweb 2008-12-15 22:21:16 UTC (rev 8177) @@ -132,6 +132,7 @@ &draft.watermark.image; &generate.id.attributes; &generate.meta.abstract; +&writing.mode; </reference> <reference xml:id="xslt"><title>XSLT Processing</title> &rootid; @@ -726,6 +727,7 @@ <src:fragref linkend="variablelist.as.table.frag"/> <src:fragref linkend="variablelist.term.separator.frag"/> <src:fragref linkend="variablelist.term.break.after.frag"/> +<src:fragref linkend="writing.mode.frag"/> <src:fragref linkend="xref.with.number.and.title.frag"/> <src:fragref linkend="xref.label-title.separator.frag"/> <src:fragref linkend="xref.label-page.separator.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2008-12-15 22:26:42
|
Revision: 8178 http://docbook.svn.sourceforge.net/docbook/?rev=8178&view=rev Author: bobstayton Date: 2008-12-15 22:26:38 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Change align="left" to use $direction.align.start instead, and change align="right" to use $direction.align.end instead. Modified Paths: -------------- trunk/xsl/html/admon.xsl trunk/xsl/html/autotoc.xsl trunk/xsl/html/block.xsl trunk/xsl/html/chunk-common.xsl trunk/xsl/html/ebnf.xsl trunk/xsl/html/footnote.xsl trunk/xsl/html/graphics.xsl trunk/xsl/html/lists.xsl trunk/xsl/html/qandaset.xsl trunk/xsl/html/titlepage.xsl Modified: trunk/xsl/html/admon.xsl =================================================================== --- trunk/xsl/html/admon.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/admon.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -87,7 +87,7 @@ </xsl:attribute> </img> </td> - <th align="left"> + <th align="{$direction.align.start}"> <xsl:call-template name="anchor"/> <xsl:if test="$admon.textlabel != 0 or title or info/title"> <xsl:apply-templates select="." mode="object.title.markup"/> @@ -95,7 +95,7 @@ </th> </tr> <tr> - <td align="left" valign="top"> + <td align="{$direction.align.start}" valign="top"> <xsl:apply-templates/> </td> </tr> Modified: trunk/xsl/html/autotoc.xsl =================================================================== --- trunk/xsl/html/autotoc.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/autotoc.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -462,7 +462,7 @@ <xsl:call-template name="subtoc"> <xsl:with-param name="toc-context" select="$toc-context"/> - <xsl:with-param name="nodes" select="section + <xsl:with-param name="nodes" select="section|refentry|simplesect |bridgehead[$bridgehead.in.toc != 0]"/> </xsl:call-template> </xsl:template> Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/block.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -160,7 +160,7 @@ </tr> <tr> <td width="10%" valign="top"> </td> - <td colspan="2" align="right" valign="top"> + <td colspan="2" align="{$direction.align.end}" valign="top"> <xsl:text>--</xsl:text> <xsl:apply-templates select="attribution"/> </td> @@ -329,7 +329,7 @@ <xsl:apply-templates select="." mode="class.attribute"/> <table border="0" width="100%" summary="Revision history"> <tr> - <th align="left" valign="top" colspan="3"> + <th align="{$direction.align.start}" valign="top" colspan="3"> <b> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'RevHistory'"/> @@ -348,7 +348,7 @@ <xsl:variable name="revauthor" select="authorinitials|author"/> <xsl:variable name="revremark" select="revremark|revdescription"/> <tr> - <td align="left"> + <td align="{$direction.align.start}"> <xsl:if test="$revnumber"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Revision'"/> @@ -357,19 +357,19 @@ <xsl:apply-templates select="$revnumber"/> </xsl:if> </td> - <td align="left"> + <td align="{$direction.align.start}"> <xsl:apply-templates select="$revdate"/> </td> <xsl:choose> <xsl:when test="count($revauthor)=0"> - <td align="left"> + <td align="{$direction.align.start}"> <xsl:call-template name="dingbat"> <xsl:with-param name="dingbat">nbsp</xsl:with-param> </xsl:call-template> </td> </xsl:when> <xsl:otherwise> - <td align="left"> + <td align="{$direction.align.start}"> <xsl:for-each select="$revauthor"> <xsl:apply-templates select="."/> <xsl:if test="position() != last()"> @@ -382,7 +382,7 @@ </tr> <xsl:if test="$revremark"> <tr> - <td align="left" colspan="3"> + <td align="{$direction.align.start}" colspan="3"> <xsl:apply-templates select="$revremark"/> </td> </tr> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/chunk-common.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -865,7 +865,7 @@ <xsl:if test="$fcount > 0"> <div class="footnotes"> <br/> - <hr width="100" align="left"/> + <hr width="100" align="{$direction.align.start}"/> <xsl:call-template name="process.footnotes.in.this.chunk"> <xsl:with-param name="node" select="."/> <xsl:with-param name="footnotes" select="$footnotes"/> @@ -1507,7 +1507,7 @@ <xsl:if test="$row2"> <tr> - <td width="20%" align="left"> + <td width="20%" align="{$direction.align.start}"> <xsl:if test="count($prev)>0"> <a accesskey="p"> <xsl:attribute name="href"> @@ -1532,7 +1532,7 @@ <xsl:otherwise> </xsl:otherwise> </xsl:choose> </th> - <td width="20%" align="right"> + <td width="20%" align="{$direction.align.end}"> <xsl:text> </xsl:text> <xsl:if test="count($next)>0"> <a accesskey="n"> @@ -1589,7 +1589,7 @@ <table width="100%" summary="Navigation footer"> <xsl:if test="$row1"> <tr> - <td width="40%" align="left"> + <td width="40%" align="{$direction.align.start}"> <xsl:if test="count($prev)>0"> <a accesskey="p"> <xsl:attribute name="href"> @@ -1622,7 +1622,7 @@ <xsl:otherwise> </xsl:otherwise> </xsl:choose> </td> - <td width="40%" align="right"> + <td width="40%" align="{$direction.align.end}"> <xsl:text> </xsl:text> <xsl:if test="count($next)>0"> <a accesskey="n"> @@ -1642,7 +1642,7 @@ <xsl:if test="$row2"> <tr> - <td width="40%" align="left" valign="top"> + <td width="40%" align="{$direction.align.start}" valign="top"> <xsl:if test="$navig.showtitles != 0"> <xsl:apply-templates select="$prev" mode="object.title.markup"/> </xsl:if> @@ -1684,7 +1684,7 @@ </a> </xsl:if> </td> - <td width="40%" align="right" valign="top"> + <td width="40%" align="{$direction.align.end}" valign="top"> <xsl:text> </xsl:text> <xsl:if test="$navig.showtitles != 0"> <xsl:apply-templates select="$next" mode="object.title.markup"/> Modified: trunk/xsl/html/ebnf.xsl =================================================================== --- trunk/xsl/html/ebnf.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/ebnf.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -73,7 +73,7 @@ <xsl:if test="title"> <tr> - <th align="left" valign="top"> + <th align="{$direction.align.start}" valign="top"> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="title"/> </th> @@ -105,12 +105,12 @@ <xsl:template match="production"> <xsl:param name="recap" select="false()"/> <tr> - <td align="left" valign="top" width="3%"> + <td align="{$direction.align.start}" valign="top" width="3%"> <xsl:text>[</xsl:text> <xsl:number count="production" level="any"/> <xsl:text>]</xsl:text> </td> - <td align="right" valign="top" width="10%"> + <td align="{$direction.align.end}" valign="top" width="10%"> <xsl:choose> <xsl:when test="$recap"> <a> @@ -135,7 +135,7 @@ <xsl:apply-templates select="rhs"/> <xsl:copy-of select="$ebnf.statement.terminator"/> </td> - <td align="left" valign="top" width="30%"> + <td align="{$direction.align.start}" valign="top" width="30%"> <xsl:choose> <xsl:when test="rhs/lineannotation|constraint"> <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/> Modified: trunk/xsl/html/footnote.xsl =================================================================== --- trunk/xsl/html/footnote.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/footnote.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -242,7 +242,7 @@ <xsl:if test="count($footnotes)>count($table.footnotes)"> <div class="footnotes"> <br/> - <hr width="100" align="left"/> + <hr width="100" align="{$direction.align.start}"/> <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/> </div> </xsl:if> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/graphics.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -1352,7 +1352,7 @@ </xsl:call-template> </xsl:variable> - <div class="longdesc-link" align="right"> + <div class="longdesc-link" align="{$direction.align.end}"> <br clear="all"/> <span class="longdesc-link"> <xsl:text>[</xsl:text> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/lists.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -155,7 +155,7 @@ <xsl:choose> <xsl:when test="@inheritnum='inherit' and ancestor::listitem[parent::orderedlist]"> <table border="0"> - <col align="left" valign="top"/> + <col align="{$direction.align.start}" valign="top"/> <tbody> <xsl:apply-templates mode="orderedlist-table" @@ -307,7 +307,7 @@ <xsl:value-of select="$table-summary"/> </xsl:attribute> </xsl:if> - <col align="left" valign="top"> + <col align="{$direction.align.start}" valign="top"> <xsl:if test="$term-width != ''"> <xsl:attribute name="width"> <xsl:value-of select="$term-width"/> @@ -997,7 +997,7 @@ </xsl:with-param> </xsl:call-template> - <td width="5%" valign="top" align="left"> + <td width="5%" valign="top" align="{$direction.align.start}"> <p> <xsl:call-template name="anchor"/> <xsl:call-template name="callout.arearefs"> @@ -1005,7 +1005,7 @@ </xsl:call-template> </p> </td> - <td valign="top" align="left"> + <td valign="top" align="{$direction.align.start}"> <xsl:apply-templates/> </td> </tr> Modified: trunk/xsl/html/qandaset.xsl =================================================================== --- trunk/xsl/html/qandaset.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/qandaset.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -75,7 +75,7 @@ <xsl:if test="blockinfo/title|info/title|title"> <tr class="qandadiv"> - <td align="left" valign="top" colspan="2"> + <td align="{$direction.align.start}" valign="top" colspan="2"> <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/> </td> </tr> @@ -93,14 +93,14 @@ <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') or $toc = '1'"> <tr class="toc"> - <td align="left" valign="top" colspan="2"> + <td align="{$direction.align.start}" valign="top" colspan="2"> <xsl:call-template name="process.qanda.toc"/> </td> </tr> </xsl:if> <xsl:if test="$preamble"> <tr class="toc"> - <td align="left" valign="top" colspan="2"> + <td align="{$direction.align.start}" valign="top" colspan="2"> <xsl:apply-templates select="$preamble"/> </td> </tr> @@ -151,7 +151,7 @@ <tr> <xsl:apply-templates select="." mode="class.attribute"/> - <td align="left" valign="top"> + <td align="{$direction.align.start}" valign="top"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> <xsl:with-param name="conditional" select="0"/> @@ -173,7 +173,7 @@ </b></p> </xsl:if> </td> - <td align="left" valign="top"> + <td align="{$direction.align.start}" valign="top"> <xsl:choose> <xsl:when test="$deflabel = 'none' and not(label)"> <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b> @@ -200,7 +200,7 @@ </xsl:variable> <tr class="{local-name(.)}"> - <td align="left" valign="top"> + <td align="{$direction.align.start}" valign="top"> <xsl:call-template name="anchor"/> <xsl:variable name="answer.label"> <xsl:apply-templates select="." mode="label.markup"/> @@ -211,7 +211,7 @@ </b></p> </xsl:if> </td> - <td align="left" valign="top"> + <td align="{$direction.align.start}" valign="top"> <xsl:apply-templates select="*[local-name(.) != 'label' and local-name(.) != 'qandaentry']"/> <!-- * handle nested answer/qandaentry instances --> @@ -362,7 +362,7 @@ </xsl:attribute> </xsl:if> - <col align="left"> + <col align="{$direction.align.start}"> <xsl:attribute name="width"> <xsl:choose> <xsl:when test="$label-width != ''"> Modified: trunk/xsl/html/titlepage.xsl =================================================================== --- trunk/xsl/html/titlepage.xsl 2008-12-15 22:21:16 UTC (rev 8177) +++ trunk/xsl/html/titlepage.xsl 2008-12-15 22:26:38 UTC (rev 8178) @@ -763,7 +763,7 @@ <xsl:apply-templates select="." mode="class.attribute"/> <table border="1" width="100%" summary="Revision history"> <tr> - <th align="left" valign="top" colspan="{$numcols}"> + <th align="{$direction.align.start}" valign="top" colspan="{$numcols}"> <b> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'RevHistory'"/> @@ -839,7 +839,7 @@ <xsl:variable name="revauthor" select="authorinitials|author"/> <xsl:variable name="revremark" select="revremark|revdescription"/> <tr> - <td align="left"> + <td align="{$direction.align.start}"> <xsl:if test="$revnumber"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Revision'"/> @@ -848,12 +848,12 @@ <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/> </xsl:if> </td> - <td align="left"> + <td align="{$direction.align.start}"> <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/> </td> <xsl:choose> <xsl:when test="$revauthor"> - <td align="left"> + <td align="{$direction.align.start}"> <xsl:for-each select="$revauthor"> <xsl:apply-templates select="." mode="titlepage.mode"/> <xsl:if test="position() != last()"> @@ -870,7 +870,7 @@ </tr> <xsl:if test="$revremark"> <tr> - <td align="left" colspan="{$numcols}"> + <td align="{$direction.align.start}" colspan="{$numcols}"> <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/> </td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-11 08:30:02
|
Revision: 8310 http://docbook.svn.sourceforge.net/docbook/?rev=8310&view=rev Author: bobstayton Date: 2009-03-11 08:29:45 +0000 (Wed, 11 Mar 2009) Log Message: ----------- Fix bug #1787140 HTML tables not handling attributes correctly. Modified Paths: -------------- trunk/xsl/html/formal.xsl trunk/xsl/html/htmltbl.xsl Modified: trunk/xsl/html/formal.xsl =================================================================== --- trunk/xsl/html/formal.xsl 2009-03-11 08:28:12 UTC (rev 8309) +++ trunk/xsl/html/formal.xsl 2009-03-11 08:29:45 UTC (rev 8310) @@ -186,13 +186,13 @@ </xsl:when> <xsl:otherwise> <!-- do not use xsl:copy because of XHTML's needs --> - <table> - <xsl:copy-of select="@*[not(local-name()='id')]"/> + <xsl:element name="table" namespace=""> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> </xsl:attribute> <xsl:call-template name="htmlTable"/> - </table> + </xsl:element> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -327,10 +327,13 @@ </xsl:call-template> </xsl:when> <xsl:otherwise> - <table> - <xsl:copy-of select="@*"/> + <xsl:element name="table" namespace=""> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> + <xsl:attribute name="id"> + <xsl:call-template name="object.id"/> + </xsl:attribute> <xsl:call-template name="htmlTable"/> - </table> + </xsl:element> </xsl:otherwise> </xsl:choose> </xsl:template> Modified: trunk/xsl/html/htmltbl.xsl =================================================================== --- trunk/xsl/html/htmltbl.xsl 2009-03-11 08:28:12 UTC (rev 8309) +++ trunk/xsl/html/htmltbl.xsl 2009-03-11 08:29:45 UTC (rev 8310) @@ -15,22 +15,22 @@ <!-- ==================================================================== --> <xsl:template match="colgroup" mode="htmlTable"> - <xsl:copy> - <xsl:copy-of select="@*"/> + <xsl:element name="{local-name()}" namespace=""> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> <xsl:apply-templates mode="htmlTable"/> - </xsl:copy> + </xsl:element> </xsl:template> <xsl:template match="col" mode="htmlTable"> - <xsl:copy> - <xsl:copy-of select="@*"/> - </xsl:copy> + <xsl:element name="{local-name()}" namespace=""> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> + </xsl:element> </xsl:template> <xsl:template match="caption" mode="htmlTable"> <!-- do not use xsl:copy because of XHTML's needs --> <caption> - <xsl:copy-of select="@*"/> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> <xsl:apply-templates select=".." mode="object.title.markup"> <xsl:with-param name="allow-anchors" select="1"/> @@ -40,17 +40,99 @@ </xsl:template> <xsl:template match="tbody|thead|tfoot|tr" mode="htmlTable"> - <xsl:element name="{name(.)}"> - <xsl:copy-of select="@*"/> + <xsl:element name="{local-name(.)}"> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> <xsl:apply-templates mode="htmlTable"/> </xsl:element> </xsl:template> <xsl:template match="th|td" mode="htmlTable"> - <xsl:element name="{name(.)}"> - <xsl:copy-of select="@*"/> + <xsl:element name="{local-name(.)}"> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> <xsl:apply-templates/> <!-- *not* mode=htmlTable --> </xsl:element> </xsl:template> +<!-- don't copy through DocBook-specific attributes on HTML table markup --> +<!-- default behavior is to not copy through because there are more + DocBook attributes than HTML attributes --> +<xsl:template mode="htmlTableAtt" match="@*"/> + +<!-- copy these through --> +<xsl:template mode="htmlTableAtt" + match="@abbr + | @align + | @axis + | @bgcolor + | @border + | @cellpadding + | @cellspacing + | @char + | @charoff + | @class + | @colspan + | @dir + | @frame + | @headers + | @height + | @lang + | @nowrap + | @onclick + | @ondblclick + | @onkeydown + | @onkeypress + | @onkeyup + | @onmousedown + | @onmousemove + | @onmouseout + | @onmouseover + | @onmouseup + | @rowspan + | @rules + | @span + | @style + | @summary + | @title + | @valign + | @valign + | @width + | @xml:lang"> + <xsl:copy-of select="."/> +</xsl:template> + +<xsl:template match="@span|@rowspan|@colspan" mode="htmlTableAtt"> + <!-- No need to copy through the DTD's default value "1" of the attribute --> + <xsl:if test="number(.) != 1"> + <xsl:attribute name="{local-name(.)}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:if> +</xsl:template> + +<!-- map floatstyle to HTML float values --> +<xsl:template match="@floatstyle" mode="htmlTableAtt"> + <xsl:attribute name="style"> + <xsl:text>float: </xsl:text> + <xsl:choose> + <xsl:when test="contains(., 'left')">left</xsl:when> + <xsl:when test="contains(., 'right')">right</xsl:when> + <xsl:when test="contains(., 'start')"> + <xsl:value-of select="$direction.align.start"/> + </xsl:when> + <xsl:when test="contains(., 'end')"> + <xsl:value-of select="$direction.align.end"/> + </xsl:when> + <xsl:when test="contains(., 'inside')"> + <xsl:value-of select="$direction.align.start"/> + </xsl:when> + <xsl:when test="contains(., 'outside')"> + <xsl:value-of select="$direction.align.end"/> + </xsl:when> + <xsl:when test="contains(., 'before')">none</xsl:when> + <xsl:when test="contains(., 'none')">none</xsl:when> + </xsl:choose> + <xsl:text>;</xsl:text> + </xsl:attribute> +</xsl:template> + </xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-13 00:25:03
|
Revision: 8325 http://docbook.svn.sourceforge.net/docbook/?rev=8325&view=rev Author: bobstayton Date: 2009-03-13 00:25:01 +0000 (Fri, 13 Mar 2009) Log Message: ----------- Now support xref to phrase, simpara, anchor, and quote, most useful when an xrefstyle is used. Modified Paths: -------------- trunk/xsl/html/inline.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2009-03-13 00:05:51 UTC (rev 8324) +++ trunk/xsl/html/inline.xsl 2009-03-13 00:25:01 UTC (rev 8325) @@ -57,10 +57,10 @@ <!-- Is it an olink ? --> <xsl:variable name="is.olink"> <xsl:choose> - <!-- If xlink:role="http://docbook.org/xlink/role/olink" --> + <!-- 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> + @xlink:role = $xolink.role">1</xsl:when> <xsl:otherwise>0</xsl:otherwise> </xsl:choose> </xsl:variable> @@ -126,9 +126,9 @@ </xsl:when> <xsl:when test="$is.olink = 1"> - <xsl:call-template name="olink"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> + <xsl:call-template name="olink"> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> </xsl:when> <!-- otherwise it's a URI --> @@ -144,18 +144,18 @@ </xsl:attribute> </xsl:if> - <!-- For URIs, use @xlink:show if defined, otherwise use ulink.target --> - <xsl:attribute name="target"> - <xsl:choose> - <xsl:when test="$target.show !=''"> - <xsl:value-of select="$target.show"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$ulink.target"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - + <!-- For URIs, use @xlink:show if defined, otherwise use ulink.target --> + <xsl:attribute name="target"> + <xsl:choose> + <xsl:when test="$target.show !=''"> + <xsl:value-of select="$target.show"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$ulink.target"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:copy-of select="$content"/> </a> </xsl:otherwise> @@ -829,18 +829,22 @@ </xsl:with-param> </xsl:call-template> </xsl:variable> - <xsl:choose> - <xsl:when test="$depth mod 2 = 0"> - <xsl:call-template name="gentext.startquote"/> - <xsl:call-template name="inline.charseq"/> - <xsl:call-template name="gentext.endquote"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="gentext.nestedstartquote"/> - <xsl:call-template name="inline.charseq"/> - <xsl:call-template name="gentext.nestedendquote"/> - </xsl:otherwise> - </xsl:choose> + <span> + <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="anchor"/> + <xsl:choose> + <xsl:when test="$depth mod 2 = 0"> + <xsl:call-template name="gentext.startquote"/> + <xsl:call-template name="inline.charseq"/> + <xsl:call-template name="gentext.endquote"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="gentext.nestedstartquote"/> + <xsl:call-template name="inline.charseq"/> + <xsl:call-template name="gentext.nestedendquote"/> + </xsl:otherwise> + </xsl:choose> + </span> </xsl:template> <xsl:template match="varname"> @@ -1282,14 +1286,14 @@ </xsl:call-template> </xsl:attribute> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:apply-templates select="$target" mode="citation"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="inline.charseq"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$bibliography.numbered != 0"> + <xsl:apply-templates select="$target" mode="citation"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="inline.charseq"/> + </xsl:otherwise> + </xsl:choose> </a> <xsl:text>]</xsl:text> @@ -1319,7 +1323,7 @@ </xsl:call-template> </xsl:attribute> - <xsl:call-template name="inline.charseq"/> + <xsl:call-template name="inline.charseq"/> </a> <xsl:text>]</xsl:text> @@ -1334,7 +1338,7 @@ <xsl:template match="biblioentry|bibliomixed" mode="citation"> <xsl:number from="bibliography" count="biblioentry|bibliomixed" - level="any" format="1"/> + level="any" format="1"/> </xsl:template> <!-- ==================================================================== --> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2009-03-13 00:05:51 UTC (rev 8324) +++ trunk/xsl/html/xref.xsl 2009-03-13 00:25:01 UTC (rev 8325) @@ -777,7 +777,10 @@ </xsl:apply-templates> </xsl:template> -<xsl:template match="para" mode="xref-to"> +<!-- These are elements for which no link text exists, so an xref to one + uses the xrefstyle attribute if specified, or if not it falls back + to the container element's link text --> +<xsl:template match="para|phrase|simpara|anchor|quote" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> <xsl:param name="verbose" select="1"/> @@ -807,12 +810,23 @@ |ancestor::listitem |ancestor::varlistentry)[last()]"/> - <xsl:apply-templates select="$context" mode="xref-to"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> + <xsl:choose> + <xsl:when test="$xrefstyle != ''"> + <xsl:apply-templates select="." mode="object.xref.markup"> + <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$context" mode="xref-to"> + <xsl:with-param name="purpose" select="'xref'"/> + <xsl:with-param name="xrefstyle" select="$xrefstyle"/> + <xsl:with-param name="referrer" select="$referrer"/> + <xsl:with-param name="verbose" select="$verbose"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!-- ==================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-14 00:01:14
|
Revision: 8327 http://docbook.svn.sourceforge.net/docbook/?rev=8327&view=rev Author: bobstayton Date: 2009-03-14 00:00:40 +0000 (Sat, 14 Mar 2009) Log Message: ----------- Create separate templates for computing label of question and answer in a qandaentry, so such can be used for the alt text of an xref to a qandaentry. Modified Paths: -------------- trunk/xsl/html/html.xsl trunk/xsl/html/qandaset.xsl Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2009-03-13 23:59:36 UTC (rev 8326) +++ trunk/xsl/html/html.xsl 2009-03-14 00:00:40 UTC (rev 8327) @@ -106,9 +106,32 @@ </xsl:attribute> </xsl:when> </xsl:choose> +</xsl:template> +<xsl:template match="qandaentry" mode="html.title.attribute"> + <xsl:apply-templates select="question" mode="html.title.attribute"/> </xsl:template> +<xsl:template match="question" mode="html.title.attribute"> + <xsl:variable name="label.text"> + <xsl:apply-templates select="." mode="qanda.label"/> + </xsl:variable> + + <xsl:choose> + <xsl:when test="string-length($label.text) != 0"> + <xsl:attribute name="title"> + <xsl:value-of select="$label.text"/> + </xsl:attribute> + </xsl:when> + <!-- Fall back to alt if available --> + <xsl:when test="alt"> + <xsl:attribute name="title"> + <xsl:value-of select="normalize-space(alt)"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> +</xsl:template> + <xsl:template name="dir"> <xsl:param name="inherit" select="0"/> Modified: trunk/xsl/html/qandaset.xsl =================================================================== --- trunk/xsl/html/qandaset.xsl 2009-03-13 23:59:36 UTC (rev 8326) +++ trunk/xsl/html/qandaset.xsl 2009-03-14 00:00:40 UTC (rev 8327) @@ -138,15 +138,7 @@ <xsl:template match="question"> <xsl:variable name="deflabel"> - <xsl:choose> - <xsl:when test="ancestor-or-self::*[@defaultlabel]"> - <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()] - /@defaultlabel"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$qanda.defaultlabel"/> - </xsl:otherwise> - </xsl:choose> + <xsl:apply-templates select="." mode="qanda.defaultlabel"/> </xsl:variable> <tr> @@ -161,10 +153,7 @@ </xsl:call-template> <xsl:variable name="label.content"> - <xsl:apply-templates select="." mode="label.markup"/> - <xsl:if test="$deflabel = 'number' and not(label)"> - <xsl:apply-templates select="." mode="intralabel.punctuation"/> - </xsl:if> + <xsl:apply-templates select="." mode="qanda.label"/> </xsl:variable> <xsl:if test="string-length($label.content) > 0"> @@ -186,17 +175,31 @@ </tr> </xsl:template> +<xsl:template match="*" mode="qanda.defaultlabel"> + <xsl:choose> + <xsl:when test="ancestor-or-self::*[@defaultlabel]"> + <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()] + /@defaultlabel"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$qanda.defaultlabel"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template match="question" mode="qanda.label"> + <xsl:variable name="deflabel"> + <xsl:apply-templates select="." mode="qanda.defaultlabel"/> + </xsl:variable> + <xsl:apply-templates select="." mode="label.markup"/> + <xsl:if test="$deflabel = 'number' and not(label)"> + <xsl:apply-templates select="." mode="intralabel.punctuation"/> + </xsl:if> +</xsl:template> + <xsl:template match="answer"> <xsl:variable name="deflabel"> - <xsl:choose> - <xsl:when test="ancestor-or-self::*[@defaultlabel]"> - <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()] - /@defaultlabel"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$qanda.defaultlabel"/> - </xsl:otherwise> - </xsl:choose> + <xsl:apply-templates select="." mode="qanda.defaultlabel"/> </xsl:variable> <tr class="{local-name(.)}"> @@ -223,6 +226,10 @@ </tr> </xsl:template> +<xsl:template match="answer" mode="qanda.label"> + <xsl:apply-templates select="." mode="label.markup"/> +</xsl:template> + <xsl:template match="label"> <xsl:apply-templates/> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-15 19:38:35
|
Revision: 8337 http://docbook.svn.sourceforge.net/docbook/?rev=8337&view=rev Author: bobstayton Date: 2009-03-15 19:38:17 +0000 (Sun, 15 Mar 2009) Log Message: ----------- Pass through an id on primary, secondary, or tertiary to the index entry, so that one could link to an index entry. You can't link to the id on an indexterm because that is used to place the main anchor in the text flow. Modified Paths: -------------- trunk/xsl/html/autoidx.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/autoidx.xsl =================================================================== --- trunk/xsl/html/autoidx.xsl 2009-03-15 19:11:47 UTC (rev 8336) +++ trunk/xsl/html/autoidx.xsl 2009-03-15 19:38:17 UTC (rev 8337) @@ -273,6 +273,9 @@ <xsl:variable name="key" select="&primary;"/> <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/> <dt> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="primary"/> + </xsl:call-template> <xsl:value-of select="primary"/> <xsl:choose> <xsl:when test="$index.links.to.section = 1"> @@ -340,6 +343,9 @@ <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/> <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/> <dt> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="secondary"/> + </xsl:call-template> <xsl:value-of select="secondary"/> <xsl:choose> <xsl:when test="$index.links.to.section = 1"> @@ -407,6 +413,9 @@ <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/> <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/> <dt> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="tertiary"/> + </xsl:call-template> <xsl:value-of select="tertiary"/> <xsl:choose> <xsl:when test="$index.links.to.section = 1"> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2009-03-15 19:11:47 UTC (rev 8336) +++ trunk/xsl/html/xref.xsl 2009-03-15 19:38:17 UTC (rev 8337) @@ -744,6 +744,10 @@ </xsl:apply-templates> </xsl:template> +<xsl:template match="primary|secondary|tertiary" mode="xref-to"> + <xsl:value-of select="."/> +</xsl:template> + <xsl:template match="indexterm" mode="xref-to"> <xsl:value-of select="primary"/> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-16 02:48:21
|
Revision: 8339 http://docbook.svn.sourceforge.net/docbook/?rev=8339&view=rev Author: bobstayton Date: 2009-03-16 02:48:19 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Add new param index.links.to.section. Modified Paths: -------------- trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2009-03-16 02:45:55 UTC (rev 8338) +++ trunk/xsl/html/param.ent 2009-03-16 02:48:19 UTC (rev 8339) @@ -135,6 +135,7 @@ <!ENTITY htmlhelp.use.hhk SYSTEM "../params/htmlhelp.use.hhk.xml"> <!ENTITY htmlhelp.window.geometry SYSTEM "../params/htmlhelp.window.geometry.xml"> <!ENTITY img.src.path SYSTEM "../params/img.src.path.xml"> +<!ENTITY index.links.to.section SYSTEM "../params/index.links.to.section.xml"> <!ENTITY index.on.role SYSTEM "../params/index.on.role.xml"> <!ENTITY index.prefer.titleabbrev SYSTEM "../params/index.prefer.titleabbrev.xml"> <!ENTITY index.on.type SYSTEM "../params/index.on.type.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2009-03-16 02:45:55 UTC (rev 8338) +++ trunk/xsl/html/param.xweb 2009-03-16 02:48:19 UTC (rev 8339) @@ -79,6 +79,7 @@ &index.method; &index.on.type; &index.on.role; +&index.links.to.section; &index.prefer.titleabbrev; &index.term.separator; &index.number.separator; @@ -590,6 +591,7 @@ <src:fragref linkend="id.warnings.frag"/> <src:fragref linkend="index.method.frag"/> <src:fragref linkend="index.on.role.frag"/> +<src:fragref linkend="index.links.to.section.frag"/> <src:fragref linkend="index.on.type.frag"/> <src:fragref linkend="index.number.separator.frag"/> <src:fragref linkend="index.term.separator.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-16 06:44:27
|
Revision: 8345 http://docbook.svn.sourceforge.net/docbook/?rev=8345&view=rev Author: bobstayton Date: 2009-03-16 06:44:07 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Use new param exsl.node.set.available to test, handles Xalan bug. Modified Paths: -------------- trunk/xsl/html/chunk-code.xsl trunk/xsl/html/chunkfast.xsl trunk/xsl/html/footnote.xsl trunk/xsl/html/html-rtf.xsl trunk/xsl/html/param.ent trunk/xsl/html/param.xweb trunk/xsl/html/verbatim.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/chunk-code.xsl 2009-03-16 06:44:07 UTC (rev 8345) @@ -413,10 +413,7 @@ <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document, toss the namespace and continue. Use the docbook5 namespaced stylesheets for DocBook5 if you don't want to use this feature.--> - <!-- include extra test for Xalan quirk --> - <xsl:when test="(function-available('exsl:node-set') or - contains(system-property('xsl:vendor'), - 'Apache Software Foundation')) + <xsl:when test="$exsl.node.set.available != 0 and (*/self::ng:* or */self::db:*)"> <xsl:call-template name="log.message"> <xsl:with-param name="level">Note</xsl:with-param> Modified: trunk/xsl/html/chunkfast.xsl =================================================================== --- trunk/xsl/html/chunkfast.xsl 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/chunkfast.xsl 2009-03-16 06:44:07 UTC (rev 8345) @@ -25,7 +25,7 @@ <xsl:template name="process-chunk-element"> <xsl:choose> - <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')"> + <xsl:when test="$chunk.fast != 0 and $exsl.node.set.available != 0"> <xsl:variable name="genid" select="generate-id()"/> <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/> Modified: trunk/xsl/html/footnote.xsl =================================================================== --- trunk/xsl/html/footnote.xsl 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/footnote.xsl 2009-03-16 06:44:07 UTC (rev 8345) @@ -187,7 +187,7 @@ </xsl:variable> <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"> + <xsl:when test="$exsl.node.set.available != 0"> <xsl:variable name="html-nodes" select="exsl:node-set($html)"/> <xsl:choose> <xsl:when test="$html-nodes//p"> @@ -274,7 +274,8 @@ </div> </xsl:when> - <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')"> + <xsl:when test="$html.cleanup != 0 and + $exsl.node.set.available != 0"> <div> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="*[1]" mode="footnote.body.number"/> Modified: trunk/xsl/html/html-rtf.xsl =================================================================== --- trunk/xsl/html/html-rtf.xsl 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/html-rtf.xsl 2009-03-16 06:44:07 UTC (rev 8345) @@ -108,7 +108,7 @@ <xsl:template name="unwrap.p"> <xsl:param name="p"/> <xsl:choose> - <xsl:when test="function-available('exsl:node-set') + <xsl:when test="$exsl.node.set.available != 0 and function-available('set:leading') and function-available('set:trailing')"> <xsl:apply-templates select="exsl:node-set($p)" mode="unwrap.p"/> @@ -301,7 +301,7 @@ <xsl:template name="remove.empty.div"> <xsl:param name="div"/> <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"> + <xsl:when test="$exsl.node.set.available != 0"> <xsl:apply-templates select="exsl:node-set($div)" mode="remove.empty.div"/> </xsl:when> <xsl:otherwise> Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/param.ent 2009-03-16 06:44:07 UTC (rev 8345) @@ -310,3 +310,4 @@ <!ENTITY glossary.sort SYSTEM "../params/glossary.sort.xml"> <!ENTITY javahelp.encoding SYSTEM "../params/javahelp.encoding.xml"> <!ENTITY writing.mode SYSTEM "../params/writing.mode.xml"> +<!ENTITY exsl.node.set.available SYSTEM "../params/exsl.node.set.available.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/param.xweb 2009-03-16 06:44:07 UTC (rev 8345) @@ -265,6 +265,7 @@ &highlight.xslthl.config; &highlight.default.language; &email.delimiters.enabled; +&exsl.node.set.available; </reference> <reference xml:id="annos"><title>Annotations</title> &annotation.support; @@ -497,6 +498,7 @@ <src:fragref linkend="email.delimiters.enabled.frag"/> <src:fragref linkend="emphasis.propagates.style.frag"/> <src:fragref linkend="entry.propagates.style.frag"/> +<src:fragref linkend="exsl.node.set.available.frag"/> <src:fragref linkend="firstterm.only.link.frag"/> <src:fragref linkend="footer.rule.frag"/> <src:fragref linkend="footnote.number.format.frag"/> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/verbatim.xsl 2009-03-16 06:44:07 UTC (rev 8345) @@ -341,7 +341,7 @@ or I have to rely on CSS. --> <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"> + <xsl:when test="$exsl.node.set.available != 0"> <xsl:apply-templates select="exsl:node-set($rtf)" mode="make.verbatim.mode"/> </xsl:when> <xsl:otherwise> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2009-03-16 06:35:43 UTC (rev 8344) +++ trunk/xsl/html/xref.xsl 2009-03-16 06:44:07 UTC (rev 8345) @@ -234,7 +234,7 @@ </xsl:variable> <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"> + <xsl:when test="$exsl.node.set.available != 0"> <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/> </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...> - 2009-03-18 07:47:24
|
Revision: 8355 http://docbook.svn.sourceforge.net/docbook/?rev=8355&view=rev Author: bobstayton Date: 2009-03-18 07:47:14 +0000 (Wed, 18 Mar 2009) Log Message: ----------- Added template named common.html.attributes to output class, title, lang, and dir for most elements. Started adding it to some list and block elements. Modified Paths: -------------- trunk/xsl/html/block.xsl trunk/xsl/html/html.xsl trunk/xsl/html/lists.xsl Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2009-03-18 07:44:41 UTC (rev 8354) +++ trunk/xsl/html/block.xsl 2009-03-18 07:47:14 UTC (rev 8355) @@ -140,10 +140,7 @@ <xsl:template match="blockquote"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:if test="@lang or @xml:lang"> - <xsl:call-template name="language.attribute"/> - </xsl:if> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:choose> Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2009-03-18 07:44:41 UTC (rev 8354) +++ trunk/xsl/html/html.xsl 2009-03-18 07:47:14 UTC (rev 8355) @@ -84,10 +84,17 @@ </xsl:call-template> </xsl:variable> + <xsl:variable name="has.title.markup"> + <xsl:apply-templates select="." mode="title.markup"> + <xsl:with-param name="verbose" select="0"/> + </xsl:apply-templates> + </xsl:variable> + <xsl:variable name="gentext.title"> - <xsl:if test="$is.title != 0 or + <xsl:if test="$has.title.markup != '???TITLE???' and + ($is.title != 0 or $is.title-numbered != 0 or - $is.title-unnumbered != 0"> + $is.title-unnumbered != 0)"> <xsl:apply-templates select="." mode="object.title.markup.textonly"/> </xsl:if> @@ -269,6 +276,10 @@ </xsl:if> </xsl:template> +<xsl:template name="generate.class.attribute"> + <xsl:apply-templates select="." mode="class.attribute"/> +</xsl:template> + <xsl:template match="*" mode="class.attribute"> <xsl:param name="class" select="local-name(.)"/> <!-- permit customization of class attributes --> @@ -287,5 +298,48 @@ <xsl:value-of select="$class"/> </xsl:template> +<!-- Apply common attributes such as class, lang, dir --> +<xsl:template name="common.html.attributes"> + <xsl:apply-templates select="." mode="common.html.attributes"/> +</xsl:template> + +<xsl:template match="*" mode="common.html.attributes"> + <xsl:call-template name="generate.html.lang"/> + <xsl:call-template name="dir"/> + <xsl:call-template name="generate.class.attribute"/> + <xsl:call-template name="generate.html.title"/> +</xsl:template> + +<!-- Pass through any lang attributes --> +<xsl:template name="generate.html.lang"> + <xsl:apply-templates select="." mode="html.lang.attribute"/> +</xsl:template> + +<xsl:template match="*" mode="html.lang.attribute"> + <!-- match the attribute name to the output type --> + <xsl:choose> + <xsl:when test="@lang and $stylesheet.result.type = 'html'"> + <xsl:attribute name="lang"> + <xsl:value-of select="@lang"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="@lang and $stylesheet.result.type = 'xhtml'"> + <xsl:attribute name="xml:lang"> + <xsl:value-of select="@lang"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="@xml:lang and $stylesheet.result.type = 'html'"> + <xsl:attribute name="lang"> + <xsl:value-of select="@xml:lang"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="@xml:lang and $stylesheet.result.type = 'xhtml'"> + <xsl:attribute name="xml:lang"> + <xsl:value-of select="@xml:lang"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> +</xsl:template> + </xsl:stylesheet> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2009-03-18 07:44:41 UTC (rev 8354) +++ trunk/xsl/html/lists.xsl 2009-03-18 07:47:14 UTC (rev 8355) @@ -729,7 +729,7 @@ |processing-instruction()[not(preceding-sibling::step)]"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"> <xsl:with-param name="conditional"> <xsl:choose> @@ -785,12 +785,14 @@ <xsl:call-template name="anchor"/> <ol type="{$numeration}"> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </ol> </xsl:template> <xsl:template match="step"> <li> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-24 04:45:47
|
Revision: 8375 http://docbook.svn.sourceforge.net/docbook/?rev=8375&view=rev Author: bobstayton Date: 2009-03-24 04:45:34 +0000 (Tue, 24 Mar 2009) Log Message: ----------- More elements get common.html.attributes. Added locale.html.attributes template which does the lang, dir, and title attributes, but not the class attribute (used on para, for example). Modified Paths: -------------- trunk/xsl/html/block.xsl trunk/xsl/html/html.xsl trunk/xsl/html/lists.xsl Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2009-03-23 08:31:16 UTC (rev 8374) +++ trunk/xsl/html/block.xsl 2009-03-24 04:45:34 UTC (rev 8375) @@ -23,7 +23,7 @@ <xsl:template name="block.object"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> @@ -57,12 +57,16 @@ <xsl:variable name="p"> <p> - <xsl:call-template name="dir"/> - <xsl:if test="$class != ''"> - <xsl:apply-templates select="." mode="class.attribute"> - <xsl:with-param name="class" select="$class"/> - </xsl:apply-templates> - </xsl:if> + <xsl:choose> + <xsl:when test="$class != ''"> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="class" select="$class"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="locale.html.attributes"/> + </xsl:otherwise> + </xsl:choose> <xsl:copy-of select="$content"/> </p> </xsl:variable> Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2009-03-23 08:31:16 UTC (rev 8374) +++ trunk/xsl/html/html.xsl 2009-03-24 04:45:34 UTC (rev 8375) @@ -277,7 +277,10 @@ </xsl:template> <xsl:template name="generate.class.attribute"> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:param name="class" select="local-name(.)"/> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="$class"/> + </xsl:apply-templates> </xsl:template> <xsl:template match="*" mode="class.attribute"> @@ -300,16 +303,33 @@ <!-- Apply common attributes such as class, lang, dir --> <xsl:template name="common.html.attributes"> - <xsl:apply-templates select="." mode="common.html.attributes"/> + <xsl:param name="class" select="local-name(.)"/> + <xsl:apply-templates select="." mode="common.html.attributes"> + <xsl:with-param name="class" select="$class"/> + </xsl:apply-templates> </xsl:template> <xsl:template match="*" mode="common.html.attributes"> + <xsl:param name="class" select="local-name(.)"/> <xsl:call-template name="generate.html.lang"/> <xsl:call-template name="dir"/> - <xsl:call-template name="generate.class.attribute"/> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="$class"/> + </xsl:apply-templates> <xsl:call-template name="generate.html.title"/> </xsl:template> +<!-- Apply common attributes not including class --> +<xsl:template name="locale.html.attributes"> + <xsl:apply-templates select="." mode="locale.html.attributes"/> +</xsl:template> + +<xsl:template match="*" mode="locale.html.attributes"> + <xsl:call-template name="generate.html.lang"/> + <xsl:call-template name="dir"/> + <xsl:call-template name="generate.html.title"/> +</xsl:template> + <!-- Pass through any lang attributes --> <xsl:template name="generate.html.lang"> <xsl:apply-templates select="." mode="html.lang.attribute"/> Modified: trunk/xsl/html/lists.xsl =================================================================== --- trunk/xsl/html/lists.xsl 2009-03-23 08:31:16 UTC (rev 8374) +++ trunk/xsl/html/lists.xsl 2009-03-24 04:45:34 UTC (rev 8375) @@ -16,7 +16,7 @@ <xsl:template match="itemizedlist"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -31,6 +31,7 @@ |processing-instruction()[not(preceding-sibling::listitem)]"/> <ul> + <xsl:call-template name="common.html.attributes"/> <xsl:if test="$css.decoration != 0"> <xsl:attribute name="type"> <xsl:call-template name="list.itemsymbol"/> @@ -81,6 +82,7 @@ </xsl:variable> <li> + <xsl:call-template name="common.html.attributes"/> <xsl:if test="$css.decoration = '1' and $cssmark != ''"> <xsl:attribute name="style"> <xsl:text>list-style-type: </xsl:text> @@ -137,7 +139,7 @@ </xsl:variable> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> @@ -155,6 +157,7 @@ <xsl:choose> <xsl:when test="@inheritnum='inherit' and ancestor::listitem[parent::orderedlist]"> <table border="0"> + <xsl:call-template name="common.html.attributes"/> <col align="{$direction.align.start}" valign="top"/> <tbody> <xsl:apply-templates @@ -167,6 +170,7 @@ </xsl:when> <xsl:otherwise> <ol> + <xsl:call-template name="common.html.attributes"/> <xsl:if test="$start != '1'"> <xsl:attribute name="start"> <xsl:value-of select="$start"/> @@ -198,6 +202,7 @@ <xsl:template match="orderedlist/listitem"> <li> + <xsl:call-template name="common.html.attributes"/> <xsl:if test="@override"> <xsl:attribute name="value"> <xsl:value-of select="@override"/> @@ -281,7 +286,7 @@ </xsl:variable> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:if test="title"> <xsl:call-template name="formal.object.heading"/> @@ -369,14 +374,18 @@ </xsl:when> <xsl:otherwise> <p> - <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:apply-templates select="." mode="class.attribute"> - <xsl:with-param name="class" select="@role"/> - </xsl:apply-templates> - </xsl:if> + <xsl:choose> + <xsl:when test="@role and $para.propagates.style != 0"> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="class" select="@role"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="common.html.attributes"/> + </xsl:otherwise> + </xsl:choose> <xsl:call-template name="anchor"/> - <xsl:apply-templates/> </p> </xsl:otherwise> </xsl:choose> @@ -450,7 +459,7 @@ <xsl:template match="varlistentry/term"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:call-template name="simple.xlink"> <xsl:with-param name="content"> @@ -499,7 +508,7 @@ <!-- with no type specified, the default is 'vert' --> <xsl:call-template name="anchor"/> <table border="0" summary="Simple list"> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="simplelist.vert"> <xsl:with-param name="cols"> <xsl:choose> @@ -515,47 +524,47 @@ <xsl:template match="simplelist[@type='inline']"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> - <!-- 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 --> - <xsl:variable name="localized-choice-separator"> - <xsl:choose> - <xsl:when test="processing-instruction('dbchoice')"> - <xsl:call-template name="select.choice.separator"/> - </xsl:when> - <xsl:otherwise> - <!-- empty --> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:for-each select="member"> - <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content"> - <xsl:apply-templates/> - </xsl:with-param> - </xsl:call-template> - <xsl:choose> - <xsl:when test="position() = last()"/> <!-- do nothing --> - <xsl:otherwise> - <xsl:text>, </xsl:text> - <xsl:if test="position() = last() - 1"> - <xsl:if test="$localized-choice-separator != ''"> - <xsl:value-of select="$localized-choice-separator"/> - <xsl:text> </xsl:text> + <xsl:call-template name="common.html.attributes"/> + <!-- 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 --> + <xsl:variable name="localized-choice-separator"> + <xsl:choose> + <xsl:when test="processing-instruction('dbchoice')"> + <xsl:call-template name="select.choice.separator"/> + </xsl:when> + <xsl:otherwise> + <!-- empty --> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:for-each select="member"> + <xsl:call-template name="simple.xlink"> + <xsl:with-param name="content"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + <xsl:choose> + <xsl:when test="position() = last()"/> <!-- do nothing --> + <xsl:otherwise> + <xsl:text>, </xsl:text> + <xsl:if test="position() = last() - 1"> + <xsl:if test="$localized-choice-separator != ''"> + <xsl:value-of select="$localized-choice-separator"/> + <xsl:text> </xsl:text> + </xsl:if> </xsl:if> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> </span> </xsl:template> <xsl:template match="simplelist[@type='horiz']"> <xsl:call-template name="anchor"/> <table border="0" summary="Simple list"> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="simplelist.horiz"> <xsl:with-param name="cols"> <xsl:choose> @@ -572,7 +581,7 @@ <xsl:template match="simplelist[@type='vert']"> <xsl:call-template name="anchor"/> <table border="0" summary="Simple list"> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="simplelist.vert"> <xsl:with-param name="cols"> <xsl:choose> @@ -752,6 +761,7 @@ <xsl:choose> <xsl:when test="count(step) = 1"> <ul> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates select="step |comment()[preceding-sibling::step] @@ -760,6 +770,7 @@ </xsl:when> <xsl:otherwise> <ol> + <xsl:call-template name="common.html.attributes"/> <xsl:attribute name="type"> <xsl:value-of select="substring($procedure.step.numeration.formats,1,1)"/> </xsl:attribute> @@ -805,13 +816,14 @@ <xsl:template match="stepalternatives"> <xsl:call-template name="anchor"/> <ul> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </ul> </xsl:template> <xsl:template match="step/title"> <p> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <b> <xsl:apply-templates/> </b> @@ -826,7 +838,7 @@ </xsl:variable> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:choose> @@ -848,10 +860,10 @@ <xsl:template match="segmentedlist/title"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <strong> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </span> </strong> @@ -867,7 +879,7 @@ <xsl:template match="seglistitem"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:apply-templates/> </div> @@ -885,7 +897,7 @@ --> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <strong> <span class="segtitle"> <xsl:apply-templates select="$segtitles[$segnum=position()]" @@ -944,7 +956,7 @@ </xsl:variable> <tr> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="tr.attributes"> <xsl:with-param name="rownum" select="$seglinum + 1"/> </xsl:call-template> @@ -954,14 +966,14 @@ <xsl:template match="seg" mode="seglist-table"> <td> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </td> </xsl:template> <xsl:template match="seg[1]" mode="seglist-table"> <td> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"> <xsl:with-param name="node" select="ancestor::seglistitem"/> </xsl:call-template> @@ -973,7 +985,7 @@ <xsl:template match="calloutlist"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:if test="title|info/title"> <xsl:call-template name="formal.object.heading"/> @@ -1055,9 +1067,16 @@ <xsl:otherwise> <p> <xsl:if test="@role and $para.propagates.style != 0"> - <xsl:apply-templates select="." mode="class.attribute"> - <xsl:with-param name="class" select="@role"/> - </xsl:apply-templates> + <xsl:choose> + <xsl:when test="@role and $para.propagates.style != 0"> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="class" select="@role"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="common.html.attributes"/> + </xsl:otherwise> + </xsl:choose> </xsl:if> <xsl:call-template name="anchor"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-05-04 07:49:54
|
Revision: 8421 http://docbook.svn.sourceforge.net/docbook/?rev=8421&view=rev Author: bobstayton Date: 2009-05-04 07:49:49 +0000 (Mon, 04 May 2009) Log Message: ----------- Convert all calls to class.attribute to calls to common.html.attributes to support dir, lang, and title attributes in html output for all elements. Fulfills feature request #1993833. 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/footnote.xsl trunk/xsl/html/glossary.xsl trunk/xsl/html/graphics.xsl trunk/xsl/html/html.xsl trunk/xsl/html/index.xsl trunk/xsl/html/info.xsl trunk/xsl/html/inline.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/table.xsl trunk/xsl/html/task.xsl trunk/xsl/html/titlepage.xsl trunk/xsl/html/toc.xsl trunk/xsl/html/verbatim.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/html/admon.xsl =================================================================== --- trunk/xsl/html/admon.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/admon.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -61,7 +61,7 @@ </xsl:variable> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:if test="$admon.style != ''"> <xsl:attribute name="style"> <xsl:value-of select="$admon.style"/> @@ -105,7 +105,9 @@ <xsl:template name="nongraphical.admonition"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="inherit" select="1"/> + </xsl:call-template> <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 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/biblio.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -18,7 +18,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="inherit" select="1"/> + </xsl:call-template> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -47,14 +49,16 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="inherit" select="0"/> + </xsl:call-template> <xsl:apply-templates/> </div> </xsl:template> <xsl:template match="bibliodiv/title"> <h3> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"> <xsl:with-param name="node" select=".."/> <xsl:with-param name="conditional" select="0"/> @@ -67,7 +71,9 @@ <xsl:template match="bibliolist"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="inherit" select="0"/> + </xsl:call-template> <xsl:call-template name="anchor"/> <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> @@ -119,7 +125,7 @@ <xsl:value-of select="$bibliography.collection"/> </xsl:message> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <p> <xsl:copy-of select="$label"/> @@ -134,7 +140,7 @@ </xsl:when> <xsl:otherwise> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> @@ -189,7 +195,7 @@ <xsl:value-of select="$bibliography.collection"/> </xsl:message> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <p> <xsl:copy-of select="$label"/> @@ -204,12 +210,12 @@ </xsl:when> <xsl:otherwise> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> <p> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:copy-of select="$label"/> <xsl:apply-templates mode="bibliomixed.mode"/> </p> @@ -270,7 +276,7 @@ <xsl:template match="address" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -278,7 +284,7 @@ <xsl:template match="affiliation" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -286,7 +292,7 @@ <xsl:template match="shortaffil" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -294,7 +300,7 @@ <xsl:template match="jobtitle" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -302,7 +308,7 @@ <xsl:template match="artheader|articleinfo|info" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -310,7 +316,7 @@ <xsl:template match="artpagenums" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -318,7 +324,7 @@ <xsl:template match="author" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -330,7 +336,7 @@ <xsl:template match="authorgroup" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="person.name.list"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -338,7 +344,7 @@ <xsl:template match="authorinitials" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -346,7 +352,7 @@ <xsl:template match="bibliomisc" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -354,7 +360,7 @@ <xsl:template match="bibliomset" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -364,7 +370,7 @@ <xsl:template match="biblioset" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> @@ -389,7 +395,7 @@ <xsl:template match="bookbiblio" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -397,7 +403,7 @@ <xsl:template match="citetitle" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -414,7 +420,7 @@ <xsl:template match="collab" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -422,7 +428,7 @@ <xsl:template match="collabname" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -430,7 +436,7 @@ <xsl:template match="confgroup" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -438,7 +444,7 @@ <xsl:template match="confdates" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -446,7 +452,7 @@ <xsl:template match="conftitle" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -454,7 +460,7 @@ <xsl:template match="confnum" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -462,7 +468,7 @@ <xsl:template match="confsponsor" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -470,7 +476,7 @@ <xsl:template match="contractnum" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -478,7 +484,7 @@ <xsl:template match="contractsponsor" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -486,7 +492,7 @@ <xsl:template match="contrib" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -496,7 +502,7 @@ <xsl:template match="copyright" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Copyright'"/> </xsl:call-template> @@ -530,7 +536,7 @@ <xsl:template match="corpauthor" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -538,7 +544,7 @@ <xsl:template match="corpcredit" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -546,7 +552,7 @@ <xsl:template match="corpname" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -554,7 +560,7 @@ <xsl:template match="date" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -562,7 +568,7 @@ <xsl:template match="edition" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -570,7 +576,7 @@ <xsl:template match="editor" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="person.name"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -578,7 +584,7 @@ <xsl:template match="firstname" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -586,7 +592,7 @@ <xsl:template match="honorific" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -594,7 +600,7 @@ <xsl:template match="indexterm" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -602,7 +608,7 @@ <xsl:template match="invpartnumber" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -610,7 +616,7 @@ <xsl:template match="isbn" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -618,7 +624,7 @@ <xsl:template match="issn" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -626,7 +632,7 @@ <xsl:template match="issuenum" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -634,7 +640,7 @@ <xsl:template match="lineage" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -642,7 +648,7 @@ <xsl:template match="orgname" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -650,7 +656,7 @@ <xsl:template match="orgdiv" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -658,7 +664,7 @@ <xsl:template match="othercredit" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -666,7 +672,7 @@ <xsl:template match="othername" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -674,7 +680,7 @@ <xsl:template match="pagenums" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -686,7 +692,7 @@ <xsl:template match="productname" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -694,7 +700,7 @@ <xsl:template match="productnumber" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -702,7 +708,7 @@ <xsl:template match="pubdate" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -710,14 +716,14 @@ <xsl:template match="publisher" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -725,7 +731,7 @@ <xsl:template match="pubsnumber" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -733,7 +739,7 @@ <xsl:template match="releaseinfo" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -745,14 +751,14 @@ <xsl:template match="seriesinfo" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> </span> </xsl:template> <xsl:template match="seriesvolnums" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -760,7 +766,7 @@ <xsl:template match="subtitle" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -768,7 +774,7 @@ <xsl:template match="surname" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -776,7 +782,7 @@ <xsl:template match="title" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <i><xsl:apply-templates mode="bibliography.mode"/></i> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -784,7 +790,7 @@ <xsl:template match="titleabbrev" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -792,7 +798,7 @@ <xsl:template match="volumenum" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -801,7 +807,7 @@ <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliography.mode"/> <xsl:copy-of select="$biblioentry.item.separator"/> </span> @@ -811,7 +817,7 @@ <xsl:template match="biblioid[@class='doi']" mode="bibliography.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <a href="{concat('http://dx.doi.org/', .)}">doi:<xsl:value-of select="."/></a> </span> </xsl:template> @@ -830,77 +836,77 @@ <xsl:template match="abstract" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="address" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="affiliation" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="shortaffil" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="jobtitle" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="artpagenums" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="author" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorgroup" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="authorinitials" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="bibliomisc" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -909,7 +915,7 @@ <xsl:template match="bibliomset" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -933,14 +939,14 @@ <xsl:template match="biblioset" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="citetitle" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:choose> <xsl:when test="@pubwork = 'article'"> <xsl:call-template name="gentext.startquote"/> @@ -957,224 +963,224 @@ <xsl:template match="collab" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="confgroup" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractnum" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contractsponsor" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="contrib" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="copyright" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpauthor" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpcredit" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="corpname" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="date" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="edition" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="editor" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="firstname" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="honorific" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="indexterm" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="invpartnumber" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="isbn" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issn" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="issuenum" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="lineage" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="orgname" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othercredit" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="othername" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pagenums" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="printhistory" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productname" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="productnumber" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubdate" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publisher" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="publishername" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="pubsnumber" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="releaseinfo" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -1185,42 +1191,42 @@ <xsl:template match="seriesvolnums" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="subtitle" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="surname" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="title" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="titleabbrev" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> <xsl:template match="volumenum" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -1228,7 +1234,7 @@ <xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates mode="bibliomixed.mode"/> </span> </xsl:template> @@ -1237,7 +1243,7 @@ <xsl:template match="biblioid[@class='doi']" mode="bibliomixed.mode"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <a href="{concat('http://dx.doi.org/', .)}">doi:<xsl:value-of select="."/></a> </span> </xsl:template> Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/block.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -86,6 +86,7 @@ <xsl:template match="simpara"> <!-- see also listitem/simpara in lists.xsl --> <p> + <xsl:call-template name="locale.html.attributes"/> <xsl:if test="@role and $para.propagates.style != 0"> <xsl:apply-templates select="." mode="class.attribute"> <xsl:with-param name="class" select="@role"/> @@ -170,7 +171,7 @@ </xsl:when> <xsl:otherwise> <blockquote> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </blockquote> </xsl:otherwise> @@ -190,7 +191,7 @@ <xsl:template match="epigraph"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <xsl:if test="attribution"> <div class="attribution"> @@ -202,7 +203,7 @@ <xsl:template match="attribution"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </span> </xsl:template> @@ -211,7 +212,7 @@ <xsl:template match="abstract|sidebar"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="title"> @@ -327,7 +328,7 @@ <xsl:template match="revhistory"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <table border="0" width="100%" summary="Revision history"> <tr> <th align="{$direction.align.start}" valign="top" colspan="3"> @@ -419,7 +420,7 @@ <xsl:template match="ackno|acknowledgements[parent::article]"> <p> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </p> </xsl:template> Modified: trunk/xsl/html/callout.xsl =================================================================== --- trunk/xsl/html/callout.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/callout.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -51,7 +51,7 @@ <xsl:when test="$verbatim/@linenumbering = 'numbered' and $linenumbering.extension != '0'"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf-with-callouts"/> <xsl:with-param name="pi.context" @@ -62,7 +62,7 @@ </xsl:when> <xsl:otherwise> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:copy-of select="$rtf-with-callouts"/> <xsl:apply-templates select="calloutlist"/> </div> @@ -71,7 +71,7 @@ </xsl:when> <xsl:otherwise> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates/> </div> </xsl:otherwise> @@ -96,7 +96,7 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="@id or @xml:id"> <xsl:attribute name="name"> <xsl:value-of select="(@id|@xml:id)[1]"/> Modified: trunk/xsl/html/component.xsl =================================================================== --- trunk/xsl/html/component.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/component.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -78,11 +78,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> + <xsl:call-template name="common.html.attributes"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> - <xsl:call-template name="language.attribute"/> <xsl:call-template name="dedication.titlepage"/> <xsl:apply-templates/> <xsl:call-template name="process.footnotes"/> @@ -114,11 +112,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> + <xsl:call-template name="common.html.attributes"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> - <xsl:call-template name="language.attribute"/> <xsl:call-template name="acknowledgements.titlepage"/> <xsl:apply-templates/> <xsl:call-template name="process.footnotes"/> @@ -150,11 +146,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> + <xsl:call-template name="common.html.attributes"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> - <xsl:call-template name="language.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -180,11 +174,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> + <xsl:call-template name="common.html.attributes"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> - <xsl:call-template name="language.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -239,11 +231,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> + <xsl:call-template name="common.html.attributes"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> - <xsl:call-template name="language.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -302,11 +292,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> + <xsl:call-template name="common.html.attributes"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> - <xsl:call-template name="language.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -378,11 +366,9 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> + <xsl:call-template name="common.html.attributes"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> - <xsl:call-template name="language.attribute"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> Modified: trunk/xsl/html/division.xsl =================================================================== --- trunk/xsl/html/division.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/division.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -18,7 +18,7 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="dir"> <xsl:with-param name="inherit" select="1"/> </xsl:call-template> @@ -61,11 +61,7 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> - <xsl:with-param name="inherit" select="1"/> - </xsl:call-template> - <xsl:call-template name="language.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -108,11 +104,7 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> - <xsl:with-param name="inherit" select="1"/> - </xsl:call-template> - <xsl:call-template name="language.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -152,11 +144,7 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"> - <xsl:with-param name="inherit" select="1"/> - </xsl:call-template> - <xsl:call-template name="language.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> Modified: trunk/xsl/html/footnote.xsl =================================================================== --- trunk/xsl/html/footnote.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/footnote.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -137,6 +137,7 @@ </xsl:call-template> </xsl:variable> <p> + <xsl:call-template name="locale.html.attributes"/> <xsl:if test="@role and $para.propagates.style != 0"> <xsl:apply-templates select="." mode="class.attribute"> <xsl:with-param name="class" select="@role"/> @@ -269,7 +270,7 @@ <xsl:choose> <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </div> </xsl:when> @@ -277,7 +278,7 @@ <xsl:when test="$html.cleanup != 0 and $exsl.node.set.available != 0"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates select="*[1]" mode="footnote.body.number"/> <xsl:apply-templates select="*[position() > 1]"/> </div> @@ -291,7 +292,7 @@ <xsl:text> unexpected as first child of footnote.</xsl:text> </xsl:message> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates/> </div> </xsl:otherwise> Modified: trunk/xsl/html/glossary.xsl =================================================================== --- trunk/xsl/html/glossary.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/glossary.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -25,7 +25,7 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -86,7 +86,7 @@ <xsl:template match="glosslist"> &setup-language-variable; <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:if test="blockinfo/title|info/title|title"> <xsl:call-template name="formal.object.heading"/> @@ -113,7 +113,7 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> @@ -135,7 +135,7 @@ <xsl:template match="glossdiv/title"> <h3> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates/> </h3> </xsl:template> @@ -252,7 +252,7 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> @@ -321,7 +321,7 @@ <xsl:choose> <xsl:when test="$target"> <a> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> @@ -389,7 +389,7 @@ </xsl:if> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -460,7 +460,7 @@ &setup-language-variable; <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> <dl> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/graphics.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -63,7 +63,7 @@ <xsl:template match="screenshot"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates/> </div> </xsl:template> @@ -1126,7 +1126,7 @@ </xsl:variable> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$align != '' "> <xsl:attribute name="align"> <xsl:value-of select="$align"/> @@ -1141,7 +1141,7 @@ <xsl:template match="inlinemediaobject"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:call-template name="anchor"/> <xsl:call-template name="select.mediaobject"/> </span> @@ -1451,7 +1451,7 @@ <xsl:template match="caption"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <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/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/html.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -303,16 +303,21 @@ <!-- Apply common attributes such as class, lang, dir --> <xsl:template name="common.html.attributes"> + <xsl:param name="inherit" select="0"/> <xsl:param name="class" select="local-name(.)"/> <xsl:apply-templates select="." mode="common.html.attributes"> <xsl:with-param name="class" select="$class"/> + <xsl:with-param name="inherit" select="$inherit"/> </xsl:apply-templates> </xsl:template> <xsl:template match="*" mode="common.html.attributes"> <xsl:param name="class" select="local-name(.)"/> + <xsl:param name="inherit" select="0"/> <xsl:call-template name="generate.html.lang"/> - <xsl:call-template name="dir"/> + <xsl:call-template name="dir"> + <xsl:with-param name="inherit" select="$inherit"/> + </xsl:call-template> <xsl:apply-templates select="." mode="class.attribute"> <xsl:with-param name="class" select="$class"/> </xsl:apply-templates> Modified: trunk/xsl/html/index.xsl =================================================================== --- trunk/xsl/html/index.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/index.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -25,7 +25,7 @@ <xsl:if test="count(*)>0 or $generate.index != '0'"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -80,7 +80,7 @@ <xsl:if test="count(*)>0 or $generate.index != '0'"> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -115,7 +115,7 @@ <xsl:call-template name="id.warning"/> <div> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="$generate.id.attributes != 0"> <xsl:attribute name="id"> <xsl:call-template name="object.id"/> @@ -132,7 +132,7 @@ <xsl:template match="indexdiv/title"> <h3> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates/> </h3> </xsl:template> Modified: trunk/xsl/html/info.xsl =================================================================== --- trunk/xsl/html/info.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/info.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -24,7 +24,7 @@ <xsl:template match="corpauthor"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates/> </span> </xsl:template> @@ -33,7 +33,7 @@ <xsl:template match="jobtitle"> <span> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:apply-templates/> </span> </xsl:template> Modified: trunk/xsl/html/inline.xsl =================================================================== --- trunk/xsl/html/inline.xsl 2009-05-04 02:17:33 UTC (rev 8420) +++ trunk/xsl/html/inline.xsl 2009-05-04 07:49:49 UTC (rev 8421) @@ -98,7 +98,7 @@ <xsl:otherwise> <a> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> @@ -134,7 +134,7 @@ <!-- otherwise it's a URI --> <xsl:otherwise> <a> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:attribute name="href"> <xsl:value-of select="$xhref"/> </xsl:attribute> @@ -171,7 +171,7 @@ </xsl:call-template> <a> - <xsl:apply-templates select="." mode="class.attribute"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$target"/> @@ -234,9 +234,7 @@ </xsl:call-template> </xsl:param> <code> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="dir"/> - <xsl:call-template name="generate.html.title"/> + <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:copy-of select="$content"/> <xsl:call-template name="apply-annotations"/> </code> @@ -253,9 +251,7 @@ </xsl:param> ... [truncated message content] |
From: <bob...@us...> - 2009-12-06 21:54:10
|
Revision: 8550 http://docbook.svn.sourceforge.net/docbook/?rev=8550&view=rev Author: bobstayton Date: 2009-12-06 21:54:03 +0000 (Sun, 06 Dec 2009) Log Message: ----------- Add new params for CSS file generation. Modified Paths: -------------- trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2009-12-06 21:47:04 UTC (rev 8549) +++ trunk/xsl/html/param.ent 2009-12-06 21:54:03 UTC (rev 8550) @@ -311,3 +311,8 @@ <!ENTITY javahelp.encoding SYSTEM "../params/javahelp.encoding.xml"> <!ENTITY writing.mode SYSTEM "../params/writing.mode.xml"> <!ENTITY exsl.node.set.available SYSTEM "../params/exsl.node.set.available.xml"> +<!ENTITY docbook.css.source SYSTEM "../params/docbook.css.source.xml"> +<!ENTITY docbook.css.link SYSTEM "../params/docbook.css.link.xml"> +<!ENTITY generate.css.header SYSTEM "../params/generate.css.header.xml"> +<!ENTITY make.clean.html SYSTEM "../params/make.clean.html.xml"> +<!ENTITY custom.css.source SYSTEM "../params/custom.css.source.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2009-12-06 21:47:04 UTC (rev 8549) +++ trunk/xsl/html/param.xweb 2009-12-06 21:54:03 UTC (rev 8550) @@ -133,6 +133,11 @@ &draft.watermark.image; &generate.id.attributes; &generate.meta.abstract; +&make.clean.html.xml; +&docbook.css.source.xml; +&docbook.css.link.xml; +&custom.css.source.xml; +&generate.css.header.xml; </reference> <reference xml:id="xslt"><title>XSLT Processing</title> &rootid; @@ -433,6 +438,7 @@ ******************************************************************** --> +<src:fragref linkend="abstract.notitle.enabled.frag"/> <src:fragref linkend="admon.graphics.extension.frag"/> <src:fragref linkend="admon.graphics.frag"/> <src:fragref linkend="admon.graphics.path.frag"/> @@ -440,14 +446,14 @@ <src:fragref linkend="admon.textlabel.frag"/> <src:fragref linkend="annotate.toc.frag"/> <src:fragref linkend="annotation.css.frag"/> +<src:fragref linkend="annotation.graphic.close.frag"/> +<src:fragref linkend="annotation.graphic.open.frag"/> <src:fragref linkend="annotation.js.frag"/> -<src:fragref linkend="annotation.graphic.open.frag"/> -<src:fragref linkend="annotation.graphic.close.frag"/> <src:fragref linkend="annotation.support.frag"/> <src:fragref linkend="appendix.autolabel.frag"/> <src:fragref linkend="author.othername.in.middle.frag"/> +<src:fragref linkend="autotoc.label.in.hyperlink.frag"/> <src:fragref linkend="autotoc.label.separator.frag"/> -<src:fragref linkend="autotoc.label.in.hyperlink.frag"/> <src:fragref linkend="base.dir.frag"/> <src:fragref linkend="biblioentry.item.separator.frag"/> <src:fragref linkend="bibliography.collection.frag"/> @@ -470,29 +476,32 @@ <src:fragref linkend="chunk.first.sections.frag"/> <src:fragref linkend="chunk.quietly.frag"/> <src:fragref linkend="chunk.section.depth.frag"/> +<src:fragref linkend="chunk.separate.lots.frag"/> <src:fragref linkend="chunk.toc.frag"/> <src:fragref linkend="chunk.tocs.and.lots.frag"/> <src:fragref linkend="chunk.tocs.and.lots.has.title.frag"/> -<src:fragref linkend="chunk.separate.lots.frag"/> <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="custom.css.source.frag"/> <src:fragref linkend="default.float.class.frag"/> <src:fragref linkend="default.image.width.frag"/> +<src:fragref linkend="default.table.frame.frag"/> <src:fragref linkend="default.table.width.frag"/> -<src:fragref linkend="default.table.frame.frag"/> +<src:fragref linkend="docbook.css.link.frag"/> +<src:fragref linkend="docbook.css.source.frag"/> <src:fragref linkend="draft.mode.frag"/> <src:fragref linkend="draft.watermark.image.frag"/> +<src:fragref linkend="ebnf.assignment.frag"/> +<src:fragref linkend="ebnf.statement.terminator.frag"/> <src:fragref linkend="ebnf.table.bgcolor.frag"/> <src:fragref linkend="ebnf.table.border.frag"/> -<src:fragref linkend="ebnf.assignment.frag"/> -<src:fragref linkend="ebnf.statement.terminator.frag"/> <src:fragref linkend="eclipse.autolabel.frag"/> +<src:fragref linkend="eclipse.plugin.id.frag"/> <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"/> @@ -508,12 +517,13 @@ <src:fragref linkend="funcsynopsis.decoration.frag"/> <src:fragref linkend="funcsynopsis.style.frag"/> <src:fragref linkend="function.parens.frag"/> +<src:fragref linkend="generate.css.header.frag"/> <src:fragref linkend="generate.id.attributes.frag"/> <src:fragref linkend="generate.index.frag"/> <src:fragref linkend="generate.legalnotice.link.frag"/> -<src:fragref linkend="generate.revhistory.link.frag"/> <src:fragref linkend="generate.manifest.frag"/> <src:fragref linkend="generate.meta.abstract.frag"/> +<src:fragref linkend="generate.revhistory.link.frag"/> <src:fragref linkend="generate.section.toc.level.frag"/> <src:fragref linkend="generate.toc.frag"/> <src:fragref linkend="glossary.collection.frag"/> @@ -534,8 +544,8 @@ <src:fragref linkend="html.cleanup.frag"/> <src:fragref linkend="html.ext.frag"/> <src:fragref linkend="html.extra.head.links.frag"/> +<src:fragref linkend="html.head.legalnotice.link.multiple.frag"/> <src:fragref linkend="html.head.legalnotice.link.types.frag"/> -<src:fragref linkend="html.head.legalnotice.link.multiple.frag"/> <src:fragref linkend="html.longdesc.frag"/> <src:fragref linkend="html.longdesc.link.frag"/> <src:fragref linkend="html.stylesheet.frag"/> @@ -589,18 +599,20 @@ <src:fragref linkend="htmlhelp.title.frag"/> <src:fragref linkend="htmlhelp.use.hhk.frag"/> <src:fragref linkend="htmlhelp.window.geometry.frag"/> +<src:fragref linkend="id.warnings.frag"/> +<src:fragref linkend="ignore.image.scaling.frag"/> <src:fragref linkend="img.src.path.frag"/> -<src:fragref linkend="id.warnings.frag"/> +<src:fragref linkend="index.links.to.section.frag"/> <src:fragref linkend="index.method.frag"/> +<src:fragref linkend="index.number.separator.frag"/> <src:fragref linkend="index.on.role.frag"/> -<src:fragref linkend="index.links.to.section.frag"/> <src:fragref linkend="index.on.type.frag"/> -<src:fragref linkend="index.number.separator.frag"/> +<src:fragref linkend="index.prefer.titleabbrev.frag"/> +<src:fragref linkend="index.range.separator.frag"/> <src:fragref linkend="index.term.separator.frag"/> -<src:fragref linkend="index.range.separator.frag"/> -<src:fragref linkend="index.prefer.titleabbrev.frag"/> -<src:fragref linkend="ignore.image.scaling.frag"/> <src:fragref linkend="inherit.keywords.frag"/> +<src:fragref linkend="insert.olink.page.number.frag"/> +<src:fragref linkend="insert.olink.pdf.frag.frag"/> <src:fragref linkend="insert.xref.page.number.frag"/> <src:fragref linkend="javahelp.encoding.frag"/> <src:fragref linkend="keep.relative.image.uris.frag"/> @@ -614,6 +626,7 @@ <src:fragref linkend="linenumbering.separator.frag"/> <src:fragref linkend="linenumbering.width.frag"/> <src:fragref linkend="link.mailto.url.frag"/> +<src:fragref linkend="make.clean.html.frag"/> <src:fragref linkend="make.graphic.viewport.frag"/> <src:fragref linkend="make.single.year.ranges.frag"/> <src:fragref linkend="make.valid.html.frag"/> @@ -632,18 +645,14 @@ <src:fragref linkend="nominal.table.width.frag"/> <src:fragref linkend="olink.base.uri.frag"/> <src:fragref linkend="olink.debug.frag"/> -<src:fragref linkend="olink.properties.frag"/> -<src:fragref linkend="insert.olink.page.number.frag"/> -<src:fragref linkend="insert.olink.pdf.frag.frag"/> -<src:fragref linkend="prefer.internal.olink.frag"/> -<src:fragref linkend="olink.lang.fallback.sequence.frag"/> <src:fragref linkend="olink.doctitle.frag"/> <src:fragref linkend="olink.fragid.frag"/> +<src:fragref linkend="olink.lang.fallback.sequence.frag"/> <src:fragref linkend="olink.outline.ext.frag"/> +<src:fragref linkend="olink.properties.frag"/> <src:fragref linkend="olink.pubid.frag"/> <src:fragref linkend="olink.resolver.frag"/> <src:fragref linkend="olink.sysid.frag"/> -<src:fragref linkend="abstract.notitle.enabled.frag"/> <src:fragref linkend="othercredit.like.author.enabled.frag"/> <src:fragref linkend="para.propagates.style.frag"/> <src:fragref linkend="part.autolabel.frag"/> @@ -651,12 +660,13 @@ <src:fragref linkend="pixels.per.inch.frag"/> <src:fragref linkend="points.per.em.frag"/> <src:fragref linkend="preface.autolabel.frag"/> +<src:fragref linkend="prefer.internal.olink.frag"/> <src:fragref linkend="preferred.mediaobject.role.frag"/> <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.attribute.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"/> <src:fragref linkend="profile.lang.frag"/> @@ -673,16 +683,16 @@ <src:fragref linkend="profile.wordsize.frag"/> <src:fragref linkend="punct.honorific.frag"/> <src:fragref linkend="qanda.defaultlabel.frag"/> +<src:fragref linkend="qanda.in.toc.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="refclass.suppress.frag"/> <src:fragref linkend="refentry.generate.name.frag"/> <src:fragref linkend="refentry.generate.title.frag"/> <src:fragref linkend="refentry.separator.frag"/> <src:fragref linkend="refentry.xref.manvolnum.frag"/> <src:fragref linkend="reference.autolabel.frag"/> -<src:fragref linkend="refclass.suppress.frag"/> <src:fragref linkend="root.filename.frag"/> <src:fragref linkend="rootid.frag"/> <src:fragref linkend="runinhead.default.title.end.punct.frag"/> @@ -712,14 +722,14 @@ <src:fragref linkend="tablecolumns.extension.frag"/> <src:fragref linkend="target.database.document.frag"/> <src:fragref linkend="targets.filename.frag"/> -<src:fragref linkend="textdata.default.encoding.frag"/> <src:fragref linkend="tex.math.delims.frag"/> <src:fragref linkend="tex.math.file.frag"/> <src:fragref linkend="tex.math.in.alt.frag"/> +<src:fragref linkend="textdata.default.encoding.frag"/> <src:fragref linkend="textinsert.extension.frag"/> <src:fragref linkend="toc.list.type.frag"/> +<src:fragref linkend="toc.max.depth.frag"/> <src:fragref linkend="toc.section.depth.frag"/> -<src:fragref linkend="toc.max.depth.frag"/> <src:fragref linkend="ulink.target.frag"/> <src:fragref linkend="use.embed.for.svg.frag"/> <src:fragref linkend="use.extensions.frag"/> @@ -729,13 +739,13 @@ <src:fragref linkend="use.role.for.mediaobject.frag"/> <src:fragref linkend="use.svg.frag"/> <src:fragref linkend="variablelist.as.table.frag"/> +<src:fragref linkend="variablelist.term.break.after.frag"/> <src:fragref linkend="variablelist.term.separator.frag"/> -<src:fragref linkend="variablelist.term.break.after.frag"/> <src:fragref linkend="writing.mode.frag"/> -<src:fragref linkend="xref.with.number.and.title.frag"/> +<src:fragref linkend="xref.label-page.separator.frag"/> <src:fragref linkend="xref.label-title.separator.frag"/> -<src:fragref linkend="xref.label-page.separator.frag"/> <src:fragref linkend="xref.title-page.separator.frag"/> +<src:fragref linkend="xref.with.number.and.title.frag"/> </xsl:stylesheet> </src:fragment> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-12-11 00:07:19
|
Revision: 8557 http://docbook.svn.sourceforge.net/docbook/?rev=8557&view=rev Author: bobstayton Date: 2009-12-11 00:07:12 +0000 (Fri, 11 Dec 2009) Log Message: ----------- Add support for make.clean.html setting in block elements. Modified Paths: -------------- trunk/xsl/html/block.xsl trunk/xsl/html/docbook.css.xml Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2009-12-11 00:05:45 UTC (rev 8556) +++ trunk/xsl/html/block.xsl 2009-12-11 00:07:12 UTC (rev 8557) @@ -127,14 +127,28 @@ </xsl:if> </xsl:variable> - <b> - <xsl:copy-of select="$titleStr"/> - <xsl:if test="$lastChar != '' - and not(contains($runinhead.title.end.punct, $lastChar))"> - <xsl:value-of select="$runinhead.default.title.end.punct"/> - </xsl:if> - <xsl:text> </xsl:text> - </b> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <span class="formalpara-title"> + <xsl:copy-of select="$titleStr"/> + <xsl:if test="$lastChar != '' + and not(contains($runinhead.title.end.punct, $lastChar))"> + <xsl:value-of select="$runinhead.default.title.end.punct"/> + </xsl:if> + <xsl:text> </xsl:text> + </span> + </xsl:when> + <xsl:otherwise> + <b> + <xsl:copy-of select="$titleStr"/> + <xsl:if test="$lastChar != '' + and not(contains($runinhead.title.end.punct, $lastChar))"> + <xsl:value-of select="$runinhead.default.title.end.punct"/> + </xsl:if> + <xsl:text> </xsl:text> + </b> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="formalpara/para"> @@ -180,13 +194,22 @@ </xsl:template> <xsl:template match="blockquote/title|blockquote/info/title"> - <div class="blockquote-title"> - <p> - <b> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <div class="blockquote-title"> <xsl:apply-templates/> - </b> - </p> - </div> + </div> + </xsl:when> + <xsl:otherwise> + <div class="blockquote-title"> + <p> + <b> + <xsl:apply-templates/> + </b> + </p> + </div> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!-- Use an em dash per Chicago Manual of Style and https://sourceforge.net/tracker/index.php?func=detail&aid=2793878&group_id=21935&atid=373747 --> @@ -254,7 +277,16 @@ </xsl:template> <xsl:template match="msgmain/title"> - <b><xsl:apply-templates/></b> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <span class="msgmain-title"> + <xsl:apply-templates/> + </span> + </xsl:when> + <xsl:otherwise> + <b><xsl:apply-templates/></b> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="msgsub"> @@ -262,7 +294,16 @@ </xsl:template> <xsl:template match="msgsub/title"> - <b><xsl:apply-templates/></b> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <span class="msgsub-title"> + <xsl:apply-templates/> + </span> + </xsl:when> + <xsl:otherwise> + <b><xsl:apply-templates/></b> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="msgrel"> @@ -270,7 +311,16 @@ </xsl:template> <xsl:template match="msgrel/title"> - <b><xsl:apply-templates/></b> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <span class="msgrel-title"> + <xsl:apply-templates/> + </span> + </xsl:when> + <xsl:otherwise> + <b><xsl:apply-templates/></b> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="msgtext"> @@ -282,39 +332,84 @@ </xsl:template> <xsl:template match="msglevel"> - <p> - <b> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'msgset'"/> - <xsl:with-param name="name" select="'MsgLevel'"/> - </xsl:call-template> - </b> - <xsl:apply-templates/> - </p> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <div class="msglevel"> + <span class="msglevel-title"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'msgset'"/> + <xsl:with-param name="name" select="'MsgLevel'"/> + </xsl:call-template> + </span> + <xsl:apply-templates/> + </div> + </xsl:when> + <xsl:otherwise> + <p> + <b> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'msgset'"/> + <xsl:with-param name="name" select="'MsgLevel'"/> + </xsl:call-template> + </b> + <xsl:apply-templates/> + </p> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="msgorig"> - <p> - <b> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'msgset'"/> - <xsl:with-param name="name" select="'MsgOrig'"/> - </xsl:call-template> - </b> - <xsl:apply-templates/> - </p> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <div class="msgorig"> + <span class="msgorig-title"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'msgset'"/> + <xsl:with-param name="name" select="'MsgOrig'"/> + </xsl:call-template> + </span> + <xsl:apply-templates/> + </div> + </xsl:when> + <xsl:otherwise> + <p> + <b> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'msgset'"/> + <xsl:with-param name="name" select="'MsgOrig'"/> + </xsl:call-template> + </b> + <xsl:apply-templates/> + </p> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="msgaud"> - <p> - <b> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'msgset'"/> - <xsl:with-param name="name" select="'MsgAud'"/> - </xsl:call-template> - </b> - <xsl:apply-templates/> - </p> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <div class="msgaud"> + <span class="msgaud-title"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'msgset'"/> + <xsl:with-param name="name" select="'MsgAud'"/> + </xsl:call-template> + </span> + <xsl:apply-templates/> + </div> + </xsl:when> + <xsl:otherwise> + <p> + <b> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'msgset'"/> + <xsl:with-param name="name" select="'MsgAud'"/> + </xsl:call-template> + </b> + <xsl:apply-templates/> + </p> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="msgexplan"> @@ -322,7 +417,22 @@ </xsl:template> <xsl:template match="msgexplan/title"> - <p><b><xsl:apply-templates/></b></p> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <div class="msgexplan"> + <span class="msgexplan-title"> + <xsl:apply-templates/> + </span> + </div> + </xsl:when> + <xsl:otherwise> + <p> + <b> + <xsl:apply-templates/> + </b> + </p> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!-- ==================================================================== --> Modified: trunk/xsl/html/docbook.css.xml =================================================================== --- trunk/xsl/html/docbook.css.xml 2009-12-11 00:05:45 UTC (rev 8556) +++ trunk/xsl/html/docbook.css.xml 2009-12-11 00:07:12 UTC (rev 8557) @@ -1,3 +1,50 @@ <?xml version="1.0"?> <style> + +/********************************/ +/* start of styles in block.xsl */ +/********************************/ +.formalpara-title { + font-weight: bold; +} + +div.blockquote-title { + font-weight: bold; + margin-top: 1em; + margin-bottom: 1em; +} + +span.msgmain-title { + font-weight: bold; +} + +span.msgsub-title { + font-weight: bold; +} + +span.msgrel-title { + font-weight: bold; +} + +div.msglevel, div.msgorig, div.msgaud { + margin-top: 1em; + margin-bottom: 1em; +} + +span.msglevel-title, span.msgorig-title, span.msgaud-title { + font-weight: bold; +} + +div.msgexplan { + margin-top: 1em; + margin-bottom: 1em; +} + +span.msgexplan-title { + font-weight: bold; +} + +/********************************/ +/* end of styles in block.xsl */ +/********************************/ </style> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-12-11 00:33:30
|
Revision: 8558 http://docbook.svn.sourceforge.net/docbook/?rev=8558&view=rev Author: bobstayton Date: 2009-12-11 00:33:17 +0000 (Fri, 11 Dec 2009) Log Message: ----------- Support make.clean.html in autotoc.xsl. Modified Paths: -------------- trunk/xsl/html/autotoc.xsl trunk/xsl/html/docbook.css.xml Modified: trunk/xsl/html/autotoc.xsl =================================================================== --- trunk/xsl/html/autotoc.xsl 2009-12-11 00:07:12 UTC (rev 8557) +++ trunk/xsl/html/autotoc.xsl 2009-12-11 00:33:17 UTC (rev 8558) @@ -36,13 +36,24 @@ <xsl:variable name="toc.title"> <xsl:if test="$toc.title.p"> - <p> - <b> - <xsl:call-template name="gentext"> - <xsl:with-param name="key">TableofContents</xsl:with-param> - </xsl:call-template> - </b> - </p> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <div class="toc-title"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key">TableofContents</xsl:with-param> + </xsl:call-template> + </div> + </xsl:when> + <xsl:otherwise> + <p> + <b> + <xsl:call-template name="gentext"> + <xsl:with-param name="key">TableofContents</xsl:with-param> + </xsl:call-template> + </b> + </p> + </xsl:otherwise> + </xsl:choose> </xsl:if> </xsl:variable> @@ -611,22 +622,42 @@ <xsl:if test="$nodes"> <div class="list-of-{$titles}s"> - <p> - <b> - <xsl:call-template name="gentext"> - <xsl:with-param name="key"> - <xsl:choose> - <xsl:when test="$titles='table'">ListofTables</xsl:when> - <xsl:when test="$titles='figure'">ListofFigures</xsl:when> - <xsl:when test="$titles='equation'">ListofEquations</xsl:when> - <xsl:when test="$titles='example'">ListofExamples</xsl:when> - <xsl:when test="$titles='procedure'">ListofProcedures</xsl:when> - <xsl:otherwise>ListofUnknown</xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:call-template> - </b> - </p> + <xsl:choose> + <xsl:when test="$make.clean.html != 0"> + <div class="toc-title"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key"> + <xsl:choose> + <xsl:when test="$titles='table'">ListofTables</xsl:when> + <xsl:when test="$titles='figure'">ListofFigures</xsl:when> + <xsl:when test="$titles='equation'">ListofEquations</xsl:when> + <xsl:when test="$titles='example'">ListofExamples</xsl:when> + <xsl:when test="$titles='procedure'">ListofProcedures</xsl:when> + <xsl:otherwise>ListofUnknown</xsl:otherwise> + </xsl:choose> + </xsl:with-param> + </xsl:call-template> + </div> + </xsl:when> + <xsl:otherwise> + <p> + <b> + <xsl:call-template name="gentext"> + <xsl:with-param name="key"> + <xsl:choose> + <xsl:when test="$titles='table'">ListofTables</xsl:when> + <xsl:when test="$titles='figure'">ListofFigures</xsl:when> + <xsl:when test="$titles='equation'">ListofEquations</xsl:when> + <xsl:when test="$titles='example'">ListofExamples</xsl:when> + <xsl:when test="$titles='procedure'">ListofProcedures</xsl:when> + <xsl:otherwise>ListofUnknown</xsl:otherwise> + </xsl:choose> + </xsl:with-param> + </xsl:call-template> + </b> + </p> + </xsl:otherwise> + </xsl:choose> <xsl:element name="{$toc.list.type}"> <xsl:apply-templates select="$nodes" mode="toc"> Modified: trunk/xsl/html/docbook.css.xml =================================================================== --- trunk/xsl/html/docbook.css.xml 2009-12-11 00:07:12 UTC (rev 8557) +++ trunk/xsl/html/docbook.css.xml 2009-12-11 00:33:17 UTC (rev 8558) @@ -47,4 +47,14 @@ /********************************/ /* end of styles in block.xsl */ /********************************/ + +/********************************/ +/* start of styles in autotoc.xsl */ +/********************************/ +div.toc-title { + font-weight: bold; + margin-top: 1em; + margin-bottom: 1em; +} + </style> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2010-08-09 18:13:13
|
Revision: 8805 http://docbook.svn.sourceforge.net/docbook/?rev=8805&view=rev Author: bobstayton Date: 2010-08-09 18:13:06 +0000 (Mon, 09 Aug 2010) Log Message: ----------- Fix bug 2840768 sidebar without title inserts empty b tag. Modified Paths: -------------- trunk/xsl/html/block.xsl trunk/xsl/html/titlepage.templates.xml Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2010-08-09 16:41:43 UTC (rev 8804) +++ trunk/xsl/html/block.xsl 2010-08-09 18:13:06 UTC (rev 8805) @@ -238,13 +238,7 @@ <div> <xsl:call-template name="common.html.attributes"/> <xsl:call-template name="anchor"/> - <xsl:call-template name="formal.object.heading"> - <xsl:with-param name="title"> - <xsl:apply-templates select="." mode="title.markup"> - <xsl:with-param name="allow-anchors" select="'1'"/> - </xsl:apply-templates> - </xsl:with-param> - </xsl:call-template> + <xsl:call-template name="sidebar.titlepage"/> <xsl:apply-templates/> </div> </xsl:template> Modified: trunk/xsl/html/titlepage.templates.xml =================================================================== --- trunk/xsl/html/titlepage.templates.xml 2010-08-09 16:41:43 UTC (rev 8804) +++ trunk/xsl/html/titlepage.templates.xml 2010-08-09 18:13:06 UTC (rev 8805) @@ -1,5 +1,5 @@ <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0" - xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" + xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <!-- ==================================================================== --> @@ -106,9 +106,9 @@ <t:titlepage t:element="part" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title - t:force="1" - t:named-template="division.title" - param:node="ancestor-or-self::part[1]"/> + t:force="1" + t:named-template="division.title" + param:node="ancestor-or-self::part[1]"/> <subtitle/> <corpauthor/> <authorgroup/> @@ -205,8 +205,8 @@ <t:titlepage-content t:side="recto"> <!-- uncomment this if you want refentry titlepages <title t:force="1" - t:named-template="refentry.title" - param:node="ancestor-or-self::refentry[1]"/> + t:named-template="refentry.title" + param:node="ancestor-or-self::refentry[1]"/> --> </t:titlepage-content> @@ -227,9 +227,9 @@ <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::dedication[1]"/> + t:force="1" + t:named-template="component.title" + param:node="ancestor-or-self::dedication[1]"/> <subtitle/> </t:titlepage-content> @@ -251,9 +251,9 @@ <t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::acknowledgements[1]"/> + t:force="1" + t:named-template="component.title" + param:node="ancestor-or-self::acknowledgements[1]"/> <subtitle/> </t:titlepage-content> @@ -590,9 +590,9 @@ <t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::bibliography[1]"/> + t:force="1" + t:named-template="component.title" + param:node="ancestor-or-self::bibliography[1]"/> <subtitle/> </t:titlepage-content> @@ -614,9 +614,9 @@ <t:titlepage t:element="glossary" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::glossary[1]"/> + t:force="1" + t:named-template="component.title" + param:node="ancestor-or-self::glossary[1]"/> <subtitle/> </t:titlepage-content> @@ -638,9 +638,9 @@ <t:titlepage t:element="index" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::index[1]"/> + t:force="1" + t:named-template="component.title" + param:node="ancestor-or-self::index[1]"/> <subtitle/> </t:titlepage-content> @@ -662,9 +662,9 @@ <t:titlepage t:element="setindex" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::setindex[1]"/> + t:force="1" + t:named-template="component.title" + param:node="ancestor-or-self::setindex[1]"/> <subtitle/> </t:titlepage-content> @@ -682,5 +682,27 @@ </t:titlepage> <!-- ==================================================================== --> +<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage"> + <t:titlepage-content t:side="recto"> + <title + t:named-template="formal.object.heading" + param:object="ancestor-or-self::sidebar[1]"/> + <subtitle/> + </t:titlepage-content> + <t:titlepage-content t:side="verso"> + </t:titlepage-content> + + <t:titlepage-separator> + </t:titlepage-separator> + + <t:titlepage-before t:side="recto"> + </t:titlepage-before> + + <t:titlepage-before t:side="verso"> + </t:titlepage-before> +</t:titlepage> + +<!-- ==================================================================== --> + </t:templates> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2010-08-09 18:57:47
|
Revision: 8807 http://docbook.svn.sourceforge.net/docbook/?rev=8807&view=rev Author: bobstayton Date: 2010-08-09 18:57:41 +0000 (Mon, 09 Aug 2010) Log Message: ----------- Fix bug 2844927 Validity error for callout bugs. Modified Paths: -------------- trunk/xsl/html/docbook.css.xml trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/html/docbook.css.xml =================================================================== --- trunk/xsl/html/docbook.css.xml 2010-08-09 18:25:58 UTC (rev 8806) +++ trunk/xsl/html/docbook.css.xml 2010-08-09 18:57:41 UTC (rev 8807) @@ -3,7 +3,7 @@ /********************************/ /* start of styles in block.xsl */ -/********************************/ + .formalpara-title { font-weight: bold; } @@ -44,17 +44,66 @@ font-weight: bold; } -/********************************/ /* end of styles in block.xsl */ /********************************/ /********************************/ /* start of styles in autotoc.xsl */ -/********************************/ -div.toc-title { + font-weight: bold; margin-top: 1em; margin-bottom: 1em; } + +/* end of styles in autotoc.xsl */ +/********************************/ + +/********************************/ +/* start of styles in formal.xsl */ + +div.figure-title { + font-weight: bold; +} + +div.example-title { + font-weight: bold; +} + +div.equation-title { + font-weight: bold; +} + +div.table-title { + font-weight: bold; +} + +div.sidebar-title { + font-weight: bold; +} + + +/* end of styles in formal.xsl */ +/********************************/ + +/********************************/ +/* start of styles in verbatim.xsl */ + +div.programlisting { + white-space: pre; + font-family: monospace; +} + +div.screen { + white-space: pre; + font-family: monospace; +} + +div.synopsis { + white-space: pre; + font-family: monospace; +} + +/* end of styles in verbatim.xsl */ +/********************************/ </style> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2010-08-09 18:25:58 UTC (rev 8806) +++ trunk/xsl/html/verbatim.xsl 2010-08-09 18:57:41 UTC (rev 8807) @@ -34,6 +34,13 @@ <xsl:call-template name="anchor"/> + <xsl:variable name="div.element"> + <xsl:choose> + <xsl:when test="$make.clean.html != 0">div</xsl:when> + <xsl:otherwise>pre</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:if test="$shade.verbatim != 0"> <xsl:message> <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text> @@ -61,7 +68,7 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> - <pre> + <xsl:element name="{$div.element}"> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="@width != ''"> <xsl:attribute name="width"> @@ -71,10 +78,10 @@ <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> </xsl:call-template> - </pre> + </xsl:element> </xsl:when> <xsl:otherwise> - <pre> + <xsl:element name="{$div.element}"> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="@width != ''"> <xsl:attribute name="width"> @@ -89,7 +96,7 @@ <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> - </pre> + </xsl:element> </xsl:otherwise> </xsl:choose> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-10-09 22:03:37
|
Revision: 9126 http://docbook.svn.sourceforge.net/docbook/?rev=9126&view=rev Author: bobstayton Date: 2011-10-09 22:03:30 +0000 (Sun, 09 Oct 2011) Log Message: ----------- Replace duplicate undocumented parameter chunker.output.quiet with the original documented parameter chunk.quietly. Modified Paths: -------------- trunk/xsl/html/chunk-common.xsl trunk/xsl/html/chunker.xsl Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2011-10-09 21:39:38 UTC (rev 9125) +++ trunk/xsl/html/chunk-common.xsl 2011-10-09 22:03:30 UTC (rev 9126) @@ -30,13 +30,13 @@ <xsl:if test="$chunk.fast != 0"> <xsl:choose> <xsl:when test="$exsl.node.set.available != 0"> - <xsl:if test="$chunker.output.quiet = 0"> + <xsl:if test="$chunk.quietly = 0"> <xsl:message>Computing chunks...</xsl:message> </xsl:if> <xsl:apply-templates select="/*" mode="find.chunks"/> </xsl:when> <xsl:otherwise> - <xsl:if test="$chunker.output.quiet = 0"> + <xsl:if test="$chunk.quietly = 0"> <xsl:message> <xsl:text>Fast chunking requires exsl:node-set(). </xsl:text> <xsl:text>Using "slow" chunking.</xsl:text> Modified: trunk/xsl/html/chunker.xsl =================================================================== --- trunk/xsl/html/chunker.xsl 2011-10-09 21:39:38 UTC (rev 9125) +++ trunk/xsl/html/chunker.xsl 2011-10-09 22:03:30 UTC (rev 9126) @@ -33,7 +33,6 @@ <xsl:param name="chunker.output.doctype-system" select="''"/> <xsl:param name="chunker.output.media-type" select="''"/> <xsl:param name="chunker.output.cdata-section-elements" select="''"/> -<xsl:param name="chunker.output.quiet" select="0"/> <xsl:param name="saxon.character.representation" select="'entity;decimal'"/> @@ -75,7 +74,7 @@ <xsl:template name="write.chunk"> <xsl:param name="filename" select="''"/> - <xsl:param name="quiet" select="$chunker.output.quiet"/> + <xsl:param name="quiet" select="$chunk.quietly"/> <xsl:param name="suppress-context-node-name" select="0"/> <xsl:param name="message-prolog"/> <xsl:param name="message-epilog"/> @@ -373,7 +372,7 @@ <xsl:template name="write.chunk.with.doctype"> <xsl:param name="filename" select="''"/> - <xsl:param name="quiet" select="$chunker.output.quiet"/> + <xsl:param name="quiet" select="$chunk.quietly"/> <xsl:param name="method" select="$chunker.output.method"/> <xsl:param name="encoding" select="$chunker.output.encoding"/> @@ -407,7 +406,7 @@ <xsl:template name="write.text.chunk"> <xsl:param name="filename" select="''"/> - <xsl:param name="quiet" select="$chunker.output.quiet"/> + <xsl:param name="quiet" select="$chunk.quietly"/> <xsl:param name="suppress-context-node-name" select="0"/> <xsl:param name="message-prolog"/> <xsl:param name="message-epilog"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-10-30 03:42:19
|
Revision: 9140 http://docbook.svn.sourceforge.net/docbook/?rev=9140&view=rev Author: bobstayton Date: 2011-10-30 03:42:11 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Now handles caption in html markup table like title, so formal.object.title is used with all its features, including formatting and placement. Added htmlTable.with.caption template to handle the wrapper, and left htmlTable template unchanged. Now caption template in mode="htmlTable" does nothing, because caption handled by formal.object.title template. Modified Paths: -------------- trunk/xsl/html/formal.xsl trunk/xsl/html/htmltbl.xsl Modified: trunk/xsl/html/formal.xsl =================================================================== --- trunk/xsl/html/formal.xsl 2011-10-29 15:41:58 UTC (rev 9139) +++ trunk/xsl/html/formal.xsl 2011-10-30 03:42:11 UTC (rev 9140) @@ -197,6 +197,9 @@ <xsl:when test="tgroup|mediaobject|graphic"> <xsl:call-template name="calsTable"/> </xsl:when> + <xsl:when test="caption"> + <xsl:call-template name="htmlTable.with.caption"/> + </xsl:when> <xsl:otherwise> <!-- do not use xsl:copy because of XHTML's needs --> <xsl:element name="table" namespace=""> @@ -210,6 +213,87 @@ </xsl:choose> </xsl:template> +<!-- Handle html markup table like formal.object --> +<xsl:template name="htmlTable.with.caption"> + <xsl:param name="class"> + <xsl:apply-templates select="." mode="class.value"/> + </xsl:param> + + <xsl:variable name="param.placement" + select="substring-after(normalize-space($formal.title.placement), + concat(local-name(.), ' '))"/> + + <xsl:variable name="placement"> + <xsl:choose> + <xsl:when test="contains($param.placement, ' ')"> + <xsl:value-of select="substring-before($param.placement, ' ')"/> + </xsl:when> + <xsl:when test="$param.placement = ''">before</xsl:when> + <xsl:otherwise> + <xsl:value-of select="$param.placement"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:call-template name="id.warning"/> + + <xsl:variable name="content"> + <div class="{$class}"> + <xsl:call-template name="anchor"> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + + <xsl:choose> + <xsl:when test="$placement = 'before'"> + + <xsl:call-template name="formal.object.heading"/> + + <div class="{$class}-contents"> + <xsl:apply-templates select="." mode="htmlTable"/> + </div> + + <xsl:call-template name="table.longdesc"/> + + <xsl:if test="$spacing.paras != 0"><p/></xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:if test="$spacing.paras != 0"><p/></xsl:if> + + <div class="{$class}-contents"> + <xsl:apply-templates select="." mode="htmlTable"/> + </div> + + <xsl:call-template name="table.longdesc"/> + + <xsl:call-template name="formal.object.heading"/> + </xsl:otherwise> + </xsl:choose> + </div> + <xsl:if test="not($formal.object.break.after = '0')"> + <br class="{$class}-break"/> + </xsl:if> + </xsl:variable> + + <xsl:variable name="floatstyle"> + <xsl:call-template name="floatstyle"/> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$floatstyle != ''"> + <xsl:call-template name="floater"> + <xsl:with-param name="class"><xsl:value-of + select="$class"/>-float</xsl:with-param> + <xsl:with-param name="floatstyle" select="$floatstyle"/> + <xsl:with-param name="content" select="$content"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$content"/> + </xsl:otherwise> + </xsl:choose> + +</xsl:template> + <xsl:template name="calsTable"> <xsl:if test="tgroup/tbody/tr |tgroup/thead/tr Modified: trunk/xsl/html/htmltbl.xsl =================================================================== --- trunk/xsl/html/htmltbl.xsl 2011-10-29 15:41:58 UTC (rev 9139) +++ trunk/xsl/html/htmltbl.xsl 2011-10-30 03:42:11 UTC (rev 9140) @@ -14,6 +14,16 @@ <!-- ==================================================================== --> +<xsl:template match="table" mode="htmlTable"> + <xsl:element name="table" namespace=""> + <xsl:apply-templates select="@*" mode="htmlTableAtt"/> + <xsl:attribute name="id"> + <xsl:call-template name="object.id"/> + </xsl:attribute> + <xsl:call-template name="htmlTable"/> + </xsl:element> +</xsl:template> + <xsl:template match="colgroup" mode="htmlTable"> <xsl:element name="{local-name()}" namespace=""> <xsl:apply-templates select="@*" mode="htmlTableAtt"/> @@ -27,18 +37,9 @@ </xsl:element> </xsl:template> -<xsl:template match="caption" mode="htmlTable"> - <!-- do not use xsl:copy because of XHTML's needs --> - <caption> - <xsl:apply-templates select="@*" mode="htmlTableAtt"/> +<!-- Handled by formal.object.title template --> +<xsl:template match="caption" mode="htmlTable"/> - <xsl:apply-templates select=".." mode="object.title.markup"> - <xsl:with-param name="allow-anchors" select="1"/> - </xsl:apply-templates> - - </caption> -</xsl:template> - <xsl:template match="tbody|thead|tfoot|tr" mode="htmlTable"> <xsl:element name="{local-name(.)}"> <xsl:apply-templates select="@*" mode="htmlTableAtt"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-10-31 20:37:29
|
Revision: 9141 http://docbook.svn.sourceforge.net/docbook/?rev=9141&view=rev Author: bobstayton Date: 2011-10-31 20:37:22 +0000 (Mon, 31 Oct 2011) Log Message: ----------- Fixed bug #3388088 where non-namespaced chunkfast.xsl not properly handling namespaced document. Modified Paths: -------------- trunk/xsl/html/chunk-code.xsl trunk/xsl/html/chunk-common.xsl trunk/xsl/html/docbook.xsl Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2011-10-30 03:42:11 UTC (rev 9140) +++ trunk/xsl/html/chunk-code.xsl 2011-10-31 20:37:22 UTC (rev 9141) @@ -421,6 +421,7 @@ stylesheets for DocBook5 if you don't want to use this feature.--> <xsl:when test="$exsl.node.set.available != 0 and (*/self::ng:* or */self::db:*)"> + <xsl:call-template name="log.message"> <xsl:with-param name="level">Note</xsl:with-param> <xsl:with-param name="source" select="$doc.title"/> @@ -428,23 +429,11 @@ <xsl:text>namesp. cut</xsl:text> </xsl:with-param> <xsl:with-param name="message"> - <xsl:text>stripped namespace before processing</xsl:text> - </xsl:with-param> - </xsl:call-template> - <xsl:variable name="nons"> - <xsl:apply-templates mode="stripNS"/> - </xsl:variable> - <xsl:call-template name="log.message"> - <xsl:with-param name="level">Note</xsl:with-param> - <xsl:with-param name="source" select="$doc.title"/> - <xsl:with-param name="context-desc"> - <xsl:text>namesp. cut</xsl:text> - </xsl:with-param> - <xsl:with-param name="message"> <xsl:text>processing stripped document</xsl:text> </xsl:with-param> </xsl:call-template> - <xsl:apply-templates select="exsl:node-set($nons)"/> + + <xsl:apply-templates select="exsl:node-set($no.namespace)"/> </xsl:when> <!-- Can't process unless namespace removed --> <xsl:when test="*/self::ng:* or */self::db:*"> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2011-10-30 03:42:11 UTC (rev 9140) +++ trunk/xsl/html/chunk-common.xsl 2011-10-31 20:37:22 UTC (rev 9141) @@ -29,10 +29,19 @@ <xsl:variable name="chunk.hierarchy"> <xsl:if test="$chunk.fast != 0"> <xsl:choose> + <!-- Are we handling a docbook5 document? --> + <xsl:when test="$exsl.node.set.available != 0 + and (*/self::ng:* or */self::db:*)"> + <xsl:if test="$chunk.quietly = 0"> + <xsl:message>Computing stripped namespace chunks...</xsl:message> + </xsl:if> + <xsl:apply-templates mode="find.chunks" select="exsl:node-set($no.namespace)"/> + </xsl:when> <xsl:when test="$exsl.node.set.available != 0"> <xsl:if test="$chunk.quietly = 0"> <xsl:message>Computing chunks...</xsl:message> </xsl:if> + <xsl:apply-templates select="/*" mode="find.chunks"/> </xsl:when> <xsl:otherwise> Modified: trunk/xsl/html/docbook.xsl =================================================================== --- trunk/xsl/html/docbook.xsl 2011-10-30 03:42:11 UTC (rev 9140) +++ trunk/xsl/html/docbook.xsl 2011-10-31 20:37:22 UTC (rev 9141) @@ -328,6 +328,16 @@ <xsl:param name="node" select="."/> </xsl:template> +<!-- To use the same stripped nodeset everywhere, it should +be created as a global variable here. +Used by docbook.xsl, chunk-code.xsl and chunkfast.xsl --> +<xsl:variable name="no.namespace"> + <xsl:if test="$exsl.node.set.available != 0 + and (*/self::ng:* or */self::db:*)"> + <xsl:apply-templates select="/*" mode="stripNS"/> + </xsl:if> +</xsl:variable> + <xsl:template match="/"> <!-- * Get a title for current doc so that we let the user --> <!-- * know what document we are processing at this point. --> @@ -351,16 +361,13 @@ <xsl:text>stripped namespace before processing</xsl:text> </xsl:with-param> </xsl:call-template> - <xsl:variable name="nons"> - <xsl:apply-templates mode="stripNS"/> - </xsl:variable> - <!-- + <!-- DEBUG: to save stripped document. <xsl:message>Saving stripped document.</xsl:message> <xsl:call-template name="write.chunk"> <xsl:with-param name="filename" select="'/tmp/stripped.xml'"/> <xsl:with-param name="method" select="'xml'"/> <xsl:with-param name="content"> - <xsl:copy-of select="exsl:node-set($nons)"/> + <xsl:copy-of select="exsl:node-set($no.namespace)"/> </xsl:with-param> </xsl:call-template> --> @@ -374,7 +381,7 @@ <xsl:text>processing stripped document</xsl:text> </xsl:with-param> </xsl:call-template> - <xsl:apply-templates select="exsl:node-set($nons)"/> + <xsl:apply-templates select="exsl:node-set($no.namespace)"/> </xsl:when> <!-- Can't process unless namespace removed --> <xsl:when test="*/self::ng:* or */self::db:*"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-11-12 00:05:51
|
Revision: 9147 http://docbook.svn.sourceforge.net/docbook/?rev=9147&view=rev Author: bobstayton Date: 2011-11-12 00:05:44 +0000 (Sat, 12 Nov 2011) Log Message: ----------- Add support for chunked.filename.prefix param. Make sure base.dir value has a trailing slash in the chunk.base.dir internal param used by the templates. Modified Paths: -------------- trunk/xsl/html/chunk-code.xsl trunk/xsl/html/chunk-common.xsl trunk/xsl/html/chunker.xsl trunk/xsl/html/chunktoc.xsl trunk/xsl/html/graphics.xsl trunk/xsl/html/html.xsl trunk/xsl/html/titlepage.xsl Modified: trunk/xsl/html/chunk-code.xsl =================================================================== --- trunk/xsl/html/chunk-code.xsl 2011-11-11 23:17:20 UTC (rev 9146) +++ trunk/xsl/html/chunk-code.xsl 2011-11-12 00:05:44 UTC (rev 9147) @@ -54,6 +54,8 @@ <xsl:call-template name="dbhtml-dir"/> </xsl:if> + <xsl:value-of select="$chunked.filename.prefix"/> + <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 --> @@ -590,7 +592,7 @@ <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:value-of select="$chunk.base.dir"/> </xsl:if> </xsl:with-param> <xsl:with-param name="base.name"> @@ -610,7 +612,7 @@ <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:value-of select="$chunk.base.dir"/> </xsl:if> </xsl:with-param> <xsl:with-param name="base.name"> @@ -629,7 +631,7 @@ <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:value-of select="$chunk.base.dir"/> </xsl:if> </xsl:with-param> <xsl:with-param name="base.name"> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2011-11-11 23:17:20 UTC (rev 9146) +++ trunk/xsl/html/chunk-common.xsl 2011-11-12 00:05:44 UTC (rev 9147) @@ -143,7 +143,7 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name" select="$chunkfn"/> </xsl:call-template> </xsl:variable> @@ -613,9 +613,10 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name"> <xsl:call-template name="dbhtml-dir"/> + <xsl:value-of select="$chunked.filename.prefix"/> <xsl:apply-templates select="." mode="recursive-chunk-filename"> <xsl:with-param name="recursive" select="true()"/> </xsl:apply-templates> @@ -656,7 +657,7 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name"> <xsl:call-template name="dbhtml-dir"/> <xsl:value-of select="$type"/> @@ -1694,6 +1695,7 @@ <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'"> <a accesskey="t"> <xsl:attribute name="href"> + <xsl:value-of select="$chunked.filename.prefix"/> <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename"> <xsl:with-param name="recursive" select="true()"/> @@ -1883,7 +1885,7 @@ <xsl:call-template name="write.text.chunk"> <xsl:with-param name="filename"> <xsl:if test="$manifest.in.base.dir != 0"> - <xsl:value-of select="$base.dir"/> + <xsl:value-of select="$chunk.base.dir"/> </xsl:if> <xsl:value-of select="$manifest"/> </xsl:with-param> Modified: trunk/xsl/html/chunker.xsl =================================================================== --- trunk/xsl/html/chunker.xsl 2011-11-11 23:17:20 UTC (rev 9146) +++ trunk/xsl/html/chunker.xsl 2011-11-12 00:05:44 UTC (rev 9147) @@ -34,6 +34,20 @@ <xsl:param name="chunker.output.media-type" select="''"/> <xsl:param name="chunker.output.cdata-section-elements" select="''"/> +<!-- Make sure base.dir has a trailing slash now --> +<xsl:param name="chunk.base.dir"> + <xsl:choose> + <xsl:when test="string-length($base.dir) = 0"></xsl:when> + <!-- make sure to add trailing slash if omitted by user --> + <xsl:when test="substring($base.dir, string-length($base.dir), 1) = '/'"> + <xsl:value-of select="$base.dir"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($base.dir, '/')"/> + </xsl:otherwise> + </xsl:choose> +</xsl:param> + <xsl:param name="saxon.character.representation" select="'entity;decimal'"/> <!-- ==================================================================== --> @@ -46,13 +60,13 @@ <!-- put Saxon first to work around a bug in libxslt --> <xsl:when test="element-available('saxon:output')"> <!-- Saxon doesn't make the chunks relative --> - <xsl:value-of select="concat($base.dir,$base.name)"/> + <xsl:value-of select="concat($chunk.base.dir,$base.name)"/> </xsl:when> <xsl:when test="element-available('exsl:document')"> <!-- EXSL document does make the chunks relative, I think --> <xsl:choose> <xsl:when test="count(parent::*) = 0"> - <xsl:value-of select="concat($base.dir,$base.name)"/> + <xsl:value-of select="concat($chunk.base.dir,$base.name)"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="$base.name"/> @@ -61,7 +75,7 @@ </xsl:when> <xsl:when test="element-available('redirect:write')"> <!-- Xalan doesn't make the chunks relative --> - <xsl:value-of select="concat($base.dir,$base.name)"/> + <xsl:value-of select="concat($chunk.base.dir,$base.name)"/> </xsl:when> <xsl:otherwise> <xsl:message terminate="yes"> Modified: trunk/xsl/html/chunktoc.xsl =================================================================== --- trunk/xsl/html/chunktoc.xsl 2011-11-11 23:17:20 UTC (rev 9146) +++ trunk/xsl/html/chunktoc.xsl 2011-11-12 00:05:44 UTC (rev 9147) @@ -96,7 +96,7 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name" select="$chunkfn"/> </xsl:call-template> </xsl:variable> @@ -443,7 +443,7 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name"> <xsl:call-template name="dbhtml-dir"/> <xsl:apply-templates select="." mode="recursive-chunk-filename"> @@ -484,7 +484,7 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name"> <xsl:call-template name="dbhtml-dir"/> <xsl:value-of select="$type"/> @@ -496,6 +496,7 @@ <xsl:variable name="href"> <xsl:call-template name="make-relative-filename"> + <xsl:with-param name="base.dir" select="''"/> <xsl:with-param name="base.name"> <xsl:call-template name="dbhtml-dir"/> <xsl:value-of select="$type"/> Modified: trunk/xsl/html/graphics.xsl =================================================================== --- trunk/xsl/html/graphics.xsl 2011-11-11 23:17:20 UTC (rev 9146) +++ trunk/xsl/html/graphics.xsl 2011-11-12 00:05:44 UTC (rev 9147) @@ -1284,7 +1284,7 @@ <xsl:value-of select="$dbhtml.dir"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="$base.dir"/> + <xsl:value-of select="$chunk.base.dir"/> </xsl:otherwise> </xsl:choose> </xsl:with-param> @@ -1363,7 +1363,7 @@ <xsl:variable name="this.uri"> <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.dir" select="$base.dir"/> + <xsl:with-param name="base.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name"> <xsl:call-template name="href.target.uri"/> </xsl:with-param> Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2011-11-11 23:17:20 UTC (rev 9146) +++ trunk/xsl/html/html.xsl 2011-11-12 00:05:44 UTC (rev 9147) @@ -204,7 +204,7 @@ <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:value-of select="$chunk.base.dir"/> </xsl:if> <xsl:call-template name="href.target"> <xsl:with-param name="context" select="$context"/> @@ -610,7 +610,7 @@ </xsl:call-template> </xsl:variable> - <xsl:variable name="path" select="concat($base.dir, $file)"/> + <xsl:variable name="path" select="concat($chunk.base.dir, $file)"/> <xsl:value-of select="$path"/> </xsl:template> Modified: trunk/xsl/html/titlepage.xsl =================================================================== --- trunk/xsl/html/titlepage.xsl 2011-11-11 23:17:20 UTC (rev 9146) +++ trunk/xsl/html/titlepage.xsl 2011-11-12 00:05:44 UTC (rev 9147) @@ -555,7 +555,7 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name" select="$file"/> </xsl:call-template> </xsl:variable> @@ -806,7 +806,7 @@ <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.dir" select="$chunk.base.dir"/> <xsl:with-param name="base.name" select="$file"/> </xsl:call-template> </xsl:variable> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-11-12 00:07:36
|
Revision: 9148 http://docbook.svn.sourceforge.net/docbook/?rev=9148&view=rev Author: bobstayton Date: 2011-11-12 00:07:29 +0000 (Sat, 12 Nov 2011) Log Message: ----------- Add new param chunked.filename.prefix to fix bug 3087359. Modified Paths: -------------- trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2011-11-12 00:05:44 UTC (rev 9147) +++ trunk/xsl/html/param.ent 2011-11-12 00:07:29 UTC (rev 9148) @@ -317,3 +317,4 @@ <!ENTITY make.clean.html SYSTEM "../params/make.clean.html.xml"> <!ENTITY custom.css.source SYSTEM "../params/custom.css.source.xml"> <!ENTITY generate.consistent.ids SYSTEM "../params/generate.consistent.ids.xml"> +<!ENTITY chunked.filename.prefix SYSTEM "../params/chunked.filename.prefix.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2011-11-12 00:05:44 UTC (rev 9147) +++ trunk/xsl/html/param.xweb 2011-11-12 00:07:29 UTC (rev 9148) @@ -313,6 +313,7 @@ &html.extra.head.links; &root.filename; &base.dir; +&chunked.filename.prefix; &generate.manifest; &manifest; &manifest.in.base.dir; @@ -485,6 +486,7 @@ <src:fragref linkend="chunk.toc.frag"/> <src:fragref linkend="chunk.tocs.and.lots.frag"/> <src:fragref linkend="chunk.tocs.and.lots.has.title.frag"/> +<src:fragref linkend="chunked.filename.prefix.frag"/> <src:fragref linkend="citerefentry.link.frag"/> <src:fragref linkend="collect.xref.targets.frag"/> <src:fragref linkend="component.label.includes.part.label.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2011-11-24 00:12:22
|
Revision: 9158 http://docbook.svn.sourceforge.net/docbook/?rev=9158&view=rev Author: bobstayton Date: 2011-11-24 00:12:16 +0000 (Thu, 24 Nov 2011) Log Message: ----------- Fix bug 3441149 where mode="class.value" does not work for para or entry when the element does not have a role attribute. Modified Paths: -------------- trunk/xsl/html/block.xsl trunk/xsl/html/html.xsl trunk/xsl/html/table.xsl Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2011-11-23 22:29:23 UTC (rev 9157) +++ trunk/xsl/html/block.xsl 2011-11-24 00:12:16 UTC (rev 9158) @@ -64,7 +64,9 @@ </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:call-template name="locale.html.attributes"/> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="class" select="''"/> + </xsl:call-template> </xsl:otherwise> </xsl:choose> <xsl:copy-of select="$content"/> Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2011-11-23 22:29:23 UTC (rev 9157) +++ trunk/xsl/html/html.xsl 2011-11-24 00:12:16 UTC (rev 9158) @@ -296,11 +296,17 @@ <xsl:param name="class" select="local-name(.)"/> <!-- permit customization of class attributes --> <!-- Use element name by default --> - <xsl:attribute name="class"> + <xsl:variable name="class.value"> <xsl:apply-templates select="." mode="class.value"> <xsl:with-param name="class" select="$class"/> </xsl:apply-templates> - </xsl:attribute> + </xsl:variable> + + <xsl:if test="string-length(normalize-space($class.value)) != 0"> + <xsl:attribute name="class"> + <xsl:value-of select="$class.value"/> + </xsl:attribute> + </xsl:if> </xsl:template> <xsl:template match="*" mode="class.value"> Modified: trunk/xsl/html/table.xsl =================================================================== --- trunk/xsl/html/table.xsl 2011-11-23 22:29:23 UTC (rev 9157) +++ trunk/xsl/html/table.xsl 2011-11-24 00:12:16 UTC (rev 9158) @@ -847,11 +847,18 @@ </xsl:if> <xsl:call-template name="locale.html.attributes"/> - <xsl:if test="$entry.propagates.style != 0 and @role"> - <xsl:apply-templates select="." mode="class.attribute"> - <xsl:with-param name="class" select="@role"/> - </xsl:apply-templates> - </xsl:if> + <xsl:choose> + <xsl:when test="$entry.propagates.style != 0 and @role"> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="@role"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="''"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> <xsl:if test="$show.revisionflag and @revisionflag"> <xsl:attribute name="class"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2012-01-30 02:49:39
|
Revision: 9201 http://docbook.svn.sourceforge.net/docbook/?rev=9201&view=rev Author: bobstayton Date: 2012-01-30 02:49:32 +0000 (Mon, 30 Jan 2012) Log Message: ----------- Add new params html.script and html.script.type to support Javascript references. Modified Paths: -------------- trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Modified: trunk/xsl/html/param.ent =================================================================== --- trunk/xsl/html/param.ent 2012-01-30 02:46:48 UTC (rev 9200) +++ trunk/xsl/html/param.ent 2012-01-30 02:49:32 UTC (rev 9201) @@ -318,3 +318,5 @@ <!ENTITY custom.css.source SYSTEM "../params/custom.css.source.xml"> <!ENTITY generate.consistent.ids SYSTEM "../params/generate.consistent.ids.xml"> <!ENTITY chunked.filename.prefix SYSTEM "../params/chunked.filename.prefix.xml"> +<!ENTITY html.script SYSTEM "../params/html.script.xml"> +<!ENTITY html.script.type SYSTEM "../params/html.script.type.xml"> Modified: trunk/xsl/html/param.xweb =================================================================== --- trunk/xsl/html/param.xweb 2012-01-30 02:46:48 UTC (rev 9200) +++ trunk/xsl/html/param.xweb 2012-01-30 02:49:32 UTC (rev 9201) @@ -120,9 +120,11 @@ --> <reference xml:id="html"><title>HTML</title> &html.base; +&html.stylesheet; &html.stylesheet.type; -&html.stylesheet; &css.decoration; +&html.script; +&html.script.type; &spacing.paras; &emphasis.propagates.style; ¶.propagates.style; @@ -556,6 +558,8 @@ <src:fragref linkend="html.head.legalnotice.link.types.frag"/> <src:fragref linkend="html.longdesc.frag"/> <src:fragref linkend="html.longdesc.link.frag"/> +<src:fragref linkend="html.script.frag"/> +<src:fragref linkend="html.script.type.frag"/> <src:fragref linkend="html.stylesheet.frag"/> <src:fragref linkend="html.stylesheet.type.frag"/> <src:fragref linkend="htmlhelp.alias.file.frag"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2012-01-30 03:14:37
|
Revision: 9202 http://docbook.svn.sourceforge.net/docbook/?rev=9202&view=rev Author: bobstayton Date: 2012-01-30 03:14:31 +0000 (Mon, 30 Jan 2012) Log Message: ----------- Add support for html.script param to insert Javascript references. Modified Paths: -------------- trunk/xsl/html/docbook.xsl trunk/xsl/html/html.xsl Modified: trunk/xsl/html/docbook.xsl =================================================================== --- trunk/xsl/html/docbook.xsl 2012-01-30 02:49:32 UTC (rev 9201) +++ trunk/xsl/html/docbook.xsl 2012-01-30 03:14:31 UTC (rev 9202) @@ -148,6 +148,12 @@ </xsl:call-template> </xsl:if> + <xsl:if test="$html.script != ''"> + <xsl:call-template name="output.html.scripts"> + <xsl:with-param name="scripts" select="normalize-space($html.script)"/> + </xsl:call-template> + </xsl:if> + <xsl:if test="$link.mailto.url != ''"> <link rev="made" href="{$link.mailto.url}"/> @@ -228,6 +234,29 @@ </xsl:choose> </xsl:template> +<xsl:template name="output.html.scripts"> + <xsl:param name="scripts" select="''"/> + + <xsl:choose> + <xsl:when test="contains($scripts, ' ')"> + <xsl:variable name="script.filename" select="substring-before($scripts, ' ')"/> + + <xsl:call-template name="make.script.link"> + <xsl:with-param name="script.filename" select="$script.filename"/> + </xsl:call-template> + + <xsl:call-template name="output.html.scripts"> + <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$scripts != ''"> + <xsl:call-template name="make.script.link"> + <xsl:with-param name="script.filename" select="$scripts"/> + </xsl:call-template> + </xsl:when> + </xsl:choose> +</xsl:template> + <!-- ============================================================ --> <xsl:template match="*" mode="head.keywords.content"> Modified: trunk/xsl/html/html.xsl =================================================================== --- trunk/xsl/html/html.xsl 2012-01-30 02:49:32 UTC (rev 9201) +++ trunk/xsl/html/html.xsl 2012-01-30 03:14:31 UTC (rev 9202) @@ -475,8 +475,55 @@ <xsl:template name="make.css.link"> <xsl:param name="css.filename" select="''"/> - <xsl:variable name="href.to.uri" select="$css.filename"/> + <xsl:variable name="href"> + <xsl:call-template name="relative.path.link"> + <xsl:with-param name="target.pathname" select="$css.filename"/> + </xsl:call-template> + </xsl:variable> + <xsl:if test="string-length($css.filename) != 0"> + <link rel="stylesheet" + type="text/css" + href="{$href}"/> + </xsl:if> +</xsl:template> + +<!-- And the same applies to script links --> +<xsl:template name="make.script.link"> + <xsl:param name="script.filename" select="''"/> + + <xsl:variable name="src"> + <xsl:call-template name="relative.path.link"> + <xsl:with-param name="target.pathname" select="$script.filename"/> + </xsl:call-template> + </xsl:variable> + + <xsl:if test="string-length($script.filename) != 0"> + <script> + <xsl:attribute name="src"> + <xsl:value-of select="$src"/> + </xsl:attribute> + <xsl:attribute name="type"> + <xsl:value-of select="$html.script.type"/> + </xsl:attribute> + <xsl:call-template name="other.script.attributes"> + <xsl:with-param name="script.filename" select="$script.filename"/> + </xsl:call-template> + </script> + </xsl:if> +</xsl:template> + +<xsl:template name="other.script.attributes"> + <xsl:param name="script.filename"/> + <!-- Placeholder template to allow customization to + insert additional script element attributes if needed --> +</xsl:template> + +<xsl:template name="relative.path.link"> + <xsl:param name="target.pathname"/> + + <xsl:variable name="href.to.uri" select="$target.pathname"/> + <xsl:variable name="href.from.uri"> <xsl:call-template name="href.target.uri"> <xsl:with-param name="object" select="."/> @@ -511,11 +558,7 @@ <xsl:value-of select="$href.to"/> </xsl:variable> - <xsl:if test="string-length($css.filename) != 0"> - <link rel="stylesheet" - type="text/css" - href="{$href}"/> - </xsl:if> + <xsl:value-of select="$href"/> </xsl:template> <!-- ==================================================================== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2012-03-29 16:36:29
|
Revision: 9259 http://docbook.svn.sourceforge.net/docbook/?rev=9259&view=rev Author: bobstayton Date: 2012-03-29 16:36:20 +0000 (Thu, 29 Mar 2012) Log Message: ----------- Restore programlisting to use <pre> instead of <div> and instead wrap callout img elements in <span> to make valid HTML. Modified Paths: -------------- trunk/xsl/html/callout.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/html/callout.xsl =================================================================== --- trunk/xsl/html/callout.xsl 2012-03-29 09:12:54 UTC (rev 9258) +++ trunk/xsl/html/callout.xsl 2012-03-29 16:36:20 UTC (rev 9259) @@ -158,8 +158,9 @@ <xsl:choose> <xsl:when test="$callout.graphics != 0 and $conum <= $callout.graphics.number.limit"> - <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}" - alt="{$conum}" border="0"/> + <!-- Added span to make valid in XHTML 1 --> + <span><img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}" + alt="{$conum}" border="0"/></span> </xsl:when> <xsl:when test="$callout.unicode != 0 and $conum <= $callout.unicode.number.limit"> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2012-03-29 09:12:54 UTC (rev 9258) +++ trunk/xsl/html/verbatim.xsl 2012-03-29 16:36:20 UTC (rev 9259) @@ -34,12 +34,7 @@ <xsl:call-template name="anchor"/> - <xsl:variable name="div.element"> - <xsl:choose> - <xsl:when test="$make.clean.html != 0">div</xsl:when> - <xsl:otherwise>pre</xsl:otherwise> - </xsl:choose> - </xsl:variable> + <xsl:variable name="div.element">pre</xsl:variable> <xsl:if test="$shade.verbatim != 0"> <xsl:message> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |