From: <ko...@us...> - 2008-07-18 21:26:43
|
Revision: 8092 http://docbook.svn.sourceforge.net/docbook/?rev=8092&view=rev Author: kosek Date: 2008-07-18 21:26:36 +0000 (Fri, 18 Jul 2008) Log Message: ----------- Upgraded to support the latest version of XSLTHL 2.0 -- nested markup in highlited code is now processed -- it is no longer needed to specify path XSLTHL configuration file using Java property -- support for new languages, including Perl, Python and Ruby was added Modified Paths: -------------- trunk/xsl/fo/highlight.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb trunk/xsl/highlighting/c-hl.xml trunk/xsl/highlighting/common.xsl trunk/xsl/highlighting/delphi-hl.xml trunk/xsl/highlighting/ini-hl.xml trunk/xsl/highlighting/java-hl.xml trunk/xsl/highlighting/m2-hl.xml trunk/xsl/highlighting/myxml-hl.xml trunk/xsl/highlighting/php-hl.xml trunk/xsl/highlighting/xslthl-config.xml trunk/xsl/html/highlight.xsl trunk/xsl/html/param.ent trunk/xsl/html/param.xweb trunk/xsl/params/highlight.source.xml Added Paths: ----------- trunk/xsl/highlighting/cpp-hl.xml trunk/xsl/highlighting/csharp-hl.xml trunk/xsl/highlighting/javascript-hl.xml trunk/xsl/highlighting/perl-hl.xml trunk/xsl/highlighting/python-hl.xml trunk/xsl/highlighting/ruby-hl.xml trunk/xsl/highlighting/tcl-hl.xml trunk/xsl/params/highlight.xslthl.config.xml Modified: trunk/xsl/fo/highlight.xsl =================================================================== --- trunk/xsl/fo/highlight.xsl 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/fo/highlight.xsl 2008-07-18 21:26:36 UTC (rev 8092) @@ -15,28 +15,28 @@ ******************************************************************** --> -<xsl:template match='xslthl:keyword'> - <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline> +<xsl:template match='xslthl:keyword' mode="xslthl"> + <fo:inline font-weight="bold"><xsl:apply-templates mode="xslthl"/></fo:inline> </xsl:template> -<xsl:template match='xslthl:string'> - <fo:inline font-weight="bold" font-style="italic"><xsl:apply-templates/></fo:inline> +<xsl:template match='xslthl:string' mode="xslthl"> + <fo:inline font-weight="bold" font-style="italic"><xsl:apply-templates mode="xslthl"/></fo:inline> </xsl:template> -<xsl:template match='xslthl:comment'> - <fo:inline font-style="italic"><xsl:apply-templates/></fo:inline> +<xsl:template match='xslthl:comment' mode="xslthl"> + <fo:inline font-style="italic"><xsl:apply-templates mode="xslthl"/></fo:inline> </xsl:template> -<xsl:template match='xslthl:tag'> - <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline> +<xsl:template match='xslthl:tag' mode="xslthl"> + <fo:inline font-weight="bold"><xsl:apply-templates mode="xslthl"/></fo:inline> </xsl:template> -<xsl:template match='xslthl:attribute'> - <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline> +<xsl:template match='xslthl:attribute' mode="xslthl"> + <fo:inline font-weight="bold"><xsl:apply-templates mode="xslthl"/></fo:inline> </xsl:template> -<xsl:template match='xslthl:value'> - <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline> +<xsl:template match='xslthl:value' mode="xslthl"> + <fo:inline font-weight="bold"><xsl:apply-templates mode="xslthl"/></fo:inline> </xsl:template> <!-- @@ -53,5 +53,23 @@ </xsl:template> --> +<xsl:template match='xslthl:number' mode="xslthl"> + <xsl:apply-templates mode="xslthl"/> +</xsl:template> + +<xsl:template match='xslthl:annotation' mode="xslthl"> + <fo:inline color="gray"><xsl:apply-templates mode="xslthl"/></fo:inline> +</xsl:template> + +<xsl:template match='xslthl:directive' mode="xslthl"> + <xsl:apply-templates mode="xslthl"/> +</xsl:template> + +<!-- Not sure which element will be in final XSLTHL 2.0 --> +<xsl:template match='xslthl:doccomment|xslthl:doctype' mode="xslthl"> + <fo:inline font-weight="bold"><xsl:apply-templates mode="xslthl"/></fo:inline> +</xsl:template> + + </xsl:stylesheet> Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/fo/param.ent 2008-07-18 21:26:36 UTC (rev 8092) @@ -89,6 +89,7 @@ <!ENTITY headers.on.blank.pages SYSTEM "../params/headers.on.blank.pages.xml"> <!ENTITY highlight.default.language SYSTEM "../params/highlight.default.language.xml"> <!ENTITY highlight.source SYSTEM "../params/highlight.source.xml"> +<!ENTITY highlight.xslthl.config SYSTEM "../params/highlight.xslthl.config.xml"> <!ENTITY hyphenate SYSTEM "../params/hyphenate.xml"> <!ENTITY hyphenate.verbatim SYSTEM "../params/hyphenate.verbatim.xml"> <!ENTITY hyphenate.verbatim.characters SYSTEM "../params/hyphenate.verbatim.characters.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/fo/param.xweb 2008-07-18 21:26:36 UTC (rev 8092) @@ -256,6 +256,7 @@ &subscript.properties; &pgwide.properties; &highlight.source; +&highlight.xslthl.config; &highlight.default.language; &email.delimiters.enabled; §ion.container.element; @@ -649,6 +650,7 @@ <src:fragref linkend="headers.on.blank.pages.frag"/> <src:fragref linkend="highlight.default.language.frag"/> <src:fragref linkend="highlight.source.frag"/> +<src:fragref linkend="highlight.xslthl.config.frag"/> <src:fragref linkend="hyphenate.frag"/> <src:fragref linkend="hyphenate.verbatim.frag"/> <src:fragref linkend="hyphenate.verbatim.characters.frag"/> Modified: trunk/xsl/highlighting/c-hl.xml =================================================================== --- trunk/xsl/highlighting/c-hl.xml 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/highlighting/c-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -1,105 +1,101 @@ -<?xml version='1.0'?> -<highlighters> - -<highlighter type='multiline-comment'> - <start>/*</start> - <end>*/</end> -</highlighter> - -<highlighter type='oneline-comment'> - // -</highlighter> - -<highlighter type='oneline-comment'> - # -</highlighter> - -<highlighter type='string'> - <string>"</string> - <escape>\</escape> -</highlighter> - -<highlighter type='string'> - <string>'</string> - <escape>\</escape> -</highlighter> - -<highlighter type='heredoc'> - <start><<<</start> -</highlighter> - -<highlighter type='keywords'> - <keyword>and</keyword> - <keyword>auto</keyword> - <keyword>break</keyword> - <keyword>case</keyword> - <keyword>char</keyword> - <keyword>class</keyword> - <keyword>__CLASS__</keyword> - <keyword>const</keyword> - <keyword>continue</keyword> - <keyword>declare</keyword> - <keyword>default</keyword> - <keyword>do</keyword> - <keyword>double</keyword> - <keyword>else</keyword> - <keyword>enum</keyword> - <keyword>exit</keyword> - <keyword>extern</keyword> - <keyword>__FILE__</keyword> - <keyword>float</keyword> - <keyword>for</keyword> - <keyword>global</keyword> - <keyword>goto</keyword> - <keyword>if</keyword> - <keyword>include</keyword> - <keyword>int</keyword> - <keyword>__LINE__</keyword> - <keyword>long</keyword> - <keyword>new</keyword> - <keyword>or</keyword> - <keyword>private</keyword> - <keyword>protected</keyword> - <keyword>public</keyword> - <keyword>register</keyword> - <keyword>return</keyword> - <keyword>short</keyword> - <keyword>signed</keyword> - <keyword>sizeof</keyword> - <keyword>static</keyword> - <keyword>struct</keyword> - <keyword>switch</keyword> - <keyword>typedef</keyword> - <keyword>union</keyword> - <keyword>unsigned</keyword> - <keyword>void</keyword> - <keyword>volatile</keyword> - <keyword>while</keyword> - <ignoreCase/> -</highlighter> - -</highlighters> -<!-- - -Copyright (c) 2005 Michal Molhanec - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source - distribution. - ---> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> + <!-- + Syntax highlighting definition for C xslthl - XSLT Syntax Highlighting http://sourceforge.net/projects/xslthl/ + Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any + express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this + software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and + to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not + be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an + acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must + be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be + removed or altered from any source distribution. Michal Molhanec <mol1111 at users.sourceforge.net> Jirka Kosek <kosek + at users.sourceforge.net> Michiel Hendriks <elmuerte at users.sourceforge.net> + --> +<highlighters> + <highlighter type="multiline-comment"> + <start>/**</start> + <end>*/</end> + <style>doccomment</style> + </highlighter> + <highlighter type="oneline-comment"> + <start>///</start> + <style>doccomment</style> + </highlighter> + <highlighter type="multiline-comment"> + <start>/*</start> + <end>*/</end> + </highlighter> + <highlighter type="oneline-comment">//</highlighter> + <highlighter type="oneline-comment"> + <!-- use the online-comment highlighter to detect directives --> + <start>#</start> + <lineBreakEscape>\</lineBreakEscape> + <style>directive</style> + </highlighter> + <highlighter type="string"> + <string>"</string> + <escape>\</escape> + </highlighter> + <highlighter type="string"> + <string>'</string> + <escape>\</escape> + </highlighter> + <highlighter type="hexnumber"> + <prefix>0x</prefix> + <suffix>ul</suffix> + <suffix>lu</suffix> + <suffix>u</suffix> + <suffix>l</suffix> + <ignoreCase /> + </highlighter> + <highlighter type="number"> + <point>.</point> + <pointStarts /> + <exponent>e</exponent> + <suffix>ul</suffix> + <suffix>lu</suffix> + <suffix>u</suffix> + <suffix>f</suffix> + <suffix>l</suffix> + <ignoreCase /> + </highlighter> + <highlighter type="keywords"> + <keyword>auto</keyword> + <keyword>_Bool</keyword> + <keyword>break</keyword> + <keyword>case</keyword> + <keyword>char</keyword> + <keyword>_Complex</keyword> + <keyword>const</keyword> + <keyword>continue</keyword> + <keyword>default</keyword> + <keyword>do</keyword> + <keyword>double</keyword> + <keyword>else</keyword> + <keyword>enum</keyword> + <keyword>extern</keyword> + <keyword>float</keyword> + <keyword>for</keyword> + <keyword>goto</keyword> + <keyword>if</keyword> + <keyword>_Imaginary</keyword> + <keyword>inline</keyword> + <keyword>int</keyword> + <keyword>long</keyword> + <keyword>register</keyword> + <keyword>restrict</keyword> + <keyword>return</keyword> + <keyword>short</keyword> + <keyword>signed</keyword> + <keyword>sizeof</keyword> + <keyword>static</keyword> + <keyword>struct</keyword> + <keyword>switch</keyword> + <keyword>typedef</keyword> + <keyword>union</keyword> + <keyword>unsigned</keyword> + <keyword>void</keyword> + <keyword>volatile</keyword> + <keyword>while</keyword> + </highlighter> +</highlighters> \ No newline at end of file Modified: trunk/xsl/highlighting/common.xsl =================================================================== --- trunk/xsl/highlighting/common.xsl 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/highlighting/common.xsl 2008-07-18 21:26:36 UTC (rev 8092) @@ -1,10 +1,19 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:hl="java:net.sf.xslthl.ConnectorSaxon6" - xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="exsl hl" - version='1.0'> + xmlns:d="http://docbook.org/ns/docbook" + xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6" + xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB" + xmlns:xhl="http://net.sf.xslthl/ConnectorXalan" + xmlns:saxon6="http://icl.com/saxon" + xmlns:saxonb="http://saxon.sf.net/" + xmlns:xalan="http://xml.apache.org/xalan" + + xmlns:exsl="http://exslt.org/common" + xmlns:xslthl="http://xslthl.sf.net" + exclude-result-prefixes="exsl d xslthl s6hl sbhl xhl" + version='1.0'> + <!-- ******************************************************************** $Id$ ******************************************************************** @@ -15,6 +24,18 @@ ******************************************************************** --> +<!-- this construction is needed to have the saxon and xalan connectors working alongside each other --> +<xalan:component prefix="xhl" functions="highlight"> + <xalan:script lang="javaclass" src="xalan://net.sf.xslthl.ConnectorXalan" /> +</xalan:component> + +<!-- for saxon 6 --> +<saxon6:script implements-prefix="s6hl" language="java" src="java:net.sf.xslthl.ConnectorSaxon6" /> + +<!-- for saxon 8.5 and later --> +<saxonb:script implements-prefix="sbhl" language="java" src="java:net.sf.xslthl.ConnectorSaxonB" /> + + <!-- You can override this template to do more complex mapping of language attribute to highlighter language ID (see xslthl-config.xml) --> <xsl:template name="language.to.xslthl"> @@ -33,7 +54,7 @@ <xsl:template name="apply-highlighting"> <xsl:choose> <!-- Do we want syntax highlighting --> - <xsl:when test="$highlight.source != 0 and function-available('hl:highlight')"> + <xsl:when test="$highlight.source != 0"> <xsl:variable name="language"> <xsl:call-template name="language.to.xslthl"> <xsl:with-param name="context" select="."/> @@ -44,7 +65,23 @@ <xsl:variable name="content"> <xsl:apply-templates/> </xsl:variable> - <xsl:apply-templates select="hl:highlight($language, exsl:node-set($content))"/> + <xsl:choose> + <xsl:when test="function-available('s6hl:highlight')"> + <xsl:apply-templates select="s6hl:highlight($language, exsl:node-set($content), $highlight.xslthl.config)" + mode="xslthl"/> + </xsl:when> + <xsl:when test="function-available('sbhl:highlight')"> + <xsl:apply-templates select="sbhl:highlight($language, exsl:node-set($content), $highlight.xslthl.config)" + mode="xslthl"/> + </xsl:when> + <xsl:when test="function-available('xhl:highlight')"> + <xsl:apply-templates select="xhl:highlight($language, exsl:node-set($content), $highlight.xslthl.config)" + mode="xslthl"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$content"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:apply-templates/> @@ -58,5 +95,27 @@ </xsl:choose> </xsl:template> -</xsl:stylesheet> +<!-- A fallback when the specific style isn't recognized --> +<xsl:template match="xslthl:*" mode="xslthl"> + <xsl:message> + <xsl:text>unprocessed xslthl style: </xsl:text> + <xsl:value-of select="local-name(.)" /> + </xsl:message> + <xsl:apply-templates mode="xslthl"/> +</xsl:template> +<!-- Copy over already produced markup (FO/HTML) --> +<xsl:template match="node()" mode="xslthl" priority="-1"> + <xsl:copy> + <xsl:apply-templates select="node()" mode="xslthl"/> + </xsl:copy> +</xsl:template> + +<xsl:template match="*" mode="xslthl"> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:apply-templates select="node()" mode="xslthl"/> + </xsl:copy> +</xsl:template> + +</xsl:stylesheet> \ No newline at end of file Added: trunk/xsl/highlighting/cpp-hl.xml =================================================================== --- trunk/xsl/highlighting/cpp-hl.xml (rev 0) +++ trunk/xsl/highlighting/cpp-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -0,0 +1,150 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Syntax highlighting definition for C++ + +xslthl - XSLT Syntax Highlighting +http://sourceforge.net/projects/xslthl/ +Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Michal Molhanec <mol1111 at users.sourceforge.net> +Jirka Kosek <kosek at users.sourceforge.net> +Michiel Hendriks <elmuerte at users.sourceforge.net> + +--> +<highlighters> + <highlighter type="multiline-comment"> + <start>/**</start> + <end>*/</end> + <style>doccomment</style> + </highlighter> + <highlighter type="oneline-comment"> + <start>///</start> + <style>doccomment</style> + </highlighter> + <highlighter type="multiline-comment"> + <start>/*</start> + <end>*/</end> + </highlighter> + <highlighter type="oneline-comment">//</highlighter> + <highlighter type="oneline-comment"> + <!-- use the online-comment highlighter to detect directives --> + <start>#</start> + <lineBreakEscape>\</lineBreakEscape> + <style>directive</style> + </highlighter> + <highlighter type="string"> + <string>"</string> + <escape>\</escape> + </highlighter> + <highlighter type="string"> + <string>'</string> + <escape>\</escape> + </highlighter> + <highlighter type="hexnumber"> + <prefix>0x</prefix> + <suffix>ul</suffix> + <suffix>lu</suffix> + <suffix>u</suffix> + <suffix>l</suffix> + <ignoreCase /> + </highlighter> + <highlighter type="number"> + <point>.</point> + <pointStarts /> + <exponent>e</exponent> + <suffix>ul</suffix> + <suffix>lu</suffix> + <suffix>u</suffix> + <suffix>f</suffix> + <suffix>l</suffix> + <ignoreCase /> + </highlighter> + <highlighter type="keywords"> + <!-- C keywords --> + <keyword>auto</keyword> + <keyword>_Bool</keyword> + <keyword>break</keyword> + <keyword>case</keyword> + <keyword>char</keyword> + <keyword>_Complex</keyword> + <keyword>const</keyword> + <keyword>continue</keyword> + <keyword>default</keyword> + <keyword>do</keyword> + <keyword>double</keyword> + <keyword>else</keyword> + <keyword>enum</keyword> + <keyword>extern</keyword> + <keyword>float</keyword> + <keyword>for</keyword> + <keyword>goto</keyword> + <keyword>if</keyword> + <keyword>_Imaginary</keyword> + <keyword>inline</keyword> + <keyword>int</keyword> + <keyword>long</keyword> + <keyword>register</keyword> + <keyword>restrict</keyword> + <keyword>return</keyword> + <keyword>short</keyword> + <keyword>signed</keyword> + <keyword>sizeof</keyword> + <keyword>static</keyword> + <keyword>struct</keyword> + <keyword>switch</keyword> + <keyword>typedef</keyword> + <keyword>union</keyword> + <keyword>unsigned</keyword> + <keyword>void</keyword> + <keyword>volatile</keyword> + <keyword>while</keyword> + <!-- C++ keywords --> + <keyword>asm</keyword> + <keyword>dynamic_cast</keyword> + <keyword>namespace</keyword> + <keyword>reinterpret_cast</keyword> + <keyword>try</keyword> + <keyword>bool</keyword> + <keyword>explicit</keyword> + <keyword>new</keyword> + <keyword>static_cast</keyword> + <keyword>typeid</keyword> + <keyword>catch</keyword> + <keyword>false</keyword> + <keyword>operator</keyword> + <keyword>template</keyword> + <keyword>typename</keyword> + <keyword>class</keyword> + <keyword>friend</keyword> + <keyword>private</keyword> + <keyword>this</keyword> + <keyword>using</keyword> + <keyword>const_cast</keyword> + <keyword>inline</keyword> + <keyword>public</keyword> + <keyword>throw</keyword> + <keyword>virtual</keyword> + <keyword>delete</keyword> + <keyword>mutable</keyword> + <keyword>protected</keyword> + <keyword>true</keyword> + <keyword>wchar_t</keyword> + </highlighter> +</highlighters> \ No newline at end of file Added: trunk/xsl/highlighting/csharp-hl.xml =================================================================== --- trunk/xsl/highlighting/csharp-hl.xml (rev 0) +++ trunk/xsl/highlighting/csharp-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Syntax highlighting definition for C# + +xslthl - XSLT Syntax Highlighting +http://sourceforge.net/projects/xslthl/ +Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Michal Molhanec <mol1111 at users.sourceforge.net> +Jirka Kosek <kosek at users.sourceforge.net> +Michiel Hendriks <elmuerte at users.sourceforge.net> + +--> +<highlighters> + <highlighter type="multiline-comment"> + <start>/**</start> + <end>*/</end> + <style>doccomment</style> + </highlighter> + <highlighter type="oneline-comment"> + <start>///</start> + <style>doccomment</style> + </highlighter> + <highlighter type="multiline-comment"> + <start>/*</start> + <end>*/</end> + </highlighter> + <highlighter type="oneline-comment">//</highlighter> + <highlighter type="annotation"> + <!-- annotations are called (custom) "attributes" in .NET --> + <start>[</start> + <end>]</end> + <valueStart>(</valueStart> + <valueEnd>)</valueEnd> + </highlighter> + <highlighter type="oneline-comment"> + <!-- C# supports a couple of directives --> + <start>#</start> + <lineBreakEscape>\</lineBreakEscape> + <style>directive</style> + </highlighter> + <highlighter type="string"> + <!-- strings starting with an "@" can span multiple lines --> + <string>@"</string> + <endString>"</endString> + <escape>\</escape> + <spanNewLines /> + </highlighter> + <highlighter type="string"> + <string>"</string> + <escape>\</escape> + </highlighter> + <highlighter type="string"> + <string>'</string> + <escape>\</escape> + </highlighter> + <highlighter type="hexnumber"> + <prefix>0x</prefix> + <suffix>ul</suffix> + <suffix>lu</suffix> + <suffix>u</suffix> + <suffix>l</suffix> + <ignoreCase /> + </highlighter> + <highlighter type="number"> + <point>.</point> + <pointStarts /> + <exponent>e</exponent> + <suffix>ul</suffix> + <suffix>lu</suffix> + <suffix>u</suffix> + <suffix>f</suffix> + <suffix>d</suffix> + <suffix>m</suffix> + <suffix>l</suffix> + <ignoreCase /> + </highlighter> + <highlighter type="keywords"> + <keyword>abstract</keyword> + <keyword>as</keyword> + <keyword>base</keyword> + <keyword>bool</keyword> + <keyword>break</keyword> + <keyword>byte</keyword> + <keyword>case</keyword> + <keyword>catch</keyword> + <keyword>char</keyword> + <keyword>checked</keyword> + <keyword>class</keyword> + <keyword>const</keyword> + <keyword>continue</keyword> + <keyword>decimal</keyword> + <keyword>default</keyword> + <keyword>delegate</keyword> + <keyword>do</keyword> + <keyword>double</keyword> + <keyword>else</keyword> + <keyword>enum</keyword> + <keyword>event</keyword> + <keyword>explicit</keyword> + <keyword>extern</keyword> + <keyword>false</keyword> + <keyword>finally</keyword> + <keyword>fixed</keyword> + <keyword>float</keyword> + <keyword>for</keyword> + <keyword>foreach</keyword> + <keyword>goto</keyword> + <keyword>if</keyword> + <keyword>implicit</keyword> + <keyword>in</keyword> + <keyword>int</keyword> + <keyword>interface</keyword> + <keyword>internal</keyword> + <keyword>is</keyword> + <keyword>lock</keyword> + <keyword>long</keyword> + <keyword>namespace</keyword> + <keyword>new</keyword> + <keyword>null</keyword> + <keyword>object</keyword> + <keyword>operator</keyword> + <keyword>out</keyword> + <keyword>override</keyword> + <keyword>params</keyword> + <keyword>private</keyword> + <keyword>protected</keyword> + <keyword>public</keyword> + <keyword>readonly</keyword> + <keyword>ref</keyword> + <keyword>return</keyword> + <keyword>sbyte</keyword> + <keyword>sealed</keyword> + <keyword>short</keyword> + <keyword>sizeof</keyword> + <keyword>stackalloc</keyword> + <keyword>static</keyword> + <keyword>string</keyword> + <keyword>struct</keyword> + <keyword>switch</keyword> + <keyword>this</keyword> + <keyword>throw</keyword> + <keyword>true</keyword> + <keyword>try</keyword> + <keyword>typeof</keyword> + <keyword>uint</keyword> + <keyword>ulong</keyword> + <keyword>unchecked</keyword> + <keyword>unsafe</keyword> + <keyword>ushort</keyword> + <keyword>using</keyword> + <keyword>virtual</keyword> + <keyword>void</keyword> + <keyword>volatile</keyword> + <keyword>while</keyword> + </highlighter> + <highlighter type="keywords"> + <!-- special words, not really keywords --> + <keyword>add</keyword> + <keyword>alias</keyword> + <keyword>get</keyword> + <keyword>global</keyword> + <keyword>partial</keyword> + <keyword>remove</keyword> + <keyword>set</keyword> + <keyword>value</keyword> + <keyword>where</keyword> + <keyword>yield</keyword> + </highlighter> +</highlighters> \ No newline at end of file Modified: trunk/xsl/highlighting/delphi-hl.xml =================================================================== --- trunk/xsl/highlighting/delphi-hl.xml 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/highlighting/delphi-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -1,174 +1,200 @@ -<?xml version='1.0'?> -<highlighters> - -<highlighter type='multiline-comment'> - <start>{</start> - <end>}</end> -</highlighter> - -<highlighter type='multiline-comment'> - <start>(*</start> - <end>*)</end> -</highlighter> - -<highlighter type='oneline-comment'> - // -</highlighter> - -<highlighter type='string'> - <string>'</string> - <doubleEscapes/> -</highlighter> - -<highlighter type='keywords'> - - <!-- Reserved words --> - <keyword>and</keyword> - <keyword>else</keyword> - <keyword>inherited</keyword> - <keyword>packed</keyword> - <keyword>then</keyword> - <keyword>array</keyword> - <keyword>end</keyword> - <keyword>initialization</keyword> - <keyword>procedure</keyword> - <keyword>threadvar</keyword> - <keyword>as</keyword> - <keyword>except</keyword> - <keyword>inline</keyword> - <keyword>program</keyword> - <keyword>to</keyword> - <keyword>asm</keyword> - <keyword>exports</keyword> - <keyword>interface</keyword> - <keyword>property</keyword> - <keyword>try</keyword> - <keyword>begin</keyword> - <keyword>file</keyword> - <keyword>is</keyword> - <keyword>raise</keyword> - <keyword>type</keyword> - <keyword>case</keyword> - <keyword>final</keyword> - <keyword>label</keyword> - <keyword>record</keyword> - <keyword>unit</keyword> - <keyword>class</keyword> - <keyword>finalization</keyword> - <keyword>library</keyword> - <keyword>repeat</keyword> - <keyword>unsafe</keyword> - <keyword>const</keyword> - <keyword>finally</keyword> - <keyword>mod</keyword> - <keyword>resourcestring</keyword> - <keyword>until</keyword> - <keyword>constructor</keyword> - <keyword>for</keyword> - <keyword>nil</keyword> - <keyword>sealed</keyword> - <keyword>uses</keyword> - <keyword>destructor</keyword> - <keyword>function</keyword> - <keyword>not</keyword> - <keyword>set</keyword> - <keyword>var</keyword> - <keyword>dispinterface</keyword> - <keyword>goto</keyword> - <keyword>object</keyword> - <keyword>shl</keyword> - <keyword>while</keyword> - <keyword>div</keyword> - <keyword>if</keyword> - <keyword>of</keyword> - <keyword>shr</keyword> - <keyword>with</keyword> - <keyword>do</keyword> - <keyword>implementation</keyword> - <keyword>or</keyword> - <keyword>static</keyword> - <keyword>xor</keyword> - <keyword>downto</keyword> - <keyword>in</keyword> - <keyword>out</keyword> - <keyword>string</keyword> - - <!-- Special meaning --> - <keyword>at</keyword> - <keyword>on</keyword> - - <!-- Directives --> - <keyword>absolute</keyword> - <keyword>dynamic</keyword> - <keyword>local</keyword> - <keyword>platform</keyword> - <keyword>requires</keyword> - <keyword>abstract</keyword> - <keyword>export</keyword> - <keyword>message</keyword> - <keyword>private</keyword> - <keyword>resident</keyword> - <keyword>assembler</keyword> - <keyword>external</keyword> - <keyword>name</keyword> - <keyword>protected</keyword> - <keyword>safecall</keyword> - <keyword>automated</keyword> - <keyword>far</keyword> - <keyword>near</keyword> - <keyword>public</keyword> - <keyword>stdcall</keyword> - <keyword>cdecl</keyword> - <keyword>forward</keyword> - <keyword>nodefault</keyword> - <keyword>published</keyword> - <keyword>stored</keyword> - <keyword>contains</keyword> - <keyword>implements</keyword> - <keyword>overload</keyword> - <keyword>read</keyword> - <keyword>varargs</keyword> - <keyword>default</keyword> - <keyword>index</keyword> - <keyword>override</keyword> - <keyword>readonly</keyword> - <keyword>virtual</keyword> - <keyword>deprecated</keyword> - <keyword>inline</keyword> - <keyword>package</keyword> - <keyword>register</keyword> - <keyword>write</keyword> - <keyword>dispid</keyword> - <keyword>library</keyword> - <keyword>pascal</keyword> - <keyword>reintroduce</keyword> - <keyword>writeonly</keyword> - - <ignoreCase/> -</highlighter> - -</highlighters> -<!-- - -Copyright (c) 2005 Michal Molhanec - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source - distribution. - ---> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Syntax highlighting definition for Delphi (also suitable for Pascal) + +xslthl - XSLT Syntax Highlighting +http://sourceforge.net/projects/xslthl/ +Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Michal Molhanec <mol1111 at users.sourceforge.net> +Jirka Kosek <kosek at users.sourceforge.net> +Michiel Hendriks <elmuerte at users.sourceforge.net> + +--> +<highlighters> + <highlighter type="multiline-comment"> + <!-- multiline comments starting with an $ are directives --> + <start>{$</start> + <end>}</end> + <style>directive</style> + </highlighter> + <highlighter type="multiline-comment"> + <!-- multiline comments starting with an $ are directives --> + <start>(*$</start> + <end>)</end> + <style>directive</style> + </highlighter> + <highlighter type="multiline-comment"> + <start>{</start> + <end>}</end> + </highlighter> + <highlighter type="multiline-comment"> + <start>(*</start> + <end>*)</end> + </highlighter> + <highlighter type="oneline-comment">//</highlighter> + <highlighter type="string"> + <string>'</string> + <doubleEscapes /> + </highlighter> + <highlighter type="hexnumber"> + <prefix>#$</prefix> + <ignoreCase /> + <style>string</style> + </highlighter> + <highlighter type="number"> + <prefix>#</prefix> + <ignoreCase /> + <style>string</style> + </highlighter> + <highlighter type="hexnumber"> + <prefix>$</prefix> + <ignoreCase /> + </highlighter> + <highlighter type="number"> + <point>.</point> + <exponent>e</exponent> + <ignoreCase /> + </highlighter> + <highlighter type="keywords"> + <!-- Reserved words --> + <keyword>and</keyword> + <keyword>else</keyword> + <keyword>inherited</keyword> + <keyword>packed</keyword> + <keyword>then</keyword> + <keyword>array</keyword> + <keyword>end</keyword> + <keyword>initialization</keyword> + <keyword>procedure</keyword> + <keyword>threadvar</keyword> + <keyword>as</keyword> + <keyword>except</keyword> + <keyword>inline</keyword> + <keyword>program</keyword> + <keyword>to</keyword> + <keyword>asm</keyword> + <keyword>exports</keyword> + <keyword>interface</keyword> + <keyword>property</keyword> + <keyword>try</keyword> + <keyword>begin</keyword> + <keyword>file</keyword> + <keyword>is</keyword> + <keyword>raise</keyword> + <keyword>type</keyword> + <keyword>case</keyword> + <keyword>final</keyword> + <keyword>label</keyword> + <keyword>record</keyword> + <keyword>unit</keyword> + <keyword>class</keyword> + <keyword>finalization</keyword> + <keyword>library</keyword> + <keyword>repeat</keyword> + <keyword>unsafe</keyword> + <keyword>const</keyword> + <keyword>finally</keyword> + <keyword>mod</keyword> + <keyword>resourcestring</keyword> + <keyword>until</keyword> + <keyword>constructor</keyword> + <keyword>for</keyword> + <keyword>nil</keyword> + <keyword>sealed</keyword> + <keyword>uses</keyword> + <keyword>destructor</keyword> + <keyword>function</keyword> + <keyword>not</keyword> + <keyword>set</keyword> + <keyword>var</keyword> + <keyword>dispinterface</keyword> + <keyword>goto</keyword> + <keyword>object</keyword> + <keyword>shl</keyword> + <keyword>while</keyword> + <keyword>div</keyword> + <keyword>if</keyword> + <keyword>of</keyword> + <keyword>shr</keyword> + <keyword>with</keyword> + <keyword>do</keyword> + <keyword>implementation</keyword> + <keyword>or</keyword> + <keyword>static</keyword> + <keyword>xor</keyword> + <keyword>downto</keyword> + <keyword>in</keyword> + <keyword>out</keyword> + <keyword>string</keyword> + + <!-- Special meaning --> + <keyword>at</keyword> + <keyword>on</keyword> + + <!-- Directives --> + <keyword>absolute</keyword> + <keyword>dynamic</keyword> + <keyword>local</keyword> + <keyword>platform</keyword> + <keyword>requires</keyword> + <keyword>abstract</keyword> + <keyword>export</keyword> + <keyword>message</keyword> + <keyword>private</keyword> + <keyword>resident</keyword> + <keyword>assembler</keyword> + <keyword>external</keyword> + <keyword>name</keyword> + <keyword>protected</keyword> + <keyword>safecall</keyword> + <keyword>automated</keyword> + <keyword>far</keyword> + <keyword>near</keyword> + <keyword>public</keyword> + <keyword>stdcall</keyword> + <keyword>cdecl</keyword> + <keyword>forward</keyword> + <keyword>nodefault</keyword> + <keyword>published</keyword> + <keyword>stored</keyword> + <keyword>contains</keyword> + <keyword>implements</keyword> + <keyword>overload</keyword> + <keyword>read</keyword> + <keyword>varargs</keyword> + <keyword>default</keyword> + <keyword>index</keyword> + <keyword>override</keyword> + <keyword>readonly</keyword> + <keyword>virtual</keyword> + <keyword>deprecated</keyword> + <keyword>inline</keyword> + <keyword>package</keyword> + <keyword>register</keyword> + <keyword>write</keyword> + <keyword>dispid</keyword> + <keyword>library</keyword> + <keyword>pascal</keyword> + <keyword>reintroduce</keyword> + <keyword>writeonly</keyword> + <ignoreCase /> + </highlighter> +</highlighters> \ No newline at end of file Modified: trunk/xsl/highlighting/ini-hl.xml =================================================================== --- trunk/xsl/highlighting/ini-hl.xml 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/highlighting/ini-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -1,43 +1,45 @@ -<?xml version='1.0'?> -<highlighters> - -<wholehighlighter type='regex'> - <pattern>(?m)(;.*)$</pattern> - <style>comment</style> -</wholehighlighter> - -<wholehighlighter type='regex'> - <pattern>(?m)^(\[.+\]\s*)$</pattern> - <style>section</style> -</wholehighlighter> - -<wholehighlighter type='regex'> - <pattern>(?m)^(.+=)</pattern> - <style>keyword</style> -</wholehighlighter> - -</highlighters> -<!-- - -Copyright (c) 2005 Michal Molhanec - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source - distribution. - ---> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Syntax highlighting definition for ini files + +xslthl - XSLT Syntax Highlighting +http://sourceforge.net/projects/xslthl/ +Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Michal Molhanec <mol1111 at users.sourceforge.net> +Jirka Kosek <kosek at users.sourceforge.net> +Michiel Hendriks <elmuerte at users.sourceforge.net> + +--> +<highlighters> + <highlighter type="oneline-comment">;</highlighter> + <highlighter type="regex"> + <!-- ini sections --> + <pattern>^(\[.+\]\s*)$</pattern> + <style>keyword</style> + <flags>MULTILINE</flags> + </highlighter> + <highlighter type="regex"> + <!-- the keys in an ini section --> + <pattern>^(.+)(?==)</pattern> + <style>attribute</style> + <flags>MULTILINE</flags> + </highlighter> +</highlighters> \ No newline at end of file Modified: trunk/xsl/highlighting/java-hl.xml =================================================================== --- trunk/xsl/highlighting/java-hl.xml 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/highlighting/java-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -1,98 +1,117 @@ -<?xml version='1.0'?> -<highlighters> - -<highlighter type='multiline-comment'> - <start>/*</start> - <end>*/</end> -</highlighter> - -<highlighter type='oneline-comment'> - // -</highlighter> - -<highlighter type='string'> - <string>"</string> - <escape>\</escape> -</highlighter> - -<highlighter type='string'> - <string>'</string> - <escape>\</escape> -</highlighter> - -<highlighter type='keywords'> - <keyword>abstract</keyword> - <keyword>boolean</keyword> - <keyword>break</keyword> - <keyword>byte</keyword> - <keyword>case</keyword> - <keyword>catch</keyword> - <keyword>char</keyword> - <keyword>class</keyword> - <keyword>const</keyword> - <keyword>continue</keyword> - <keyword>default</keyword> - <keyword>do</keyword> - <keyword>double</keyword> - <keyword>else</keyword> - <keyword>extends</keyword> - <keyword>final</keyword> - <keyword>finally</keyword> - <keyword>float</keyword> - <keyword>for</keyword> - <keyword>goto</keyword> - <keyword>if</keyword> - <keyword>implements</keyword> - <keyword>import</keyword> - <keyword>instanceof</keyword> - <keyword>int</keyword> - <keyword>interface</keyword> - <keyword>long</keyword> - <keyword>native</keyword> - <keyword>new</keyword> - <keyword>package</keyword> - <keyword>private</keyword> - <keyword>protected</keyword> - <keyword>public</keyword> - <keyword>return</keyword> - <keyword>short</keyword> - <keyword>static</keyword> - <keyword>strictfp</keyword> - <keyword>super</keyword> - <keyword>switch</keyword> - <keyword>synchronized</keyword> - <keyword>this</keyword> - <keyword>throw</keyword> - <keyword>throws</keyword> - <keyword>transient</keyword> - <keyword>try</keyword> - <keyword>void</keyword> - <keyword>volatile</keyword> - <keyword>while</keyword> -</highlighter> - -</highlighters> -<!-- - -Copyright (c) 2005 Michal Molhanec - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source - distribution. - ---> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Syntax highlighting definition for Java + +xslthl - XSLT Syntax Highlighting +http://sourceforge.net/projects/xslthl/ +Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Michal Molhanec <mol1111 at users.sourceforge.net> +Jirka Kosek <kosek at users.sourceforge.net> +Michiel Hendriks <elmuerte at users.sourceforge.net> + +--> +<highlighters> + <highlighter type="multiline-comment"> + <start>/**</start> + <end>*/</end> + <style>doccomment</style> + </highlighter> + <highlighter type="multiline-comment"> + <start>/*</start> + <end>*/</end> + </highlighter> + <highlighter type="oneline-comment">//</highlighter> + <highlighter type="string"> + <string>"</string> + <escape>\</escape> + </highlighter> + <highlighter type="string"> + <string>'</string> + <escape>\</escape> + </highlighter> + <highlighter type="annotation"> + <start>@</start> + <valueStart>(</valueStart> + <valueEnd>)</valueEnd> + </highlighter> + <highlighter type="hexnumber"> + <prefix>0x</prefix> + <ignoreCase /> + </highlighter> + <highlighter type="number"> + <point>.</point> + <exponent>e</exponent> + <suffix>f</suffix> + <suffix>d</suffix> + <suffix>l</suffix> + <ignoreCase /> + </highlighter> + <highlighter type="keywords"> + <keyword>abstract</keyword> + <keyword>boolean</keyword> + <keyword>break</keyword> + <keyword>byte</keyword> + <keyword>case</keyword> + <keyword>catch</keyword> + <keyword>char</keyword> + <keyword>class</keyword> + <keyword>const</keyword> + <keyword>continue</keyword> + <keyword>default</keyword> + <keyword>do</keyword> + <keyword>double</keyword> + <keyword>else</keyword> + <keyword>extends</keyword> + <keyword>final</keyword> + <keyword>finally</keyword> + <keyword>float</keyword> + <keyword>for</keyword> + <keyword>goto</keyword> + <keyword>if</keyword> + <keyword>implements</keyword> + <keyword>import</keyword> + <keyword>instanceof</keyword> + <keyword>int</keyword> + <keyword>interface</keyword> + <keyword>long</keyword> + <keyword>native</keyword> + <keyword>new</keyword> + <keyword>package</keyword> + <keyword>private</keyword> + <keyword>protected</keyword> + <keyword>public</keyword> + <keyword>return</keyword> + <keyword>short</keyword> + <keyword>static</keyword> + <keyword>strictfp</keyword> + <keyword>super</keyword> + <keyword>switch</keyword> + <keyword>synchronized</keyword> + <keyword>this</keyword> + <keyword>throw</keyword> + <keyword>throws</keyword> + <keyword>transient</keyword> + <keyword>try</keyword> + <keyword>void</keyword> + <keyword>volatile</keyword> + <keyword>while</keyword> + </highlighter> +</highlighters> \ No newline at end of file Added: trunk/xsl/highlighting/javascript-hl.xml =================================================================== --- trunk/xsl/highlighting/javascript-hl.xml (rev 0) +++ trunk/xsl/highlighting/javascript-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Syntax highlighting definition for JavaScript + +xslthl - XSLT Syntax Highlighting +http://sourceforge.net/projects/xslthl/ +Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Michal Molhanec <mol1111 at users.sourceforge.net> +Jirka Kosek <kosek at users.sourceforge.net> +Michiel Hendriks <elmuerte at users.sourceforge.net> + +--> +<highlighters> + <highlighter type="multiline-comment"> + <start>/*</start> + <end>*/</end> + </highlighter> + <highlighter type="oneline-comment">//</highlighter> + <highlighter type="string"> + <string>"</string> + <escape>\</escape> + </highlighter> + <highlighter type="string"> + <string>'</string> + <escape>\</escape> + </highlighter> + <highlighter type="hexnumber"> + <prefix>0x</prefix> + <ignoreCase /> + </highlighter> + <highlighter type="number"> + <point>.</point> + <exponent>e</exponent> + <ignoreCase /> + </highlighter> + <highlighter type="keywords"> + <keyword>break</keyword> + <keyword>case</keyword> + <keyword>catch</keyword> + <keyword>continue</keyword> + <keyword>default</keyword> + <keyword>delete</keyword> + <keyword>do</keyword> + <keyword>else</keyword> + <keyword>finally</keyword> + <keyword>for</keyword> + <keyword>function</keyword> + <keyword>if</keyword> + <keyword>in</keyword> + <keyword>instanceof</keyword> + <keyword>new</keyword> + <keyword>return</keyword> + <keyword>switch</keyword> + <keyword>this</keyword> + <keyword>throw</keyword> + <keyword>try</keyword> + <keyword>typeof</keyword> + <keyword>var</keyword> + <keyword>void</keyword> + <keyword>while</keyword> + <keyword>with</keyword> + <!-- future keywords --> + <keyword>abstract</keyword> + <keyword>boolean</keyword> + <keyword>byte</keyword> + <keyword>char</keyword> + <keyword>class</keyword> + <keyword>const</keyword> + <keyword>debugger</keyword> + <keyword>double</keyword> + <keyword>enum</keyword> + <keyword>export</keyword> + <keyword>extends</keyword> + <keyword>final</keyword> + <keyword>float</keyword> + <keyword>goto</keyword> + <keyword>implements</keyword> + <keyword>import</keyword> + <keyword>int</keyword> + <keyword>interface</keyword> + <keyword>long</keyword> + <keyword>native</keyword> + <keyword>package</keyword> + <keyword>private</keyword> + <keyword>protected</keyword> + <keyword>public</keyword> + <keyword>short</keyword> + <keyword>static</keyword> + <keyword>super</keyword> + <keyword>synchronized</keyword> + <keyword>throws</keyword> + <keyword>transient</keyword> + <keyword>volatile</keyword> + </highlighter> + <highlighter type="keywords"> + <keyword>prototype</keyword> + <!-- Global Objects --> + <keyword>Array</keyword> + <keyword>Boolean</keyword> + <keyword>Date</keyword> + <keyword>Error</keyword> + <keyword>EvalError</keyword> + <keyword>Function</keyword> + <keyword>Math</keyword> + <keyword>Number</keyword> + <keyword>Object</keyword> + <keyword>RangeError</keyword> + <keyword>ReferenceError</keyword> + <keyword>RegExp</keyword> + <keyword>String</keyword> + <keyword>SyntaxError</keyword> + <keyword>TypeError</keyword> + <keyword>URIError</keyword> + <!-- Global functions --> + <keyword>decodeURI</keyword> + <keyword>decodeURIComponent</keyword> + <keyword>encodeURI</keyword> + <keyword>encodeURIComponent</keyword> + <keyword>eval</keyword> + <keyword>isFinite</keyword> + <keyword>isNaN</keyword> + <keyword>parseFloat</keyword> + <keyword>parseInt</keyword> + <!-- Global properties --> + <keyword>Infinity</keyword> + <keyword>NaN</keyword> + <keyword>undefined</keyword> + </highlighter> +</highlighters> \ No newline at end of file Modified: trunk/xsl/highlighting/m2-hl.xml =================================================================== --- trunk/xsl/highlighting/m2-hl.xml 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/highlighting/m2-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -1,86 +1,90 @@ -<?xml version='1.0'?> -<highlighters> - -<highlighter type='nested-multiline-comment'> - <start>(*</start> - <end>*)</end> -</highlighter> - -<highlighter type='string'> - <string>"</string> -</highlighter> - -<highlighter type='string'> - <string>'</string> -</highlighter> - -<highlighter type='keywords'> - <keyword>and</keyword> - <keyword>array</keyword> - <keyword>begin</keyword> - <keyword>by</keyword> - <keyword>case</keyword> - <keyword>const</keyword> - <keyword>definition</keyword> - <keyword>div</keyword> - <keyword>do</keyword> - <keyword>else</keyword> - <keyword>elsif</keyword> - <keyword>end</keyword> - <keyword>exit</keyword> - <keyword>export</keyword> - <keyword>for</keyword> - <keyword>from</keyword> - <keyword>if</keyword> - <keyword>implementation</keyword> - <keyword>import</keyword> - <keyword>in</keyword> - <keyword>loop</keyword> - <keyword>mod</keyword> - <keyword>module</keyword> - <keyword>not</keyword> - <keyword>of</keyword> - <keyword>or</keyword> - <keyword>pointer</keyword> - <keyword>procedure</keyword> - <keyword>qualified</keyword> - <keyword>record</keyword> - <keyword>repeat</keyword> - <keyword>return</keyword> - <keyword>set</keyword> - <keyword>then</keyword> - <keyword>to</keyword> - <keyword>type</keyword> - <keyword>until</keyword> - <keyword>var</keyword> - <keyword>while</keyword> - <keyword>with</keyword> - - <ignoreCase/> -</highlighter> - -</highlighters> -<!-- - -Copyright (c) 2005 Michal Molhanec - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source - distribution. - ---> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Syntax highlighting definition for Modulo-2 + +xslthl - XSLT Syntax Highlighting +http://sourceforge.net/projects/xslthl/ +Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Michal Molhanec <mol1111 at users.sourceforge.net> +Jirka Kosek <kosek at users.sourceforge.net> +Michiel Hendriks <elmuerte at users.sourceforge.net> + +--> +<highlighters> + <highlighter type="nested-multiline-comment"> + <start>(*</start> + <end>*)</end> + </highlighter> + <highlighter type="string"> + <string>"</string> + </highlighter> + <highlighter type="string"> + <string>'</string> + </highlighter> + <highlighter type="number"> + <point>.</point> + <exponent>e</exponent> + <ignoreCase /> + </highlighter> + <highlighter type="keywords"> + <keyword>and</keyword> + <keyword>array</keyword> + <keyword>begin</keyword> + <keyword>by</keyword> + <keyword>case</keyword> + <keyword>const</keyword> + <keyword>definition</keyword> + <keyword>div</keyword> + <keyword>do</keyword> + <keyword>else</keyword> + <keyword>elsif</keyword> + <keyword>end</keyword> + <keyword>exit</keyword> + <keyword>export</keyword> + <keyword>for</keyword> + <keyword>from</keyword> + <keyword>if</keyword> + <keyword>implementation</keyword> + <keyword>import</keyword> + <keyword>in</keyword> + <keyword>loop</keyword> + <keyword>mod</keyword> + <keyword>module</keyword> + <keyword>not</keyword> + <keyword>of</keyword> + <keyword>or</keyword> + <keyword>pointer</keyword> + <keyword>procedure</keyword> + <keyword>qualified</keyword> + <keyword>record</keyword> + <keyword>repeat</keyword> + <keyword>return</keyword> + <keyword>set</keyword> + <keyword>then</keyword> + <keyword>to</keyword> + <keyword>type</keyword> + <keyword>until</keyword> + <keyword>var</keyword> + <keyword>while</keyword> + <keyword>with</keyword> + <ignoreCase /> + </highlighter> +</highlighters> \ No newline at end of file Modified: trunk/xsl/highlighting/myxml-hl.xml =================================================================== --- trunk/xsl/highlighting/myxml-hl.xml 2008-07-18 12:32:56 UTC (rev 8091) +++ trunk/xsl/highlighting/myxml-hl.xml 2008-07-18 21:26:36 UTC (rev 8092) @@ -1,131 +1,116 @@ -<?xml version='1.0'?> -<highlighters> - -<wholehighlighter type='xml'> - <elementSet> - <style>html</style> - <element>A</element> - <element>ABBR</element> - <element>ACRONYM</element> - <element>ADDRESS</element> - <element>APPLET</element> - <element>AREA</element> - <element>B</element> - <element>BASE</element> - <element>BASEFONT</element> - <element>BDO</element> - <element>BIG</element> - <element>BLOCKQUOTE</element> - <element>BODY</element> - <element>BR</element> - <element>BUTTON</element> - <element>CAPTION</element> - <element>CENTER</element> - <element>CITE</element> - <element>CODE</element> - <element>COL</element> - <element>COLGROUP</element> - <element>DD</element> - <element>DEL</element> - <element>DFN</element> - <element>DIR</element> - <element>DIV</element> - <element>DL</element> - <element>DT</element> - <element>EM</element> - <element>FIELDSET</element> - <element>FONT</element> - <element>FORM</element> - <element>FRAME</element> - <element>FRAMESET</element> - <element>H1</element> - <element>H2</element> - <element>H3</element> - <element>H4</element> - <element>H5</element> - <element>H6</element> - <element>HEAD</element> - <element>HR</element> - <element>HTML</element> - <element>I</element> - <element>IFRAME</element> - <element>IMG</element> - <element>INPUT</element> - <element>INS</element> - <element>ISINDEX</element> - <element>KBD</element> - <element>LABEL</element> - <element>LEGEND</element> - <element>LI</element> - <element>LINK</element> - <element>MAP</element> - <element>MENU</element> - <element>META</element> - <element>NOFRAMES</element> - <element>NOSCRIPT</element> - <element>OBJECT</element> - <element>OL</element> - <element>OPTGROUP</element> - <element>OPTION</element> - <e... [truncated message content] |
From: <mz...@us...> - 2008-08-03 13:08:00
|
Revision: 8096 http://docbook.svn.sourceforge.net/docbook/?rev=8096&view=rev Author: mzjn Date: 2008-08-03 13:07:57 +0000 (Sun, 03 Aug 2008) Log Message: ----------- Removed duplicate templates. Closes bug #2034582. Modified Paths: -------------- trunk/xsl/fo/toc.xsl trunk/xsl/html/toc.xsl Modified: trunk/xsl/fo/toc.xsl =================================================================== --- trunk/xsl/fo/toc.xsl 2008-08-03 13:04:59 UTC (rev 8095) +++ trunk/xsl/fo/toc.xsl 2008-08-03 13:07:57 UTC (rev 8096) @@ -256,12 +256,6 @@ <xsl:call-template name="component.toc"/> </xsl:template> -<xsl:template match="*" mode="toc.for.section"> -<!-- - <xsl:call-template name="section.toc"/> ---> -</xsl:template> - <xsl:template match="*" mode="toc.for.division"> <xsl:call-template name="division.toc"/> </xsl:template> Modified: trunk/xsl/html/toc.xsl =================================================================== --- trunk/xsl/html/toc.xsl 2008-08-03 13:04:59 UTC (rev 8095) +++ trunk/xsl/html/toc.xsl 2008-08-03 13:07:57 UTC (rev 8096) @@ -153,10 +153,6 @@ <xsl:call-template name="component.toc"/> </xsl:template> -<xsl:template match="*" mode="toc.for.section"> - <xsl:call-template name="section.toc"/> -</xsl:template> - <xsl:template match="*" mode="toc.for.division"> <xsl:call-template name="division.toc"/> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2008-09-01 09:33:32
|
Revision: 8114 http://docbook.svn.sourceforge.net/docbook/?rev=8114&view=rev Author: xmldoc Date: 2008-09-01 09:33:17 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Added new param email.mailto.enabled for FO output. Patch from Paolo Borelli. Closes #2086321. Modified Paths: -------------- trunk/xsl/fo/inline.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Added Paths: ----------- trunk/xsl/params/email.mailto.enabled.xml Modified: trunk/xsl/fo/inline.xsl =================================================================== --- trunk/xsl/fo/inline.xsl 2008-08-28 19:25:59 UTC (rev 8113) +++ trunk/xsl/fo/inline.xsl 2008-09-01 09:33:17 UTC (rev 8114) @@ -992,7 +992,20 @@ <xsl:if test="not($email.delimiters.enabled = 0)"> <xsl:text><</xsl:text> </xsl:if> - <xsl:apply-templates/> + <xsl:choose> + <xsl:when test="not($email.mailto.enabled = 0)"> + <fo:basic-link xsl:use-attribute-sets="xref.properties" + keep-together.within-line="always" hyphenate="false"> + <xsl:attribute name="external-destination"> + mailto:<xsl:value-of select="string(.)" /> + </xsl:attribute> + <xsl:apply-templates/> + </fo:basic-link> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> <xsl:if test="not($email.delimiters.enabled = 0)"> <xsl:text>></xsl:text> </xsl:if> Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2008-08-28 19:25:59 UTC (rev 8113) +++ trunk/xsl/fo/param.ent 2008-09-01 09:33:17 UTC (rev 8114) @@ -54,6 +54,7 @@ <!ENTITY draft.mode SYSTEM "../params/draft.mode.xml"> <!ENTITY draft.watermark.image SYSTEM "../params/draft.watermark.image.xml"> <!ENTITY email.delimiters.enabled SYSTEM "../params/email.delimiters.enabled.xml"> +<!ENTITY email.mailto.enabled SYSTEM "../params/email.mailto.enabled.xml"> <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml"> <!ENTITY footer.rule SYSTEM "../params/footer.rule.xml"> <!ENTITY footer.column.widths SYSTEM "../params/footer.column.widths.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2008-08-28 19:25:59 UTC (rev 8113) +++ trunk/xsl/fo/param.xweb 2008-09-01 09:33:17 UTC (rev 8114) @@ -259,6 +259,7 @@ &highlight.xslthl.config; &highlight.default.language; &email.delimiters.enabled; +&email.mailto.enabled; §ion.container.element; </reference> <reference xml:id="graphics"><title>Graphics</title> @@ -605,6 +606,7 @@ <src:fragref linkend="ebnf.assignment.frag"/> <src:fragref linkend="ebnf.statement.terminator.frag"/> <src:fragref linkend="email.delimiters.enabled.frag"/> +<src:fragref linkend="email.mailto.enabled.frag"/> <src:fragref linkend="equation.properties.frag"/> <src:fragref linkend="example.properties.frag"/> <src:fragref linkend="figure.properties.frag"/> Added: trunk/xsl/params/email.mailto.enabled.xml =================================================================== --- trunk/xsl/params/email.mailto.enabled.xml (rev 0) +++ trunk/xsl/params/email.mailto.enabled.xml 2008-09-01 09:33:17 UTC (rev 8114) @@ -0,0 +1,29 @@ +<refentry xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="5.0" xml:id="email.mailto.enabled"> +<refmeta> +<refentrytitle>email.mailto.enabled</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>email.mailto.enabled</refname> +<refpurpose>Generate mailto: links for email addresses?</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment xml:id="email.mailto.enabled.frag"> +<xsl:param name="email.mailto.enabled" select="0"/> +</src:fragment> +</refsynopsisdiv> + +<refsection><info><title>Description</title></info> + +<para>If non-zero the generated output for the <tag>email</tag> element +will be a clickable mailto: link that brings up the default mail client +on the system.</para> + +</refsection> +</refentry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2009-02-09 16:22:24
|
Revision: 8235 http://docbook.svn.sourceforge.net/docbook/?rev=8235&view=rev Author: xmldoc Date: 2009-02-09 16:22:14 +0000 (Mon, 09 Feb 2009) Log Message: ----------- This change closes bug 2013441 and makes man-page output generally usable again on Solaris and other platforms that use AT&T troff instead of groff. The change was to add man.output.better.ps.enabled parameter, with its default value set to zero. If the value of the man.output.better.ps.enabled parameter is non-zero, certain markup is embedded in each generated man page such that PostScript output from the man -Tps command for that page will include a number of enhancements designed to improve the quality of that output. If man.output.better.ps.enabled is zero (the default), no such markup is embedded in generated man pages, and no enhancements are included in the PostScript output generated from those man pages by the man -Tps command. WARNING: The enhancements provided by this parameter rely on features that are specific to groff (GNU troff) and that are not part of "classic" AT&T troff or any of its derivatives. Therefore, any man pages you generate with this parameter enabled will be readable only on systems on which the groff (GNU troff) program is installed, such as GNU/Linux systems. The pages will not not be readable on systems on with the classic troff (AT&T troff) command is installed. NOTE: The value of this parameter only affects PostScript output generated from the man command. It has no effect on output generated using the FO backend. TIP: You can generate PostScript output for any man page by running the following command: man FOO -Tps > FOO.ps You can then generate PDF output by running the following command: ps2pdf FOO.ps Modified Paths: -------------- trunk/xsl/manpages/block.xsl trunk/xsl/manpages/docbook.xsl trunk/xsl/manpages/other.xsl trunk/xsl/manpages/param.ent trunk/xsl/manpages/param.xweb trunk/xsl/manpages/refentry.xsl trunk/xsl/manpages/utility.xsl Added Paths: ----------- trunk/xsl/params/man.output.better.ps.enabled.xml Modified: trunk/xsl/manpages/block.xsl =================================================================== --- trunk/xsl/manpages/block.xsl 2009-02-09 12:10:48 UTC (rev 8234) +++ trunk/xsl/manpages/block.xsl 2009-02-09 16:22:14 UTC (rev 8235) @@ -23,7 +23,9 @@ <xsl:text>.sp </xsl:text> <xsl:call-template name="roff-if-end"/> <xsl:text>.RS 4 </xsl:text> - <xsl:text>.BM yellow </xsl:text> + <xsl:if test="not($man.output.better.ps.enabled = 0)"> + <xsl:text>.BM yellow </xsl:text> + </xsl:if> <xsl:call-template name="pinch.together"/> <xsl:text>.ps +1 </xsl:text> <xsl:call-template name="make.bold.title"/> @@ -31,7 +33,9 @@ <xsl:text>.br </xsl:text> <xsl:apply-templates/> <xsl:text>.sp .5v </xsl:text> - <xsl:text>.EM yellow </xsl:text> + <xsl:if test="not($man.output.better.ps.enabled = 0)"> + <xsl:text>.EM yellow </xsl:text> + </xsl:if> <xsl:text>.RE </xsl:text> </xsl:template> @@ -205,9 +209,11 @@ <xsl:choose> <xsl:when test="self::literallayout|self::programlisting|self::screen and not(ancestor::*[local-name() = 'refsynopsisdiv']) + and not($man.output.better.ps.enabled = 0) "> - <!-- * if this is a literallayout|programlisting|screen, then --> - <!-- * we put a background behind it in non-TTY output; except --> + <!-- * if this is a literallayout|programlisting|screen, --> + <!-- * and user has set man.output.better.ps.enabled to non-zero, --> + <!-- * then we put a background behind it in non-TTY output; except --> <!-- * if it’s a descendant of a refsynopsisdiv (as can be --> <!-- * found in the git docs) --> <xsl:choose> Modified: trunk/xsl/manpages/docbook.xsl =================================================================== --- trunk/xsl/manpages/docbook.xsl 2009-02-09 12:10:48 UTC (rev 8234) +++ trunk/xsl/manpages/docbook.xsl 2009-02-09 16:22:14 UTC (rev 8235) @@ -227,7 +227,9 @@ <!-- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- * (re)define some macros --> <!-- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:call-template name="define.macros"/> + <xsl:if test="not($man.output.better.ps.enabled = 0)"> + <xsl:call-template name="define.macros"/> + </xsl:if> <!-- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- * Set default hyphenation, justification, indentation, and --> <!-- * line-breaking --> Modified: trunk/xsl/manpages/other.xsl =================================================================== --- trunk/xsl/manpages/other.xsl 2009-02-09 12:10:48 UTC (rev 8234) +++ trunk/xsl/manpages/other.xsl 2009-02-09 16:22:14 UTC (rev 8235) @@ -747,7 +747,7 @@ .if \\n[.$] \&\\$* .. </xsl:text> <xsl:text>.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ </xsl:text> - <xsl:text>.\" BB/BE - put background/screen (filled box) around block of text </xsl:text> + <xsl:text>.\" BB/EB - put background/screen (filled box) around block of text </xsl:text> <xsl:text>.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ </xsl:text> <xsl:text>.de BB .if t \{\ Modified: trunk/xsl/manpages/param.ent =================================================================== --- trunk/xsl/manpages/param.ent 2009-02-09 12:10:48 UTC (rev 8234) +++ trunk/xsl/manpages/param.ent 2009-02-09 16:22:14 UTC (rev 8235) @@ -32,6 +32,7 @@ <!ENTITY man.output.lang.in.name.enabled SYSTEM "../params/man.output.lang.in.name.enabled.xml"> <!ENTITY man.output.manifest.enabled SYSTEM "../params/man.output.manifest.enabled.xml"> <!ENTITY man.output.manifest.filename SYSTEM "../params/man.output.manifest.filename.xml"> +<!ENTITY man.output.better.ps.enabled SYSTEM "../params/man.output.better.ps.enabled.xml"> <!ENTITY man.output.quietly SYSTEM "../params/man.output.quietly.xml"> <!ENTITY man.output.subdirs.enabled SYSTEM "../params/man.output.subdirs.enabled.xml"> <!ENTITY man.segtitle.suppress SYSTEM "../params/man.segtitle.suppress.xml"> Modified: trunk/xsl/manpages/param.xweb =================================================================== --- trunk/xsl/manpages/param.xweb 2009-02-09 12:10:48 UTC (rev 8234) +++ trunk/xsl/manpages/param.xweb 2009-02-09 16:22:14 UTC (rev 8235) @@ -121,6 +121,7 @@ &man.output.subdirs.enabled; &man.output.quietly; &man.output.encoding; +&man.output.better.ps.enabled; </reference> <reference xml:id="other"> <title>Other</title> @@ -185,6 +186,7 @@ <src:fragref linkend="man.output.lang.in.name.enabled.frag"/> <src:fragref linkend="man.output.manifest.enabled.frag"/> <src:fragref linkend="man.output.manifest.filename.frag"/> +<src:fragref linkend="man.output.better.ps.enabled.frag"/> <src:fragref linkend="man.output.quietly.frag"/> <src:fragref linkend="man.output.subdirs.enabled.frag"/> <src:fragref linkend="man.segtitle.suppress.frag"/> Modified: trunk/xsl/manpages/refentry.xsl =================================================================== --- trunk/xsl/manpages/refentry.xsl 2009-02-09 12:10:48 UTC (rev 8234) +++ trunk/xsl/manpages/refentry.xsl 2009-02-09 16:22:14 UTC (rev 8235) @@ -297,14 +297,23 @@ <xsl:template name="process.SH.xref"> <xsl:param name="title"/> - <xsl:text>\c</xsl:text> - <xsl:text>▒</xsl:text> - <xsl:text>.SH-xref </xsl:text> - <xsl:text>"</xsl:text> - <xsl:value-of select="$title"/> - <xsl:text>\c"</xsl:text> - <xsl:text>▒</xsl:text> - <xsl:text>\&</xsl:text> + <xsl:choose> + <xsl:when test="not($man.output.better.ps.enabled = 0)"> + <xsl:text>\c</xsl:text> + <xsl:text>▒</xsl:text> + <xsl:text>.SH-xref </xsl:text> + <xsl:text>"</xsl:text> + <xsl:value-of select="$title"/> + <xsl:text>\c"</xsl:text> + <xsl:text>▒</xsl:text> + <xsl:text>\&</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="string.upper"> + <xsl:with-param name="string" select="$title"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> </xsl:template> </xsl:stylesheet> Modified: trunk/xsl/manpages/utility.xsl =================================================================== --- trunk/xsl/manpages/utility.xsl 2009-02-09 12:10:48 UTC (rev 8234) +++ trunk/xsl/manpages/utility.xsl 2009-02-09 16:22:14 UTC (rev 8235) @@ -79,21 +79,29 @@ <!-- ================================================================== --> <xsl:template name="verbatim-block-start"> - <xsl:text>.fam C </xsl:text> - <xsl:text>.ps -1 </xsl:text> + <xsl:if test="not($man.output.better.ps.enabled = 0)"> + <xsl:text>.fam C </xsl:text> + <xsl:text>.ps -1 </xsl:text> + </xsl:if> </xsl:template> <xsl:template name="verbatim-block-end"> - <xsl:text>.fam </xsl:text> - <xsl:text>.ps +1 </xsl:text> + <xsl:if test="not($man.output.better.ps.enabled = 0)"> + <xsl:text>.fam </xsl:text> + <xsl:text>.ps +1 </xsl:text> + </xsl:if> </xsl:template> <xsl:template name="synopsis-block-start"> - <xsl:text>.fam C </xsl:text> + <xsl:if test="not($man.output.better.ps.enabled = 0)"> + <xsl:text>.fam C </xsl:text> + </xsl:if> </xsl:template> <xsl:template name="synopsis-block-end"> - <xsl:text>.fam </xsl:text> + <xsl:if test="not($man.output.better.ps.enabled = 0)"> + <xsl:text>.fam </xsl:text> + </xsl:if> </xsl:template> <!-- ================================================================== --> @@ -490,7 +498,16 @@ <xsl:text>.SH</xsl:text> <xsl:text> </xsl:text> <xsl:text>"</xsl:text> - <xsl:value-of select="$title"/> + <xsl:choose> + <xsl:when test="not($man.output.better.ps.enabled = 0)"> + <xsl:value-of select="$title"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="string.upper"> + <xsl:with-param name="string" select="$title"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> <xsl:text>"</xsl:text> <xsl:text> </xsl:text> <xsl:call-template name="mark.subheading"/> Added: trunk/xsl/params/man.output.better.ps.enabled.xml =================================================================== --- trunk/xsl/params/man.output.better.ps.enabled.xml (rev 0) +++ trunk/xsl/params/man.output.better.ps.enabled.xml 2009-02-09 16:22:14 UTC (rev 8235) @@ -0,0 +1,61 @@ +<refentry xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="5.0" xml:id="man.output.better.ps.enabled"> +<refmeta> +<refentrytitle>man.output.better.ps.enabled</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>man.output.better.ps.enabled</refname> +<refpurpose>Enable enhanced print/PostScript output?</refpurpose> +</refnamediv> +<refsynopsisdiv> +<src:fragment xml:id="man.output.better.ps.enabled.frag"> +<xsl:param name="man.output.better.ps.enabled">0</xsl:param> +</src:fragment> +</refsynopsisdiv> +<refsection><info><title>Description</title></info> + +<para>If the value of the +<parameter>man.output.better.ps.enabled</parameter> parameter is +non-zero, certain markup is embedded in each generated man page +such that PostScript output from the <command>man -Tps</command> +command for that page will include a number of enhancements +designed to improve the quality of that output.</para> + +<para>If <parameter>man.output.better.ps.enabled</parameter> is +zero (the default), no such markup is embedded in generated man +pages, and no enhancements are included in the PostScript +output generated from those man pages by the <command>man + -Tps</command> command.</para> + +<warning> + <para>The enhancements provided by this parameter rely on + features that are specific to groff (GNU troff) and that are + not part of “classic” AT&T troff or any of its + derivatives. Therefore, any man pages you generate with this + parameter enabled will be readable only on systems on which + the groff (GNU troff) program is installed, such as GNU/Linux + systems. The pages <emphasis role="bold">will not not be + readable on systems on with the classic troff (AT&T + troff) command is installed</emphasis>.</para> +</warning> + +<para>The value of this parameter only affects PostScript output + generated from the <command>man</command> command. It has no + effect on output generated using the FO backend.</para> + +<tip> + <para>You can generate PostScript output for any man page by + running the following command:</para> + <programlisting> man <replaceable>FOO</replaceable> -Tps > <replaceable>FOO</replaceable>.ps</programlisting> + <para>You can then generate PDF output by running the following + command:</para> + <programlisting> ps2pdf <replaceable>FOO</replaceable>.ps</programlisting> +</tip> + +</refsection> +</refentry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-02-20 04:40:20
|
Revision: 8257 http://docbook.svn.sourceforge.net/docbook/?rev=8257&view=rev Author: abdelazer Date: 2009-02-20 04:40:16 +0000 (Fri, 20 Feb 2009) Log Message: ----------- Alternate attempt at sanely including/excluding XSLTHT code Modified Paths: -------------- trunk/xsl/fo/verbatim.xsl trunk/xsl/highlighting/common.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/fo/verbatim.xsl =================================================================== --- trunk/xsl/fo/verbatim.xsl 2009-02-20 04:39:38 UTC (rev 8256) +++ trunk/xsl/fo/verbatim.xsl 2009-02-20 04:40:16 UTC (rev 8257) @@ -18,8 +18,10 @@ ******************************************************************** --> +<!-- These stylesheets should be included (in your customization layer + or elsewhere) only if you want to use the XSLTHL highlighting tool <xsl:include href="../highlighting/common.xsl"/> -<xsl:include href="highlight.xsl"/> +<xsl:include href="highlight.xsl"/>--> <lxslt:component prefix="xverb" functions="numberLines"/> Modified: trunk/xsl/highlighting/common.xsl =================================================================== --- trunk/xsl/highlighting/common.xsl 2009-02-20 04:39:38 UTC (rev 8256) +++ trunk/xsl/highlighting/common.xsl 2009-02-20 04:40:16 UTC (rev 8257) @@ -24,15 +24,15 @@ ******************************************************************** --> <!-- this construction is needed to have the saxon and xalan connectors working alongside each other --> -<!-- <xalan:component prefix="xhl" functions="highlight"> --> -<!-- <xalan:script lang="javaclass" src="xalan://net.sf.xslthl.ConnectorXalan" /> --> -<!-- </xalan:component> --> +<xalan:component prefix="xhl" functions="highlight"> + <xalan:script lang="javaclass" src="xalan://net.sf.xslthl.ConnectorXalan" /> +</xalan:component> <!-- for saxon 6 --> -<!-- <saxon6:script implements-prefix="s6hl" language="java" src="java:net.sf.xslthl.ConnectorSaxon6" /> --> +<saxon6:script implements-prefix="s6hl" language="java" src="java:net.sf.xslthl.ConnectorSaxon6" /> <!-- for saxon 8.5 and later --> -<!-- <saxonb:script implements-prefix="sbhl" language="java" src="java:net.sf.xslthl.ConnectorSaxonB" /> --> +<saxonb:script implements-prefix="sbhl" language="java" src="java:net.sf.xslthl.ConnectorSaxonB" /> <!-- You can override this template to do more complex mapping of @@ -117,4 +117,4 @@ </xsl:copy> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2009-02-20 04:39:38 UTC (rev 8256) +++ trunk/xsl/html/verbatim.xsl 2009-02-20 04:40:16 UTC (rev 8257) @@ -17,8 +17,10 @@ ******************************************************************** --> +<!-- These stylesheets should be included (in your customization layer + or elsewhere) only if you want to use the XSLTHL highlighting tool <xsl:include href="../highlighting/common.xsl"/> -<xsl:include href="highlight.xsl"/> +<xsl:include href="highlight.xsl"/>--> <lxslt:component prefix="xverb" functions="numberLines"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-02-20 05:00:20
|
Revision: 8259 http://docbook.svn.sourceforge.net/docbook/?rev=8259&view=rev Author: abdelazer Date: 2009-02-20 05:00:14 +0000 (Fri, 20 Feb 2009) Log Message: ----------- More tweaking the way that XSLTHL does or does not get called Modified Paths: -------------- trunk/xsl/fo/verbatim.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/fo/verbatim.xsl =================================================================== --- trunk/xsl/fo/verbatim.xsl 2009-02-20 04:40:58 UTC (rev 8258) +++ trunk/xsl/fo/verbatim.xsl 2009-02-20 05:00:14 UTC (rev 8259) @@ -21,7 +21,11 @@ <!-- These stylesheets should be included (in your customization layer or elsewhere) only if you want to use the XSLTHL highlighting tool <xsl:include href="../highlighting/common.xsl"/> -<xsl:include href="highlight.xsl"/>--> +<xsl:include href="highlight.xsl"/> + ... and the next apply-highlighting template should be deleted--> +<xsl:template name="apply-highlighting"> + <xsl:apply-templates/> +</xsl:template> <lxslt:component prefix="xverb" functions="numberLines"/> @@ -38,12 +42,26 @@ and $linenumbering.extension != '0'"> <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf"> - <xsl:call-template name="apply-highlighting"/> + <xsl:choose> + <xsl:when test="$highlight.source != 0"> + <xsl:call-template name="apply-highlighting"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> </xsl:with-param> </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:call-template name="apply-highlighting"/> + <xsl:choose> + <xsl:when test="$highlight.source != 0"> + <xsl:call-template name="apply-highlighting"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> </xsl:otherwise> </xsl:choose> </xsl:variable> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2009-02-20 04:40:58 UTC (rev 8258) +++ trunk/xsl/html/verbatim.xsl 2009-02-20 05:00:14 UTC (rev 8259) @@ -51,7 +51,14 @@ and $use.extensions != '0' and $linenumbering.extension != '0'"> <xsl:variable name="rtf"> - <xsl:call-template name="apply-highlighting"/> + <xsl:choose> + <xsl:when test="$highlight.source != 0"> + <xsl:call-template name="apply-highlighting"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> </xsl:variable> <pre> <xsl:apply-templates select="." mode="class.attribute"/> @@ -63,7 +70,14 @@ <xsl:otherwise> <pre> <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:call-template name="apply-highlighting"/> + <xsl:choose> + <xsl:when test="$highlight.source != 0"> + <xsl:call-template name="apply-highlighting"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> </pre> </xsl:otherwise> </xsl:choose> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-02-20 13:57:18
|
Revision: 8264 http://docbook.svn.sourceforge.net/docbook/?rev=8264&view=rev Author: abdelazer Date: 2009-02-20 13:57:14 +0000 (Fri, 20 Feb 2009) Log Message: ----------- The DocBook 1.74.* had problems with different XSLT processors. Add instructions to release instructions and make Makefiles more flexible to allow 'make check' to *actually* be run with something other than xsltproc. Thanks to Sorin Ristache for reporting this issue. Because of problems with the 1.74.* releases, it is now recommended that "make check" be run multiple times with different XSLT processors. One recommended way to invoke "make check" is the following: rm -f DOCBOOK-BUILD.LOG && \ . ~/docbk.sh && \ make check 2>&1 \ XSLTENGINE=xsltproc \ | tee DOCBOOK-BUILD.LOG && \ $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG After running with "xsltproc", you should run it again with "saxon": rm -f DOCBOOK-BUILD.LOG && \ . ~/docbk.sh && \ make check 2>&1 \ XSLTENGINE=saxon \ | tee DOCBOOK-BUILD.LOG && \ $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG Modified Paths: -------------- trunk/xsl/Makefile.tests trunk/xsl/README.BUILD Modified: trunk/xsl/Makefile.tests =================================================================== --- trunk/xsl/Makefile.tests 2009-02-20 13:25:04 UTC (rev 8263) +++ trunk/xsl/Makefile.tests 2009-02-20 13:57:14 UTC (rev 8264) @@ -45,39 +45,39 @@ smoketest-normal: for stylesheet in $(NORMAL_STYLES); do \ - echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null"; \ - $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null; \ - echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null"; \ - $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null; \ + echo "$(XSLT) $(TESTFILE) $$stylesheet > /dev/null"; \ + $(XSLT) $(TESTFILE) $$stylesheet > /dev/null; \ + echo "$(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null"; \ + $(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null; \ done smoketest-normal-profile: for stylesheet in $(NORMAL_PROFILE_STYLES); do \ - echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null"; \ - $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null; \ - echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null"; \ - $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null; \ + echo "$(XSLT) $(TESTFILE) $$stylesheet > /dev/null"; \ + $(XSLT) $(TESTFILE) $$stylesheet > /dev/null; \ + echo "$(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null"; \ + $(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null; \ done smoketest-chunk: for stylesheet in $(MULTIFILE_STYLES) ; do \ - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE); \ - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE-NS); \ + $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ + $(XSLT) $(TESTFILE-NS) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ done; smoketest-chunk-profile: for stylesheet in $(MULTIFILE_PROFILE_STYLES) ; do \ - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE); \ - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE-NS); \ + $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ + $(XSLT) $(TESTFILE-NS) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ done; smoketest-man: - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_STYLE) $(TESTFILE); \ - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_STYLE) $(TESTFILE-NS); \ + $(XSLT) $(TESTFILE) $(MAN_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ + $(XSLT) $(TESTFILE-NS) $(MAN_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ smoketest-man-profile: - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_PROFILE_STYLE) $(TESTFILE); \ - $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_PROFILE_STYLE) $(TESTFILE-NS); \ + $(XSLT) $(TESTFILE) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ + $(XSLT) $(TESTFILE-NS) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ smoketest-clean: $(RM) -r $(TMP_OUTPUT_DIR) Modified: trunk/xsl/README.BUILD =================================================================== --- trunk/xsl/README.BUILD 2009-02-20 13:25:04 UTC (rev 8263) +++ trunk/xsl/README.BUILD 2009-02-20 13:57:14 UTC (rev 8264) @@ -247,6 +247,10 @@ the driver stylesheets for each output format (e.g., html/docbook.xsl, fo/docbook.xsl, etc.). + Because of problems with the 1.74.* releases, it is now + recommended that "make check" be run multiple times with + different XSLT processors. + One recommended way to invoke "make check" is the following: rm -f DOCBOOK-BUILD.LOG && \ @@ -256,6 +260,15 @@ | tee DOCBOOK-BUILD.LOG && \ $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG + After running with "xsltproc", you should run it again with + "saxon": + rm -f DOCBOOK-BUILD.LOG && \ + . ~/docbk.sh && \ + make check 2>&1 \ + XSLTENGINE=saxon \ + | tee DOCBOOK-BUILD.LOG && \ + $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG + 4. Fix any obvious problems. If build-check and/or "make check" report any problems, fix them. Then repeat Step 1 until you don't see any more problems. @@ -264,7 +277,7 @@ Once you have any obvious problems fixed (that is, the kind that build-check and "make check" can catch, you should do further testing of the changes (if any) that you have made - to the stylesheet code. Try to test with a variety of test + m to the stylesheet code. Try to test with a variety of test files, not just with DocBook XML source files you've created yourself. Consider using the files in the "testdocs" module (see step 1 of the "Build Setup" section above). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-02-20 14:40:48
|
Revision: 8265 http://docbook.svn.sourceforge.net/docbook/?rev=8265&view=rev Author: abdelazer Date: 2009-02-20 14:40:45 +0000 (Fri, 20 Feb 2009) Log Message: ----------- Another stab at fixing the stupid XSLTHT includes across processors (Saxon regression reported by Sorin Ristache) Modified Paths: -------------- trunk/xsl/Makefile.tests trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/Makefile.tests =================================================================== --- trunk/xsl/Makefile.tests 2009-02-20 13:57:14 UTC (rev 8264) +++ trunk/xsl/Makefile.tests 2009-02-20 14:40:45 UTC (rev 8265) @@ -12,7 +12,7 @@ XSLTPROC_FLAGS= TESTFILE=tests/refentry.007.xml -TESTFILE=tests/refentry.007.ns.xml +TESTFILE_NS=tests/refentry.007.ns.xml NORMAL_STYLES=fo/docbook.xsl html/docbook.xsl xhtml/docbook.xsl NORMAL_PROFILE_STYLES=fo/profile-docbook.xsl html/profile-docbook.xsl xhtml/profile-docbook.xsl @@ -47,37 +47,49 @@ for stylesheet in $(NORMAL_STYLES); do \ echo "$(XSLT) $(TESTFILE) $$stylesheet > /dev/null"; \ $(XSLT) $(TESTFILE) $$stylesheet > /dev/null; \ - echo "$(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null"; \ - $(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null; \ + echo "$(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null"; \ + $(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null; \ done smoketest-normal-profile: for stylesheet in $(NORMAL_PROFILE_STYLES); do \ echo "$(XSLT) $(TESTFILE) $$stylesheet > /dev/null"; \ $(XSLT) $(TESTFILE) $$stylesheet > /dev/null; \ - echo "$(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null"; \ - $(XSLT) $(TESTFILE-NS) $$stylesheet > /dev/null; \ + echo "$(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null"; \ + $(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null; \ done +# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: +# --param manifest.in.base.dir=1; \ + smoketest-chunk: for stylesheet in $(MULTIFILE_STYLES) ; do \ - $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ - $(XSLT) $(TESTFILE-NS) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ + $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ done; +# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: +# --param manifest.in.base.dir=1; \ + smoketest-chunk-profile: for stylesheet in $(MULTIFILE_PROFILE_STYLES) ; do \ - $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ - $(XSLT) $(TESTFILE-NS) $$stylesheet --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1; \ + $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ done; +# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: +# --param man.output.in.separate.dir 1 \ + smoketest-man: - $(XSLT) $(TESTFILE) $(MAN_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ - $(XSLT) $(TESTFILE-NS) $(MAN_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ + $(XSLT) $(TESTFILE) $(MAN_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $(MAN_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; +# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: +# --param man.output.in.separate.dir 1 \ + smoketest-man-profile: - $(XSLT) $(TESTFILE) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ - $(XSLT) $(TESTFILE-NS) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 \ + $(XSLT) $(TESTFILE) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; smoketest-clean: $(RM) -r $(TMP_OUTPUT_DIR) Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2009-02-20 13:57:14 UTC (rev 8264) +++ trunk/xsl/html/verbatim.xsl 2009-02-20 14:40:45 UTC (rev 8265) @@ -20,7 +20,11 @@ <!-- These stylesheets should be included (in your customization layer or elsewhere) only if you want to use the XSLTHL highlighting tool <xsl:include href="../highlighting/common.xsl"/> -<xsl:include href="highlight.xsl"/>--> +<xsl:include href="highlight.xsl"/> + ... and the next apply-highlighting template should be deleted--> +<xsl:template name="apply-highlighting"> + <xsl:apply-templates/> +</xsl:template> <lxslt:component prefix="xverb" functions="numberLines"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-02-25 00:49:32
|
Revision: 8272 http://docbook.svn.sourceforge.net/docbook/?rev=8272&view=rev Author: abdelazer Date: 2009-02-25 00:49:20 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Add better pointer to README for XSLTHL Modified Paths: -------------- trunk/xsl/RELEASE-NOTES.xml trunk/xsl/fo/verbatim.xsl trunk/xsl/html/verbatim.xsl Modified: trunk/xsl/RELEASE-NOTES.xml =================================================================== --- trunk/xsl/RELEASE-NOTES.xml 2009-02-25 00:07:04 UTC (rev 8271) +++ trunk/xsl/RELEASE-NOTES.xml 2009-02-25 00:49:20 UTC (rev 8272) @@ -60,6 +60,7 @@ <sect1 xml:id="V1.74.3"> <title>Release Notes: 1.74.3</title> <para>This release fixes some bugs in the 1.74.2 release.</para> +<para>See <filename>highlighting/README</filename> for XSLTHL usage instructions.</para> </sect1> <sect1 xml:id="V1.74.2"> <title>Release Notes: 1.74.2</title> Modified: trunk/xsl/fo/verbatim.xsl =================================================================== --- trunk/xsl/fo/verbatim.xsl 2009-02-25 00:07:04 UTC (rev 8271) +++ trunk/xsl/fo/verbatim.xsl 2009-02-25 00:49:20 UTC (rev 8272) @@ -18,11 +18,8 @@ ******************************************************************** --> -<!-- These stylesheets should be included (in your customization layer - or elsewhere) only if you want to use the XSLTHL highlighting tool -<xsl:include href="../highlighting/common.xsl"/> -<xsl:include href="highlight.xsl"/> - ... and the next apply-highlighting template should be deleted--> +<!-- XSLTHL highlighting is turned off by default. See highlighting/README + for instructions on how to turn on XSLTHL --> <xsl:template name="apply-highlighting"> <xsl:apply-templates/> </xsl:template> Modified: trunk/xsl/html/verbatim.xsl =================================================================== --- trunk/xsl/html/verbatim.xsl 2009-02-25 00:07:04 UTC (rev 8271) +++ trunk/xsl/html/verbatim.xsl 2009-02-25 00:49:20 UTC (rev 8272) @@ -17,11 +17,8 @@ ******************************************************************** --> -<!-- These stylesheets should be included (in your customization layer - or elsewhere) only if you want to use the XSLTHL highlighting tool -<xsl:include href="../highlighting/common.xsl"/> -<xsl:include href="highlight.xsl"/> - ... and the next apply-highlighting template should be deleted--> +<!-- XSLTHL highlighting is turned off by default. See highlighting/README + for instructions on how to turn on XSLTHL --> <xsl:template name="apply-highlighting"> <xsl:apply-templates/> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-03-06 04:48:08
|
Revision: 8285 http://docbook.svn.sourceforge.net/docbook/?rev=8285&view=rev Author: abdelazer Date: 2009-03-06 04:48:04 +0000 (Fri, 06 Mar 2009) Log Message: ----------- Added regression test and fix for XHTML validation problem with <a>s added inside <blockquote>; This potentially causes another problem (where something is referenced by has no anchor, but someone reporting that should cause the whole <a id='thing'/> thing to be reconsidered with modern browsers in mind. Modified Paths: -------------- trunk/xsl/epub/bin/spec/epub_regressions_spec.rb trunk/xsl/xhtml/html2xhtml.xsl trunk/xsl/xhtml-1_1/html2xhtml.xsl Added Paths: ----------- trunk/xsl/epub/bin/spec/files/blockquotepre.xml Modified: trunk/xsl/epub/bin/spec/epub_regressions_spec.rb =================================================================== --- trunk/xsl/epub/bin/spec/epub_regressions_spec.rb 2009-03-06 02:15:06 UTC (rev 8284) +++ trunk/xsl/epub/bin/spec/epub_regressions_spec.rb 2009-03-06 04:48:04 UTC (rev 8285) @@ -109,6 +109,13 @@ opf_lns.to_s.should =~ /reference[^>]+type=['"]cover['"]/ end + it "should allow pre elements inside blockquotes" do + blockquotepre_epub = DocBook::Epub.new(File.join(@filedir, "blockquotepre.xml"), @tmpdir) + blockquotepre_epubfile = File.join(@tmpdir, "blockquotepreepub.epub") + blockquotepre_epub.render_to_file(blockquotepre_epubfile, $DEBUG) + blockquotepre_epubfile.should be_valid_epub + end + after(:all) do FileUtils.rm_r(@tmpdir, :force => true) end Added: trunk/xsl/epub/bin/spec/files/blockquotepre.xml =================================================================== --- trunk/xsl/epub/bin/spec/files/blockquotepre.xml (rev 0) +++ trunk/xsl/epub/bin/spec/files/blockquotepre.xml 2009-03-06 04:48:04 UTC (rev 8285) @@ -0,0 +1,14 @@ +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> +<sect1><title>Blockquote with pre test</title> + <blockquote> + <para><emphasis>Definition:</emphasis> Let <emphasis>A, B</emphasis>, + . . . <emphasis>, Z</emphasis> be subsets of the heading of relvar + <emphasis>R</emphasis>. Then <emphasis>R</emphasis> satisfies the + <emphasis>join dependency</emphasis> (JD<indexterm id="IDX-CHP-7-0533" significance="normal"><primary>JD</primary></indexterm>)</para> + <programlisting format="linespecific" id="I_7_tt242">{ <emphasis>A</emphasis>, <emphasis>B</emphasis>, ..., <emphasis>Z</emphasis> } +</programlisting> + <para>if and only if every relation that's a legal value for + <emphasis>R</emphasis> is equal to the join of its projections on + <emphasis>A, B</emphasis>, . . . <emphasis>, Z</emphasis>.</para> + </blockquote> +</sect1> Property changes on: trunk/xsl/epub/bin/spec/files/blockquotepre.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Modified: trunk/xsl/xhtml/html2xhtml.xsl =================================================================== --- trunk/xsl/xhtml/html2xhtml.xsl 2009-03-06 02:15:06 UTC (rev 8284) +++ trunk/xsl/xhtml/html2xhtml.xsl 2009-03-06 04:48:04 UTC (rev 8285) @@ -132,6 +132,19 @@ </xsl:copy> </xsl:template> +<!-- Bare anchors (<a/>) are not allowed in <blockquote>s --> +<xsl:template match="xsl:template[@name='anchor']/xsl:if"> + <xslo:if> + <xsl:attribute name="test"> + <xsl:text>not($node[parent::blockquote])</xsl:text> + </xsl:attribute> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:apply-templates/> + </xsl:copy> + </xslo:if> +</xsl:template> + <xsl:template match="xsl:template[@name='body.attributes']"> <xsl:copy> <xsl:copy-of select="@*"/> Modified: trunk/xsl/xhtml-1_1/html2xhtml.xsl =================================================================== --- trunk/xsl/xhtml-1_1/html2xhtml.xsl 2009-03-06 02:15:06 UTC (rev 8284) +++ trunk/xsl/xhtml-1_1/html2xhtml.xsl 2009-03-06 04:48:04 UTC (rev 8285) @@ -1,6 +1,7 @@ <?xml version="1.0"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" + xmlns:xslo="http://www.w3.org/1999/XSL/TransformAlias" xmlns:saxon="http://icl.com/saxon" exclude-result-prefixes="exsl" version="1.0"> @@ -11,6 +12,7 @@ saxon:character-representation="decimal" /> <xsl:preserve-space elements="*"/> +<xsl:namespace-alias stylesheet-prefix="xslo" result-prefix="xsl"/> <xsl:template match="/"> <xsl:comment>This file was created automatically by html2xhtml</xsl:comment> @@ -208,6 +210,19 @@ </xsl:copy> </xsl:template> +<!-- Bare anchors (<a/>) are not allowed in <blockquote>s --> +<xsl:template match="xsl:template[@name='anchor']/xsl:if"> + <xslo:if> + <xsl:attribute name="test"> + <xsl:text>not($node[parent::blockquote])</xsl:text> + </xsl:attribute> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:apply-templates/> + </xsl:copy> + </xslo:if> +</xsl:template> + <xsl:template match="xsl:template[@name='body.attributes']"> <xsl:copy> <xsl:copy-of select="@*"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2009-03-07 18:56:09
|
Revision: 8293 http://docbook.svn.sourceforge.net/docbook/?rev=8293&view=rev Author: mzjn Date: 2009-03-07 18:56:02 +0000 (Sat, 07 Mar 2009) Log Message: ----------- Added support for acknowledgements in article. Support in book/part remains to be added. Modified Paths: -------------- trunk/xsl/fo/block.xsl trunk/xsl/html/block.xsl Modified: trunk/xsl/fo/block.xsl =================================================================== --- trunk/xsl/fo/block.xsl 2009-03-07 18:09:36 UTC (rev 8292) +++ trunk/xsl/fo/block.xsl 2009-03-07 18:56:02 UTC (rev 8293) @@ -582,7 +582,7 @@ <!-- ==================================================================== --> -<xsl:template match="ackno"> +<xsl:template match="ackno|acknowledgements[parent::article]"> <fo:block xsl:use-attribute-sets="normal.para.spacing"> <xsl:call-template name="anchor"/> <xsl:apply-templates/> Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2009-03-07 18:09:36 UTC (rev 8292) +++ trunk/xsl/html/block.xsl 2009-03-07 18:56:02 UTC (rev 8293) @@ -416,7 +416,7 @@ <!-- ==================================================================== --> -<xsl:template match="ackno"> +<xsl:template match="ackno|acknowledgements[parent::article]"> <p> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-03-09 00:26:27
|
Revision: 8302 http://docbook.svn.sourceforge.net/docbook/?rev=8302&view=rev Author: abdelazer Date: 2009-03-09 00:26:05 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Remove a nesting of <p> inside <p> for refclass (made XHTML* invalid, made HTML silly) Modified Paths: -------------- trunk/xsl/epub/bin/spec/epub_regressions_spec.rb trunk/xsl/html/refentry.xsl Added Paths: ----------- trunk/xsl/epub/bin/spec/files/refclass.xml Modified: trunk/xsl/epub/bin/spec/epub_regressions_spec.rb =================================================================== --- trunk/xsl/epub/bin/spec/epub_regressions_spec.rb 2009-03-08 14:32:32 UTC (rev 8301) +++ trunk/xsl/epub/bin/spec/epub_regressions_spec.rb 2009-03-09 00:26:05 UTC (rev 8302) @@ -116,6 +116,13 @@ blockquotepre_epubfile.should be_valid_epub end + it "should render refentry/refclass without duplicating <p>s" do + refclass_epub = DocBook::Epub.new(File.join(@filedir, "refclass.xml"), @tmpdir) + refclass_epubfile = File.join(@tmpdir, "refclassepub.epub") + refclass_epub.render_to_file(refclass_epubfile, $DEBUG) + refclass_epubfile.should be_valid_epub + end + after(:all) do FileUtils.rm_r(@tmpdir, :force => true) end Added: trunk/xsl/epub/bin/spec/files/refclass.xml =================================================================== --- trunk/xsl/epub/bin/spec/files/refclass.xml (rev 0) +++ trunk/xsl/epub/bin/spec/files/refclass.xml 2009-03-09 00:26:05 UTC (rev 8302) @@ -0,0 +1,17 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> +<refentry id="siehe_auch-id522"> + <refnamediv> + <refname>XSLTProcessor</refname> + <refpurpose>Transformiert XML mit XSLT-Stylesheets</refpurpose> + <refclass>Firefox 1.0, Safari 2.01, Opera 9</refclass> + <refclass>Object → XSLTProcessor</refclass> + </refnamediv> + <refsect1 id="konstruktor-id22"> + <title>Konstruktor</title> + <programlisting id="I_programlisting_d1e98549" format="linespecific">new XSLTProcessor( )</programlisting> + </refsect1> + <refsect1 id="methoden-id48"> + <title>Methoden</title> + <para/> + </refsect1> +</refentry> Property changes on: trunk/xsl/epub/bin/spec/files/refclass.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Modified: trunk/xsl/html/refentry.xsl =================================================================== --- trunk/xsl/html/refentry.xsl 2009-03-08 14:32:32 UTC (rev 8301) +++ trunk/xsl/html/refentry.xsl 2009-03-09 00:26:05 UTC (rev 8302) @@ -196,15 +196,13 @@ <xsl:template match="refclass"> <xsl:if test="$refclass.suppress = 0"> - <p> - <b> - <xsl:if test="@role"> - <xsl:value-of select="@role"/> - <xsl:text>: </xsl:text> - </xsl:if> - <xsl:apply-templates/> - </b> - </p> + <b> + <xsl:if test="@role"> + <xsl:value-of select="@role"/> + <xsl:text>: </xsl:text> + </xsl:if> + <xsl:apply-templates/> + </b> </xsl:if> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2009-03-12 17:40:31
|
Revision: 8318 http://docbook.svn.sourceforge.net/docbook/?rev=8318&view=rev Author: mzjn Date: 2009-03-12 17:40:15 +0000 (Thu, 12 Mar 2009) Log Message: ----------- Added code to handle acknowledgements in book and part. The element is processed similarly to dedication. All acknowledgements will appear as front matter, after any dedications. Modified Paths: -------------- trunk/xsl/common/titles.xsl trunk/xsl/html/component.xsl trunk/xsl/html/division.xsl trunk/xsl/html/titlepage.templates.xml trunk/xsl/html/titlepage.xsl trunk/xsl/html/xref.xsl Modified: trunk/xsl/common/titles.xsl =================================================================== --- trunk/xsl/common/titles.xsl 2009-03-12 06:14:02 UTC (rev 8317) +++ trunk/xsl/common/titles.xsl 2009-03-12 17:40:15 UTC (rev 8318) @@ -157,6 +157,22 @@ </xsl:choose> </xsl:template> +<xsl:template match="acknowledgements" mode="title.markup"> + <xsl:param name="allow-anchors" select="0"/> + <xsl:choose> + <xsl:when test="title"> + <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup"> + <xsl:with-param name="allow-anchors" select="$allow-anchors"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Acknowledgements'"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="colophon" mode="title.markup"> <xsl:param name="allow-anchors" select="0"/> <xsl:choose> Modified: trunk/xsl/html/component.xsl =================================================================== --- trunk/xsl/html/component.xsl 2009-03-12 06:14:02 UTC (rev 8317) +++ trunk/xsl/html/component.xsl 2009-03-12 17:40:15 UTC (rev 8318) @@ -110,6 +110,42 @@ <!-- ==================================================================== --> +<xsl:template match="acknowledgements" mode="acknowledgements"> + <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="acknowledgements.titlepage"/> + <xsl:apply-templates/> + <xsl:call-template name="process.footnotes"/> + </div> +</xsl:template> + +<xsl:template match="acknowledgements/title|acknowledgements/info/title" + mode="titlepage.mode" priority="2"> + <xsl:call-template name="component.title"> + <xsl:with-param name="node" select="ancestor::acknowledgements[1]"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="acknowledgements/subtitle|acknowledgements/info/subtitle" + mode="titlepage.mode" priority="2"> + <xsl:call-template name="component.subtitle"> + <xsl:with-param name="node" select="ancestor::acknowledgements[1]"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="acknowledgements"></xsl:template> <!-- see mode="acknowledgements" --> +<xsl:template match="acknowledgements/title"></xsl:template> +<xsl:template match="acknowledgements/subtitle"></xsl:template> +<xsl:template match="acknowledgements/titleabbrev"></xsl:template> + +<!-- ==================================================================== --> + <xsl:template match="colophon"> <xsl:call-template name="id.warning"/> Modified: trunk/xsl/html/division.xsl =================================================================== --- trunk/xsl/html/division.xsl 2009-03-12 06:14:02 UTC (rev 8317) +++ trunk/xsl/html/division.xsl 2009-03-12 17:40:15 UTC (rev 8318) @@ -75,6 +75,7 @@ <xsl:call-template name="book.titlepage"/> <xsl:apply-templates select="dedication" mode="dedication"/> + <xsl:apply-templates select="acknowledgements" mode="acknowledgements"/> <xsl:variable name="toc.params"> <xsl:call-template name="find.path.params"> Modified: trunk/xsl/html/titlepage.templates.xml =================================================================== --- trunk/xsl/html/titlepage.templates.xml 2009-03-12 06:14:02 UTC (rev 8317) +++ trunk/xsl/html/titlepage.templates.xml 2009-03-12 17:40:15 UTC (rev 8318) @@ -248,6 +248,30 @@ <!-- ==================================================================== --> +<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]"/> + <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:titlepage t:element="preface" t:wrapper="div" class="titlepage"> <t:titlepage-content t:side="recto"> <title/> Modified: trunk/xsl/html/titlepage.xsl =================================================================== --- trunk/xsl/html/titlepage.xsl 2009-03-12 06:14:02 UTC (rev 8317) +++ trunk/xsl/html/titlepage.xsl 2009-03-12 17:40:15 UTC (rev 8318) @@ -38,6 +38,9 @@ <xsl:attribute-set name="dedication.titlepage.recto.style"/> <xsl:attribute-set name="dedication.titlepage.verso.style"/> +<xsl:attribute-set name="acknowledgements.titlepage.recto.style"/> +<xsl:attribute-set name="acknowledgements.titlepage.verso.style"/> + <xsl:attribute-set name="preface.titlepage.recto.style"/> <xsl:attribute-set name="preface.titlepage.verso.style"/> @@ -248,6 +251,10 @@ <xsl:template match="authorgroup" mode="titlepage.mode"> <div> + <xsl:if test="parent::refentryinfo"> + <h2>Authors</h2> + </xsl:if> + <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> <xsl:apply-templates mode="titlepage.mode"/> @@ -354,6 +361,11 @@ </xsl:template> <xsl:template match="copyright" mode="titlepage.mode"> + + <xsl:if test="generate-id() = generate-id(//refentryinfo/copyright[1])"> + <h2>Copyright</h2> + </xsl:if> + <p> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="gentext"> Modified: trunk/xsl/html/xref.xsl =================================================================== --- trunk/xsl/html/xref.xsl 2009-03-12 06:14:02 UTC (rev 8317) +++ trunk/xsl/html/xref.xsl 2009-03-12 17:40:15 UTC (rev 8318) @@ -424,7 +424,7 @@ <xsl:apply-templates select="(.//function)[1]" mode="xref"/> </xsl:template> -<xsl:template match="dedication|preface|chapter|appendix|article" mode="xref-to"> +<xsl:template match="dedication|acknowledgements|preface|chapter|appendix|article" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> <xsl:param name="verbose" select="1"/> @@ -798,6 +798,7 @@ |ancestor::preface |ancestor::partintro |ancestor::dedication + |ancestor::acknowledgements |ancestor::colophon |ancestor::bibliography |ancestor::index This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2009-03-15 14:26:29
|
Revision: 8334 http://docbook.svn.sourceforge.net/docbook/?rev=8334&view=rev Author: mzjn Date: 2009-03-15 14:26:23 +0000 (Sun, 15 Mar 2009) Log Message: ----------- Added modeless template for ooclass|oointerface|ooexception. Closes bug #1623468. Modified Paths: -------------- trunk/xsl/fo/synop.xsl trunk/xsl/html/synop.xsl Modified: trunk/xsl/fo/synop.xsl =================================================================== --- trunk/xsl/fo/synop.xsl 2009-03-15 09:03:49 UTC (rev 8333) +++ trunk/xsl/fo/synop.xsl 2009-03-15 14:26:23 UTC (rev 8334) @@ -974,6 +974,11 @@ </fo:block> </xsl:template> +<!-- Used when not occurring as a child of classsynopsis --> +<xsl:template match="ooclass|oointerface|ooexception"> + <xsl:apply-templates/> +</xsl:template> + <!-- ==================================================================== --> <!-- * DocBook 5 allows linking elements (link, olink, and xref) --> Modified: trunk/xsl/html/synop.xsl =================================================================== --- trunk/xsl/html/synop.xsl 2009-03-15 09:03:49 UTC (rev 8333) +++ trunk/xsl/html/synop.xsl 2009-03-15 14:26:23 UTC (rev 8334) @@ -1521,6 +1521,11 @@ <xsl:call-template name="synop-break"/> </xsl:template> +<!-- Used when not occurring as a child of classsynopsis --> +<xsl:template match="ooclass|oointerface|ooexception"> + <xsl:apply-templates/> +</xsl:template> + <!-- ==================================================================== --> <!-- * DocBook 5 allows linking elements (link, olink, and xref) --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-17 07:24:32
|
Revision: 8350 http://docbook.svn.sourceforge.net/docbook/?rev=8350&view=rev Author: bobstayton Date: 2009-03-17 07:24:29 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Add two new qanda.defaultlabel values so that numbered sections and numbered questions can be distinguished. Satisfies Feature Request #1539045. Modified Paths: -------------- trunk/xsl/common/labels.xsl trunk/xsl/fo/qandaset.xsl trunk/xsl/html/qandaset.xsl trunk/xsl/params/qanda.defaultlabel.xml Modified: trunk/xsl/common/labels.xsl =================================================================== --- trunk/xsl/common/labels.xsl 2009-03-17 06:53:03 UTC (rev 8349) +++ trunk/xsl/common/labels.xsl 2009-03-17 07:24:29 UTC (rev 8350) @@ -570,9 +570,14 @@ <xsl:if test="$qanda.inherit.numeration != 0"> <xsl:choose> <xsl:when test="ancestor::qandadiv"> - <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/> - <xsl:apply-templates select="ancestor::qandadiv[1]" - mode="intralabel.punctuation"/> + <xsl:variable name="div.label"> + <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/> + </xsl:variable> + <xsl:if test="string-length($div.label) != 0"> + <xsl:copy-of select="$div.label"/> + <xsl:apply-templates select="ancestor::qandadiv[1]" + mode="intralabel.punctuation"/> + </xsl:if> </xsl:when> <xsl:when test="$lparent.prefix != ''"> <xsl:apply-templates select="$lparent" mode="label.markup"/> @@ -603,22 +608,38 @@ <xsl:apply-templates select="$label"/> </xsl:when> - <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'question'"> + <xsl:when test="$deflabel = 'qanda' and self::question"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Question'"/> </xsl:call-template> </xsl:when> - <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'answer'"> + <xsl:when test="$deflabel = 'qanda' and self::answer"> <xsl:call-template name="gentext"> <xsl:with-param name="key" select="'Answer'"/> </xsl:call-template> </xsl:when> - <xsl:when test="$deflabel = 'number' and local-name(.) = 'question'"> + <xsl:when test="($deflabel = 'qnumber' or + $deflabel = 'qnumberanda') and self::question"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Question'"/> + </xsl:call-template> + <xsl:text> </xsl:text> <xsl:value-of select="$prefix"/> <xsl:number level="multiple" count="qandaentry" format="1"/> </xsl:when> + + <xsl:when test="$deflabel = 'qnumberanda' and self::answer"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Answer'"/> + </xsl:call-template> + </xsl:when> + + <xsl:when test="$deflabel = 'number' and self::question"> + <xsl:value-of select="$prefix"/> + <xsl:number level="multiple" count="qandaentry" format="1"/> + </xsl:when> </xsl:choose> </xsl:template> @@ -722,11 +743,11 @@ <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/> </xsl:if> <xsl:number format="1" count="equation[title or info/title]" - from="chapter|appendix" level="any"/> + from="chapter|appendix" level="any"/> </xsl:when> <xsl:otherwise> <xsl:number format="1" count="equation[title or info/title]" - from="book|article" level="any"/> + from="book|article" level="any"/> </xsl:otherwise> </xsl:choose> </xsl:otherwise> @@ -838,9 +859,9 @@ <xsl:when test="$format='upperroman' or $format='I'"> <xsl:value-of select="'I'"/> </xsl:when> - <xsl:when test="$format='arabicindic' or $format='١'"> - <xsl:value-of select="'١'"/> - </xsl:when> + <xsl:when test="$format='arabicindic' or $format='١'"> + <xsl:value-of select="'١'"/> + </xsl:when> <xsl:otherwise> <xsl:message> <xsl:text>Unexpected </xsl:text><xsl:value-of select="local-name(.)"/><xsl:text>.autolabel value: </xsl:text> Modified: trunk/xsl/fo/qandaset.xsl =================================================================== --- trunk/xsl/fo/qandaset.xsl 2009-03-17 06:53:03 UTC (rev 8349) +++ trunk/xsl/fo/qandaset.xsl 2009-03-17 07:24:29 UTC (rev 8350) @@ -20,24 +20,8 @@ <xsl:call-template name="object.id"/> </xsl:variable> - <xsl:variable name="label-width"> - <xsl:call-template name="pi.dbfo_label-width"/> - </xsl:variable> - <xsl:variable name="label-length"> - <xsl:choose> - <xsl:when test="$label-width != ''"> - <xsl:value-of select="$label-width"/> - </xsl:when> - <xsl:when test="descendant::label"> - <xsl:call-template name="longest.term"> - <xsl:with-param name="terms" select="descendant::label"/> - <xsl:with-param name="maxlength" select="20"/> - </xsl:call-template> - <xsl:text>em * 0.50</xsl:text> - </xsl:when> - <xsl:otherwise>2.5em</xsl:otherwise> - </xsl:choose> + <xsl:call-template name="qandaset.label.length"/> </xsl:variable> <xsl:variable name="toc"> @@ -113,6 +97,43 @@ </xsl:template> +<xsl:template name="qandaset.label.length"> + <xsl:param name="deflabel"> + <xsl:apply-templates select="." mode="qanda.defaultlabel"/> + </xsl:param> + + <xsl:variable name="label-width"> + <xsl:call-template name="pi.dbfo_label-width"/> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$label-width != ''"> + <xsl:value-of select="$label-width"/> + </xsl:when> + <xsl:when test="descendant::label"> + <xsl:call-template name="longest.term"> + <xsl:with-param name="terms" select="descendant::label"/> + <xsl:with-param name="maxlength" select="20"/> + </xsl:call-template> + <xsl:text>em * 0.50</xsl:text> + </xsl:when> + <xsl:when test="contains($deflabel, 'qnumber') and + $qandadiv.autolabel != 0 and + $qanda.inherit.numeration != 0"> + <xsl:text>5em</xsl:text> + </xsl:when> + <xsl:when test="$deflabel ='qnumber' and + $qandadiv.autolabel != 0 and + $qanda.inherit.numeration != 0"> + <xsl:text>4em</xsl:text> + </xsl:when> + <xsl:when test="$deflabel = 'number'"> + <xsl:text>3em</xsl:text> + </xsl:when> + <xsl:otherwise>2.5em</xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="qandaset/blockinfo/title|qandset/info/title|qandaset/title"> <xsl:variable name="enclsect" select="(ancestor::section | ancestor::simplesect @@ -147,26 +168,11 @@ <xsl:template match="qandadiv"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - <xsl:variable name="label-width"> - <xsl:call-template name="pi.dbfo_label-width"/> - </xsl:variable> <xsl:variable name="label-length"> - <xsl:choose> - <xsl:when test="$label-width != ''"> - <xsl:value-of select="$label-width"/> - </xsl:when> - <xsl:when test="descendant::label"> - <xsl:call-template name="longest.term"> - <xsl:with-param name="terms" select="descendant::label"/> - <xsl:with-param name="maxlength" select="20"/> - </xsl:call-template> - <xsl:text>*0.6em</xsl:text> - </xsl:when> - <xsl:otherwise>2.5em</xsl:otherwise> - </xsl:choose> + <xsl:call-template name="qandaset.label.length"/> </xsl:variable> - + <fo:block id="{$id}"> <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/> <xsl:apply-templates select="*[local-name(.) != 'title' @@ -240,24 +246,16 @@ </xsl:variable> <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> - <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:variable> + <xsl:variable name="label.content"> + <xsl:apply-templates select="." mode="label.markup"/> + <xsl:if test="contains($deflabel, 'number') and not(label)"> + <xsl:apply-templates select="." mode="intralabel.punctuation"/> + </xsl:if> + </xsl:variable> <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing"> <fo:list-item-label id="{$id}" end-indent="label-end()"> @@ -293,15 +291,7 @@ </xsl:variable> <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> <xsl:variable name="answer.label"> @@ -332,6 +322,18 @@ </fo:list-item> </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="label"> <xsl:apply-templates/> </xsl:template> Modified: trunk/xsl/html/qandaset.xsl =================================================================== --- trunk/xsl/html/qandaset.xsl 2009-03-17 06:53:03 UTC (rev 8349) +++ trunk/xsl/html/qandaset.xsl 2009-03-17 07:24:29 UTC (rev 8350) @@ -198,7 +198,7 @@ <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:if test="contains($deflabel, 'number') and not(label)"> <xsl:apply-templates select="." mode="intralabel.punctuation"/> </xsl:if> </xsl:template> @@ -268,8 +268,13 @@ </xsl:call-template> </xsl:variable> - <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/> - <xsl:value-of select="$autotoc.label.separator"/> + <xsl:variable name="div.label"> + <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/> + </xsl:variable> + <xsl:if test="string-length($div.label) != 0"> + <xsl:copy-of select="$div.label"/> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> <xsl:text> </xsl:text> <a> <xsl:attribute name="href"> @@ -332,7 +337,7 @@ <dt> <xsl:apply-templates select="." mode="label.markup"/> - <xsl:if test="$deflabel = 'number' and not(label)"> + <xsl:if test="contains($deflabel,'number') and not(label)"> <xsl:apply-templates select="." mode="intralabel.punctuation"/> </xsl:if> <xsl:text> </xsl:text> @@ -363,6 +368,10 @@ <xsl:template name="process.qandaset"> + <xsl:variable name="deflabel"> + <xsl:apply-templates select="." mode="qanda.defaultlabel"/> + </xsl:variable> + <xsl:variable name="label-width"> <xsl:call-template name="pi.dbhtml_label-width"/> </xsl:variable> @@ -379,7 +388,7 @@ <xsl:call-template name="pi.dbhtml_cellspacing"/> </xsl:variable> - <table border="0" summary="Q and A Set"> + <table border="0" width="100%" summary="Q and A Set"> <xsl:if test="$table-summary != ''"> <xsl:attribute name="summary"> <xsl:value-of select="$table-summary"/> @@ -404,10 +413,13 @@ <xsl:when test="$label-width != ''"> <xsl:value-of select="$label-width"/> </xsl:when> - <xsl:otherwise>1%</xsl:otherwise> + <xsl:otherwise> + <xsl:text>1%</xsl:text> + </xsl:otherwise> </xsl:choose> </xsl:attribute> </col> + <col/> <tbody> <xsl:apply-templates select="qandaentry|qandadiv"/> </tbody> Modified: trunk/xsl/params/qanda.defaultlabel.xml =================================================================== --- trunk/xsl/params/qanda.defaultlabel.xml 2009-03-17 06:53:03 UTC (rev 8349) +++ trunk/xsl/params/qanda.defaultlabel.xml 2009-03-17 07:24:29 UTC (rev 8350) @@ -25,20 +25,63 @@ <refsection><info><title>Description</title></info> <para>If no <literal>defaultlabel</literal> attribute is specified on -a <tag>qandaset</tag>, this value is used. It must be one of the legal -values for the defaultlabel attribute, one from none, number or -qanda. The default value is 'number'. +a <tag>qandaset</tag>, this value is used. It is generally one of the legal +values for the defaultlabel attribute (<literal>none</literal>, +<literal>number</literal> or +<literal>qanda</literal>), or one of the additional stylesheet-specific values +(<literal>qnumber</literal> or <literal>qnumberanda</literal>). +The default value is 'number'. </para> -<para>Meaning</para> -<para>qanda - <tag>question</tag>s are labeled “Q:” and <tag>answer</tag>s are labeled “A:”. </para> -<para>number - The entries are enumerated. </para> -<para>none - No distinguishing label precedes Questions or Answers. +<para>The values are rendered as follows:</para> +<variablelist> +<varlistentry><term><literal>qanda</literal></term> +<listitem> +<para><tag>question</tag>s are labeled "Q:" and +<tag>answer</tag>s are labeled "A:". </para> +</listitem> +</varlistentry> +<variablelist> +<varlistentry><term><literal>number</literal></term> +<listitem> +<para>The questions are enumerated and the answers +are not labeled. </para> +</listitem> +</varlistentry> +<variablelist> +<varlistentry><term><literal>qnumber</literal></term> +<listitem> +<para>The questions are labeled "Q:" followed by a number, and answers are not +labeled. +When sections are numbered, adding a label +to the number distinguishes the question numbers +from the section numbers. +This value is not allowed in the +<tag class="attribute">defaultlabel</tag> attribute +of a <tag>qandaset</tag> element.</para> +</listitem> +</varlistentry> +<variablelist> +<varlistentry><term><literal>qnumberanda</literal></term> +<listitem> +<para>The questions are labeled "Q:" followed by a number, and +the answers are labeled "A:". +When sections are numbered, adding a label +to the number distinguishes the question numbers +from the section numbers. +This value is not allowed in the +<tag class="attribute">defaultlabel</tag> attribute +of a <tag>qandaset</tag> element.</para> +</listitem> +</varlistentry> +<variablelist> +<varlistentry><term><literal>none</literal></term> +<listitem> +<para>No distinguishing label precedes Questions or Answers. </para> +</listitem> +</varlistentry> +</variablelist> - - - - </refsection> </refentry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-03-22 06:22:53
|
Revision: 8368 http://docbook.svn.sourceforge.net/docbook/?rev=8368&view=rev Author: bobstayton Date: 2009-03-22 06:22:50 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Add new variablelist.term.properties to format terms, per request # 1968513. Modified Paths: -------------- trunk/xsl/fo/lists.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Added Paths: ----------- trunk/xsl/params/variablelist.term.properties.xml Modified: trunk/xsl/fo/lists.xsl =================================================================== --- trunk/xsl/fo/lists.xsl 2009-03-22 06:11:44 UTC (rev 8367) +++ trunk/xsl/fo/lists.xsl 2009-03-22 06:22:50 UTC (rev 8368) @@ -467,7 +467,7 @@ </xsl:variable> <xsl:variable name="item.contents"> <fo:list-item-label end-indent="label-end()" text-align="start"> - <fo:block> + <fo:block xsl:-use-attribute-sets="variablelist.term.properties"> <xsl:apply-templates select="term"/> </fo:block> </fo:list-item-label> @@ -538,7 +538,8 @@ <xsl:template match="varlistentry" mode="vl.as.blocks"> <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing" + <fo:block id="{$id}" xsl:use-attribute-sets="variablelist.term.properties + list.item.spacing" keep-together.within-column="always" keep-with-next.within-column="always"> <xsl:apply-templates select="term"/> Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-03-22 06:11:44 UTC (rev 8367) +++ trunk/xsl/fo/param.ent 2009-03-22 06:22:50 UTC (rev 8368) @@ -223,6 +223,7 @@ <!ENTITY use.svg SYSTEM "../params/use.svg.xml"> <!ENTITY variablelist.as.blocks SYSTEM "../params/variablelist.as.blocks.xml"> <!ENTITY variablelist.max.termlength SYSTEM "../params/variablelist.max.termlength.xml"> +<!ENTITY variablelist.term.properties SYSTEM "../params/variablelist.term.properties.xml"> <!ENTITY variablelist.term.separator SYSTEM "../params/variablelist.term.separator.xml"> <!ENTITY variablelist.term.break.after SYSTEM "../params/variablelist.term.break.after.xml"> <!ENTITY verbatim.properties SYSTEM "../params/verbatim.properties.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-03-22 06:11:44 UTC (rev 8367) +++ trunk/xsl/fo/param.xweb 2009-03-22 06:22:50 UTC (rev 8368) @@ -193,6 +193,7 @@ &orderedlist.label.width; &variablelist.max.termlength; &variablelist.term.separator; +&variablelist.term.properties; &variablelist.term.break.after; </reference> <reference xml:id="qa"><title>QAndASet</title> @@ -866,6 +867,7 @@ <src:fragref linkend="variablelist.as.blocks.frag"/> <src:fragref linkend="variablelist.max.termlength.frag"/> <src:fragref linkend="variablelist.term.separator.frag"/> +<src:fragref linkend="variablelist.term.properties.frag"/> <src:fragref linkend="variablelist.term.break.after.frag"/> <src:fragref linkend="verbatim.properties.frag"/> <src:fragref linkend="writing.mode.frag"/> Added: trunk/xsl/params/variablelist.term.properties.xml =================================================================== --- trunk/xsl/params/variablelist.term.properties.xml (rev 0) +++ trunk/xsl/params/variablelist.term.properties.xml 2009-03-22 06:22:50 UTC (rev 8368) @@ -0,0 +1,29 @@ +<refentry xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="5.0" xml:id="variablelist.term.properties"> +<refmeta> +<refentrytitle>variablelist.term.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> +<refnamediv> +<refname>variablelist.term.properties</refname> +<refpurpose>To add properties to the term elements in a variablelist.</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment xml:id="variablelist.term.properties.frag"> +<xsl:attribute-set name="variablelist.term.properties"> +</xsl:attribute-set> +</src:fragment> +</refsynopsisdiv> +<refsection><info><title>Description</title></info> +<para>These properties are added to the block containing a +term in a variablelist. +Use this attribute-set to set +font properties or alignment, for example.</para> + +</refsection> +</refentry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2009-03-28 14:17:28
|
Revision: 8384 http://docbook.svn.sourceforge.net/docbook/?rev=8384&view=rev Author: mzjn Date: 2009-03-28 14:17:17 +0000 (Sat, 28 Mar 2009) Log Message: ----------- Added a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. When the parameter has a non-zero value (the default), only the top-level bookmarks are displayed initially. Otherwise, the whole tree of bookmarks is displayed. This is implemented for FOP 0.9X. Closes FR #1792326. Modified Paths: -------------- trunk/xsl/fo/fop1.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb Added Paths: ----------- trunk/xsl/params/bookmarks.collapse.xml Modified: trunk/xsl/fo/fop1.xsl =================================================================== --- trunk/xsl/fo/fop1.xsl 2009-03-28 12:31:53 UTC (rev 8383) +++ trunk/xsl/fo/fop1.xsl 2009-03-28 14:17:17 UTC (rev 8384) @@ -15,6 +15,13 @@ <!-- ==================================================================== --> +<xsl:variable name="bookmarks.state"> + <xsl:choose> + <xsl:when test="$bookmarks.collapse != 0">hide</xsl:when> + <xsl:otherwise>show</xsl:otherwise> + </xsl:choose> +</xsl:variable> + <xsl:template match="*" mode="fop1.outline"> <xsl:apply-templates select="*" mode="fop1.outline"/> </xsl:template> @@ -40,6 +47,9 @@ <xsl:when test="self::index and $generate.index = 0"/> <xsl:when test="parent::*"> <fo:bookmark internal-destination="{$id}"> + <xsl:attribute name="starting-state"> + <xsl:value-of select="$bookmarks.state"/> + </xsl:attribute> <fo:bookmark-title> <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/> </fo:bookmark-title> @@ -48,6 +58,9 @@ </xsl:when> <xsl:otherwise> <fo:bookmark internal-destination="{$id}"> + <xsl:attribute name="starting-state"> + <xsl:value-of select="$bookmarks.state"/> + </xsl:attribute> <fo:bookmark-title> <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/> </fo:bookmark-title> Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-03-28 12:31:53 UTC (rev 8383) +++ trunk/xsl/fo/param.ent 2009-03-28 14:17:17 UTC (rev 8384) @@ -338,3 +338,4 @@ <!ENTITY glossdef.list.properties SYSTEM "../params/glossdef.list.properties.xml"> <!ENTITY glossdef.block.properties SYSTEM "../params/glossdef.block.properties.xml"> <!ENTITY glossentry.list.item.properties SYSTEM "../params/glossentry.list.item.properties.xml"> +<!ENTITY bookmarks.collapse SYSTEM "../params/bookmarks.collapse.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-03-28 12:31:53 UTC (rev 8383) +++ trunk/xsl/fo/param.xweb 2009-03-28 14:17:17 UTC (rev 8384) @@ -269,6 +269,7 @@ §ion.container.element; &monospace.verbatim.font.width; &exsl.node.set.available; +&bookmarks.collapse; </reference> <reference xml:id="graphics"><title>Graphics</title> &graphic.default.extension; @@ -568,6 +569,7 @@ <src:fragref linkend="body.margin.top.frag"/> <src:fragref linkend="body.start.indent.frag"/> <src:fragref linkend="body.end.indent.frag"/> +<src:fragref linkend="bookmarks.collapse.frag"/> <src:fragref linkend="bridgehead.in.toc.frag"/> <src:fragref linkend="callout.defaultcolumn.frag"/> <src:fragref linkend="callout.graphics.extension.frag"/> Added: trunk/xsl/params/bookmarks.collapse.xml =================================================================== --- trunk/xsl/params/bookmarks.collapse.xml (rev 0) +++ trunk/xsl/params/bookmarks.collapse.xml 2009-03-28 14:17:17 UTC (rev 8384) @@ -0,0 +1,31 @@ +<refentry xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="5.0" xml:id="bookmarks.collapse"> +<refmeta> +<refentrytitle>bookmarks.collapse</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> +</refmeta> +<refnamediv> +<refname>bookmarks.collapse</refname> +<refpurpose>Specifies the initial state of bookmarks</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<src:fragment xml:id="bookmarks.collapse.frag"> +<xsl:param name="bookmarks.collapse" select="1"></xsl:param> +</src:fragment> +</refsynopsisdiv> + +<refsection><info><title>Description</title></info> + +<para>If non-zero, the bookmark tree is collapsed so that only the +top-level bookmarks are displayed initially. Otherwise, the whole tree +of bookmarks is displayed.</para> + +<para>This parameter currently works with FOP 0.93 or later.</para> + +</refsection> +</refentry> Property changes on: trunk/xsl/params/bookmarks.collapse.xml ___________________________________________________________________ Added: svn:eol-style + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-04-01 08:48:04
|
Revision: 8392 http://docbook.svn.sourceforge.net/docbook/?rev=8392&view=rev Author: bobstayton Date: 2009-04-01 08:47:55 +0000 (Wed, 01 Apr 2009) Log Message: ----------- Add support for some format properties on tables using HTML table markup. These include: - frame attribute on table (or uses $default.table.frame parameter). - rules attribute on table (or uses $default.table.rules parameter). - align attribute on td and th - valign attribute on td and th - colspan on td and th - rowspan on td and th - bgcolor on td and th Modified Paths: -------------- trunk/xsl/common/table.xsl trunk/xsl/fo/htmltbl.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb trunk/xsl/fo/table.xsl Modified: trunk/xsl/common/table.xsl =================================================================== --- trunk/xsl/common/table.xsl 2009-04-01 08:37:44 UTC (rev 8391) +++ trunk/xsl/common/table.xsl 2009-04-01 08:47:55 UTC (rev 8392) @@ -258,7 +258,7 @@ <xsl:variable name="table" select="($tgroup/ancestor::table |$tgroup/ancestor::informaltable - |$entry/ancestor::entrytbl)[last()]"/> + |$entry/ancestor::entrytbl)[last()]"/> <xsl:variable name="entry.value"> <xsl:call-template name="get-attribute"> @@ -411,7 +411,7 @@ <xsl:param name="attribute" select="'colname'"/> <xsl:param name="colspec.ancestor" select="(ancestor::tgroup|ancestor::entrytbl) - [position() = last()]"/> + [position() = last()]"/> <xsl:param name="colspecs" select="$colspec.ancestor/colspec"/> <xsl:param name="count" select="1"/> Modified: trunk/xsl/fo/htmltbl.xsl =================================================================== --- trunk/xsl/fo/htmltbl.xsl 2009-04-01 08:37:44 UTC (rev 8391) +++ trunk/xsl/fo/htmltbl.xsl 2009-04-01 08:47:55 UTC (rev 8392) @@ -15,10 +15,6 @@ <!-- ==================================================================== --> -<xsl:attribute-set name="th.style"> - <xsl:attribute name="font-weight">bold</xsl:attribute> -</xsl:attribute-set> - <!-- Outputs an fo:table only, not the caption --> <xsl:template match="table|informaltable" mode="htmlTable"> @@ -43,6 +39,7 @@ <xsl:attribute name="table-layout">fixed</xsl:attribute> </xsl:when> </xsl:choose> + <xsl:attribute name="width"> <xsl:choose> <xsl:when test="@width"> @@ -54,9 +51,36 @@ <xsl:otherwise>100%</xsl:otherwise> </xsl:choose> </xsl:attribute> + + <xsl:call-template name="table.frame"> + <xsl:with-param name="frame"> + <xsl:choose> + <xsl:when test="@frame = 'box'">all</xsl:when> + <xsl:when test="@frame = 'border'">all</xsl:when> + <xsl:when test="@frame = 'below'">bottom</xsl:when> + <xsl:when test="@frame = 'above'">top</xsl:when> + <xsl:when test="@frame = 'hsides'">topbot</xsl:when> + <xsl:when test="@frame = 'vsides'">sides</xsl:when> + <xsl:when test="@frame = 'lhs'">lhs</xsl:when> + <xsl:when test="@frame = 'rhs'">rhs</xsl:when> + <xsl:when test="@frame = 'void'">none</xsl:when> + <xsl:when test="@border != '' and @border != 0">all</xsl:when> + <xsl:when test="@border != '' and @border = 0">none</xsl:when> + <xsl:when test="@frame != ''"> + <xsl:value-of select="@frame"/> + </xsl:when> + <xsl:when test="$default.table.frame != ''"> + <xsl:value-of select="$default.table.frame"/> + </xsl:when> + <xsl:otherwise>all</xsl:otherwise> + </xsl:choose> + </xsl:with-param> + </xsl:call-template> + <xsl:call-template name="make-html-table-columns"> <xsl:with-param name="count" select="$numcols"/> </xsl:call-template> + <xsl:apply-templates select="thead" mode="htmlTable"/> <xsl:apply-templates select="tfoot" mode="htmlTable"/> <xsl:choose> @@ -73,6 +97,171 @@ </xsl:template> +<!-- This template writes rowsep or colsep equivalant for html tables --> +<xsl:template name="html.table.cell.rules"> + <xsl:variable name="border" + select="(ancestor::table | + ancestor::informaltable)[last()]/@border"/> + <xsl:variable name="table.rules" + select="(ancestor::table | + ancestor::informaltable)[last()]/@rules"/> + + <xsl:variable name="rules"> + <xsl:choose> + <xsl:when test="$table.rules != ''"> + <xsl:value-of select="$table.rules"/> + </xsl:when> + <xsl:when test="$default.table.rules != ''"> + <xsl:value-of select="$default.table.rules"/> + </xsl:when> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$border != '' and $border != 0"> + <xsl:attribute name="border"> + <xsl:value-of select="$table.cell.border.thickness"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$table.cell.border.style"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$table.cell.border.color"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="$rules = 'none'"> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="border-bottom-style">none</xsl:attribute> + </xsl:when> + + <xsl:when test="$rules = 'cols' and following-sibling::*"> + <!-- If not the last column, add border after --> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="border-bottom-style">none</xsl:attribute> + <xsl:attribute name="border-end-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-end-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-end-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:when> + <!-- If not the last row, add border below --> + <xsl:when test="$rules = 'rows'"> + <xsl:variable name="rowborder"> + <xsl:choose> + <!-- If in thead and tbody has rows, add border --> + <xsl:when test="parent::tr/parent::thead/ + following-sibling::tbody/tr">1</xsl:when> + <!-- If in tbody and tfoot has rows, add border --> + <xsl:when test="parent::tr/parent::tbody/ + following-sibling::tfoot/tr">1</xsl:when> + <xsl:when test="parent::tr/parent::tbody/ + preceding-sibling::tfoot/tr">1</xsl:when> + <!-- If following rows, but not rowspan reaches last row --> + <xsl:when test="parent::tr/following-sibling::tr and + not(@rowspan = count(parent::tr/following-sibling::tr) + 1)">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:if test="$rowborder = 1"> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="border-bottom-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-bottom-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-bottom-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:if> + </xsl:when> + <xsl:when test="$rules = 'all'"> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + + <xsl:variable name="rowborder"> + <xsl:choose> + <!-- If in thead and tbody has rows, add border --> + <xsl:when test="parent::tr/parent::thead/ + following-sibling::tbody/tr">1</xsl:when> + <!-- If in tbody and tfoot has rows, add border --> + <xsl:when test="parent::tr/parent::tbody/ + following-sibling::tfoot/tr">1</xsl:when> + <xsl:when test="parent::tr/parent::tbody/ + preceding-sibling::tfoot/tr">1</xsl:when> + <!-- If following rows, but not rowspan reaches last row --> + <xsl:when test="parent::tr/following-sibling::tr and + not(@rowspan = count(parent::tr/following-sibling::tr) + 1)">1</xsl:when> + <xsl:otherwise>0</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:if test="$rowborder = 1"> + <xsl:attribute name="border-bottom-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-bottom-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-bottom-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:if> + + <xsl:if test="following-sibling::*"> + <!-- If not the last column, add border after --> + <xsl:attribute name="border-end-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-end-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-end-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:if> + </xsl:when> + <xsl:when test="$rules = 'groups' and ancestor::thead + and not(parent::tr/following-sibling::tr)"> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="border-bottom-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-bottom-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-bottom-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="$rules = 'groups' and ancestor::tfoot + and not(parent::tr/preceding-sibling::tr)"> + <xsl:attribute name="border-start-style">none</xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="border-top-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-top-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-top-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:when> + </xsl:choose> +</xsl:template> + <xsl:template match="caption" mode="htmlTable"> <!-- Handled by formal.object.heading --> </xsl:template> @@ -146,55 +335,12 @@ </xsl:template> <xsl:template match="tbody" mode="htmlTable"> - <fo:table-body border-bottom-width="0.25pt" - border-bottom-style="solid" - border-bottom-color="black" - start-indent="0pt" + <fo:table-body start-indent="0pt" end-indent="0pt"> <xsl:apply-templates mode="htmlTable"/> </fo:table-body> </xsl:template> -<xsl:template match="td" mode="htmlTable"> - <xsl:variable name="bgcolor.pi"> - <xsl:call-template name="pi.dbfo_bgcolor"/> - </xsl:variable> - <xsl:variable name="bgcolor"> - <xsl:choose> - <xsl:when test="$bgcolor.pi != ''"> - <xsl:value-of select="$bgcolor.pi"/> - </xsl:when> - <xsl:when test="string-length(@bgcolor) != 0"> - <xsl:value-of select="@bgcolor"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - <fo:table-cell xsl:use-attribute-sets="table.cell.padding"> - <xsl:call-template name="table.cell.properties"> - <xsl:with-param name="bgcolor.pi" select="$bgcolor"/> - <xsl:with-param name="rowsep.inherit" select="0"/> - <xsl:with-param name="colsep.inherit" select="0"/> - </xsl:call-template> - - <xsl:if test="@colspan > 1"> - <xsl:attribute name="number-columns-spanned"> - <xsl:value-of select="@colspan"/> - </xsl:attribute> - </xsl:if> - - <xsl:if test="@rowspan > 1"> - <xsl:attribute name="number-rows-spanned"> - <xsl:value-of select="@rowspan"/> - </xsl:attribute> - </xsl:if> - - <fo:block> - <xsl:call-template name="table.cell.block.properties"/> - <xsl:apply-templates/> - </fo:block> - </fo:table-cell> -</xsl:template> - <xsl:template match="tfoot" mode="htmlTable"> <fo:table-footer start-indent="0pt" end-indent="0pt"> @@ -202,10 +348,11 @@ </fo:table-footer> </xsl:template> -<xsl:template match="th" mode="htmlTable"> +<xsl:template match="th|td" mode="htmlTable"> <xsl:variable name="bgcolor.pi"> <xsl:call-template name="pi.dbfo_bgcolor"/> </xsl:variable> + <xsl:variable name="bgcolor"> <xsl:choose> <xsl:when test="$bgcolor.pi != ''"> @@ -216,11 +363,29 @@ </xsl:when> </xsl:choose> </xsl:variable> - <fo:table-cell xsl:use-attribute-sets="th.style table.cell.padding"> + <xsl:variable name="align"> + <xsl:call-template name="inherited.table.attribute"> + <xsl:with-param name="entry" select="."/> + <xsl:with-param name="row" select="parent::tr"/> + <xsl:with-param name="attribute" select="'align'"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="valign"> + <xsl:call-template name="inherited.table.attribute"> + <xsl:with-param name="entry" select="."/> + <xsl:with-param name="row" select="parent::tr"/> + <xsl:with-param name="attribute" select="'valign'"/> + </xsl:call-template> + </xsl:variable> + + <fo:table-cell xsl:use-attribute-sets="table.cell.padding"> <xsl:call-template name="table.cell.properties"> <xsl:with-param name="bgcolor.pi" select="$bgcolor"/> <xsl:with-param name="rowsep.inherit" select="0"/> + <xsl:with-param name="align.inherit" select="$align"/> + <xsl:with-param name="valign.inherit" select="$valign"/> <xsl:with-param name="colsep.inherit" select="0"/> </xsl:call-template> @@ -244,12 +409,8 @@ </xsl:template> <xsl:template match="thead" mode="htmlTable"> - <fo:table-header border-bottom-width="0.25pt" - border-bottom-style="solid" - border-bottom-color="black" - start-indent="0pt" - end-indent="0pt" - font-weight="bold"> + <fo:table-header start-indent="0pt" + end-indent="0pt"> <xsl:apply-templates mode="htmlTable"/> </fo:table-header> </xsl:template> Modified: trunk/xsl/fo/param.ent =================================================================== --- trunk/xsl/fo/param.ent 2009-04-01 08:37:44 UTC (rev 8391) +++ trunk/xsl/fo/param.ent 2009-04-01 08:47:55 UTC (rev 8392) @@ -48,6 +48,7 @@ <!ENTITY current.docid SYSTEM "../params/current.docid.xml"> <!ENTITY default.table.width SYSTEM "../params/default.table.width.xml"> <!ENTITY default.table.frame SYSTEM "../params/default.table.frame.xml"> +<!ENTITY default.table.rules SYSTEM "../params/default.table.rules.xml"> <!ENTITY default.units SYSTEM "../params/default.units.xml"> <!ENTITY dingbat.font.family SYSTEM "../params/dingbat.font.family.xml"> <!ENTITY double.sided SYSTEM "../params/double.sided.xml"> Modified: trunk/xsl/fo/param.xweb =================================================================== --- trunk/xsl/fo/param.xweb 2009-04-01 08:37:44 UTC (rev 8391) +++ trunk/xsl/fo/param.xweb 2009-04-01 08:47:55 UTC (rev 8392) @@ -148,6 +148,7 @@ &default.table.width; &nominal.table.width; &default.table.frame; +&default.table.rules; &table.cell.padding; &table.frame.border.thickness; &table.frame.border.style; @@ -609,6 +610,7 @@ <src:fragref linkend="default.image.width.frag"/> <src:fragref linkend="default.table.width.frag"/> <src:fragref linkend="default.table.frame.frag"/> +<src:fragref linkend="default.table.rules.frag"/> <src:fragref linkend="default.units.frag"/> <src:fragref linkend="dingbat.font.family.frag"/> <src:fragref linkend="double.sided.frag"/> Modified: trunk/xsl/fo/table.xsl =================================================================== --- trunk/xsl/fo/table.xsl 2009-04-01 08:37:44 UTC (rev 8391) +++ trunk/xsl/fo/table.xsl 2009-04-01 08:47:55 UTC (rev 8392) @@ -148,11 +148,11 @@ <xsl:when test="self::table"> <fo:block id="{$id}" xsl:use-attribute-sets="table.properties"> - <xsl:if test="$keep.together != ''"> - <xsl:attribute name="keep-together.within-column"> - <xsl:value-of select="$keep.together"/> - </xsl:attribute> - </xsl:if> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"> + <xsl:value-of select="$keep.together"/> + </xsl:attribute> + </xsl:if> <xsl:if test="$placement = 'before'"> <xsl:call-template name="formal.object.heading"> <xsl:with-param name="placement" select="$placement"/> @@ -226,11 +226,11 @@ <xsl:variable name="rowsep"> <xsl:choose> <!-- If this is the last row, rowsep never applies (except when - the ancestor tgroup has a following sibling tgroup) --> + the ancestor tgroup has a following sibling tgroup) --> <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row or ancestor-or-self::thead/following-sibling::tbody or ancestor-or-self::tbody/preceding-sibling::tfoot) - and not(ancestor::tgroup/following-sibling::tgroup)"> + and not(ancestor::tgroup/following-sibling::tgroup)"> <xsl:value-of select="0"/> </xsl:when> <xsl:otherwise> @@ -285,7 +285,7 @@ <!-- ==================================================================== --> <xsl:template name="table.frame"> - <xsl:variable name="frame"> + <xsl:param name="frame"> <xsl:choose> <xsl:when test="../@frame"> <xsl:value-of select="../@frame"/> @@ -295,8 +295,9 @@ </xsl:when> <xsl:otherwise>all</xsl:otherwise> </xsl:choose> - </xsl:variable> + </xsl:param> + <xsl:choose> <xsl:when test="$frame='all'"> <xsl:attribute name="border-start-style"> @@ -372,6 +373,34 @@ <xsl:value-of select="$table.frame.border.color"/> </xsl:attribute> </xsl:when> + <xsl:when test="$frame='lhs'"> + <xsl:attribute name="border-start-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="border-bottom-style">none</xsl:attribute> + <xsl:attribute name="border-start-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-start-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="$frame='rhs'"> + <xsl:attribute name="border-end-style"> + <xsl:value-of select="$table.frame.border.style"/> + </xsl:attribute> + <xsl:attribute name="border-end-style">none</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="border-bottom-style">none</xsl:attribute> + <xsl:attribute name="border-end-width"> + <xsl:value-of select="$table.frame.border.thickness"/> + </xsl:attribute> + <xsl:attribute name="border-end-color"> + <xsl:value-of select="$table.frame.border.color"/> + </xsl:attribute> + </xsl:when> <xsl:when test="$frame='top'"> <xsl:attribute name="border-start-style">none</xsl:attribute> <xsl:attribute name="border-end-style">none</xsl:attribute> @@ -819,11 +848,11 @@ <xsl:variable name="rowsep"> <xsl:choose> <!-- If this is the last row, rowsep never applies (except when - the ancestor tgroup has a following sibling tgroup) --> + the ancestor tgroup has a following sibling tgroup) --> <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row or ancestor-or-self::thead/following-sibling::tbody or ancestor-or-self::tbody/preceding-sibling::tfoot) - and not(ancestor::tgroup/following-sibling::tgroup)"> + and not(ancestor::tgroup/following-sibling::tgroup)"> <xsl:value-of select="0"/> </xsl:when> <!-- Check for morerows too --> @@ -831,7 +860,7 @@ following-sibling::row) = @morerows ) and not (ancestor-or-self::thead/following-sibling::tbody or ancestor-or-self::tbody/preceding-sibling::tfoot) - and not(ancestor::tgroup/following-sibling::tgroup)"> + and not(ancestor::tgroup/following-sibling::tgroup)"> <xsl:value-of select="0"/> </xsl:when> @@ -1151,18 +1180,33 @@ <xsl:value-of select="$bgcolor.pi"/> </xsl:attribute> </xsl:if> - <xsl:variable name="border" - select="(ancestor::table | - ancestor::informaltable)[last()]/@border"/> - <xsl:if test="$border != '' and $border != 0"> - <xsl:attribute name="border"> - <xsl:value-of select="$table.cell.border.thickness"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$table.cell.border.style"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$table.cell.border.color"/> + + <xsl:if test="$align.inherit != ''"> + <xsl:attribute name="text-align"> + <xsl:value-of select="$align.inherit"/> </xsl:attribute> </xsl:if> + + <xsl:if test="$valign.inherit != ''"> + <xsl:attribute name="display-align"> + <xsl:choose> + <xsl:when test="$valign.inherit='top'">before</xsl:when> + <xsl:when test="$valign.inherit='middle'">center</xsl:when> + <xsl:when test="$valign.inherit='bottom'">after</xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>Unexpected valign value: </xsl:text> + <xsl:value-of select="$valign.inherit"/> + <xsl:text>, center used.</xsl:text> + </xsl:message> + <xsl:text>center</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:if> + + <xsl:call-template name="html.table.cell.rules"/> + </xsl:otherwise> </xsl:choose> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2009-04-02 20:32:12
|
Revision: 8394 http://docbook.svn.sourceforge.net/docbook/?rev=8394&view=rev Author: mzjn Date: 2009-04-02 20:31:30 +0000 (Thu, 02 Apr 2009) Log Message: ----------- Fixed doc bug for row-height. Modified Paths: -------------- trunk/xsl/fo/pi.xsl trunk/xsl/html/pi.xsl Modified: trunk/xsl/fo/pi.xsl =================================================================== --- trunk/xsl/fo/pi.xsl 2009-04-02 14:20:44 UTC (rev 8393) +++ trunk/xsl/fo/pi.xsl 2009-04-02 20:31:30 UTC (rev 8394) @@ -913,7 +913,7 @@ <variablelist> <varlistentry><term>row-height="<replaceable>height</replaceable>"</term> <listitem> - <para>Specifies the label height (including units)</para> + <para>Specifies the row height (including units)</para> </listitem> </varlistentry> </variablelist> Modified: trunk/xsl/html/pi.xsl =================================================================== --- trunk/xsl/html/pi.xsl 2009-04-02 14:20:44 UTC (rev 8393) +++ trunk/xsl/html/pi.xsl 2009-04-02 20:31:30 UTC (rev 8394) @@ -610,7 +610,7 @@ <variablelist> <varlistentry><term>row-height="<replaceable>height</replaceable>"</term> <listitem> - <para>Specifies the label height (including units)</para> + <para>Specifies the row height (including units)</para> </listitem> </varlistentry> </variablelist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-04-08 07:37:44
|
Revision: 8399 http://docbook.svn.sourceforge.net/docbook/?rev=8399&view=rev Author: bobstayton Date: 2009-04-08 07:37:42 +0000 (Wed, 08 Apr 2009) Log Message: ----------- Convert function-available for node-set() to use new $exsl.node.set.available param in test. Modified Paths: -------------- trunk/xsl/fo/autoidx-kosek.xsl trunk/xsl/fo/autoidx.xsl trunk/xsl/fo/docbook.xsl trunk/xsl/html/autoidx-kosek.xsl trunk/xsl/html/autoidx.xsl trunk/xsl/html/chunk-changebars.xsl trunk/xsl/html/chunk-common.xsl trunk/xsl/html/chunktoc.xsl trunk/xsl/html/docbook.xsl Modified: trunk/xsl/fo/autoidx-kosek.xsl =================================================================== --- trunk/xsl/fo/autoidx-kosek.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/fo/autoidx-kosek.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -59,8 +59,7 @@ </xsl:if> - <xsl:if test="not(function-available('exslt:node-set') or - function-available('exslt:nodeSet'))"> + <xsl:if test="$exsl.node.set.available = 0"> <xsl:message terminate="yes"> <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text> <xsl:text>exslt:node-set() function. Use a processor that </xsl:text> Modified: trunk/xsl/fo/autoidx.xsl =================================================================== --- trunk/xsl/fo/autoidx.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/fo/autoidx.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -169,8 +169,7 @@ </xsl:if> - <xsl:if test="not(function-available('exslt:node-set') or - function-available('exslt:nodeSet'))"> + <xsl:if test="$exsl.node.set.available = 0"> <xsl:message terminate="yes"> <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text> <xsl:text>exslt:node-set() function. Use a processor that </xsl:text> Modified: trunk/xsl/fo/docbook.xsl =================================================================== --- trunk/xsl/fo/docbook.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/fo/docbook.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -131,10 +131,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/autoidx-kosek.xsl =================================================================== --- trunk/xsl/html/autoidx-kosek.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/html/autoidx-kosek.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -50,8 +50,7 @@ </xsl:message> </xsl:if> - <xsl:if test="not(function-available('exslt:node-set') or - function-available('exslt:nodeSet'))"> + <xsl:if test="$exsl.node.set.available = 0"> <xsl:message terminate="yes"> <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text> <xsl:text>exslt:node-set() function. Use a processor that </xsl:text> Modified: trunk/xsl/html/autoidx.xsl =================================================================== --- trunk/xsl/html/autoidx.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/html/autoidx.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -172,8 +172,7 @@ </xsl:if> - <xsl:if test="not(function-available('exslt:node-set') or - function-available('exslt:nodeSet'))"> + <xsl:if test="$exsl.node.set.available = 0"> <xsl:message terminate="yes"> <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text> <xsl:text>exslt:node-set() function. Use a processor that </xsl:text> Modified: trunk/xsl/html/chunk-changebars.xsl =================================================================== --- trunk/xsl/html/chunk-changebars.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/html/chunk-changebars.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -42,7 +42,7 @@ </xsl:param> <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="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> <xsl:variable name="genid" select="generate-id()"/> @@ -96,4 +96,4 @@ <xsl:include href="chunk-code.xsl"/> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: trunk/xsl/html/chunk-common.xsl =================================================================== --- trunk/xsl/html/chunk-common.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/html/chunk-common.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -29,7 +29,7 @@ <xsl:variable name="chunk.hierarchy"> <xsl:if test="$chunk.fast != 0"> <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"> + <xsl:when test="$exsl.node.set.available != 0"> <xsl:message>Computing chunks...</xsl:message> <xsl:apply-templates select="/*" mode="find.chunks"/> </xsl:when> @@ -51,7 +51,7 @@ </xsl:param> <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="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/> <xsl:variable name="genid" select="generate-id()"/> Modified: trunk/xsl/html/chunktoc.xsl =================================================================== --- trunk/xsl/html/chunktoc.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/html/chunktoc.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -223,9 +223,7 @@ 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/docbook.xsl =================================================================== --- trunk/xsl/html/docbook.xsl 2009-04-07 14:40:25 UTC (rev 8398) +++ trunk/xsl/html/docbook.xsl 2009-04-08 07:37:42 UTC (rev 8399) @@ -341,9 +341,7 @@ 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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bob...@us...> - 2009-04-08 07:45:01
|
Revision: 8400 http://docbook.svn.sourceforge.net/docbook/?rev=8400&view=rev Author: bobstayton Date: 2009-04-08 07:44:54 +0000 (Wed, 08 Apr 2009) Log Message: ----------- Convert function-available test for node-set() function to test of $exsl.node.set.available param. Modified Paths: -------------- trunk/xsl/eclipse/eclipse.xsl trunk/xsl/epub/docbook.xsl trunk/xsl/htmlhelp/htmlhelp-common.xsl trunk/xsl/javahelp/javahelp.xsl trunk/xsl/manpages/table.xsl Modified: trunk/xsl/eclipse/eclipse.xsl =================================================================== --- trunk/xsl/eclipse/eclipse.xsl 2009-04-08 07:37:42 UTC (rev 8399) +++ trunk/xsl/eclipse/eclipse.xsl 2009-04-08 07:44:54 UTC (rev 8400) @@ -29,9 +29,7 @@ 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/epub/docbook.xsl =================================================================== --- trunk/xsl/epub/docbook.xsl 2009-04-08 07:37:42 UTC (rev 8399) +++ trunk/xsl/epub/docbook.xsl 2009-04-08 07:44:54 UTC (rev 8400) @@ -100,10 +100,7 @@ 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/htmlhelp/htmlhelp-common.xsl =================================================================== --- trunk/xsl/htmlhelp/htmlhelp-common.xsl 2009-04-08 07:37:42 UTC (rev 8399) +++ trunk/xsl/htmlhelp/htmlhelp-common.xsl 2009-04-08 07:44:54 UTC (rev 8400) @@ -45,10 +45,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> @@ -381,7 +378,8 @@ </xsl:choose> </xsl:variable> <xsl:choose> - <xsl:when test="function-available('exsl:node-set') and function-available('set:distinct')"> + <xsl:when test="$exsl.node.set.available != 0 + and function-available('set:distinct')"> <xsl:for-each select="set:distinct(exsl:node-set($imagelist)/filename)"> <xsl:value-of select="."/> <xsl:text> </xsl:text> Modified: trunk/xsl/javahelp/javahelp.xsl =================================================================== --- trunk/xsl/javahelp/javahelp.xsl 2009-04-08 07:37:42 UTC (rev 8399) +++ trunk/xsl/javahelp/javahelp.xsl 2009-04-08 07:44:54 UTC (rev 8400) @@ -33,10 +33,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/manpages/table.xsl =================================================================== --- trunk/xsl/manpages/table.xsl 2009-04-08 07:37:42 UTC (rev 8399) +++ trunk/xsl/manpages/table.xsl 2009-04-08 07:44:54 UTC (rev 8400) @@ -600,7 +600,7 @@ <xsl:apply-templates select="."/> </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"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-04-29 20:38:04
|
Revision: 8419 http://docbook.svn.sourceforge.net/docbook/?rev=8419&view=rev Author: kosek Date: 2009-04-29 20:37:52 +0000 (Wed, 29 Apr 2009) Log Message: ----------- Inclusion of highlighting code was simplified. Only one import is now necessary. Modified Paths: -------------- trunk/xsl/fo/highlight.xsl trunk/xsl/highlighting/README trunk/xsl/html/highlight.xsl Modified: trunk/xsl/fo/highlight.xsl =================================================================== --- trunk/xsl/fo/highlight.xsl 2009-04-27 17:10:33 UTC (rev 8418) +++ trunk/xsl/fo/highlight.xsl 2009-04-29 20:37:52 UTC (rev 8419) @@ -15,6 +15,8 @@ ******************************************************************** --> +<xsl:import href="../highlighting/common.xsl"/> + <xsl:template match='xslthl:keyword' mode="xslthl"> <fo:inline font-weight="bold"><xsl:apply-templates mode="xslthl"/></fo:inline> </xsl:template> Modified: trunk/xsl/highlighting/README =================================================================== --- trunk/xsl/highlighting/README 2009-04-27 17:10:33 UTC (rev 8418) +++ trunk/xsl/highlighting/README 2009-04-29 20:37:52 UTC (rev 8419) @@ -2,8 +2,7 @@ 1. Use a processor that works with the extension: Saxon 6 or Xalan-J. 2. Add the latest version of xslthl-2.X.X.jar to your classpath. 3. Set the highlight.source parameter to 1. -4. Import into your customization two stylesheet modules, - highlighting/common.xsl and one of the following: +4. Import into your customization one of the following stylesheet module: * html/highlight.xsl * xhtml/highlight.xsl * xhtml-1_1/highlight.xsl Modified: trunk/xsl/html/highlight.xsl =================================================================== --- trunk/xsl/html/highlight.xsl 2009-04-27 17:10:33 UTC (rev 8418) +++ trunk/xsl/html/highlight.xsl 2009-04-29 20:37:52 UTC (rev 8419) @@ -14,6 +14,8 @@ ******************************************************************** --> +<xsl:import href="../highlighting/common.xsl"/> + <xsl:template match='xslthl:keyword' mode="xslthl"> <b class="hl-keyword"><xsl:apply-templates mode="xslthl"/></b> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-05-24 02:15:06
|
Revision: 8441 http://docbook.svn.sourceforge.net/docbook/?rev=8441&view=rev Author: abdelazer Date: 2009-05-24 02:14:56 +0000 (Sun, 24 May 2009) Log Message: ----------- Switching to em dash for character before attribution in epigraph; resolves Bug #2793878 Modified Paths: -------------- trunk/xsl/fo/block.xsl trunk/xsl/html/block.xsl Modified: trunk/xsl/fo/block.xsl =================================================================== --- trunk/xsl/fo/block.xsl 2009-05-19 13:53:49 UTC (rev 8440) +++ trunk/xsl/fo/block.xsl 2009-05-24 02:14:56 UTC (rev 8441) @@ -142,13 +142,14 @@ </fo:block> </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 --> <xsl:template match="epigraph"> <fo:block> <xsl:call-template name="anchor"/> <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <xsl:if test="attribution"> <fo:inline> - <xsl:text>--</xsl:text> + <xsl:text>—</xsl:text> <xsl:apply-templates select="attribution"/> </fo:inline> </xsl:if> Modified: trunk/xsl/html/block.xsl =================================================================== --- trunk/xsl/html/block.xsl 2009-05-19 13:53:49 UTC (rev 8440) +++ trunk/xsl/html/block.xsl 2009-05-24 02:14:56 UTC (rev 8441) @@ -189,13 +189,14 @@ </div> </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 --> <xsl:template match="epigraph"> <div> <xsl:call-template name="common.html.attributes"/> <xsl:apply-templates select="para|simpara|formalpara|literallayout"/> <xsl:if test="attribution"> <div class="attribution"> - <span>--<xsl:apply-templates select="attribution"/></span> + <span>—<xsl:apply-templates select="attribution"/></span> </div> </xsl:if> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mz...@us...> - 2009-07-14 19:34:01
|
Revision: 8486 http://docbook.svn.sourceforge.net/docbook/?rev=8486&view=rev Author: mzjn Date: 2009-07-14 19:33:56 +0000 (Tue, 14 Jul 2009) Log Message: ----------- Added stylesheet.result.type test for copyright. Closes bug #2813289. Modified Paths: -------------- trunk/xsl/html/titlepage.xsl trunk/xsl/manpages/docbook.xsl Modified: trunk/xsl/html/titlepage.xsl =================================================================== --- trunk/xsl/html/titlepage.xsl 2009-07-14 10:16:36 UTC (rev 8485) +++ trunk/xsl/html/titlepage.xsl 2009-07-14 19:33:56 UTC (rev 8486) @@ -362,7 +362,8 @@ <xsl:template match="copyright" mode="titlepage.mode"> - <xsl:if test="generate-id() = generate-id(//refentryinfo/copyright[1])"> + <xsl:if test="generate-id() = generate-id(//refentryinfo/copyright[1]) + and $stylesheet.result.type = 'html'"> <h2>Copyright</h2> </xsl:if> Modified: trunk/xsl/manpages/docbook.xsl =================================================================== --- trunk/xsl/manpages/docbook.xsl 2009-07-14 10:16:36 UTC (rev 8485) +++ trunk/xsl/manpages/docbook.xsl 2009-07-14 19:33:56 UTC (rev 8486) @@ -46,6 +46,8 @@ <xsl:param name="tbl.font.headings" select="$man.font.table.headings"/> <xsl:param name="tbl.font.title" select="$man.font.table.title"/> + <xsl:param name="stylesheet.result.type" select="'manpages'"/> + <!-- ==================================================================== --> <xsl:template match="/"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abd...@us...> - 2009-08-12 02:55:06
|
Revision: 8516 http://docbook.svn.sourceforge.net/docbook/?rev=8516&view=rev Author: abdelazer Date: 2009-08-12 02:54:56 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Fix a bug when using index.on.type: an 'index symbols' section was created even if that typed index didn't include any symbols (they were in the other types). Modified Paths: -------------- trunk/xsl/epub/bin/spec/epub_regressions_spec.rb trunk/xsl/epub/bin/spec/files/test_cust.xsl trunk/xsl/html/autoidx.xsl Added Paths: ----------- trunk/xsl/epub/bin/spec/files/index.with.symbol.and.type.xml Modified: trunk/xsl/epub/bin/spec/epub_regressions_spec.rb =================================================================== --- trunk/xsl/epub/bin/spec/epub_regressions_spec.rb 2009-08-04 20:04:06 UTC (rev 8515) +++ trunk/xsl/epub/bin/spec/epub_regressions_spec.rb 2009-08-12 02:54:56 UTC (rev 8516) @@ -167,6 +167,15 @@ container_lines.to_s.should =~ /<container/ end + it "should not include an index entry for Symbols when using @types and the symbols are not a part of that @type" do + css_file = nil + index_on_type_customization_layer = File.join(@filedir, "test_cust.xsl") + typed_index_epub = DocBook::Epub.new(File.join(@filedir, "index.with.symbol.and.type.xml"), @tmpdir, css_file, index_on_type_customization_layer) + typed_index_epubfile = File.join(@tmpdir, "typed_indexepub.epub") + typed_index_epub.render_to_file(typed_index_epubfile, $DEBUG) + typed_index_epubfile.should be_valid_epub + end + after(:all) do FileUtils.rm_r(@tmpdir, :force => true) end Added: trunk/xsl/epub/bin/spec/files/index.with.symbol.and.type.xml =================================================================== --- trunk/xsl/epub/bin/spec/files/index.with.symbol.and.type.xml (rev 0) +++ trunk/xsl/epub/bin/spec/files/index.with.symbol.and.type.xml 2009-08-12 02:54:56 UTC (rev 8516) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> +<book> + <title>First Book</title> + <chapter> + <title>Chapter</title> + <para>Some test data +<indexterm type="a"><primary>First Book</primary></indexterm></para> + </chapter> + <chapter> + <title>Chapter</title> + <para>Some test data +<indexterm type="b"><primary>λ (lambda operator)</primary></indexterm></para> + </chapter> + <part> + <title>Part Title</title> + <chapter> + <title>Chapter</title> + <para>Some test data +<indexterm type="b"><primary>Third Book</primary></indexterm></para> + </chapter> + <index type="a"> + <title>A Index</title> + </index> + <index type="b"> + <title>B Index</title> + </index> + <index/> + </part> +</book> Property changes on: trunk/xsl/epub/bin/spec/files/index.with.symbol.and.type.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Modified: trunk/xsl/epub/bin/spec/files/test_cust.xsl =================================================================== --- trunk/xsl/epub/bin/spec/files/test_cust.xsl 2009-08-04 20:04:06 UTC (rev 8515) +++ trunk/xsl/epub/bin/spec/files/test_cust.xsl 2009-08-12 02:54:56 UTC (rev 8516) @@ -4,5 +4,6 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:import href="../../../../epub/docbook.xsl" /> <xsl:param name="xref.with.number.and.title" select="0"/> + <xsl:param name="index.on.type" select="1"/> </xsl:stylesheet> Modified: trunk/xsl/html/autoidx.xsl =================================================================== --- trunk/xsl/html/autoidx.xsl 2009-08-04 20:04:06 UTC (rev 8515) +++ trunk/xsl/html/autoidx.xsl 2009-08-12 02:54:56 UTC (rev 8516) @@ -126,24 +126,51 @@ substring(&primary;, 1, 1)))]"/> <div class="index"> <xsl:if test="$others"> - <div class="indexdiv"> - <h3> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'index symbols'"/> - </xsl:call-template> - </h3> - <dl> - <xsl:apply-templates select="$others[count(.|key('primary', - &primary;)[&scope;][1]) = 1]" - mode="index-symbol-div"> - <xsl:with-param name="position" select="position()"/> - <xsl:with-param name="scope" select="$scope"/> - <xsl:with-param name="role" select="$role"/> - <xsl:with-param name="type" select="$type"/> - <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/> - </xsl:apply-templates> - </dl> - </div> + <xsl:choose> + <xsl:when test="normalize-space($type) != '' and + $others[@type = $type][count(.|key('primary', &primary;)[&scope;][1]) = 1]"> + <div class="indexdiv"> + <h3> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'index symbols'"/> + </xsl:call-template> + </h3> + <dl> + <xsl:apply-templates select="$others[count(.|key('primary', &primary;)[&scope;][1]) = 1]" + mode="index-symbol-div"> + <xsl:with-param name="position" select="position()"/> + <xsl:with-param name="scope" select="$scope"/> + <xsl:with-param name="role" select="$role"/> + <xsl:with-param name="type" select="$type"/> + <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/> + </xsl:apply-templates> + </dl> + </div> + </xsl:when> + <xsl:when test="normalize-space($type) != ''"> + <!-- Output nothing, as there isn't a match for $other using this $type --> + </xsl:when> + <xsl:otherwise> + <div class="indexdiv"> + <h3> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'index symbols'"/> + </xsl:call-template> + </h3> + <dl> + <xsl:apply-templates select="$others[count(.|key('primary', + &primary;)[&scope;][1]) = 1]" + mode="index-symbol-div"> + <xsl:with-param name="position" select="position()"/> + <xsl:with-param name="scope" select="$scope"/> + <xsl:with-param name="role" select="$role"/> + <xsl:with-param name="type" select="$type"/> + <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/> + </xsl:apply-templates> + </dl> + </div> + </xsl:otherwise> + </xsl:choose> </xsl:if> <xsl:apply-templates select="$alphabetical[count(.|key('letter', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |