Menu
▾
▴
docbook-checkins
|
From: <ko...@us...> - 2012-07-06 13:21:57
|
Revision: 9470
http://docbook.svn.sourceforge.net/docbook/?rev=9470&view=rev
Author: kosek
Date: 2012-07-06 13:21:46 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
Renamed file in shape with rev 9396 change
Revision Links:
--------------
http://docbook.svn.sourceforge.net/docbook/?rev=9396&view=rev
Added Paths:
-----------
trunk/xsl/VERSION.xsl
Removed Paths:
-------------
trunk/xsl/VERSION
Deleted: trunk/xsl/VERSION
===================================================================
--- trunk/xsl/VERSION 2012-07-05 14:49:59 UTC (rev 9469)
+++ trunk/xsl/VERSION 2012-07-06 13:21:46 UTC (rev 9470)
@@ -1,115 +0,0 @@
-<?xml version='1.0'?> <!-- -*- nxml -*- vim: set foldlevel=2: -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
- xmlns:sf="http://sourceforge.net/"
- xmlns:dyn="http://exslt.org/dynamic"
- xmlns:saxon="http://icl.com/saxon"
- exclude-result-prefixes="fm sf"
- version='1.0'>
-
-<xsl:param name="get"/>
-<xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
-<xsl:param name="Tag" select="concat('V',translate(string(document('')//fm:Version[1]),'.',''))"/>
-<xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/>
-<xsl:param name="sf-relid" select="0"/>
-
-<xsl:param name="DistroName">docbook-xsl</xsl:param>
-<xsl:param name="PreviousRelease">1.77.0</xsl:param>
-<xsl:param name="PreviousReleaseRevision">9371</xsl:param>
-<xsl:param name="Revision">$Revision$</xsl:param>
-<xsl:param name="VersionFileURL">$URL$</xsl:param>
-
-<xsl:strip-space elements="fm:*"/>
-
-<fm:project>
- <fm:Project>DocBook</fm:Project>
- <fm:Branch>XSL Stylesheets</fm:Branch>
- <!-- * set/keep fm:version as N.NN.N-pre except for official releases, -->
- <!-- * then after the release, revert it to N.NN.N-pre & check back in -->
- <fm:Version>1.77.1</fm:Version>
-<!--
- <fm:License>MIT/X Consortium License</fm:License>
--->
- <fm:Release-Focus>
-<!-- * Initial freshmeat announcement -->
-<!-- * Documentation -->
-<!-- * Code cleanup -->
-<!-- * Minor feature enhancements -->
-* Major feature enhancements
-<!-- * Minor bugfixes -->
-<!-- * Major bugfixes -->
-<!-- * Minor security fixes -->
-<!-- * Major security fixes -->
- </fm:Release-Focus>
- <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL>
- <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.tar.gz?download</fm:Gzipped-Tar-URL>
- <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download</fm:Zipped-Tar-URL>
- <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download</fm:Bzipped-Tar-URL>
- <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
- <fm:CVS-URL>http://docbook.svn.sourceforge.net/viewvc/docbook/</fm:CVS-URL>
- <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
- <fm:Changes>This is a release with bugfixes and some enhancements.</fm:Changes>
-</fm:project>
-
-<xsl:template match="/" priority="-100">
- <xsl:choose>
- <xsl:when test="$get = 'Tag'">
- <xsl:value-of select="$Tag"/>
- </xsl:when>
- <xsl:when test="$get = 'PreviousRelease'">
- <xsl:value-of select="$PreviousRelease"/>
- </xsl:when>
- <xsl:when test="$get = 'PreviousReleaseRevision'">
- <xsl:value-of select="$PreviousReleaseRevision"/>
- </xsl:when>
- <xsl:when test="$get = 'DistroTitle'">
- <xsl:value-of select="$DistroTitle"/>
- </xsl:when>
- <xsl:when test="$get = 'VERSION'">
- <xsl:value-of select="$VERSION"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:if test="$sf-relid = 0">
- <xsl:message terminate="yes">
- <xsl:text>You must specify the sf-relid as a parameter.</xsl:text>
- </xsl:message>
- </xsl:if>
- <xsl:apply-templates select="//fm:project"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="fm:project">
- <xsl:apply-templates/>
- <xsl:text> </xsl:text>
- <xsl:apply-templates select="fm:Changes" mode="text"/>
-</xsl:template>
-
-<xsl:template match="fm:Changes"/>
-
-<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL">
- <xsl:value-of select="local-name(.)"/>
- <xsl:text>: </xsl:text>
- <xsl:value-of select="substring-before(., '{DISTRONAME-VERSION}')"/>
- <xsl:value-of select="concat($DistroName, '-', $VERSION)"/>
- <xsl:value-of select="substring-after(., '{DISTRONAME-VERSION}')"/>
- <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="fm:Changelog-URL">
- <xsl:value-of select="local-name(.)"/>
- <xsl:text>: </xsl:text>
- <xsl:value-of select="substring-before(., '{SFRELID}')"/>
- <xsl:value-of select="$sf-relid"/>
- <xsl:value-of select="substring-after(., '{SFRELID}')"/>
- <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="fm:*">
- <xsl:value-of select="local-name(.)"/>
- <xsl:text>: </xsl:text>
- <xsl:value-of select="normalize-space(.)"/>
- <xsl:text> </xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
Copied: trunk/xsl/VERSION.xsl (from rev 9469, trunk/xsl/VERSION)
===================================================================
--- trunk/xsl/VERSION.xsl (rev 0)
+++ trunk/xsl/VERSION.xsl 2012-07-06 13:21:46 UTC (rev 9470)
@@ -0,0 +1,115 @@
+<?xml version='1.0'?> <!-- -*- nxml -*- vim: set foldlevel=2: -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
+ xmlns:sf="http://sourceforge.net/"
+ xmlns:dyn="http://exslt.org/dynamic"
+ xmlns:saxon="http://icl.com/saxon"
+ exclude-result-prefixes="fm sf"
+ version='1.0'>
+
+<xsl:param name="get"/>
+<xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
+<xsl:param name="Tag" select="concat('V',translate(string(document('')//fm:Version[1]),'.',''))"/>
+<xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/>
+<xsl:param name="sf-relid" select="0"/>
+
+<xsl:param name="DistroName">docbook-xsl</xsl:param>
+<xsl:param name="PreviousRelease">1.77.0</xsl:param>
+<xsl:param name="PreviousReleaseRevision">9371</xsl:param>
+<xsl:param name="Revision">$Revision$</xsl:param>
+<xsl:param name="VersionFileURL">$URL$</xsl:param>
+
+<xsl:strip-space elements="fm:*"/>
+
+<fm:project>
+ <fm:Project>DocBook</fm:Project>
+ <fm:Branch>XSL Stylesheets</fm:Branch>
+ <!-- * set/keep fm:version as N.NN.N-pre except for official releases, -->
+ <!-- * then after the release, revert it to N.NN.N-pre & check back in -->
+ <fm:Version>1.77.1</fm:Version>
+<!--
+ <fm:License>MIT/X Consortium License</fm:License>
+-->
+ <fm:Release-Focus>
+<!-- * Initial freshmeat announcement -->
+<!-- * Documentation -->
+<!-- * Code cleanup -->
+<!-- * Minor feature enhancements -->
+* Major feature enhancements
+<!-- * Minor bugfixes -->
+<!-- * Major bugfixes -->
+<!-- * Minor security fixes -->
+<!-- * Major security fixes -->
+ </fm:Release-Focus>
+ <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL>
+ <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.tar.gz?download</fm:Gzipped-Tar-URL>
+ <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download</fm:Zipped-Tar-URL>
+ <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download</fm:Bzipped-Tar-URL>
+ <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
+ <fm:CVS-URL>http://docbook.svn.sourceforge.net/viewvc/docbook/</fm:CVS-URL>
+ <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
+ <fm:Changes>This is a release with bugfixes and some enhancements.</fm:Changes>
+</fm:project>
+
+<xsl:template match="/" priority="-100">
+ <xsl:choose>
+ <xsl:when test="$get = 'Tag'">
+ <xsl:value-of select="$Tag"/>
+ </xsl:when>
+ <xsl:when test="$get = 'PreviousRelease'">
+ <xsl:value-of select="$PreviousRelease"/>
+ </xsl:when>
+ <xsl:when test="$get = 'PreviousReleaseRevision'">
+ <xsl:value-of select="$PreviousReleaseRevision"/>
+ </xsl:when>
+ <xsl:when test="$get = 'DistroTitle'">
+ <xsl:value-of select="$DistroTitle"/>
+ </xsl:when>
+ <xsl:when test="$get = 'VERSION'">
+ <xsl:value-of select="$VERSION"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="$sf-relid = 0">
+ <xsl:message terminate="yes">
+ <xsl:text>You must specify the sf-relid as a parameter.</xsl:text>
+ </xsl:message>
+ </xsl:if>
+ <xsl:apply-templates select="//fm:project"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="fm:project">
+ <xsl:apply-templates/>
+ <xsl:text> </xsl:text>
+ <xsl:apply-templates select="fm:Changes" mode="text"/>
+</xsl:template>
+
+<xsl:template match="fm:Changes"/>
+
+<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL">
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="substring-before(., '{DISTRONAME-VERSION}')"/>
+ <xsl:value-of select="concat($DistroName, '-', $VERSION)"/>
+ <xsl:value-of select="substring-after(., '{DISTRONAME-VERSION}')"/>
+ <xsl:text> </xsl:text>
+</xsl:template>
+
+<xsl:template match="fm:Changelog-URL">
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="substring-before(., '{SFRELID}')"/>
+ <xsl:value-of select="$sf-relid"/>
+ <xsl:value-of select="substring-after(., '{SFRELID}')"/>
+ <xsl:text> </xsl:text>
+</xsl:template>
+
+<xsl:template match="fm:*">
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="normalize-space(.)"/>
+ <xsl:text> </xsl:text>
+</xsl:template>
+
+</xsl:stylesheet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2012-10-19 21:19:13
|
Revision: 9616
http://docbook.svn.sourceforge.net/docbook/?rev=9616&view=rev
Author: bobstayton
Date: 2012-10-19 21:16:44 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
Add parameter 'activate.external.olinks' to allow making
external olinks inactive, as for epub output.
Modified Paths:
--------------
trunk/xsl/common/olink.xsl
trunk/xsl/epub3/epub3-element-mods.xsl
trunk/xsl/fo/param.ent
trunk/xsl/fo/param.xweb
trunk/xsl/html/param.ent
trunk/xsl/html/param.xweb
Added Paths:
-----------
trunk/xsl/params/activate.external.olinks.xml
Modified: trunk/xsl/common/olink.xsl
===================================================================
--- trunk/xsl/common/olink.xsl 2012-10-19 17:14:36 UTC (rev 9615)
+++ trunk/xsl/common/olink.xsl 2012-10-19 21:16:44 UTC (rev 9616)
@@ -548,20 +548,37 @@
</xsl:choose>
</xsl:variable>
+ <!-- Is this olink to be active? -->
+ <xsl:variable name="active.olink">
+ <xsl:choose>
+ <xsl:when test="$activate.external.olinks = 0">
+ <xsl:choose>
+ <xsl:when test="$current.docid = ''">1</xsl:when>
+ <xsl:when test="$targetdoc = ''">1</xsl:when>
+ <xsl:when test="$targetdoc = $current.docid">1</xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
<!-- Form the href information -->
- <xsl:if test="$baseuri != ''">
- <xsl:value-of select="$baseuri"/>
- <xsl:if test="substring($target.href,1,1) != '#'">
- <!--xsl:text>/</xsl:text-->
+ <xsl:if test="$active.olink != 0">
+ <xsl:if test="$baseuri != ''">
+ <xsl:value-of select="$baseuri"/>
+ <xsl:if test="substring($target.href,1,1) != '#'">
+ <!--xsl:text>/</xsl:text-->
+ </xsl:if>
</xsl:if>
+ <!-- optionally turn off frag for PDF references -->
+ <xsl:if test="not($insert.olink.pdf.frag = 0 and
+ translate(substring($baseuri, string-length($baseuri) - 3),
+ 'PDF', 'pdf') = '.pdf'
+ and starts-with($target.href, '#') )">
+ <xsl:value-of select="$target.href"/>
+ </xsl:if>
</xsl:if>
- <!-- optionally turn off frag for PDF references -->
- <xsl:if test="not($insert.olink.pdf.frag = 0 and
- translate(substring($baseuri, string-length($baseuri) - 3),
- 'PDF', 'pdf') = '.pdf'
- and starts-with($target.href, '#') )">
- <xsl:value-of select="$target.href"/>
- </xsl:if>
</xsl:if>
</xsl:template>
Modified: trunk/xsl/epub3/epub3-element-mods.xsl
===================================================================
--- trunk/xsl/epub3/epub3-element-mods.xsl 2012-10-19 17:14:36 UTC (rev 9615)
+++ trunk/xsl/epub3/epub3-element-mods.xsl 2012-10-19 21:16:44 UTC (rev 9616)
@@ -52,6 +52,9 @@
<xsl:param name="base.dir" select="'OEBPS/'"/>
<xsl:param name="index.links.to.section" select="0"/>
+<!-- Epub does not yet support external links -->
+<xsl:param name="activate.external.olinks" select="0"/>
+
<!-- Turning this on crashes ADE, which is unbelievably awesome -->
<xsl:param name="formal.object.break.after">0</xsl:param>
Modified: trunk/xsl/fo/param.ent
===================================================================
--- trunk/xsl/fo/param.ent 2012-10-19 17:14:36 UTC (rev 9615)
+++ trunk/xsl/fo/param.ent 2012-10-19 21:16:44 UTC (rev 9616)
@@ -358,3 +358,4 @@
<!ENTITY region.outer.properties SYSTEM "../params/region.outer.properties.xml">
<!ENTITY table.caption.properties SYSTEM "../params/table.caption.properties.xml">
<!ENTITY para.properties SYSTEM "../params/para.properties.xml">
+<!ENTITY activate.external.olinks SYSTEM "../params/activate.external.olinks.xml">
Modified: trunk/xsl/fo/param.xweb
===================================================================
--- trunk/xsl/fo/param.xweb 2012-10-19 17:14:36 UTC (rev 9615)
+++ trunk/xsl/fo/param.xweb 2012-10-19 21:16:44 UTC (rev 9616)
@@ -167,6 +167,7 @@
</reference>
<reference xml:id="links"><title>Linking</title>
¤t.docid;
+&activate.external.olinks;
&collect.xref.targets;
&insert.olink.page.number;
&insert.olink.pdf.frag;
@@ -564,6 +565,7 @@
<src:fragref linkend="abstract.properties.frag"/>
<src:fragref linkend="abstract.title.properties.frag"/>
+<src:fragref linkend="activate.external.olinks.frag"/>
<src:fragref linkend="admon.graphics.extension.frag"/>
<src:fragref linkend="admon.graphics.frag"/>
<src:fragref linkend="admon.graphics.path.frag"/>
Modified: trunk/xsl/html/param.ent
===================================================================
--- trunk/xsl/html/param.ent 2012-10-19 17:14:36 UTC (rev 9615)
+++ trunk/xsl/html/param.ent 2012-10-19 21:16:44 UTC (rev 9616)
@@ -328,3 +328,4 @@
<!ENTITY webhelp.indexer.language SYSTEM "../params/webhelp.indexer.language.xml">
<!ENTITY webhelp.start.filename SYSTEM "../params/webhelp.start.filename.xml">
<!ENTITY webhelp.tree.cookie.id SYSTEM "../params/webhelp.tree.cookie.id.xml">
+<!ENTITY activate.external.olinks SYSTEM "../params/activate.external.olinks.xml">
Modified: trunk/xsl/html/param.xweb
===================================================================
--- trunk/xsl/html/param.xweb 2012-10-19 17:14:36 UTC (rev 9615)
+++ trunk/xsl/html/param.xweb 2012-10-19 21:16:44 UTC (rev 9616)
@@ -208,6 +208,7 @@
&use.local.olink.style;
¤t.docid;
&olink.doctitle;
+&activate.external.olinks;
&olink.debug;
&olink.properties;
&olink.lang.fallback.sequence;
@@ -457,6 +458,7 @@
******************************************************************** -->
<src:fragref linkend="abstract.notitle.enabled.frag"/>
+<src:fragref linkend="activate.external.olinks.frag"/>
<src:fragref linkend="admon.graphics.extension.frag"/>
<src:fragref linkend="admon.graphics.frag"/>
<src:fragref linkend="admon.graphics.path.frag"/>
Added: trunk/xsl/params/activate.external.olinks.xml
===================================================================
--- trunk/xsl/params/activate.external.olinks.xml (rev 0)
+++ trunk/xsl/params/activate.external.olinks.xml 2012-10-19 21:16:44 UTC (rev 9616)
@@ -0,0 +1,69 @@
+<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="activate.external.olinks">
+<refmeta>
+<refentrytitle>activate.external.olinks</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>activate.external.olinks</refname>
+<refpurpose>Make external olinks into active links</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment xml:id="activate.external.olinks.frag">
+<xsl:param name="activate.external.olinks" select="1"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>If <parameter>activate.external.olinks</parameter> is nonzero
+(the default), then any olinks that reference another document
+become active links that can be clicked on to follow the link.
+If the parameter is set to zero, then external olinks
+will have the appropriate link text generated, but the link is
+not made active. Olinks to destinations in
+the current document remain active.</para>
+
+<para>To make an external olink active for HTML
+outputs, the link text is wrapped in an <tag>a</tag>
+element with an <tag>href</tag> attribute. To
+make an external olink active for FO outputs, the link text is
+wrapped in an <tag>fo:basic-link</tag> element with an
+<tag>external-destination</tag> attribute.</para>
+
+<para>This parameter is useful when you need external olinks
+to resolve but not be clickable. For example, if documents
+in a collection are available independently of each other,
+then having active links between them could lead to
+unresolved links when a given target document is missing.</para>
+
+<para>The epub stylesheets set this parameter to zero by default
+because there is no standard linking mechanism between Epub documents.</para>
+
+<para>If external links are made inactive, you should
+consider setting the
+stylesheet parameter <parameter>olink.doctitle</parameter>
+to <literal>yes</literal>. That will append the external document's
+title to the link text, making it easier for the user to
+locate the other document.</para>
+
+<para>An olink is considered external when the
+<parameter>current.docid</parameter> stylesheet parameter
+is set to some value, and the olink's <tag>targetdoc</tag>
+attribute has a different value. If the two values
+match, then the link is considered internal. If the
+<parameter>current.docid</parameter> parameter is blank, or
+the <tag>olink</tag> element does not have a <tag>targetdoc</tag> attribute,
+then the link is considered to be internal and will become
+an active link.</para>
+
+<para>See also <parameter>olink.doctitle</parameter>,
+<parameter>prefer.internal.olink</parameter>.</para>
+
+</refsection>
+</refentry>
Property changes on: trunk/xsl/params/activate.external.olinks.xml
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2012-10-20 15:11:28
|
Revision: 9617
http://docbook.svn.sourceforge.net/docbook/?rev=9617&view=rev
Author: stefan
Date: 2012-10-20 15:11:19 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Merge Slides GSoC project to trunk.
Modified Paths:
--------------
trunk/xsl/params/foil.properties.xml
trunk/xsl/slides/Makefile
trunk/xsl/slides/fo/.gitignore
trunk/xsl/slides/fo/param.ent
trunk/xsl/slides/fo/param.xweb
trunk/xsl/slides/fo/plain-titlepage.xml
trunk/xsl/slides/fo/plain.xsl
trunk/xsl/slides/xhtml/.gitignore
trunk/xsl/slides/xhtml/Makefile
Added Paths:
-----------
trunk/xsl/params/disable.collapsible.xml
trunk/xsl/params/disable.incremental.xml
trunk/xsl/params/foil.footer.properties.xml
trunk/xsl/params/foil.header.properties.xml
trunk/xsl/params/foil.master.properties.xml
trunk/xsl/params/foil.page-sequence.properties.xml
trunk/xsl/params/foil.region-after.properties.xml
trunk/xsl/params/foil.region-before.properties.xml
trunk/xsl/params/foil.region-body.properties.xml
trunk/xsl/params/foil.title.properties.xml
trunk/xsl/params/generate.copyright.xml
trunk/xsl/params/generate.foilgroup.numbered.toc.xml
trunk/xsl/params/generate.foilgroup.toc.xml
trunk/xsl/params/generate.handoutnotes.xml
trunk/xsl/params/generate.page.number.xml
trunk/xsl/params/generate.pubdate.xml
trunk/xsl/params/generate.speakernotes.xml
trunk/xsl/params/generate.titlepage.xml
trunk/xsl/params/handoutnotes.properties.xml
trunk/xsl/params/mml.embedding.mode.fo.xml
trunk/xsl/params/mml.embedding.mode.xml
trunk/xsl/params/s5.controls.xml
trunk/xsl/params/s5.defaultview.xml
trunk/xsl/params/s5.opera.css.xml
trunk/xsl/params/s5.outline.css.xml
trunk/xsl/params/s5.path.prefix.xml
trunk/xsl/params/s5.print.css.xml
trunk/xsl/params/s5.slides.css.xml
trunk/xsl/params/s5.slides.js.xml
trunk/xsl/params/slides.titlepage.author.properties.xml
trunk/xsl/params/slides.titlepage.authorgroup.properties.xml
trunk/xsl/params/slides.titlepage.corpauthor.properties.xml
trunk/xsl/params/slides.titlepage.master.properties.xml
trunk/xsl/params/slides.titlepage.pubdate.properties.xml
trunk/xsl/params/slides.titlepage.region-body.properties.xml
trunk/xsl/params/slides.titlepage.subtitle.properties.xml
trunk/xsl/params/slides.titlepage.title.properties.xml
trunk/xsl/params/slidy.duration.xml
trunk/xsl/params/slidy.path.prefix.xml
trunk/xsl/params/slidy.slidy.css.xml
trunk/xsl/params/slidy.slidy.js.xml
trunk/xsl/params/slidy.user.css.xml
trunk/xsl/params/speakernotes.properties.xml
trunk/xsl/params/svg.embedding.mode.fo.xml
trunk/xsl/params/svg.embedding.mode.xml
trunk/xsl/params/user.css.xml
trunk/xsl/params/wrap.slidecontent.xml
trunk/xsl/slides/common/
trunk/xsl/slides/common/common.xsl
trunk/xsl/slides/fo/Makefile.param
trunk/xsl/slides/xhtml/Makefile.param
trunk/xsl/slides/xhtml/param.ent
trunk/xsl/slides/xhtml/param.xweb
trunk/xsl/slides/xhtml/plain-titlepage.xml
trunk/xsl/slides/xhtml/s5.xsl
trunk/xsl/slides/xhtml/slidy.xsl
Removed Paths:
-------------
trunk/xsl/slides/browser/
trunk/xsl/slides/graphics/
trunk/xsl/slides/html/
trunk/xsl/slides/htmlhelp/
trunk/xsl/slides/keynote/
trunk/xsl/slides/svg/
Added: trunk/xsl/params/disable.collapsible.xml
===================================================================
--- trunk/xsl/params/disable.collapsible.xml (rev 0)
+++ trunk/xsl/params/disable.collapsible.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="disable.collapsible">
+<refmeta>
+<refentrytitle>disable.collapsible</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>disable.collapsible</refname>
+<refpurpose>Specifies whether collapsible rendering is enabled</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="disable.collapsible.frag">
+ <xsl:param name="disable.collapsible">0</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether elements marked as
+ collapsible are generated as such in the output document.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/disable.incremental.xml
===================================================================
--- trunk/xsl/params/disable.incremental.xml (rev 0)
+++ trunk/xsl/params/disable.incremental.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="disable.incremental">
+<refmeta>
+<refentrytitle>disable.incremental</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>disable.incremental</refname>
+<refpurpose>Specifies whether incremental rendering is enabled</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="disable.incremental.frag">
+ <xsl:param name="disable.incremental">0</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether elements marked as
+ incremental are generated as such in the output document.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/foil.footer.properties.xml
===================================================================
--- trunk/xsl/params/foil.footer.properties.xml (rev 0)
+++ trunk/xsl/params/foil.footer.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,27 @@
+<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="foil.footer.properties">
+<refmeta>
+<refentrytitle>foil.footer.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.footer.properties</refname>
+<refpurpose>Specifies properties for slides footer</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.footer.properties.frag">
+ <xsl:attribute-set name="foil.footer.properties"/>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the foil footer.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/foil.header.properties.xml
===================================================================
--- trunk/xsl/params/foil.header.properties.xml (rev 0)
+++ trunk/xsl/params/foil.header.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,36 @@
+<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="foil.header.properties">
+<refmeta>
+<refentrytitle>foil.header.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.header.properties</refname>
+<refpurpose>Specifies properties for foil header area</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.header.properties.frag">
+ <xsl:attribute-set name="foil.header.properties">
+ <xsl:attribute name="background-color">white</xsl:attribute>
+ <xsl:attribute name="color">black</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ <xsl:attribute name="font-family">
+ <xsl:value-of select="$slide.title.font.family"/>
+ </xsl:attribute>
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the foil header area.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/foil.master.properties.xml
===================================================================
--- trunk/xsl/params/foil.master.properties.xml (rev 0)
+++ trunk/xsl/params/foil.master.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,46 @@
+<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="foil.master.properties">
+<refmeta>
+<refentrytitle>foil.master.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.master.properties</refname>
+<refpurpose>Specifies properties for foil master</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.master.properties.frag">
+ <xsl:attribute-set name="foil.master.properties">
+ <xsl:attribute name="page-width">
+ <xsl:value-of select="$page.width"/>
+ </xsl:attribute>
+ <xsl:attribute name="page-height">
+ <xsl:value-of select="$page.height"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-top">
+ <xsl:value-of select="$page.margin.top"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-bottom">
+ <xsl:value-of select="$page.margin.bottom"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-left">
+ <xsl:value-of select="$page.margin.inner"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-right">
+ <xsl:value-of select="$page.margin.outer"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the foil master.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/foil.page-sequence.properties.xml
===================================================================
--- trunk/xsl/params/foil.page-sequence.properties.xml (rev 0)
+++ trunk/xsl/params/foil.page-sequence.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -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="foil.page-sequence.properties">
+<refmeta>
+<refentrytitle>foil.page-sequence.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.page-sequence.properties</refname>
+<refpurpose>Specifies properties for foil page-sequence</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.page-sequence.properties.frag">
+ <xsl:attribute-set name="foil.page-sequence.properties">
+ <xsl:attribute name="hyphenate">
+ <xsl:value-of select="$hyphenate"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for foil page-sequence.</para>
+
+</refsection>
+</refentry>
Modified: trunk/xsl/params/foil.properties.xml
===================================================================
--- trunk/xsl/params/foil.properties.xml 2012-10-19 21:16:44 UTC (rev 9616)
+++ trunk/xsl/params/foil.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -24,7 +24,6 @@
<xsl:attribute name="font-size">
<xsl:value-of select="$body.font.size"/>
</xsl:attribute>
- <xsl:attribute name="font-weight">bold</xsl:attribute>
</xsl:attribute-set>
</src:fragment>
</refsynopsisdiv>
Added: trunk/xsl/params/foil.region-after.properties.xml
===================================================================
--- trunk/xsl/params/foil.region-after.properties.xml (rev 0)
+++ trunk/xsl/params/foil.region-after.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,32 @@
+<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="foil.region-after.properties">
+<refmeta>
+<refentrytitle>foil.region-after.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.region-after.properties</refname>
+<refpurpose>Specifies properties for foil region-after</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.region-after.properties.frag">
+ <xsl:attribute-set name="foil.region-after.properties">
+ <xsl:attribute name="extent">
+ <xsl:value-of select="$region.after.extent"/>
+ </xsl:attribute>
+ <xsl:attribute name="display-align">after</xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the foil region-after.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/foil.region-before.properties.xml
===================================================================
--- trunk/xsl/params/foil.region-before.properties.xml (rev 0)
+++ trunk/xsl/params/foil.region-before.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,34 @@
+<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="foil.region-before.properties">
+<refmeta>
+<refentrytitle>foil.region-before.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.region-before.properties</refname>
+<refpurpose>Specifies properties for foil region-before</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.region-before.properties.frag">
+ <xsl:attribute-set name="foil.region-before.properties">
+ <xsl:attribute name="extent">
+ <xsl:value-of select="$region.before.extent"/>
+ </xsl:attribute>
+ <xsl:attribute name="display-align">
+ <xsl:value-of select="'before'"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the foil region-before.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/foil.region-body.properties.xml
===================================================================
--- trunk/xsl/params/foil.region-body.properties.xml (rev 0)
+++ trunk/xsl/params/foil.region-body.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,37 @@
+<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="foil.region-body.properties">
+<refmeta>
+<refentrytitle>foil.region-body.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.region-body.properties</refname>
+<refpurpose>Specifies properties for foil region-body</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.region-body.properties.frag">
+ <xsl:attribute-set name="foil.region-body.properties">
+ <xsl:attribute name="margin-bottom">
+ <xsl:value-of select="$body.margin.bottom"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-top">
+ <xsl:value-of select="$body.margin.top"/>
+ </xsl:attribute>
+ <xsl:attribute name="column-count">
+ <xsl:value-of select="$column.count.body"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the foil region-body.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/foil.title.properties.xml
===================================================================
--- trunk/xsl/params/foil.title.properties.xml (rev 0)
+++ trunk/xsl/params/foil.title.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -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="foil.title.properties">
+<refmeta>
+<refentrytitle>foil.title.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>foil.title.properties</refname>
+<refpurpose>Specifies properties for foil title</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="foil.title.properties.frag">
+ <xsl:attribute-set name="foil.title.properties">
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$foil.title.size"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the foil title.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.copyright.xml
===================================================================
--- trunk/xsl/params/generate.copyright.xml (rev 0)
+++ trunk/xsl/params/generate.copyright.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="generate.copyright">
+<refmeta>
+<refentrytitle>generate.copyright</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.copyright</refname>
+<refpurpose>Specifies whether copyright is generated</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.copyright.frag">
+ <xsl:param name="generate.copyright">1</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether the copyright info is generated
+ in the footer area.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.foilgroup.numbered.toc.xml
===================================================================
--- trunk/xsl/params/generate.foilgroup.numbered.toc.xml (rev 0)
+++ trunk/xsl/params/generate.foilgroup.numbered.toc.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -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="generate.foilgroup.numbered.toc">
+<refmeta>
+<refentrytitle>generate.foilgroup.numbered.toc</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.foilgroup.numbered.toc</refname>
+<refpurpose>Specifies whether foilgroups have a numbered TOC</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.foilgroup.numbered.toc.frag">
+ <xsl:param name="generate.foilgroup.numbered.toc">1</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>If TOC generation is turned on, this parameter specifies
+ whether foilgroups have a numbered TOC. If disabled, TOC items
+ will be bulleted, not numbered.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.foilgroup.toc.xml
===================================================================
--- trunk/xsl/params/generate.foilgroup.toc.xml (rev 0)
+++ trunk/xsl/params/generate.foilgroup.toc.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="generate.foilgroup.toc">
+<refmeta>
+<refentrytitle>generate.foilgroup.toc</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.foilgroup.toc</refname>
+<refpurpose>Specifies whether foilgroups have a TOC</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.foilgroup.toc.frag">
+ <xsl:param name="generate.foilgroup.toc">1</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether foilgroups will
+ contain a table of contents of the included foils.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.handoutnotes.xml
===================================================================
--- trunk/xsl/params/generate.handoutnotes.xml (rev 0)
+++ trunk/xsl/params/generate.handoutnotes.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="generate.handoutnotes">
+<refmeta>
+<refentrytitle>generate.handoutnotes</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.handoutnotes</refname>
+<refpurpose>Specifies whether handoutnotes are generated</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.handoutnotes.frag">
+ <xsl:param name="generate.handoutnotes">0</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether handoutnotes shall
+ be generated to the output.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.page.number.xml
===================================================================
--- trunk/xsl/params/generate.page.number.xml (rev 0)
+++ trunk/xsl/params/generate.page.number.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,58 @@
+<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="generate.page.number">
+<refmeta>
+<refentrytitle>generate.page.number</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">list</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">full<alt>1/2</alt></refmiscinfo>
+<refmiscinfo class="other" otherclass="value">compact<alt>1</alt></refmiscinfo>
+<refmiscinfo class="other" otherclass="value">no</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.page.number</refname>
+<refpurpose>Specifies whether page numbers are generated</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.page.number.frag">
+ <xsl:param name="generate.page.number">compact</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies how page numbers are generated in
+ the footer area.</para>
+
+<variablelist>
+ <varlistentry>
+ <term>no</term>
+ <listitem>
+ <para>No page numbers generated at all.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>full</term>
+ <listitem>
+ <para>Current page number, a slash and the total number of pages</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>compact</term>
+ <listitem>
+ <para>Current page number only</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>no</term>
+ <listitem>
+ <para>No page numbers generated at all.</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.pubdate.xml
===================================================================
--- trunk/xsl/params/generate.pubdate.xml (rev 0)
+++ trunk/xsl/params/generate.pubdate.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="generate.pubdate">
+<refmeta>
+<refentrytitle>generate.pubdate</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.pubdate</refname>
+<refpurpose>Specifies whether the pubdate is generated</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.pubdate.frag">
+ <xsl:param name="generate.pubdate">1</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether the publication date is generated
+ in the footer area.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.speakernotes.xml
===================================================================
--- trunk/xsl/params/generate.speakernotes.xml (rev 0)
+++ trunk/xsl/params/generate.speakernotes.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="generate.speakernotes">
+<refmeta>
+<refentrytitle>generate.speakernotes</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.speakernotes</refname>
+<refpurpose>Specifies whether speakernotes are generated</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.speakernotes.frag">
+ <xsl:param name="generate.speakernotes">0</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether speakernotes shall
+ be generated to the output.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/generate.titlepage.xml
===================================================================
--- trunk/xsl/params/generate.titlepage.xml (rev 0)
+++ trunk/xsl/params/generate.titlepage.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="generate.titlepage">
+<refmeta>
+<refentrytitle>generate.titlepage</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>generate.titlepage</refname>
+<refpurpose>Specifies whether titlepage is generated</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="generate.titlepage.frag">
+ <xsl:param name="generate.titlepage">1</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether titlepage is generated
+ for the presentation.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/handoutnotes.properties.xml
===================================================================
--- trunk/xsl/params/handoutnotes.properties.xml (rev 0)
+++ trunk/xsl/params/handoutnotes.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="handoutnotes.properties">
+<refmeta>
+<refentrytitle>handoutnotes.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>footnote.properties</refname>
+<refpurpose>Properties applied to handoutnotes
+</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment xml:id="handoutnotes.properties.frag">
+<xsl:attribute-set name="handoutnotes.properties"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This attribute set is applied to handoutnotes.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/mml.embedding.mode.fo.xml
===================================================================
--- trunk/xsl/params/mml.embedding.mode.fo.xml (rev 0)
+++ trunk/xsl/params/mml.embedding.mode.fo.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,54 @@
+<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="mml.embedding.mode">
+<refmeta>
+<refentrytitle>mml.embedding.mode</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">list</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">inline</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">external-graphic</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">instream-foreign-object</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>mml.embedding.mode</refname>
+<refpurpose>Specifies how inline MathML is processed</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="mml.embedding.mode.fo.frag">
+ <xsl:param name="mml.embedding.mode">external-graphic</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies how inline MathML formulas
+ are embedded into the output document.</para>
+
+<variablelist>
+ <varlistentry>
+ <term>inline</term>
+ <listitem>
+ <para>Content is copied over inline with its namespace.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>external-graphic</term>
+ <listitem>
+ <para>Content is extracted into an externel file and referenced
+ by an <markup>external-graphic</markup> element.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>instream-foreign-object</term>
+ <listitem>
+ <para>Content is copied over with its namespace inside an
+ <markup>instream-foreign-object</markup> element.</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/mml.embedding.mode.xml
===================================================================
--- trunk/xsl/params/mml.embedding.mode.xml (rev 0)
+++ trunk/xsl/params/mml.embedding.mode.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,78 @@
+<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="mml.embedding.mode">
+<refmeta>
+<refentrytitle>mml.embedding.mode</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">list</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">inline</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">object</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">image</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">link</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">iframe</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">embed</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>mml.embedding.mode</refname>
+<refpurpose>Specifies how inline MathML is processed</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="mml.embedding.mode.frag">
+ <xsl:param name="mml.embedding.mode">inline</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies how inline MathML formulas
+ are embedded into the output document.</para>
+
+<variablelist>
+ <varlistentry>
+ <term>inline</term>
+ <listitem>
+ <para>Content is copied over inline with its namespace.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>object</term>
+ <listitem>
+ <para>Content is extracted into an externel file and referenced
+ by an <markup>object</markup> element.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>image</term>
+ <listitem>
+ <para>Content is extracted into an externel file and referenced
+ by an <markup>img</markup> element.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>link</term>
+ <listitem>
+ <para>Content is extracted into an externel file and referenced
+ by an <markup>a</markup> element.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>iframe</term>
+ <listitem>
+ <para>Content is extracted into an externel file and referenced
+ by an <markup>iframe</markup> element.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>embed</term>
+ <listitem>
+ <para>Content is extracted into an externel file and referenced
+ by an <markup>embed</markup> element.</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.controls.xml
===================================================================
--- trunk/xsl/params/s5.controls.xml (rev 0)
+++ trunk/xsl/params/s5.controls.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="s5.controls">
+<refmeta>
+<refentrytitle>s5.controls</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.controls</refname>
+<refpurpose>Specifies whether S5 controls are visible</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.controls.frag">
+ <xsl:param name="s5.controls">0</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies whether S5 navigation controls are
+ visible by default.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.defaultview.xml
===================================================================
--- trunk/xsl/params/s5.defaultview.xml (rev 0)
+++ trunk/xsl/params/s5.defaultview.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,30 @@
+<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="s5.defaultview">
+<refmeta>
+<refentrytitle>s5.defaultview</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">list</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">slideshow</refmiscinfo>
+<refmiscinfo class="other" otherclass="value">outline</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.defaultview</refname>
+<refpurpose>Specifies the default S5 view</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.defaultview.frag">
+ <xsl:param name="s5.defaultview">slideshow</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies, which is the default view
+ in the generated S5 presentation.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.opera.css.xml
===================================================================
--- trunk/xsl/params/s5.opera.css.xml (rev 0)
+++ trunk/xsl/params/s5.opera.css.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="s5.opera.css">
+<refmeta>
+<refentrytitle>s5.opera.css</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">filename</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.opera.css</refname>
+<refpurpose>Specifies the name of the S5 Opera-specific CSS file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.opera.css.frag">
+ <xsl:param name="s5.opera.css">opera.css</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies the name of the S5 Opera-specific
+ CSS file.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.outline.css.xml
===================================================================
--- trunk/xsl/params/s5.outline.css.xml (rev 0)
+++ trunk/xsl/params/s5.outline.css.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,27 @@
+<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="s5.outline.css">
+<refmeta>
+<refentrytitle>s5.outline.css</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">filename</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.outline.css</refname>
+<refpurpose>Specifies the name of the S5 outline CSS file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.outline.css.frag">
+ <xsl:param name="s5.outline.css">outline.css</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies the name of the S5 outline CSS file.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.path.prefix.xml
===================================================================
--- trunk/xsl/params/s5.path.prefix.xml (rev 0)
+++ trunk/xsl/params/s5.path.prefix.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -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="s5.path.prefix">
+<refmeta>
+<refentrytitle>s5.path.prefix</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.path.prefix</refname>
+<refpurpose>Specifies the path to S5 files</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.path.prefix.frag">
+ <xsl:param name="s5.path.prefix">files/s5/ui/default/</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies the path where S5 CSS and
+ JavaScript files reside. All the CSS and JavaScript paths
+ will be generated relative to this directory.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.print.css.xml
===================================================================
--- trunk/xsl/params/s5.print.css.xml (rev 0)
+++ trunk/xsl/params/s5.print.css.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,27 @@
+<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="s5.print.css">
+<refmeta>
+<refentrytitle>s5.print.css</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">filename</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.print.css</refname>
+<refpurpose>Specifies the name of the S5 print CSS file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.print.css.frag">
+ <xsl:param name="s5.print.css">print.css</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies the name of the S5 print CSS file.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.slides.css.xml
===================================================================
--- trunk/xsl/params/s5.slides.css.xml (rev 0)
+++ trunk/xsl/params/s5.slides.css.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,27 @@
+<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="s5.slides.css">
+<refmeta>
+<refentrytitle>s5.slides.css</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">filename</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.slides.css</refname>
+<refpurpose>Specifies the name of the S5 slides CSS file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.slides.css.frag">
+ <xsl:param name="s5.slides.css">slides.css</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies the name of the S5 slides CSS file.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/s5.slides.js.xml
===================================================================
--- trunk/xsl/params/s5.slides.js.xml (rev 0)
+++ trunk/xsl/params/s5.slides.js.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="s5.slides.js">
+<refmeta>
+<refentrytitle>s5.slides.js</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">filename</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>s5.slides.js</refname>
+<refpurpose>Specifies the name of the S5 slides JavaScript file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="s5.slides.js.frag">
+ <xsl:param name="s5.slides.js">slides.js</xsl:param>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies the name of the S5 slides JavaScript
+ file.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.author.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.author.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.author.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,32 @@
+<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="slides.titlepage.author.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.author.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.author.properties</refname>
+<refpurpose>Specifies properties for slides titlepage title</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.author.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.author.properties">
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ <xsl:attribute name="space-after">1em</xsl:attribute>
+ <xsl:attribute name="font-size">20.736pt</xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the author on the default
+ titlepage.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.authorgroup.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.authorgroup.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.authorgroup.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,28 @@
+<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="slides.titlepage.authorgroup.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.authorgroup.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.authorgroup.properties</refname>
+<refpurpose>Specifies properties for slides titlepage title</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.authorgroup.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.authorgroup.properties"/>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the authorgroup on the default
+ titlepage.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.corpauthor.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.corpauthor.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.corpauthor.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,32 @@
+<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="slides.titlepage.corpauthor.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.corpauthor.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.corpauthor.properties</refname>
+<refpurpose>Specifies properties for slides titlepage title</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.corpauthor.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.corpauthor.properties">
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ <xsl:attribute name="space-after">1em</xsl:attribute>
+ <xsl:attribute name="font-size">20.736pt</xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the corpauthor on the default
+ titlepage.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.master.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.master.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.master.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,46 @@
+<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="slides.titlepage.master.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.master.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.master.properties</refname>
+<refpurpose>Specifies properties for slides titlepage master</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.master.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.master.properties">
+ <xsl:attribute name="page-width">
+ <xsl:value-of select="$page.width"/>
+ </xsl:attribute>
+ <xsl:attribute name="page-height">
+ <xsl:value-of select="$page.height"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-top">
+ <xsl:value-of select="$page.margin.top"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-bottom">
+ <xsl:value-of select="$page.margin.bottom"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-left">
+ <xsl:value-of select="$page.margin.inner"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-right">
+ <xsl:value-of select="$page.margin.outer"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the slides titlepage master.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.pubdate.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.pubdate.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.pubdate.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,32 @@
+<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="slides.titlepage.pubdate.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.pubdate.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.pubdate.properties</refname>
+<refpurpose>Specifies properties for slides titlepage title</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.pubdate.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.pubdate.properties">
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ <xsl:attribute name="space-after">1em</xsl:attribute>
+ <xsl:attribute name="font-size">17.28pt</xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the pubdate on the default
+ titlepage.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.region-body.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.region-body.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.region-body.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,33 @@
+<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="slides.titlepage.region-body.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.region-body.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.region-body.properties</refname>
+<refpurpose>Specifies properties for slides titlepage region-body</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.region-body.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.region-body.properties">
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
+ <xsl:attribute name="column-count">
+ <xsl:value-of select="$column.count.body"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the slides titlepage region-body.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.subtitle.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.subtitle.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.subtitle.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,34 @@
+<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="slides.titlepage.subtitle.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.subtitle.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.subtitle.properties</refname>
+<refpurpose>Specifies properties for slides titlepage title</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.subtitle.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.subtitle.properties">
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ <xsl:attribute name="space-after">1em</xsl:attribute>
+ <xsl:attribute name="font-family">
+ <xsl:value-of select="$slide.title.font.family"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the subtitle on the default
+ titlepage.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slides.titlepage.title.properties.xml
===================================================================
--- trunk/xsl/params/slides.titlepage.title.properties.xml (rev 0)
+++ trunk/xsl/params/slides.titlepage.title.properties.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,40 @@
+<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="slides.titlepage.title.properties">
+<refmeta>
+<refentrytitle>slides.titlepage.title.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>slides.titlepage.title.properties</refname>
+<refpurpose>Specifies properties for slides titlepage title</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <src:fragment xml:id="slides.titlepage.title.properties.frag">
+ <xsl:attribute-set name="slides.titlepage.title.properties">
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ <xsl:attribute name="space-after">1em</xsl:attribute>
+ <xsl:attribute name="padding-top">1.5in</xsl:attribute>
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$foil.title.size"/>
+ </xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="font-family">
+ <xsl:value-of select="$slide.title.font.family"/>
+ </xsl:attribute>
+ </xsl:attribute-set>
+ </src:fragment>
+</refsynopsisdiv>
+
+<refsection><info><title>Description</title></info>
+
+<para>This parameter specifies properties for the title on the default
+ titlepage.</para>
+
+</refsection>
+</refentry>
Added: trunk/xsl/params/slidy.duration.xml
===================================================================
--- trunk/xsl/params/slidy.duration.xml (rev 0)
+++ trunk/xsl/params/slidy.duration.xml 2012-10-20 15:11:19 UTC (rev 9617)
@@ -0,0 +1,29 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="htt...
[truncated message content] |
|
From: <dc...@us...> - 2012-10-20 23:12:39
|
Revision: 9625
http://docbook.svn.sourceforge.net/docbook/?rev=9625&view=rev
Author: dcramer
Date: 2012-10-20 23:12:33 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Slides: Change html to xhtml passim.
Modified Paths:
--------------
trunk/xsl/Makefile
trunk/xsl/doc/Makefile
trunk/xsl/docsrc/reference.xml
trunk/xsl/slides/Makefile
trunk/xsl/tools/xsl/build/make-xsl-params.xsl
trunk/xsl/tools/xsl/build/xsl-param-link.xsl
Modified: trunk/xsl/Makefile
===================================================================
--- trunk/xsl/Makefile 2012-10-20 22:34:21 UTC (rev 9624)
+++ trunk/xsl/Makefile 2012-10-20 23:12:33 UTC (rev 9625)
@@ -63,11 +63,11 @@
URILIST = \
.\ http://docbook.sourceforge.net/release/xsl/current/
-DIRS=common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides website extensions webhelp xhtml5 epub3
+DIRS=common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides website extensions xhtml webhelp xhtml5 epub3
.PHONY: distrib clean doc docsrc xhtml
-all: base xhtml
+all: base
# If you're annoyed about getting the reminder that it's possible
# to use xsltproc to build, delete the following conditional from
# this makefile.
Modified: trunk/xsl/doc/Makefile
===================================================================
--- trunk/xsl/doc/Makefile 2012-10-20 22:34:21 UTC (rev 9624)
+++ trunk/xsl/doc/Makefile 2012-10-20 23:12:33 UTC (rev 9625)
@@ -22,7 +22,7 @@
HTMLMANIFEST=HTML.manifest
-PARAM_DIRS=html fo manpages roundtrip slides/fo slides/html website
+PARAM_DIRS=html fo manpages roundtrip slides/fo slides/xhtml website
PI_DIRS=html fo common
PARAM_XML_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xml)
Modified: trunk/xsl/docsrc/reference.xml
===================================================================
--- trunk/xsl/docsrc/reference.xml 2012-10-20 22:34:21 UTC (rev 9624)
+++ trunk/xsl/docsrc/reference.xml 2012-10-20 23:12:33 UTC (rev 9625)
@@ -134,7 +134,7 @@
output.</para>
</note>
</partintro>
- <xi:include href="../slides/html/param.xml" xpointer="xpointer(/book/reference)" />
+ <xi:include href="../slides/xhtml/param.xml" xpointer="xpointer(/book/reference)" />
<xi:include href="../slides/fo/param.xml" xpointer="xpointer(/book/reference)" />
</part>
<part xml:id="website">
Modified: trunk/xsl/slides/Makefile
===================================================================
--- trunk/xsl/slides/Makefile 2012-10-20 22:34:21 UTC (rev 9624)
+++ trunk/xsl/slides/Makefile 2012-10-20 23:12:33 UTC (rev 9625)
@@ -11,3 +11,4 @@
for i in $(DIRS); do \
echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
done
+ rm xhtml/params.xsl
Modified: trunk/xsl/tools/xsl/build/make-xsl-params.xsl
===================================================================
--- trunk/xsl/tools/xsl/build/make-xsl-params.xsl 2012-10-20 22:34:21 UTC (rev 9624)
+++ trunk/xsl/tools/xsl/build/make-xsl-params.xsl 2012-10-20 23:12:33 UTC (rev 9625)
@@ -18,7 +18,7 @@
<!-- ==================================================================== -->
<!-- * This stylesheet expects itself as input -->
- <xsl:param name="param.dirs">html fo manpages roundtrip slides/fo slides/html website</xsl:param>
+ <xsl:param name="param.dirs">html fo manpages roundtrip slides/fo slides/xhtml website</xsl:param>
<xsl:template match="/">
<xslt:stylesheet version="1.0">
Modified: trunk/xsl/tools/xsl/build/xsl-param-link.xsl
===================================================================
--- trunk/xsl/tools/xsl/build/xsl-param-link.xsl 2012-10-20 22:34:21 UTC (rev 9624)
+++ trunk/xsl/tools/xsl/build/xsl-param-link.xsl 2012-10-20 23:12:33 UTC (rev 9625)
@@ -13,7 +13,7 @@
<xsl:param name="fo-baseuri" select="concat($doc-baseuri,'fo/')"/>
<xsl:param name="manpages-baseuri" select="concat($doc-baseuri,'manpages/')"/>
<xsl:param name="roundtrip-baseuri" select="concat($doc-baseuri,'roundtrip/')"/>
- <xsl:param name="slides-html-baseuri" select="concat($doc-baseuri,'slides/')"/>
+ <xsl:param name="slides-xhtml-baseuri" select="concat($doc-baseuri,'slides/')"/>
<xsl:param name="slides-fo-baseuri" select="concat($doc-baseuri,'slides/')"/>
<xsl:param name="website-baseuri" select="concat($doc-baseuri,'website/')"/>
@@ -44,7 +44,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:variable name="isslideshtml">
- <xsl:call-template name="is-slides-html-parameter">
+ <xsl:call-template name="is-slides-xhtml-parameter">
<xsl:with-param name="param" select="normalize-space(.)"/>
</xsl:call-template>
</xsl:variable>
@@ -80,7 +80,7 @@
</a>
</xsl:when>
<xsl:when test="$isslideshtml != 0">
- <a href="{concat($slides-html-baseuri, normalize-space(.))}.html">
+ <a href="{concat($slides-xhtml-baseuri, normalize-space(.))}.html">
<xsl:copy-of select="$markup"/>
</a>
</xsl:when>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dc...@us...> - 2012-10-20 23:15:02
|
Revision: 9626
http://docbook.svn.sourceforge.net/docbook/?rev=9626&view=rev
Author: dcramer
Date: 2012-10-20 23:14:56 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Adding generated files to various clean targets.
Modified Paths:
--------------
trunk/xsl/docsrc/Makefile
trunk/xsl/epub3/Makefile
trunk/xsl/webhelp/Makefile
Modified: trunk/xsl/docsrc/Makefile
===================================================================
--- trunk/xsl/docsrc/Makefile 2012-10-20 23:12:33 UTC (rev 9625)
+++ trunk/xsl/docsrc/Makefile 2012-10-20 23:14:56 UTC (rev 9626)
@@ -49,6 +49,7 @@
$(RM) $(PI_XML_FILES)
$(RM) $(OTHER_XML_FILES)
$(RM) reference.xml.included
+ $(RM) reference.xml.included.tmp
ifneq ($(shell uname -s | grep -i cygwin),)
ifeq ($(XSLTENGINE),saxon)
Modified: trunk/xsl/epub3/Makefile
===================================================================
--- trunk/xsl/epub3/Makefile 2012-10-20 23:12:33 UTC (rev 9625)
+++ trunk/xsl/epub3/Makefile 2012-10-20 23:14:56 UTC (rev 9626)
@@ -4,3 +4,6 @@
titlepage.templates.xsl: titlepage.templates.xml $(NESTLEVEL)../template/titlepage.xsl
$(XSLT) $< $(NESTLEVEL)../template/titlepage.xsl $@ ns=$(TARGETNS)
+
+clean:
+ rm titlepage.templates.xsl
\ No newline at end of file
Modified: trunk/xsl/webhelp/Makefile
===================================================================
--- trunk/xsl/webhelp/Makefile 2012-10-20 23:12:33 UTC (rev 9625)
+++ trunk/xsl/webhelp/Makefile 2012-10-20 23:14:56 UTC (rev 9626)
@@ -33,6 +33,8 @@
${INPUT_XML}
xsltproc --xinclude xsl/webhelp.xsl xincluded-profiled.xml
+
+ rm xincluded-profiled.xml
index:
java \
-DhtmlDir=$(OUTPUT_DIR) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2012-10-26 18:24:09
|
Revision: 9650
http://docbook.svn.sourceforge.net/docbook/?rev=9650&view=rev
Author: bobstayton
Date: 2012-10-26 18:24:02 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Remove all references and code for obsolete olink attributes
@linkmode @targetdocent and @localinfo.
Modified Paths:
--------------
trunk/xsl/common/olink.xsl
trunk/xsl/fo/xref.xsl
trunk/xsl/html/param.ent
trunk/xsl/html/param.xweb
trunk/xsl/html/xref.xsl
Modified: trunk/xsl/common/olink.xsl
===================================================================
--- trunk/xsl/common/olink.xsl 2012-10-26 17:51:31 UTC (rev 9649)
+++ trunk/xsl/common/olink.xsl 2012-10-26 18:24:02 UTC (rev 9650)
@@ -1008,7 +1008,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:when>
- <xsl:when test="@targetdoc != '' or @targetptr != ''">
+ <xsl:otherwise>
<xsl:if test="$olink.key != ''">
<xsl:message>
<xsl:text>Olink error: no generated text for </xsl:text>
@@ -1018,15 +1018,6 @@
</xsl:message>
</xsl:if>
<xsl:text>????</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <!-- old style olink -->
- <xsl:call-template name="olink.outline">
- <xsl:with-param name="outline.base.uri"
- select="unparsed-entity-uri(@targetdocent)"/>
- <xsl:with-param name="localinfo" select="@localinfo"/>
- <xsl:with-param name="return" select="'xreftext'"/>
- </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
Modified: trunk/xsl/fo/xref.xsl
===================================================================
--- trunk/xsl/fo/xref.xsl 2012-10-26 17:51:31 UTC (rev 9649)
+++ trunk/xsl/fo/xref.xsl 2012-10-26 18:24:02 UTC (rev 9650)
@@ -1098,8 +1098,6 @@
<!-- olink content may be passed in from xlink olink -->
<xsl:param name="content" select="NOTANELEMENT"/>
- <xsl:variable name="localinfo" select="@localinfo"/>
-
<xsl:choose>
<!-- olinks resolved by stylesheet and target database -->
<xsl:when test="@targetdoc or @targetptr or
@@ -1342,14 +1340,6 @@
</xsl:template>
-<xsl:template name="olink.outline">
- <xsl:param name="outline.base.uri"/>
- <xsl:param name="localinfo"/>
- <xsl:param name="return" select="href"/>
-
- <xsl:message terminate="yes">Fatal error: olink.outline template: what is this supposed to do?</xsl:message>
-</xsl:template>
-
<!-- ==================================================================== -->
<xsl:template name="title.xref">
Modified: trunk/xsl/html/param.ent
===================================================================
--- trunk/xsl/html/param.ent 2012-10-26 17:51:31 UTC (rev 9649)
+++ trunk/xsl/html/param.ent 2012-10-26 18:24:02 UTC (rev 9650)
@@ -171,11 +171,6 @@
<!ENTITY insert.olink.page.number SYSTEM "../params/insert.olink.page.number.xml">
<!ENTITY insert.olink.pdf.frag SYSTEM "../params/insert.olink.pdf.frag.xml">
<!ENTITY olink.lang.fallback.sequence SYSTEM "../params/olink.lang.fallback.sequence.xml">
-<!ENTITY olink.fragid SYSTEM "../params/olink.fragid.xml">
-<!ENTITY olink.outline.ext SYSTEM "../params/olink.outline.ext.xml">
-<!ENTITY olink.pubid SYSTEM "../params/olink.pubid.xml">
-<!ENTITY olink.resolver SYSTEM "../params/olink.resolver.xml">
-<!ENTITY olink.sysid SYSTEM "../params/olink.sysid.xml">
<!ENTITY abstract.notitle.enabled SYSTEM "../params/abstract.notitle.enabled.xml">
<!ENTITY othercredit.like.author.enabled SYSTEM "../params/othercredit.like.author.enabled.xml">
<!ENTITY part.autolabel SYSTEM "../params/part.autolabel.xml">
Modified: trunk/xsl/html/param.xweb
===================================================================
--- trunk/xsl/html/param.xweb 2012-10-26 17:51:31 UTC (rev 9649)
+++ trunk/xsl/html/param.xweb 2012-10-26 18:24:02 UTC (rev 9650)
@@ -217,11 +217,6 @@
&prefer.internal.olink;
&link.mailto.url;
&ulink.target;
-&olink.fragid;
-&olink.outline.ext;
-&olink.pubid;
-&olink.sysid;
-&olink.resolver;
</reference>
<reference xml:id="xrefs"><title>Cross References</title>
&collect.xref.targets;
Modified: trunk/xsl/html/xref.xsl
===================================================================
--- trunk/xsl/html/xref.xsl 2012-10-26 17:51:31 UTC (rev 9649)
+++ trunk/xsl/html/xref.xsl 2012-10-26 18:24:02 UTC (rev 9650)
@@ -1047,8 +1047,6 @@
<xsl:call-template name="anchor"/>
- <xsl:variable name="localinfo" select="@localinfo"/>
-
<xsl:choose>
<!-- olinks resolved by stylesheet and target database -->
<xsl:when test="@targetdoc or @targetptr or
@@ -1186,56 +1184,20 @@
</xsl:when>
- <!-- Or use old olink mechanism -->
<xsl:otherwise>
- <xsl:variable name="href">
- <xsl:choose>
- <xsl:when test="@linkmode">
- <!-- use the linkmode to get the base URI, use localinfo as fragid -->
- <xsl:variable name="modespec" select="key('id',@linkmode)"/>
- <xsl:if test="count($modespec) != 1
- or local-name($modespec) != 'modespec'">
- <xsl:message>Warning: olink linkmode pointer is wrong.</xsl:message>
- </xsl:if>
- <xsl:value-of select="$modespec"/>
- <xsl:if test="@localinfo">
- <xsl:text>#</xsl:text>
- <xsl:value-of select="@localinfo"/>
- </xsl:if>
- </xsl:when>
- <xsl:when test="@type = 'href'">
- <xsl:call-template name="olink.outline">
- <xsl:with-param name="outline.base.uri"
- select="unparsed-entity-uri(@targetdocent)"/>
- <xsl:with-param name="localinfo" select="@localinfo"/>
- <xsl:with-param name="return" select="'href'"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$olink.resolver"/>
- <xsl:text>?</xsl:text>
- <xsl:value-of select="$olink.sysid"/>
- <xsl:value-of select="unparsed-entity-uri(@targetdocent)"/>
- <!-- XSL gives no access to the public identifier (grumble...) -->
- <xsl:if test="@localinfo">
- <xsl:text>&</xsl:text>
- <xsl:value-of select="$olink.fragid"/>
- <xsl:value-of select="@localinfo"/>
- </xsl:if>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:choose>
- <xsl:when test="$href != ''">
- <a href="{$href}">
- <xsl:apply-templates select="." mode="common.html.attributes"/>
- <xsl:call-template name="id.attribute"/>
- <xsl:call-template name="olink.hottext"/>
- </a>
+ <xsl:when test="@linkmode or @targetdocent or @localinfo">
+ <!-- old olink mechanism -->
+ <xsl:message>
+ <xsl:text>ERROR: olink using obsolete attributes </xsl:text>
+ <xsl:text>@linkmode, @targetdocent, @localinfo are </xsl:text>
+ <xsl:text>not supported.</xsl:text>
+ </xsl:message>
</xsl:when>
<xsl:otherwise>
- <xsl:call-template name="olink.hottext"/>
+ <xsl:message>
+ <xsl:text>ERROR: olink is missing linking attributes.</xsl:text>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -1246,57 +1208,6 @@
<!-- no-op in HTML -->
</xsl:template>
-
-<xsl:template name="olink.outline">
- <xsl:param name="outline.base.uri"/>
- <xsl:param name="localinfo"/>
- <xsl:param name="return" select="href"/>
-
- <xsl:variable name="outline-file"
- select="concat($outline.base.uri,
- $olink.outline.ext)"/>
-
- <xsl:variable name="outline" select="document($outline-file,.)/div"/>
-
- <xsl:variable name="node-href">
- <xsl:choose>
- <xsl:when test="$localinfo != ''">
- <xsl:variable name="node" select="$outline//
- *[@id=$localinfo or @xml:id=$localinfo]"/>
- <xsl:value-of select="$node/@href"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$outline/@href"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:variable name="node-xref">
- <xsl:choose>
- <xsl:when test="$localinfo != ''">
- <xsl:variable name="node" select="$outline//
- *[@id=$localinfo or @xml:id=$localinfo]"/>
- <xsl:copy-of select="$node/xref"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$outline/xref"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:choose>
- <xsl:when test="$return = 'href'">
- <xsl:value-of select="$node-href"/>
- </xsl:when>
- <xsl:when test="$return = 'xref'">
- <xsl:value-of select="$node-xref"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$node-xref"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
<!-- ==================================================================== -->
<xsl:template name="xref.xreflabel">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2012-11-06 19:09:26
|
Revision: 9663
http://docbook.svn.sourceforge.net/docbook/?rev=9663&view=rev
Author: bobstayton
Date: 2012-11-06 19:09:16 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Make comma inserted after function/parameter or function/replaceable
conditional on $function.parens to be consistent with the function template.
Modified Paths:
--------------
trunk/xsl/fo/inline.xsl
trunk/xsl/html/inline.xsl
Modified: trunk/xsl/fo/inline.xsl
===================================================================
--- trunk/xsl/fo/inline.xsl 2012-11-03 05:35:28 UTC (rev 9662)
+++ trunk/xsl/fo/inline.xsl 2012-11-06 19:09:16 UTC (rev 9663)
@@ -510,14 +510,14 @@
<xsl:template match="function/parameter" priority="2">
<xsl:call-template name="inline.italicmonoseq"/>
- <xsl:if test="following-sibling::*">
+ <xsl:if test="$function.parens != 0 and following-sibling::*">
<xsl:text>, </xsl:text>
</xsl:if>
</xsl:template>
<xsl:template match="function/replaceable" priority="2">
<xsl:call-template name="inline.italicmonoseq"/>
- <xsl:if test="following-sibling::*">
+ <xsl:if test="$function.parens != 0 and following-sibling::*">
<xsl:text>, </xsl:text>
</xsl:if>
</xsl:template>
Modified: trunk/xsl/html/inline.xsl
===================================================================
--- trunk/xsl/html/inline.xsl 2012-11-03 05:35:28 UTC (rev 9662)
+++ trunk/xsl/html/inline.xsl 2012-11-06 19:09:16 UTC (rev 9663)
@@ -558,14 +558,14 @@
<xsl:template match="function/parameter" priority="2">
<xsl:call-template name="inline.italicmonoseq"/>
- <xsl:if test="following-sibling::*">
+ <xsl:if test="$function.parens != 0 and following-sibling::*">
<xsl:text>, </xsl:text>
</xsl:if>
</xsl:template>
<xsl:template match="function/replaceable" priority="2">
<xsl:call-template name="inline.italicmonoseq"/>
- <xsl:if test="following-sibling::*">
+ <xsl:if test="$function.parens != 0 and following-sibling::*">
<xsl:text>, </xsl:text>
</xsl:if>
</xsl:template>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2012-11-07 20:02:25
|
Revision: 9664
http://docbook.svn.sourceforge.net/docbook/?rev=9664&view=rev
Author: bobstayton
Date: 2012-11-07 20:02:17 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Convert hard wired xsl:number for production into a template
with mode="label.markup" to be consistent with other element numbering.
Modified Paths:
--------------
trunk/xsl/common/labels.xsl
trunk/xsl/fo/ebnf.xsl
trunk/xsl/html/ebnf.xsl
Modified: trunk/xsl/common/labels.xsl
===================================================================
--- trunk/xsl/common/labels.xsl 2012-11-06 19:09:16 UTC (rev 9663)
+++ trunk/xsl/common/labels.xsl 2012-11-07 20:02:17 UTC (rev 9664)
@@ -791,6 +791,10 @@
<xsl:number value="$item-number" format="{$type}"/>
</xsl:template>
+<xsl:template match="production" mode="label.markup">
+ <xsl:number count="production" level="any"/>
+</xsl:template>
+
<xsl:template match="abstract" mode="label.markup">
<!-- nop -->
</xsl:template>
Modified: trunk/xsl/fo/ebnf.xsl
===================================================================
--- trunk/xsl/fo/ebnf.xsl 2012-11-06 19:09:16 UTC (rev 9663)
+++ trunk/xsl/fo/ebnf.xsl 2012-11-07 20:02:17 UTC (rev 9664)
@@ -99,7 +99,7 @@
<fo:table-cell>
<fo:block text-align="start">
<xsl:text>[</xsl:text>
- <xsl:number count="production" level="any"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
<xsl:text>]</xsl:text>
</fo:block>
</fo:table-cell>
Modified: trunk/xsl/html/ebnf.xsl
===================================================================
--- trunk/xsl/html/ebnf.xsl 2012-11-06 19:09:16 UTC (rev 9663)
+++ trunk/xsl/html/ebnf.xsl 2012-11-07 20:02:17 UTC (rev 9664)
@@ -107,7 +107,7 @@
<tr>
<td align="{$direction.align.start}" valign="top" width="3%">
<xsl:text>[</xsl:text>
- <xsl:number count="production" level="any"/>
+ <xsl:apply-templates select="." mode="label.markup"/>
<xsl:text>]</xsl:text>
</td>
<td align="{$direction.align.end}" valign="top" width="10%">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2013-01-22 22:08:39
|
Revision: 9713
http://docbook.svn.sourceforge.net/docbook/?rev=9713&view=rev
Author: bobstayton
Date: 2013-01-22 22:08:30 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Make consistent handling of titleabbrev in xrefs.
Modified Paths:
--------------
trunk/xsl/common/gentext.xsl
trunk/xsl/fo/xref.xsl
trunk/xsl/html/xref.xsl
Modified: trunk/xsl/common/gentext.xsl
===================================================================
--- trunk/xsl/common/gentext.xsl 2013-01-22 22:05:35 UTC (rev 9712)
+++ trunk/xsl/common/gentext.xsl 2013-01-22 22:08:30 UTC (rev 9713)
@@ -477,6 +477,12 @@
<xsl:when test="$title != ''">
<xsl:copy-of select="$title"/>
</xsl:when>
+ <xsl:when test="$purpose = 'xref'">
+ <xsl:apply-templates select="." mode="titleabbrev.markup">
+ <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+ <xsl:with-param name="verbose" select="$verbose"/>
+ </xsl:apply-templates>
+ </xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="." mode="title.markup">
<xsl:with-param name="allow-anchors" select="$allow-anchors"/>
Modified: trunk/xsl/fo/xref.xsl
===================================================================
--- trunk/xsl/fo/xref.xsl 2013-01-22 22:05:35 UTC (rev 9712)
+++ trunk/xsl/fo/xref.xsl 2013-01-22 22:08:30 UTC (rev 9713)
@@ -1431,9 +1431,8 @@
<xsl:param name="title"/>
<xsl:choose>
- <!-- FIXME: what about the case where titleabbrev is inside the info? -->
- <xsl:when test="$purpose = 'xref' and titleabbrev">
- <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+ <xsl:when test="$purpose = 'xref'">
+ <xsl:copy-of select="$title"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy-of select="$title"/>
Modified: trunk/xsl/html/xref.xsl
===================================================================
--- trunk/xsl/html/xref.xsl 2013-01-22 22:05:35 UTC (rev 9712)
+++ trunk/xsl/html/xref.xsl 2013-01-22 22:08:30 UTC (rev 9713)
@@ -1240,9 +1240,8 @@
<xsl:param name="title"/>
<xsl:choose>
- <!-- FIXME: what about the case where titleabbrev is inside the info? -->
- <xsl:when test="$purpose = 'xref' and titleabbrev">
- <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+ <xsl:when test="$purpose = 'xref'">
+ <xsl:copy-of select="$title"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy-of select="$title"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dc...@us...> - 2013-02-25 03:57:14
|
Revision: 9724
http://docbook.svn.sourceforge.net/docbook/?rev=9724&view=rev
Author: dcramer
Date: 2013-02-25 03:57:06 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
Webhelp: Fix test for webhelp.include.search.tab param
Modified Paths:
--------------
trunk/xsl/params/webhelp.include.search.tab.xml
trunk/xsl/webhelp/xsl/webhelp-common.xsl
Modified: trunk/xsl/params/webhelp.include.search.tab.xml
===================================================================
--- trunk/xsl/params/webhelp.include.search.tab.xml 2013-02-06 13:08:06 UTC (rev 9723)
+++ trunk/xsl/params/webhelp.include.search.tab.xml 2013-02-25 03:57:06 UTC (rev 9724)
@@ -15,7 +15,7 @@
<refsynopsisdiv>
<src:fragment xml:id="webhelp.include.search.tab.frag">
-<xsl:param name="webhelp.include.search.tab">true</xsl:param>
+<xsl:param name="webhelp.include.search.tab">1</xsl:param>
</src:fragment>
</refsynopsisdiv>
Modified: trunk/xsl/webhelp/xsl/webhelp-common.xsl
===================================================================
--- trunk/xsl/webhelp/xsl/webhelp-common.xsl 2013-02-06 13:08:06 UTC (rev 9723)
+++ trunk/xsl/webhelp/xsl/webhelp-common.xsl 2013-02-25 03:57:06 UTC (rev 9724)
@@ -295,7 +295,7 @@
<script type="text/javascript" src="{$webhelp.common.dir}jquery/layout/jquery.layout.js">
<xsl:comment> </xsl:comment>
</script>
- <xsl:if test="$webhelp.include.search.tab = 'true'">
+ <xsl:if test="$webhelp.include.search.tab != '0'">
<!--Scripts/css stylesheets for Search-->
<!-- TODO: Why THREE files? There's absolutely no need for having separate files.
These should have been identified at the optimization phase! -->
@@ -355,7 +355,7 @@
<!--testing toc in the content page>
<xsl:call-template name="webhelptoctoc"/>
- <xsl:if test="$webhelp.include.search.tab != 'false'">
+ <xsl:if test="$webhelp.include.search.tab != '0'">
<xsl:call-template name="search"/>
</xsl:if-->
</xsl:template>
@@ -727,7 +727,7 @@
</span>
</a>
</li>
- <xsl:if test="$webhelp.include.search.tab != 'false'">
+ <xsl:if test="$webhelp.include.search.tab != '0'">
<li>
<a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()">
<span class="searchTab">
@@ -753,7 +753,7 @@
</div>
</div>
- <xsl:if test="$webhelp.include.search.tab != 'false'">
+ <xsl:if test="$webhelp.include.search.tab != '0'">
<div id="searchDiv">
<div id="search">
<form onsubmit="Verifie(searchForm);return false"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2013-02-28 14:49:14
|
Revision: 9725
http://docbook.svn.sourceforge.net/docbook/?rev=9725&view=rev
Author: kosek
Date: 2013-02-28 14:49:03 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Added new definitions for syntax highlighting
Modified Paths:
--------------
trunk/xsl/highlighting/c-hl.xml
trunk/xsl/highlighting/cpp-hl.xml
trunk/xsl/highlighting/csharp-hl.xml
trunk/xsl/highlighting/php-hl.xml
trunk/xsl/highlighting/xslthl-config.xml
trunk/xsl/html/highlight.xsl
Added Paths:
-----------
trunk/xsl/highlighting/bourne-hl.xml
trunk/xsl/highlighting/cmake-hl.xml
trunk/xsl/highlighting/css21-hl.xml
trunk/xsl/highlighting/lua-hl.xml
trunk/xsl/highlighting/sql1999-hl.xml
trunk/xsl/highlighting/sql2003-hl.xml
trunk/xsl/highlighting/sql92-hl.xml
trunk/xsl/highlighting/upc-hl.xml
Added: trunk/xsl/highlighting/bourne-hl.xml
===================================================================
--- trunk/xsl/highlighting/bourne-hl.xml (rev 0)
+++ trunk/xsl/highlighting/bourne-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SH
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2010 Mathieu Malaterre
+
+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.
+
+-->
+<highlighters>
+ <highlighter type="oneline-comment">#</highlighter>
+ <highlighter type="heredoc">
+ <start><<</start>
+ <quote>'</quote>
+ <quote>"</quote>
+ <flag>-</flag>
+ <noWhiteSpace />
+ <looseTerminator />
+ </highlighter>
+ <highlighter type="string">
+ <string>"</string>
+ <escape>\</escape>
+ </highlighter>
+ <highlighter type="string">
+ <string>'</string>
+ <escape>\</escape>
+ <spanNewLines />
+ </highlighter>
+ <highlighter type="hexnumber">
+ <prefix>0x</prefix>
+ <ignoreCase />
+ </highlighter>
+ <highlighter type="number">
+ <point>.</point>
+ <pointStarts />
+ <ignoreCase />
+ </highlighter>
+ <highlighter type="keywords">
+ <!-- reserved words -->
+ <keyword>if</keyword>
+ <keyword>then</keyword>
+ <keyword>else</keyword>
+ <keyword>elif</keyword>
+ <keyword>fi</keyword>
+ <keyword>case</keyword>
+ <keyword>esac</keyword>
+ <keyword>for</keyword>
+ <keyword>while</keyword>
+ <keyword>until</keyword>
+ <keyword>do</keyword>
+ <keyword>done</keyword>
+ <!-- built-ins -->
+ <keyword>exec</keyword>
+ <keyword>shift</keyword>
+ <keyword>exit</keyword>
+ <keyword>times</keyword>
+ <keyword>break</keyword>
+ <keyword>export</keyword>
+ <keyword>trap</keyword>
+ <keyword>continue</keyword>
+ <keyword>readonly</keyword>
+ <keyword>wait</keyword>
+ <keyword>eval</keyword>
+ <keyword>return</keyword>
+ <!-- other commands -->
+ <keyword>cd</keyword>
+ <keyword>echo</keyword>
+ <keyword>hash</keyword>
+ <keyword>pwd</keyword>
+ <keyword>read</keyword>
+ <keyword>set</keyword>
+ <keyword>test</keyword>
+ <keyword>type</keyword>
+ <keyword>ulimit</keyword>
+ <keyword>umask</keyword>
+ <keyword>unset</keyword>
+ </highlighter>
+</highlighters>
Modified: trunk/xsl/highlighting/c-hl.xml
===================================================================
--- trunk/xsl/highlighting/c-hl.xml 2013-02-25 03:57:06 UTC (rev 9724)
+++ trunk/xsl/highlighting/c-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -1,16 +1,31 @@
<?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>
- -->
+<!--
+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>
@@ -18,7 +33,7 @@
<style>doccomment</style>
</highlighter>
<highlighter type="oneline-comment">
- <start>///</start>
+ <start><![CDATA[/// ]]></start>
<style>doccomment</style>
</highlighter>
<highlighter type="multiline-comment">
@@ -31,6 +46,7 @@
<start>#</start>
<lineBreakEscape>\</lineBreakEscape>
<style>directive</style>
+ <solitary />
</highlighter>
<highlighter type="string">
<string>"</string>
Added: trunk/xsl/highlighting/cmake-hl.xml
===================================================================
--- trunk/xsl/highlighting/cmake-hl.xml (rev 0)
+++ trunk/xsl/highlighting/cmake-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for CMake
+Copyright (c) 2010 Mathieu Malaterre
+
+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.
+
+-->
+<highlighters>
+ <highlighter type="oneline-comment">#</highlighter>
+ <highlighter type="string">
+ <string>"</string>
+ <endString>"</endString>
+ <spanNewLines />
+ </highlighter>
+ <highlighter type="hexnumber">
+ <prefix>0x</prefix>
+ <suffix>l</suffix>
+ <ignoreCase />
+ <style>string</style>
+ </highlighter>
+ <highlighter type="number">
+ <point>.</point>
+ <ignoreCase />
+ <style>string</style>
+ </highlighter>
+ <highlighter type="keywords">
+ <!-- system variable -->
+ <keyword>WIN32</keyword>
+ <keyword>UNIX</keyword>
+ <keyword>APPLE</keyword>
+ <keyword>CYGWIN</keyword>
+ <keyword>BORLAND</keyword>
+ <keyword>MINGW</keyword>
+ <keyword>MSVC</keyword>
+ <keyword>MSVC_IDE</keyword>
+ <keyword>MSVC60</keyword>
+ <keyword>MSVC70</keyword>
+ <keyword>MSVC71</keyword>
+ <keyword>MSVC80</keyword>
+ <style>attribute</style>
+ </highlighter>
+ <highlighter type="keywords">
+ <!-- operators -->
+ <keyword>AND</keyword>
+ <keyword>BOOL</keyword>
+ <keyword>CACHE</keyword>
+ <keyword>COMMAND</keyword>
+ <keyword>DEFINED</keyword>
+ <keyword>DOC</keyword>
+ <keyword>EQUAL</keyword>
+ <keyword>EXISTS</keyword>
+ <keyword>FALSE</keyword>
+ <keyword>GREATER</keyword>
+ <keyword>INTERNAL</keyword>
+ <keyword>LESS</keyword>
+ <keyword>MATCHES</keyword>
+ <keyword>NAME</keyword>
+ <keyword>NAMES</keyword>
+ <keyword>NAME_WE</keyword>
+ <keyword>NOT</keyword>
+ <keyword>OFF</keyword>
+ <keyword>ON</keyword>
+ <keyword>OR</keyword>
+ <keyword>PATH</keyword>
+ <keyword>PATHS</keyword>
+ <keyword>PROGRAM</keyword>
+ <keyword>STREQUAL</keyword>
+ <keyword>STRGREATER</keyword>
+ <keyword>STRING</keyword>
+ <keyword>STRLESS</keyword>
+ <keyword>TRUE</keyword>
+ <!-- color in blue -->
+ <!--style>doccomment</style> -->
+ <style>keyword</style>
+ </highlighter>
+ <highlighter type="keywords">
+ <!-- statement -->
+ <keyword>ADD_CUSTOM_COMMAND</keyword>
+ <keyword>ADD_CUSTOM_TARGET</keyword>
+ <keyword>ADD_DEFINITIONS</keyword>
+ <keyword>ADD_DEPENDENCIES</keyword>
+ <keyword>ADD_EXECUTABLE</keyword>
+ <keyword>ADD_LIBRARY</keyword>
+ <keyword>ADD_SUBDIRECTORY</keyword>
+ <keyword>ADD_TEST</keyword>
+ <keyword>AUX_SOURCE_DIRECTORY</keyword>
+ <keyword>BUILD_COMMAND</keyword>
+ <keyword>BUILD_NAME</keyword>
+ <keyword>CMAKE_MINIMUM_REQUIRED</keyword>
+ <keyword>CONFIGURE_FILE</keyword>
+ <keyword>CREATE_TEST_SOURCELIST</keyword>
+ <keyword>ELSE</keyword>
+ <keyword>ELSEIF</keyword>
+ <keyword>ENABLE_LANGUAGE</keyword>
+ <keyword>ENABLE_TESTING</keyword>
+ <keyword>ENDFOREACH</keyword>
+ <keyword>ENDIF</keyword>
+ <keyword>ENDWHILE</keyword>
+ <keyword>EXEC_PROGRAM</keyword>
+ <keyword>EXECUTE_PROCESS</keyword>
+ <keyword>EXPORT_LIBRARY_DEPENDENCIES</keyword>
+ <keyword>FILE</keyword>
+ <keyword>FIND_FILE</keyword>
+ <keyword>FIND_LIBRARY</keyword>
+ <keyword>FIND_PACKAGE</keyword>
+ <keyword>FIND_PATH</keyword>
+ <keyword>FIND_PROGRAM</keyword>
+ <keyword>FLTK_WRAP_UI</keyword>
+ <keyword>FOREACH</keyword>
+ <keyword>GET_CMAKE_PROPERTY</keyword>
+ <keyword>GET_DIRECTORY_PROPERTY</keyword>
+ <keyword>GET_FILENAME_COMPONENT</keyword>
+ <keyword>GET_SOURCE_FILE_PROPERTY</keyword>
+ <keyword>GET_TARGET_PROPERTY</keyword>
+ <keyword>GET_TEST_PROPERTY</keyword>
+ <keyword>IF</keyword>
+ <keyword>INCLUDE</keyword>
+ <keyword>INCLUDE_DIRECTORIES</keyword>
+ <keyword>INCLUDE_EXTERNAL_MSPROJECT</keyword>
+ <keyword>INCLUDE_REGULAR_EXPRESSION</keyword>
+ <keyword>INSTALL</keyword>
+ <keyword>INSTALL_FILES</keyword>
+ <keyword>INSTALL_PROGRAMS</keyword>
+ <keyword>INSTALL_TARGETS</keyword>
+ <keyword>LINK_DIRECTORIES</keyword>
+ <keyword>LINK_LIBRARIES</keyword>
+ <keyword>LIST</keyword>
+ <keyword>LOAD_CACHE</keyword>
+ <keyword>LOAD_COMMAND</keyword>
+ <keyword>MACRO</keyword>
+ <keyword>MAKE_DIRECTORY</keyword>
+ <keyword>MARK_AS_ADVANCED</keyword>
+ <keyword>MATH</keyword>
+ <keyword>MESSAGE</keyword>
+ <keyword>OPTION</keyword>
+ <keyword>OUTPUT_REQUIRED_FILES</keyword>
+ <keyword>PROJECT</keyword>
+ <keyword>QT_WRAP_CPP</keyword>
+ <keyword>QT_WRAP_UI</keyword>
+ <keyword>REMOVE</keyword>
+ <keyword>REMOVE_DEFINITIONS</keyword>
+ <keyword>SEPARATE_ARGUMENTS</keyword>
+ <keyword>SET</keyword>
+ <keyword>SET_DIRECTORY_PROPERTIES</keyword>
+ <keyword>SET_SOURCE_FILES_PROPERTIES</keyword>
+ <keyword>SET_TARGET_PROPERTIES</keyword>
+ <keyword>SET_TESTS_PROPERTIES</keyword>
+ <keyword>SITE_NAME</keyword>
+ <keyword>SOURCE_GROUP</keyword>
+ <keyword>STRING</keyword>
+ <keyword>SUBDIR_DEPENDS</keyword>
+ <keyword>SUBDIRS</keyword>
+ <keyword>TARGET_LINK_LIBRARIES</keyword>
+ <keyword>TRY_COMPILE</keyword>
+ <keyword>TRY_RUN</keyword>
+ <keyword>USE_MANGLED_MESA</keyword>
+ <keyword>UTILITY_SOURCE</keyword>
+ <keyword>VARIABLE_REQUIRES</keyword>
+ <keyword>VTK_MAKE_INSTANTIATOR</keyword>
+ <keyword>VTK_WRAP_JAVA</keyword>
+ <keyword>VTK_WRAP_PYTHON</keyword>
+ <keyword>VTK_WRAP_TCL</keyword>
+ <keyword>WHILE</keyword>
+ <keyword>WRITE_FILE</keyword>
+ <keyword>ENDMACRO</keyword>
+ <ignoreCase />
+ <beginChars>()</beginChars>
+ <partChars>()</partChars>
+ <style>directive</style>
+ </highlighter>
+</highlighters>
Modified: trunk/xsl/highlighting/cpp-hl.xml
===================================================================
--- trunk/xsl/highlighting/cpp-hl.xml 2013-02-25 03:57:06 UTC (rev 9724)
+++ trunk/xsl/highlighting/cpp-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -35,7 +35,7 @@
<style>doccomment</style>
</highlighter>
<highlighter type="oneline-comment">
- <start>///</start>
+ <start><![CDATA[/// ]]></start>
<style>doccomment</style>
</highlighter>
<highlighter type="multiline-comment">
@@ -48,6 +48,7 @@
<start>#</start>
<lineBreakEscape>\</lineBreakEscape>
<style>directive</style>
+ <solitary/>
</highlighter>
<highlighter type="string">
<string>"</string>
Modified: trunk/xsl/highlighting/csharp-hl.xml
===================================================================
--- trunk/xsl/highlighting/csharp-hl.xml 2013-02-25 03:57:06 UTC (rev 9724)
+++ trunk/xsl/highlighting/csharp-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -55,6 +55,7 @@
<start>#</start>
<lineBreakEscape>\</lineBreakEscape>
<style>directive</style>
+ <solitary/>
</highlighter>
<highlighter type="string">
<!-- strings starting with an "@" can span multiple lines -->
Added: trunk/xsl/highlighting/css21-hl.xml
===================================================================
--- trunk/xsl/highlighting/css21-hl.xml (rev 0)
+++ trunk/xsl/highlighting/css21-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for CSS files
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2011-2012 Martin Hujer, 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.
+
+Martin Hujer <mhujer at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+Reference: http://www.w3.org/TR/CSS21/propidx.html
+
+-->
+<highlighters>
+ <highlighter type="multiline-comment">
+ <start>/*</start>
+ <end>*/</end>
+ </highlighter>
+ <highlighter type="string">
+ <string>"</string>
+ <escape>\</escape>
+ <spanNewLines/>
+ </highlighter>
+ <highlighter type="string">
+ <string>'</string>
+ <escape>\</escape>
+ <spanNewLines/>
+ </highlighter>
+ <highlighter type="number">
+ <point>.</point>
+ <pointStarts />
+ </highlighter>
+ <highlighter type="word">
+ <word>@charset</word>
+ <word>@import</word>
+ <word>@media</word>
+ <word>@page</word>
+ <style>directive</style>
+ </highlighter>
+ <highlighter type="keywords">
+ <partChars>-</partChars>
+ <keyword>azimuth</keyword>
+ <keyword>background-attachment</keyword>
+ <keyword>background-color</keyword>
+ <keyword>background-image</keyword>
+ <keyword>background-position</keyword>
+ <keyword>background-repeat</keyword>
+ <keyword>background</keyword>
+ <keyword>border-collapse</keyword>
+ <keyword>border-color</keyword>
+ <keyword>border-spacing</keyword>
+ <keyword>border-style</keyword>
+ <keyword>border-top</keyword>
+ <keyword>border-right</keyword>
+ <keyword>border-bottom</keyword>
+ <keyword>border-left</keyword>
+ <keyword>border-top-color</keyword>
+ <keyword>border-right-color</keyword>
+ <keyword>border-bottom-color</keyword>
+ <keyword>border-left-color</keyword>
+ <keyword>border-top-style</keyword>
+ <keyword>border-right-style</keyword>
+ <keyword>border-bottom-style</keyword>
+ <keyword>border-left-style</keyword>
+ <keyword>border-top-width</keyword>
+ <keyword>border-right-width</keyword>
+ <keyword>border-bottom-width</keyword>
+ <keyword>border-left-width</keyword>
+ <keyword>border-width</keyword>
+ <keyword>border</keyword>
+ <keyword>bottom</keyword>
+ <keyword>caption-side</keyword>
+ <keyword>clear</keyword>
+ <keyword>clip</keyword>
+ <keyword>color</keyword>
+ <keyword>content</keyword>
+ <keyword>counter-increment</keyword>
+ <keyword>counter-reset</keyword>
+ <keyword>cue-after</keyword>
+ <keyword>cue-before</keyword>
+ <keyword>cue</keyword>
+ <keyword>cursor</keyword>
+ <keyword>direction</keyword>
+ <keyword>display</keyword>
+ <keyword>elevation</keyword>
+ <keyword>empty-cells</keyword>
+ <keyword>float</keyword>
+ <keyword>font-family</keyword>
+ <keyword>font-size</keyword>
+ <keyword>font-style</keyword>
+ <keyword>font-variant</keyword>
+ <keyword>font-weight</keyword>
+ <keyword>font</keyword>
+ <keyword>height</keyword>
+ <keyword>left</keyword>
+ <keyword>letter-spacing</keyword>
+ <keyword>line-height</keyword>
+ <keyword>list-style-image</keyword>
+ <keyword>list-style-position</keyword>
+ <keyword>list-style-type</keyword>
+ <keyword>list-style</keyword>
+ <keyword>margin-right</keyword>
+ <keyword>margin-left</keyword>
+ <keyword>margin-top</keyword>
+ <keyword>margin-bottom</keyword>
+ <keyword>margin</keyword>
+ <keyword>max-height</keyword>
+ <keyword>max-width</keyword>
+ <keyword>min-height</keyword>
+ <keyword>min-width</keyword>
+ <keyword>orphans</keyword>
+ <keyword>outline-color</keyword>
+ <keyword>outline-style</keyword>
+ <keyword>outline-width</keyword>
+ <keyword>outline</keyword>
+ <keyword>overflow</keyword>
+ <keyword>padding-top</keyword>
+ <keyword>padding-right</keyword>
+ <keyword>padding-bottom</keyword>
+ <keyword>padding-left</keyword>
+ <keyword>padding</keyword>
+ <keyword>page-break-after</keyword>
+ <keyword>page-break-before</keyword>
+ <keyword>page-break-inside</keyword>
+ <keyword>pause-after</keyword>
+ <keyword>pause-before</keyword>
+ <keyword>pause</keyword>
+ <keyword>pitch-range</keyword>
+ <keyword>pitch</keyword>
+ <keyword>play-during</keyword>
+ <keyword>position</keyword>
+ <keyword>quotes</keyword>
+ <keyword>richness</keyword>
+ <keyword>right</keyword>
+ <keyword>speak-header</keyword>
+ <keyword>speak-numeral</keyword>
+ <keyword>speak-punctuation</keyword>
+ <keyword>speak</keyword>
+ <keyword>speech-rate</keyword>
+ <keyword>stress</keyword>
+ <keyword>table-layout</keyword>
+ <keyword>text-align</keyword>
+ <keyword>text-decoration</keyword>
+ <keyword>text-indent</keyword>
+ <keyword>text-transform</keyword>
+ <keyword>top</keyword>
+ <keyword>unicode-bidi</keyword>
+ <keyword>vertical-align</keyword>
+ <keyword>visibility</keyword>
+ <keyword>voice-family</keyword>
+ <keyword>volume</keyword>
+ <keyword>white-space</keyword>
+ <keyword>widows</keyword>
+ <keyword>width</keyword>
+ <keyword>word-spacing</keyword>
+ <keyword>z-index</keyword>
+ </highlighter>
+</highlighters>
Added: trunk/xsl/highlighting/lua-hl.xml
===================================================================
--- trunk/xsl/highlighting/lua-hl.xml (rev 0)
+++ trunk/xsl/highlighting/lua-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Lua 5.1 and 5.2
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2012 Patrick Rapin
+
+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.
+
+ If you want to send an e-mail to Patrick Rapin, please execute the
+ following decrypting script in Lua 5.1 or 5.2:
+ print(('oc mi...@km...parip'):gsub('(..)(..)','%2%1'):reverse())
+-->
+
+<highlighters>
+ <highlighter type="keywords">
+ <keyword>and</keyword>
+ <keyword>break</keyword>
+ <keyword>do</keyword>
+ <keyword>else</keyword>
+ <keyword>elseif</keyword>
+ <keyword>end</keyword>
+ <keyword>false</keyword>
+ <keyword>for</keyword>
+ <keyword>function</keyword>
+ <keyword>goto</keyword>
+ <keyword>if</keyword>
+ <keyword>in</keyword>
+ <keyword>local</keyword>
+ <keyword>nil</keyword>
+ <keyword>not</keyword>
+ <keyword>or</keyword>
+ <keyword>repeat</keyword>
+ <keyword>return</keyword>
+ <keyword>then</keyword>
+ <keyword>true</keyword>
+ <keyword>until</keyword>
+ <keyword>while</keyword>
+ </highlighter>
+
+ <!-- Multiline comments can have any number of equal signs
+ between brackets. Let's support up to 4 -->
+ <highlighter type="multiline-comment">
+ <start>--[[</start>
+ <end>]]</end>
+ </highlighter>
+ <highlighter type="multiline-comment">
+ <start>--[=[</start>
+ <end>]=]</end>
+ </highlighter>
+ <highlighter type="multiline-comment">
+ <start>--[==[</start>
+ <end>]==]</end>
+ </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>
+ <endString>"</endString>
+ <escape>\</escape>
+ <spanNewLines/>
+ </highlighter>
+
+ <highlighter type="string">
+ <string>'</string>
+ <endString>'</endString>
+ <escape>\</escape>
+ <spanNewLines/>
+ </highlighter>
+
+ <!-- Long strings can also have any number of equal signs. -->
+ <highlighter type="string">
+ <string>[[</string>
+ <endString>]]</endString>
+ <spanNewLines/>
+ </highlighter>
+ <highlighter type="string">
+ <string>[=[</string>
+ <endString>]=]</endString>
+ <spanNewLines/>
+ </highlighter>
+ <highlighter type="string">
+ <string>[==[</string>
+ <endString>]==]</endString>
+ <spanNewLines/>
+ </highlighter>
+ <highlighter type="string">
+ <string>[===[</string>
+ <endString>]===]</endString>
+ <spanNewLines/>
+ </highlighter>
+ <highlighter type="string">
+ <string>[====[</string>
+ <endString>]====]</endString>
+ <spanNewLines/>
+ </highlighter>
+
+ <highlighter type="number">
+ <point>.</point>
+ <pointStarts />
+ <exponent>e</exponent>
+ <ignoreCase />
+ </highlighter>
+
+ <highlighter type="hexnumber">
+ <prefix>0x</prefix>
+ <point>.</point>
+ <pointStarts />
+ <exponent>p</exponent>
+ <ignoreCase />
+ </highlighter>
+
+</highlighters>
Modified: trunk/xsl/highlighting/php-hl.xml
===================================================================
--- trunk/xsl/highlighting/php-hl.xml 2013-02-25 03:57:06 UTC (rev 9724)
+++ trunk/xsl/highlighting/php-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -35,7 +35,7 @@
<style>doccomment</style>
</highlighter>
<highlighter type="oneline-comment">
- <start>///</start>
+ <start><![CDATA[/// ]]></start>
<style>doccomment</style>
</highlighter>
<highlighter type="multiline-comment">
@@ -137,6 +137,11 @@
<keyword>old_function</keyword>
<keyword>true</keyword>
<keyword>false</keyword>
+ <!-- PHP 5.3 -->
+ <keyword>namespace</keyword>
+ <keyword>__NAMESPACE__</keyword>
+ <keyword>goto</keyword>
+ <keyword>__DIR__</keyword>
<ignoreCase />
</highlighter>
<highlighter type="word">
Added: trunk/xsl/highlighting/sql1999-hl.xml
===================================================================
--- trunk/xsl/highlighting/sql1999-hl.xml (rev 0)
+++ trunk/xsl/highlighting/sql1999-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -0,0 +1,496 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SQL:1999
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3
+
+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.
+
+-->
+<highlighters>
+ <highlighter type="oneline-comment">--</highlighter>
+ <highlighter type="multiline-comment">
+ <start>/*</start>
+ <end>*/</end>
+ </highlighter>
+ <highlighter type="string">
+ <string>'</string>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="string">
+ <string>B'</string>
+ <endString>'</endString>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="string">
+ <string>N'</string>
+ <endString>'</endString>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="string">
+ <string>X'</string>
+ <endString>'</endString>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="number">
+ <point>.</point>
+ <pointStarts />
+ <exponent>e</exponent>
+ <ignoreCase />
+ </highlighter>
+ <highlighter type="keywords">
+ <ignoreCase />
+ <!-- reserved -->
+ <keyword>ABSOLUTE</keyword>
+ <keyword>ACTION</keyword>
+ <keyword>ADD</keyword>
+ <keyword>AFTER</keyword>
+ <keyword>ALL</keyword>
+ <keyword>ALLOCATE</keyword>
+ <keyword>ALTER</keyword>
+ <keyword>AND</keyword>
+ <keyword>ANY</keyword>
+ <keyword>ARE</keyword>
+ <keyword>ARRAY</keyword>
+ <keyword>AS</keyword>
+ <keyword>ASC</keyword>
+ <keyword>ASSERTION</keyword>
+ <keyword>AT</keyword>
+ <keyword>AUTHORIZATION</keyword>
+ <keyword>BEFORE</keyword>
+ <keyword>BEGIN</keyword>
+ <keyword>BETWEEN</keyword>
+ <keyword>BINARY</keyword>
+ <keyword>BIT</keyword>
+ <keyword>BLOB</keyword>
+ <keyword>BOOLEAN</keyword>
+ <keyword>BOTH</keyword>
+ <keyword>BREADTH</keyword>
+ <keyword>BY</keyword>
+ <keyword>CALL</keyword>
+ <keyword>CASCADE</keyword>
+ <keyword>CASCADED</keyword>
+ <keyword>CASE</keyword>
+ <keyword>CAST</keyword>
+ <keyword>CATALOG</keyword>
+ <keyword>CHAR</keyword>
+ <keyword>CHARACTER</keyword>
+ <keyword>CHECK</keyword>
+ <keyword>CLOB</keyword>
+ <keyword>CLOSE</keyword>
+ <keyword>COLLATE</keyword>
+ <keyword>COLLATION</keyword>
+ <keyword>COLUMN</keyword>
+ <keyword>COMMIT</keyword>
+ <keyword>CONDITION</keyword>
+ <keyword>CONNECT</keyword>
+ <keyword>CONNECTION</keyword>
+ <keyword>CONSTRAINT</keyword>
+ <keyword>CONSTRAINTS</keyword>
+ <keyword>CONSTRUCTOR</keyword>
+ <keyword>CONTINUE</keyword>
+ <keyword>CORRESPONDING</keyword>
+ <keyword>CREATE</keyword>
+ <keyword>CROSS</keyword>
+ <keyword>CUBE</keyword>
+ <keyword>CURRENT</keyword>
+ <keyword>CURRENT_DATE</keyword>
+ <keyword>CURRENT_DEFAULT_TRANSFORM_GROUP</keyword>
+ <keyword>CURRENT_TRANSFORM_GROUP_FOR_TYPE</keyword>
+ <keyword>CURRENT_PATH</keyword>
+ <keyword>CURRENT_ROLE</keyword>
+ <keyword>CURRENT_TIME</keyword>
+ <keyword>CURRENT_TIMESTAMP</keyword>
+ <keyword>CURRENT_USER</keyword>
+ <keyword>CURSOR</keyword>
+ <keyword>CYCLE</keyword>
+ <keyword>DATA</keyword>
+ <keyword>DATE</keyword>
+ <keyword>DAY</keyword>
+ <keyword>DEALLOCATE</keyword>
+ <keyword>DEC</keyword>
+ <keyword>DECIMAL</keyword>
+ <keyword>DECLARE</keyword>
+ <keyword>DEFAULT</keyword>
+ <keyword>DEFERRABLE</keyword>
+ <keyword>DEFERRED</keyword>
+ <keyword>DELETE</keyword>
+ <keyword>DEPTH</keyword>
+ <keyword>DEREF</keyword>
+ <keyword>DESC</keyword>
+ <keyword>DESCRIBE</keyword>
+ <keyword>DESCRIPTOR</keyword>
+ <keyword>DETERMINISTIC</keyword>
+ <keyword>DIAGNOSTICS</keyword>
+ <keyword>DISCONNECT</keyword>
+ <keyword>DISTINCT</keyword>
+ <keyword>DO</keyword>
+ <keyword>DOMAIN</keyword>
+ <keyword>DOUBLE</keyword>
+ <keyword>DROP</keyword>
+ <keyword>DYNAMIC</keyword>
+ <keyword>EACH</keyword>
+ <keyword>ELSE</keyword>
+ <keyword>ELSEIF</keyword>
+ <keyword>END</keyword>
+ <keyword>END-EXEC</keyword>
+ <keyword>EQUALS</keyword>
+ <keyword>ESCAPE</keyword>
+ <keyword>EXCEPT</keyword>
+ <keyword>EXCEPTION</keyword>
+ <keyword>EXEC</keyword>
+ <keyword>EXECUTE</keyword>
+ <keyword>EXISTS</keyword>
+ <keyword>EXIT</keyword>
+ <keyword>EXTERNAL</keyword>
+ <keyword>FALSE</keyword>
+ <keyword>FETCH</keyword>
+ <keyword>FIRST</keyword>
+ <keyword>FLOAT</keyword>
+ <keyword>FOR</keyword>
+ <keyword>FOREIGN</keyword>
+ <keyword>FOUND</keyword>
+ <keyword>FROM</keyword>
+ <keyword>FREE</keyword>
+ <keyword>FULL</keyword>
+ <keyword>FUNCTION</keyword>
+ <keyword>GENERAL</keyword>
+ <keyword>GET</keyword>
+ <keyword>GLOBAL</keyword>
+ <keyword>GO</keyword>
+ <keyword>GOTO</keyword>
+ <keyword>GRANT</keyword>
+ <keyword>GROUP</keyword>
+ <keyword>GROUPING</keyword>
+ <keyword>HANDLE</keyword>
+ <keyword>HAVING</keyword>
+ <keyword>HOLD</keyword>
+ <keyword>HOUR</keyword>
+ <keyword>IDENTITY</keyword>
+ <keyword>IF</keyword>
+ <keyword>IMMEDIATE</keyword>
+ <keyword>IN</keyword>
+ <keyword>INDICATOR</keyword>
+ <keyword>INITIALLY</keyword>
+ <keyword>INNER</keyword>
+ <keyword>INOUT</keyword>
+ <keyword>INPUT</keyword>
+ <keyword>INSERT</keyword>
+ <keyword>INT</keyword>
+ <keyword>INTEGER</keyword>
+ <keyword>INTERSECT</keyword>
+ <keyword>INTERVAL</keyword>
+ <keyword>INTO</keyword>
+ <keyword>IS</keyword>
+ <keyword>ISOLATION</keyword>
+ <keyword>JOIN</keyword>
+ <keyword>KEY</keyword>
+ <keyword>LANGUAGE</keyword>
+ <keyword>LARGE</keyword>
+ <keyword>LAST</keyword>
+ <keyword>LATERAL</keyword>
+ <keyword>LEADING</keyword>
+ <keyword>LEAVE</keyword>
+ <keyword>LEFT</keyword>
+ <keyword>LEVEL</keyword>
+ <keyword>LIKE</keyword>
+ <keyword>LOCAL</keyword>
+ <keyword>LOCALTIME</keyword>
+ <keyword>LOCALTIMESTAMP</keyword>
+ <keyword>LOCATOR</keyword>
+ <keyword>LOOP</keyword>
+ <keyword>MAP</keyword>
+ <keyword>MATCH</keyword>
+ <keyword>METHOD</keyword>
+ <keyword>MINUTE</keyword>
+ <keyword>MODIFIES</keyword>
+ <keyword>MODULE</keyword>
+ <keyword>MONTH</keyword>
+ <keyword>NAMES</keyword>
+ <keyword>NATIONAL</keyword>
+ <keyword>NATURAL</keyword>
+ <keyword>NCHAR</keyword>
+ <keyword>NCLOB</keyword>
+ <keyword>NESTING</keyword>
+ <keyword>NEW</keyword>
+ <keyword>NEXT</keyword>
+ <keyword>NO</keyword>
+ <keyword>NONE</keyword>
+ <keyword>NOT</keyword>
+ <keyword>NULL</keyword>
+ <keyword>NUMERIC</keyword>
+ <keyword>OBJECT</keyword>
+ <keyword>OF</keyword>
+ <keyword>OLD</keyword>
+ <keyword>ON</keyword>
+ <keyword>ONLY</keyword>
+ <keyword>OPEN</keyword>
+ <keyword>OPTION</keyword>
+ <keyword>OR</keyword>
+ <keyword>ORDER</keyword>
+ <keyword>ORDINALITY</keyword>
+ <keyword>OUT</keyword>
+ <keyword>OUTER</keyword>
+ <keyword>OUTPUT</keyword>
+ <keyword>OVERLAPS</keyword>
+ <keyword>PAD</keyword>
+ <keyword>PARAMETER</keyword>
+ <keyword>PARTIAL</keyword>
+ <keyword>PATH</keyword>
+ <keyword>PRECISION</keyword>
+ <keyword>PREPARE</keyword>
+ <keyword>PRESERVE</keyword>
+ <keyword>PRIMARY</keyword>
+ <keyword>PRIOR</keyword>
+ <keyword>PRIVILEGES</keyword>
+ <keyword>PROCEDURE</keyword>
+ <keyword>PUBLIC</keyword>
+ <keyword>READ</keyword>
+ <keyword>READS</keyword>
+ <keyword>REAL</keyword>
+ <keyword>RECURSIVE</keyword>
+ <keyword>REDO</keyword>
+ <keyword>REF</keyword>
+ <keyword>REFERENCES</keyword>
+ <keyword>REFERENCING</keyword>
+ <keyword>RELATIVE</keyword>
+ <keyword>RELEASE</keyword>
+ <keyword>REPEAT</keyword>
+ <keyword>RESIGNAL</keyword>
+ <keyword>RESTRICT</keyword>
+ <keyword>RESULT</keyword>
+ <keyword>RETURN</keyword>
+ <keyword>RETURNS</keyword>
+ <keyword>REVOKE</keyword>
+ <keyword>RIGHT</keyword>
+ <keyword>ROLE</keyword>
+ <keyword>ROLLBACK</keyword>
+ <keyword>ROLLUP</keyword>
+ <keyword>ROUTINE</keyword>
+ <keyword>ROW</keyword>
+ <keyword>ROWS</keyword>
+ <keyword>SAVEPOINT</keyword>
+ <keyword>SCHEMA</keyword>
+ <keyword>SCROLL</keyword>
+ <keyword>SEARCH</keyword>
+ <keyword>SECOND</keyword>
+ <keyword>SECTION</keyword>
+ <keyword>SELECT</keyword>
+ <keyword>SESSION</keyword>
+ <keyword>SESSION_USER</keyword>
+ <keyword>SET</keyword>
+ <keyword>SETS</keyword>
+ <keyword>SIGNAL</keyword>
+ <keyword>SIMILAR</keyword>
+ <keyword>SIZE</keyword>
+ <keyword>SMALLINT</keyword>
+ <keyword>SOME</keyword>
+ <keyword>SPACE</keyword>
+ <keyword>SPECIFIC</keyword>
+ <keyword>SPECIFICTYPE</keyword>
+ <keyword>SQL</keyword>
+ <keyword>SQLEXCEPTION</keyword>
+ <keyword>SQLSTATE</keyword>
+ <keyword>SQLWARNING</keyword>
+ <keyword>START</keyword>
+ <keyword>STATE</keyword>
+ <keyword>STATIC</keyword>
+ <keyword>SYSTEM_USER</keyword>
+ <keyword>TABLE</keyword>
+ <keyword>TEMPORARY</keyword>
+ <keyword>THEN</keyword>
+ <keyword>TIME</keyword>
+ <keyword>TIMESTAMP</keyword>
+ <keyword>TIMEZONE_HOUR</keyword>
+ <keyword>TIMEZONE_MINUTE</keyword>
+ <keyword>TO</keyword>
+ <keyword>TRAILING</keyword>
+ <keyword>TRANSACTION</keyword>
+ <keyword>TRANSLATION</keyword>
+ <keyword>TREAT</keyword>
+ <keyword>TRIGGER</keyword>
+ <keyword>TRUE</keyword>
+ <keyword>UNDER</keyword>
+ <keyword>UNDO</keyword>
+ <keyword>UNION</keyword>
+ <keyword>UNIQUE</keyword>
+ <keyword>UNKNOWN</keyword>
+ <keyword>UNNEST</keyword>
+ <keyword>UNTIL</keyword>
+ <keyword>UPDATE</keyword>
+ <keyword>USAGE</keyword>
+ <keyword>USER</keyword>
+ <keyword>USING</keyword>
+ <keyword>VALUE</keyword>
+ <keyword>VALUES</keyword>
+ <keyword>VARCHAR</keyword>
+ <keyword>VARYING</keyword>
+ <keyword>VIEW</keyword>
+ <keyword>WHEN</keyword>
+ <keyword>WHENEVER</keyword>
+ <keyword>WHERE</keyword>
+ <keyword>WHILE</keyword>
+ <keyword>WITH</keyword>
+ <keyword>WITHOUT</keyword>
+ <keyword>WORK</keyword>
+ <keyword>WRITE</keyword>
+ <keyword>YEAR</keyword>
+ <keyword>ZONE</keyword>
+ <!-- non reserved -->
+ <keyword>ABS</keyword>
+ <keyword>ADA</keyword>
+ <keyword>ADMIN</keyword>
+ <keyword>ASENSITIVE</keyword>
+ <keyword>ASSIGNMENT</keyword>
+ <keyword>ASYMMETRIC</keyword>
+ <keyword>ATOMIC</keyword>
+ <keyword>ATTRIBUTE</keyword>
+ <keyword>AVG</keyword>
+ <keyword>BIT_LENGTH</keyword>
+ <keyword>C</keyword>
+ <keyword>CALLED</keyword>
+ <keyword>CARDINALITY</keyword>
+ <keyword>CATALOG_NAME</keyword>
+ <keyword>CHAIN</keyword>
+ <keyword>CHAR_LENGTH</keyword>
+ <keyword>CHARACTERISTICS</keyword>
+ <keyword>CHARACTER_LENGTH</keyword>
+ <keyword>CHARACTER_SET_CATALOG</keyword>
+ <keyword>CHARACTER_SET_NAME</keyword>
+ <keyword>CHARACTER_SET_SCHEMA</keyword>
+ <keyword>CHECKED</keyword>
+ <keyword>CLASS_ORIGIN</keyword>
+ <keyword>COALESCE</keyword>
+ <keyword>COBOL</keyword>
+ <keyword>COLLATION_CATALOG</keyword>
+ <keyword>COLLATION_NAME</keyword>
+ <keyword>COLLATION_SCHEMA</keyword>
+ <keyword>COLUMN_NAME</keyword>
+ <keyword>COMMAND_FUNCTION</keyword>
+ <keyword>COMMAND_FUNCTION_CODE</keyword>
+ <keyword>COMMITTED</keyword>
+ <keyword>CONDITION_IDENTIFIER</keyword>
+ <keyword>CONDITION_NUMBER</keyword>
+ <keyword>CONNECTION_NAME</keyword>
+ <keyword>CONSTRAINT_CATALOG</keyword>
+ <keyword>CONSTRAINT_NAME</keyword>
+ <keyword>CONSTRAINT_SCHEMA</keyword>
+ <keyword>CONTAINS</keyword>
+ <keyword>CONVERT</keyword>
+ <keyword>COUNT</keyword>
+ <keyword>CURSOR_NAME</keyword>
+ <keyword>DATETIME_INTERVAL_CODE</keyword>
+ <keyword>DATETIME_INTERVAL_PRECISION</keyword>
+ <keyword>DEFINED</keyword>
+ <keyword>DEFINER</keyword>
+ <keyword>DEGREE</keyword>
+ <keyword>DERIVED</keyword>
+ <keyword>DISPATCH</keyword>
+ <keyword>EVERY</keyword>
+ <keyword>EXTRACT</keyword>
+ <keyword>FINAL</keyword>
+ <keyword>FORTRAN</keyword>
+ <keyword>G</keyword>
+ <keyword>GENERATED</keyword>
+ <keyword>GRANTED</keyword>
+ <keyword>HIERARCHY</keyword>
+ <keyword>IMPLEMENTATION</keyword>
+ <keyword>INSENSITIVE</keyword>
+ <keyword>INSTANCE</keyword>
+ <keyword>INSTANTIABLE</keyword>
+ <keyword>INVOKER</keyword>
+ <keyword>K</keyword>
+ <keyword>KEY_MEMBER</keyword>
+ <keyword>KEY_TYPE</keyword>
+ <keyword>LENGTH</keyword>
+ <keyword>LOWER</keyword>
+ <keyword>M</keyword>
+ <keyword>MAX</keyword>
+ <keyword>MIN</keyword>
+ <keyword>MESSAGE_LENGTH</keyword>
+ <keyword>MESSAGE_OCTET_LENGTH</keyword>
+ <keyword>MESSAGE_TEXT</keyword>
+ <keyword>MOD</keyword>
+ <keyword>MORE</keyword>
+ <keyword>MUMPS</keyword>
+ <keyword>NAME</keyword>
+ <keyword>NULLABLE</keyword>
+ <keyword>NUMBER</keyword>
+ <keyword>NULLIF</keyword>
+ <keyword>OCTET_LENGTH</keyword>
+ <keyword>ORDERING</keyword>
+ <keyword>OPTIONS</keyword>
+ <keyword>OVERLAY</keyword>
+ <keyword>OVERRIDING</keyword>
+ <keyword>PASCAL</keyword>
+ <keyword>PARAMETER_MODE</keyword>
+ <keyword>PARAMETER_NAME</keyword>
+ <keyword>PARAMETER_ORDINAL_POSITION</keyword>
+ <keyword>PARAMETER_SPECIFIC_CATALOG</keyword>
+ <keyword>PARAMETER_SPECIFIC_NAME</keyword>
+ <keyword>PARAMETER_SPECIFIC_SCHEMA</keyword>
+ <keyword>PLI</keyword>
+ <keyword>POSITION</keyword>
+ <keyword>REPEATABLE</keyword>
+ <keyword>RETURNED_CARDINALITY</keyword>
+ <keyword>RETURNED_LENGTH</keyword>
+ <keyword>RETURNED_OCTET_LENGTH</keyword>
+ <keyword>RETURNED_SQLSTATE</keyword>
+ <keyword>ROUTINE_CATALOG</keyword>
+ <keyword>ROUTINE_NAME</keyword>
+ <keyword>ROUTINE_SCHEMA</keyword>
+ <keyword>ROW_COUNT</keyword>
+ <keyword>SCALE</keyword>
+ <keyword>SCHEMA_NAME</keyword>
+ <keyword>SCOPE</keyword>
+ <keyword>SECURITY</keyword>
+ <keyword>SELF</keyword>
+ <keyword>SENSITIVE</keyword>
+ <keyword>SERIALIZABLE</keyword>
+ <keyword>SERVER_NAME</keyword>
+ <keyword>SIMPLE</keyword>
+ <keyword>SOURCE</keyword>
+ <keyword>SPECIFIC_NAME</keyword>
+ <keyword>STATEMENT</keyword>
+ <keyword>STRUCTURE</keyword>
+ <keyword>STYLE</keyword>
+ <keyword>SUBCLASS_ORIGIN</keyword>
+ <keyword>SUBSTRING</keyword>
+ <keyword>SUM</keyword>
+ <keyword>SYMMETRIC</keyword>
+ <keyword>SYSTEM</keyword>
+ <keyword>TABLE_NAME</keyword>
+ <keyword>TOP_LEVEL_COUNT</keyword>
+ <keyword>TRANSACTIONS_COMMITTED</keyword>
+ <keyword>TRANSACTIONS_ROLLED_BACK</keyword>
+ <keyword>TRANSACTION_ACTIVE</keyword>
+ <keyword>TRANSFORM</keyword>
+ <keyword>TRANSFORMS</keyword>
+ <keyword>TRANSLATE</keyword>
+ <keyword>TRIGGER_CATALOG</keyword>
+ <keyword>TRIGGER_SCHEMA</keyword>
+ <keyword>TRIGGER_NAME</keyword>
+ <keyword>TRIM</keyword>
+ <keyword>TYPE</keyword>
+ <keyword>UNCOMMITTED</keyword>
+ <keyword>UNNAMED</keyword>
+ <keyword>UPPER</keyword>
+ </highlighter>
+</highlighters>
Added: trunk/xsl/highlighting/sql2003-hl.xml
===================================================================
--- trunk/xsl/highlighting/sql2003-hl.xml (rev 0)
+++ trunk/xsl/highlighting/sql2003-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SQL:1999
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3
+
+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.
+
+-->
+<highlighters>
+ <highlighter type="oneline-comment">--</highlighter>
+ <highlighter type="multiline-comment">
+ <start>/*</start>
+ <end>*/</end>
+ </highlighter>
+ <highlighter type="string">
+ <string>'</string>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="string">
+ <string>U'</string>
+ <endString>'</endString>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="string">
+ <string>B'</string>
+ <endString>'</endString>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="string">
+ <string>N'</string>
+ <endString>'</endString>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="string">
+ <string>X'</string>
+ <endString>'</endString>
+ <doubleEscapes />
+ </highlighter>
+ <highlighter type="number">
+ <point>.</point>
+ <pointStarts />
+ <exponent>e</exponent>
+ <ignoreCase />
+ </highlighter>
+ <highlighter type="keywords">
+ <ignoreCase />
+ <!-- reserved -->
+ <keyword>A</keyword>
+ <keyword>ABS</keyword>
+ <keyword>ABSOLUTE</keyword>
+ <keyword>ACTION</keyword>
+ <keyword>ADA</keyword>
+ <keyword>ADMIN</keyword>
+ <keyword>AFTER</keyword>
+ <keyword>ALWAYS</keyword>
+ <keyword>ASC</keyword>
+ <keyword>ASSERTION</keyword>
+ <keyword>ASSIGNMENT</keyword>
+ <keyword>ATTRIBUTE</keyword>
+ <keyword>ATTRIBUTES</keyword>
+ <keyword>AVG</keyword>
+ <keyword>BEFORE</keyword>
+ <keyword>BERNOULLI</keyword>
+ <keyword>BREADTH</keyword>
+ <keyword>C</keyword>
+ <keyword>CARDINALITY</keyword>
+ <keyword>CASCADE</keyword>
+ <keyword>CATALOG_NAME</keyword>
+ <keyword>CATALOG</keyword>
+ <keyword>CEIL</keyword>
+ <keyword>CEILING</keyword>
+ <keyword>CHAIN</keyword>
+ <keyword>CHAR_LENGTH</keyword>
+ <keyword>CHARACTER_LENGTH</keyword>
+ <keyword>CHARACTER_SET_CATALOG</keyword>
+ <keyword>CHARACTER_SET_NAME</keyword>
+ <keyword>CHARACTER_SET_SCHEMA</keyword>
+ <keyword>CHARACTERISTICS</keyword>
+ <keyword>CHARACTERS</keyword>
+ <keyword>CHECKED</keyword>
+ <keyword>CLASS_ORIGIN</keyword>
+ <keyword>COALESCE</keyword>
+ <keyword>COBOL</keyword>
+ <keyword>CODE_UNITS</keyword>
+ <keyword>COLLATION_CATALOG</keyword>
+ <keyword>COLLATION_NAME</keyword>
+ <keyword>COLLATION_SCHEMA</keyword>
+ <keyword>COLLATION</keyword>
+ <keyword>COLLECT</keyword>
+ <keyword>COLUMN_NAME</keyword>
+ <keyword>COMMAND_FUNCTION_CODE</keyword>
+ <keyword>COMMAND_FUNCTION</keyword>
+ <keyword>COMMITTED</keyword>
+ <keyword>CONDITION_NUMBER</keyword>
+ <keyword>CONDITION</keyword>
+ <keyword>CONNECTION_NAME</keyword>
+ <keyword>CONSTRAINT_CATALOG</keyword>
+ <keyword>CONSTRAINT_NAME</keyword>
+ <keyword>CONSTRAINT_SCHEMA</keyword>
+ <keyword>CONSTRAINTS</keyword>
+ <keyword>CONSTRUCTORS</keyword>
+ <keyword>CONTAINS</keyword>
+ <keyword>CONVERT</keyword>
+ <keyword>CORR</keyword>
+ <keyword>COUNT</keyword>
+ <keyword>COVAR_POP</keyword>
+ <keyword>COVAR_SAMP</keyword>
+ <keyword>CUME_DIST</keyword>
+ <keyword>CURRENT_COLLATION</keyword>
+ <keyword>CURSOR_NAME</keyword>
+ <keyword>DATA</keyword>
+ <keyword>DATETIME_INTERVAL_CODE</keyword>
+ <keyword>DATETIME_INTERVAL_PRECISION</keyword>
+ <keyword>DEFAULTS</keyword>
+ <keyword>DEFERRABLE</keyword>
+ <keyword>DEFERRED</keyword>
+ <keyword>DEFINED</keyword>
+ <keyword>DEFINER</keyword>
+ <keyword>DEGREE</keyword>
+ <keyword>DENSE_RANK</keyword>
+ <keyword>DEPTH</keyword>
+ <keyword>DERIVED</keyword>
+ <keyword>DESC</keyword>
+ <keyword>DESCRIPTOR</keyword>
+ <keyword>DIAGNOSTICS</keyword>
+ <keyword>DISPATCH</keyword>
+ <keyword>DOMAIN</keyword>
+ <keyword>DYNAMIC_FUNCTION_CODE</keyword>
+ <keyword>DYNAMIC_FUNCTION</keyword>
+ <keyword>EQUALS</keyword>
+ <keyword>EVERY</keyword>
+ <keyword>EXCEPTION</keyword>
+ <keyword>EXCLUDE</keyword>
+ <keyword>EXCLUDING</keyword>
+ <keyword>EXP</keyword>
+ <keyword>EXTRACT</keyword>
+ <keyword>FINAL</keyword>
+ <keyword>FIRST</keyword>
+ <keyword>FLOOR</keyword>
+ <keyword>FOLLOWING</keyword>
+ <keyword>FORTRAN</keyword>
+ <keyword>FOUND</keyword>
+ <keyword>FUSION</keyword>
+ <keyword>G</keyword>
+ <keyword>GENERAL</keyword>
+ <keyword>GO</keyword>
+ <keyword>GOTO</keyword>
+ <keyword>GRANTED</keyword>
+ <keyword>HIERARCHY</keyword>
+ <keyword>IMPLEMENTATION</keyword>
+ <keyword>INCLUDING</keyword>
+ <keyword>INCREMENT</keyword>
+ <keyword>INITIALLY</keyword>
+ <keyword>INSTANCE</keyword>
+ <keyword>INSTANTIABLE</keyword>
+ <keyword>INTERSECTION</keyword>
+ <keyword>INVOKER</keyword>
+ <keyword>ISOLATION</keyword>
+ <keyword>K</keyword>
+ <keyword>KEY_MEMBER</keyword>
+ <keyword>KEY_TYPE</keyword>
+ <keyword>KEY</keyword>
+ <keyword>LAST</keyword>
+ <keyword>LENGTH</keyword>
+ <keyword>LEVEL</keyword>
+ <keyword>LN</keyword>
+ <keyword>LOCATOR</keyword>
+ <keyword>LOWER</keyword>
+ <keyword>M</keyword>
+ <keyword>MAP</keyword>
+ <keyword>MATCHED</keyword>
+ <keyword>MAX</keyword>
+ <keyword>MAXVALUE</keyword>
+ <keyword>MESSAGE_LENGTH</keyword>
+ <keyword>MESSAGE_OCTET_LENGTH</keyword>
+ <keyword>MESSAGE_TEXT</keyword>
+ <keyword>MIN</keyword>
+ <keyword>MINVALUE</keyword>
+ <keyword>MOD</keyword>
+ <keyword>MORE</keyword>
+ <keyword>MUMPS</keyword>
+ <keyword>NAME</keyword>
+ <keyword>NAMES</keyword>
+ <keyword>NESTING</keyword>
+ <keyword>NEXT</keyword>
+ <keyword>NORMALIZE</keyword>
+ <keyword>NORMALIZED</keyword>
+ <keyword>NULLABLE</keyword>
+ <keyword>NULLIF</keyword>
+ <keyword>NULLS</keyword>
+ <keyword>NUMBER</keyword>
+ <keyword>OBJECT</keyword>
+ <keyword>OCTET_LENGTH</keyword>
+ <keyword>OCTETS</keyword>
+ <keyword>OPTION</keyword>
+ <keyword>OPTIONS</keyword>
+ <keyword>ORDERING</keyword>
+ <keyword>ORDINALITY</keyword>
+ <keyword>OTHERS</keyword>
+ <keyword>OVERLAY</keyword>
+ <keyword>OVERRIDING</keyword>
+ <keyword>PAD</keyword>
+ <keyword>PARAMETER_MODE</keyword>
+ <keyword>PARAMETER_NAME</keyword>
+ <keyword>PARAMETER_ORDINAL_POSITION</keyword>
+ <keyword>PARAMETER_SPECIFIC_CATALOG</keyword>
+ <keyword>PARAMETER_SPECIFIC_NAME</keyword>
+ <keyword>PARAMETER_SPECIFIC_SCHEMA</keyword>
+ <keyword>PARTIAL</keyword>
+ <keyword>PASCAL</keyword>
+ <keyword>PATH</keyword>
+ <keyword>PERCENT_RANK</keyword>
+ <keyword>PERCENTILE_CONT</keyword>
+ <keyword>PERCENTILE_DISC</keyword>
+ <keyword>PLACING</keyword>
+ <keyword>PLI</keyword>
+ <keyword>POSITION</keyword>
+ <keyword>POWER</keyword>
+ <keyword>PRECEDING</keyword>
+ <keyword>PRESERVE</keyword>
+ <keyword>PRIOR</keyword>
+ <keyword>PRIVILEGES</keyword>
+ <keyword>PUBLIC</keyword>
+ <keyword>RANK</keyword>
+ <keyword>READ</keyword>
+ <keyword>RELATIVE</keyword>
+ <keyword>REPEATABLE</keyword>
+ <keyword>RESTART</keyword>
+ <keyword>RETURNED_CARDINALITY</keyword>
+ <keyword>RETURNED_LENGTH</keyword>
+ <keyword>RETURNED_OCTET_LENGTH</keyword>
+ <keyword>RETURNED_SQLSTATE</keyword>
+ <keyword>ROLE</keyword>
+ <keyword>ROUTINE_CATALOG</keyword>
+ <keyword>ROUTINE_NAME</keyword>
+ <keyword>ROUTINE_SCHEMA</keyword>
+ <keyword>ROUTINE</keyword>
+ <keyword>ROW_COUNT</keyword>
+ <keyword>ROW_NUMBER</keyword>
+ <keyword>SCALE</keyword>
+ <keyword>SCHEMA_NAME</keyword>
+ <keyword>SCHEMA</keyword>
+ <keyword>SCOPE_CATALOG</keyword>
+ <keyword>SCOPE_NAME</keyword>
+ <keyword>SCOPE_SCHEMA</keyword>
+ <keyword>SECTION</keyword>
+ <keyword>SECURITY</keyword>
+ <keyword>SELF</keyword>
+ <keyword>SEQUENCE</keyword>
+ <keyword>SERIALIZABLE</keyword>
+ <keyword>SERVER_NAME</keyword>
+ <keyword>SESSION</keyword>
+ <keyword>SETS</keyword>
+ <keyword>SIMPLE</keyword>
+ <keyword>SIZE</keyword>
+ <keyword>SOURCE</keyword>
+ <keyword>SPACE</keyword>
+ <keyword>SPECIFIC_NAME</keyword>
+ <keyword>SQRT</keyword>
+ <keyword>STATE</keyword>
+ <keyword>STATEMENT</keyword>
+ <keyword>STDDEV_POP</keyword>
+ <keyword>STDDEV_SAMP</keyword>
+ <keyword>STRUCTURE</keyword>
+ <keyword>STYLE</keyword>
+ <keyword>SUBCLASS_ORIGIN</keyword>
+ <keyword>SUBSTRING</keyword>
+ <keyword>SUM</keyword>
+ <keyword>TABLE_NAME</keyword>
+ <keyword>TABLESAMPLE</keyword>
+ <keyword>TEMPORARY</keyword>
+ <keyword>TIES</keyword>
+ <keyword>TOP_LEVEL_COUNT</keyword>
+ <keyword>TRANSACTION_ACTIVE</keyword>
+ <keyword>TRANSACTION</keyword>
+ <keyword>TRANSACTIONS_COMMITTED</keyword>
+ <keyword>TRANSACTIONS_ROLLED_BACK</keyword>
+ <keyword>TRANSFORM</keyword>
+ <keyword>TRANSFORMS</keyword>
+ <keyword>TRANSLATE</keyword>
+ <keyword>TRIGGER_CATALOG</keyword>
+ <keyword>TRIGGER_NAME</keyword>
+ <keyword>TRIGGER_SCHEMA</keyword>
+ <keyword>TRIM</keyword>
+ <keyword>TYPE</keyword>
+ <keyword>UNBOUNDED</keyword>
+ <keyword>UNCOMMITTED</keyword>
+ <keyword>UNDER</keyword>
+ <keyword>UNNAMED</keyword>
+ <keyword>USAGE</keyword>
+ <keyword>USER_DEFINED_TYPE_CATALOG</keyword>
+ <keyword>USER_DEFINED_TYPE_CODE</keyword>
+ <keyword>USER_DEFINED_TYPE_NAME</keyword>
+ <keyword>USER_DEFINED_TYPE_SCHEMA</keyword>
+ <keyword>VIEW</keyword>
+ <keyword>WORK</keyword>
+ <keyword>WRITE</keyword>
+ <keyword>ZONE</keyword>
+ <!-- non reserved -->
+ <keyword>ADD</keyword>
+ <keyword>ALL</keyword>
+ <keyword>ALLOCATE</keyword>
+ <keyword>ALTER</keyword>
+ <keyword>AND</keyword>
+ <keyword>ANY</keyword>
+ <keyword>ARE</keyword>
+ <keyword>ARRAY</keyword>
+ <keyword>AS</keyword>
+ <keyword>ASENSITIVE</keyword>
+ <keyword>ASYMMETRIC</keyword>
+ <keyword>AT</keyword>
+ <keyword>ATOMIC</keyword>
+ <keyword>AUTHORIZATION</keyword>
+ <keyword>BEGIN</keyword>
+ <keyword>BETWEEN</keyword>
+ <keyword>BIGINT</keyword>
+ <keyword>BINARY</keyword>
+ <keyword>BLOB</keyword>
+ <keyword>BOOLEAN</keyword>
+ <keyword>BOTH</keyword>
+ <keyword>BY</keyword>
+ <keyword>CALL</keyword>
+ <keyword>CALLED</keyword>
+ <keyword>CASCADED</keyword>
+ <keyword>CASE</keyword>
+ <keyword>CAST</keyword>
+ <keyword>CHAR</keyword>
+ <keyword>CHARACTER</keyword>
+ <keyword>CHECK</keyword>
+ <keyword>CLOB</keyword>
+ <keyword>CLOSE</keyword>
+ <keyword>COLLATE</keyword>
+ <keyword>COLUMN</keyword>
+ <keyword>COMMIT</keyword>
+ <keyword>CONNECT</keyword>
+ <keyword>CONSTRAINT</keyword>
+ <keyword>CONTINUE</keyword>
+ <keyword>CORRESPONDING</keyword>
+ <keyword>CREATE</keyword>
+ <keyword>CROSS</keyword>
+ <keyword>CUBE</keyword>
+ <keyword>CURRENT_DATE</keyword>
+ <keyword>CURRENT_DEFAULT_TRANSFORM_GROUP</keyword>
+ <keyword>CURRENT_PATH</keyword>
+ <keyword>CURRENT_ROLE</keyword>
+ <keyword>CURRENT_TIME</keyword>
+ <keyword>CURRENT_TIMESTAMP</keyword>
+ <keyword>CURRENT_TRANSFORM_GROUP_FOR_TYPE</keyword>
+ <keyword>CURRENT_USER</keyword>
+ <keyword>CURRENT</keyword>
+ <keyword>CURSOR</keyword>
+ <keyword>CYCLE</keyword>
+ <keyword>DATE</keyword>
+ <keyword>DAY</keyword>
+ <keyword>DEALLOCATE</keyword>
+ <keyword>DEC</keyword>
+ <keyword>DECIMAL</keyword>
+ <keyword>DECLARE</keyword>
+ <keyword>DEFAULT</keyword>
+ <keyword>DELETE</keyword>
+ <keyword>DEREF</keyword>
+ <keyword>DESCRIBE</keyword>
+ <keyword>DETERMINISTIC</keyword>
+ <keyword>DISCONNECT</keyword>
+ <keyword>DISTINCT</keyword>
+ <keyword>DOUBLE</keyword>
+ <keyword>DROP</keyword>
+ <keyword>DYNAMIC</keyword>
+ <keyword>EACH</keyword>
+ <keyword>ELEMENT</keyword>
+ <keyword>ELSE</keyword>
+ <keyword>END</keyword>
+ <keyword>END-EXEC</keyword>
+ <keyword>ESCAPE</keyword>
+ <keyword>EXCEPT</keyword>
+ <keyword>EXEC</keyword>
+ <keyword>EXECUTE</keyword>
+ <keyword>EXISTS</keyword>
+ <keyword>EXTERNAL</keyword>
+ <keyword>FALSE</keyword>
+ <keyword>FETCH</keyword>
+ <keyword>FILTER</keyword>
+ <keyword>FLOAT</keyword>
+ <keyword>FOR</keyword>
+ <keyword>FOREIGN</keyword>
+ <keyword>FREE</keyword>
+ <keyword>FROM</keyword>
+ <keyword>FULL</keyword>
+ <keyword>FUNCTION</keyword>
+ <keyword>GET</keyword>
+ <keyword>GLOBAL</keyword>
+ <keyword>GRANT</keyword>
+ <keyword>GROUP</keyword>
+ <keyword>GROUPING</keyword>
+ <keyword>HAVING</keyword>
+ <keyword>HOLD</keyword>
+ <keyword>HOUR</keyword>
+ <keyword>IDENTITY</keyword>
+ <keyword>IMMEDIATE</keyword>
+ <keyword>IN</keyword>
+ <keyword>INDICATOR</keyword>
+ <keyword>INNER</keyword>
+ <keyword>INOUT</keyword>
+ <keyword>INPUT</keyword>
+ <keyword>INSENSITIVE</keyword>
+ <keyword>INSERT</keyword>
+ <keyword>INT</keyword>
+ <keyword>INTEGER</keyword>
+ <keyword>INTERSECT</keyword>
+ <keyword>INTERVAL</keyword>
+ <keyword>INTO</keyword>
+ <keyword>IS</keyword>
+ <keyword>ISOLATION</keyword>
+ <keyword>JOIN</keyword>
+ <keyword>LANGUAGE</keyword>
+ <keyword>LARGE</keyword>
+ <keyword>LATERAL</keyword>
+ <keyword>LEADING</keyword>
+ <keyword>LEFT</keyword>
+ <keyword>LIKE</keyword>
+ <keyword>LOCAL</keyword>
+ <keyword>LOCALTIME</keyword>
+ <keyword>LOCALTIMESTAMP</keyword>
+ <keyword>MATCH</keyword>
+ <keyword>MEMBER</keyword>
+ <keyword>MERGE</keyword>
+ <keyword>METHOD</keyword>
+ <keyword>MINUTE</keyword>
+ <keyword>MODIFIES</keyword>
+ <keyword>MODULE</keyword>
+ <keyword>MONTH</keyword>
+ <keyword>MULTISET</keyword>
+ <keyword>NATIONAL</keyword>
+ <keyword>NATURAL</keyword>
+ <keyword>NCHAR</keyword>
+ <keyword>NCLOB</keyword>
+ <keyword>NEW</keyword>
+ <keyword>NO</keyword>
+ <keyword>NONE</keyword>
+ <keyword>NOT</keyword>
+ <keyword>NULL</keyword>
+ <keyword>NUMERIC</keyword>
+ <keyword>OF</keyword>
+ <keyword>OLD</keyword>
+ <keyword>ON</keyword>
+ <keyword>ONLY</keyword>
+ <keyword>OPEN</keyword>
+ <keyword>OR</keyword>
+ <keyword>ORDER</keyword>
+ <keyword>OUT</keyword>
+ <keyword>OUTER</keyword>
+ <keyword>OUTPUT</keyword>
+ <keyword>OVER</keyword>
+ <keyword>OVERLAPS</keyword>
+ <keyword>PARAMETER</keyword>
+ <keyword>PARTITION</keyword>
+ <keyword>PRECISION</keyword>
+ <keyword>PREPARE</keyword>
+ <keyword>PRIMARY</keyword>
+ <keyword>PROCEDURE</keyword>
+ <keyword>RANGE</keyword>
+ <keyword>READS</keyword>
+ <keyword>REAL</keyword>
+ <keyword>RECURSIVE</keyword>
+ <keyword>REF</keyword>
+ <keyword>REFERENCES</keyword>
+ <keyword>REFERENCING</keyword>
+ <keyword>REGR_AVGX</keyword>
+ <keyword>REGR_AVGY</keyword>
+ <keyword>REGR_COUNT</keyword>
+ <keyword>REGR_INTERCEPT</keyword>
+ <keyword>REGR_R2</keyword>
+ <keyword>REGR_SLOPE</keyword>
+ <keyword>REGR_SXX</keyword>
+ <keyword>REGR_SXY</keyword>
+ <keyword>REGR_SYY</keyword>
+ <keyword>RELEASE</keyword>
+ <keyword>RESULT</keyword>
+ <keyword>RETURN</keyword>
+ <keyword>RETURNS</keyword>
+ <keyword>REVOKE</keyword>
+ <keyword>RIGHT</keyword>
+ <keyword>ROLLBACK</keyword>
+ <keyword>ROLLUP</keyword>
+ <keyword>ROW</keyword>
+ <keyword>ROWS</keyword>
+ <keyword>SAVEPOINT</keyword>
+ <keyword>SCROLL</keyword>
+ <keyword>SEARCH</keyword>
+ <keyword>SECOND</keyword>
+ <keyword>SELECT</keyword>
+ <keyword>SENSITIVE</keyword>
+ <keyword>SESSION_USER</keyword>
+ <keyword>SET</keyword>
+ <keyword>SIMILAR</keyword>
+ <keyword>SMALLINT</keyword>
+ <keyword>SOME</keyword>
+ <keyword>SPECIFIC</keyword>
+ <keyword>SPECIFICTYPE</keyword>
+ <keyword>SQL</keyword>
+ <keyword>SQLEXCEPTION</keyword>
+ <keyword>SQLSTATE</keyword>
+ <keyword>SQLWARNING</keyword>
+ <keyword>START</keyword>
+ <keyword>STATIC</keyword>
+ <keyword>SUBMULTISET</keyword>
+ <keyword>SYMMETRIC</keyword>
+ <keyword>SYSTEM_USER</keyword>
+ <keyword>SYSTEM</keyword>
+ <keyword>TABLE</keyword>
+ <keyword>THEN</keyword>
+ <keyword>TIME</keyword>
+ <keyword>TIMESTAMP</keyword>
+ <keyword>TIMEZONE_HOUR</keyword>
+ <keyword>TIMEZONE_MINUTE</keyword>
+ <keyword>TO</keyword>
+ <keyword>TRAILING</keyword>
+ <keyword>TRANSLATION</keyword>
+ <keyword>TREAT</keyword>
+ <keyword>TRIGGER</keyword>
+ <keyword>TRUE</keyword>
+ <keyword>UESCAPE</keyword>
+ <keyword>UNION</keyword>
+ <keyword>UNIQUE</keyword>
+ <keyword>UNKNOWN</keyword>
+ <keyword>UNNEST</keyword>
+ <keyword>UPDATE</keyword>
+ <keyword>UPPER</keyword>
+ <keyword>USER</keyword>
+ <keyword>USING</keyword>
+ <keyword>VALUE</keyword>
+ <keyword>VALUES</keyword>
+ <keyword>VAR_POP</keyword>
+ <keyword>VAR_SAMP</keyword>
+ <keyword>VARCHAR</keyword>
+ <keyword>VARYING</keyword>
+ <keyword>WHEN</keyword>
+ <keyword>WHENEVER</keyword>
+ <keyword>WHERE</keyword>
+ <keyword>WIDTH_BUCKET</keyword>
+ <keyword>WINDOW</keyword>
+ <keyword>WITH</keyword>
+ <keyword>WITHIN</keyword>
+ <keyword>WITHOUT</keyword>
+ <keyword>YEAR</keyword>
+ </highlighter>
+</highlighters>
Added: trunk/xsl/highlighting/sql92-hl.xml
===================================================================
--- trunk/xsl/highlighting/sql92-hl.xml (rev 0)
+++ trunk/xsl/highlighting/sql92-hl.xml 2013-02-28 14:49:03 UTC (rev 9725)
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SQL-92
+
+xslthl - XSLT Syntax Highlighting
+http://sourceforge.net/projects/xslthl/
+Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3
+
+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.
...
[truncated message content] |
|
From: <bob...@us...> - 2013-03-17 19:24:52
|
Revision: 9732
http://docbook.svn.sourceforge.net/docbook/?rev=9732&view=rev
Author: bobstayton
Date: 2013-03-17 19:24:41 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Updated for 1.78.1 release.
Modified Paths:
--------------
trunk/xsl/VERSION
trunk/xsl/VERSION.xsl
Modified: trunk/xsl/VERSION
===================================================================
(Binary files differ)
Modified: trunk/xsl/VERSION.xsl
===================================================================
--- trunk/xsl/VERSION.xsl 2013-03-17 05:54:58 UTC (rev 9731)
+++ trunk/xsl/VERSION.xsl 2013-03-17 19:24:41 UTC (rev 9732)
@@ -14,8 +14,8 @@
<xsl:param name="sf-relid" select="0"/>
<xsl:param name="DistroName">docbook-xsl</xsl:param>
-<xsl:param name="PreviousRelease">1.77.0</xsl:param>
-<xsl:param name="PreviousReleaseRevision">9371</xsl:param>
+<xsl:param name="PreviousRelease">1.78.0</xsl:param>
+<xsl:param name="PreviousReleaseRevision">9696</xsl:param>
<xsl:param name="Revision">$Revision$</xsl:param>
<xsl:param name="VersionFileURL">$URL$</xsl:param>
@@ -26,7 +26,7 @@
<fm:Branch>XSL Stylesheets</fm:Branch>
<!-- * set/keep fm:version as N.NN.N-pre except for official releases, -->
<!-- * then after the release, revert it to N.NN.N-pre & check back in -->
- <fm:Version>1.77.1</fm:Version>
+ <fm:Version>1.78.1</fm:Version>
<!--
<fm:License>MIT/X Consortium License</fm:License>
-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2013-09-03 16:27:01
|
Revision: 9796
http://sourceforge.net/p/docbook/code/9796
Author: bobstayton
Date: 2013-09-03 16:26:58 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Add missing template for tocdiv/title elements to fix bug #1310.
Modified Paths:
--------------
trunk/xsl/fo/toc.xsl
trunk/xsl/html/toc.xsl
Modified: trunk/xsl/fo/toc.xsl
===================================================================
--- trunk/xsl/fo/toc.xsl 2013-09-02 20:37:06 UTC (rev 9795)
+++ trunk/xsl/fo/toc.xsl 2013-09-03 16:26:58 UTC (rev 9796)
@@ -167,9 +167,11 @@
</xsl:template>
<xsl:template match="tocentry|lotentry|tocdiv|tocfront|tocback">
- <fo:block text-align-last="justify"
- end-indent="2pc"
+ <fo:block end-indent="2pc"
last-line-end-indent="-2pc">
+ <xsl:if test="@linkend or @pagenum">
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
+ </xsl:if>
<fo:inline keep-with-next.within-line="always">
<xsl:choose>
<xsl:when test="@linkend">
@@ -223,19 +225,19 @@
</fo:block>
</xsl:template>
-<xsl:template match="toc/title">
+<xsl:template match="toc/title | tocdiv/title">
<fo:block font-weight="bold">
<xsl:apply-templates/>
</fo:block>
</xsl:template>
-<xsl:template match="toc/subtitle">
+<xsl:template match="toc/subtitle | tocdiv/subtitle">
<fo:block font-weight="bold">
<xsl:apply-templates/>
</fo:block>
</xsl:template>
-<xsl:template match="toc/titleabbrev">
+<xsl:template match="toc/titleabbrev |tocdiv/titleabbrev">
</xsl:template>
<!-- ==================================================================== -->
Modified: trunk/xsl/html/toc.xsl
===================================================================
--- trunk/xsl/html/toc.xsl 2013-09-02 20:37:06 UTC (rev 9795)
+++ trunk/xsl/html/toc.xsl 2013-09-03 16:26:58 UTC (rev 9796)
@@ -245,21 +245,21 @@
</xsl:choose>
</xsl:template>
-<xsl:template match="toc/title">
+<xsl:template match="toc/title | tocdiv/title">
<div>
<xsl:apply-templates select="." mode="common.html.attributes"/>
<xsl:apply-templates/>
</div>
</xsl:template>
-<xsl:template match="toc/subtitle">
+<xsl:template match="toc/subtitle | tocdiv/subtitle">
<div>
<xsl:apply-templates select="." mode="common.html.attributes"/>
<xsl:apply-templates/>
</div>
</xsl:template>
-<xsl:template match="toc/titleabbrev">
+<xsl:template match="toc/titleabbrev | tocdiv/titleabbrev">
</xsl:template>
<!-- ==================================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2013-09-03 16:55:42
|
Revision: 9797
http://sourceforge.net/p/docbook/code/9797
Author: bobstayton
Date: 2013-09-03 16:55:40 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Set previous_release to 1.78.1 so snapshots compute changes correctly.
Modified Paths:
--------------
trunk/xsl/VERSION
trunk/xsl/VERSION.xsl
Modified: trunk/xsl/VERSION
===================================================================
(Binary files differ)
Modified: trunk/xsl/VERSION.xsl
===================================================================
--- trunk/xsl/VERSION.xsl 2013-09-03 16:26:58 UTC (rev 9796)
+++ trunk/xsl/VERSION.xsl 2013-09-03 16:55:40 UTC (rev 9797)
@@ -14,8 +14,8 @@
<xsl:param name="sf-relid" select="0"/>
<xsl:param name="DistroName">docbook-xsl</xsl:param>
-<xsl:param name="PreviousRelease">1.78.0</xsl:param>
-<xsl:param name="PreviousReleaseRevision">9696</xsl:param>
+<xsl:param name="PreviousRelease">1.78.1</xsl:param>
+<xsl:param name="PreviousReleaseRevision">9732</xsl:param>
<xsl:param name="Revision">$Revision$</xsl:param>
<xsl:param name="VersionFileURL">$URL$</xsl:param>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2013-09-13 07:07:10
|
Revision: 9805
http://sourceforge.net/p/docbook/code/9805
Author: tom_schr
Date: 2013-09-13 07:07:05 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Pass referrer and xrefstyle to "xref-to-suffix" and "xref-to-prefix"
modes (to use the same signature than "xref-to" mode) as discussed with
Bob on the mailinglist (2013-09-12)
Modified Paths:
--------------
trunk/xsl/fo/xref.xsl
trunk/xsl/html/xref.xsl
Modified: trunk/xsl/fo/xref.xsl
===================================================================
--- trunk/xsl/fo/xref.xsl 2013-09-09 15:00:31 UTC (rev 9804)
+++ trunk/xsl/fo/xref.xsl 2013-09-13 07:07:05 UTC (rev 9805)
@@ -98,7 +98,10 @@
<xsl:when test="$target">
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-prefix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
<xsl:apply-templates select="$target" mode="xref-to">
@@ -107,7 +110,10 @@
</xsl:apply-templates>
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-suffix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
</xsl:when>
<xsl:otherwise>
@@ -269,15 +275,22 @@
<!--- ==================================================================== -->
-<xsl:template match="*" mode="xref-to-prefix"/>
-<xsl:template match="*" mode="xref-to-suffix"/>
+<xsl:template match="*" mode="xref-to-prefix">
+ <xsl:param name="referrer"/>
+ <xsl:param name="xrefstyle"/>
+ <xsl:param name="verbose" select="1"/>
+</xsl:template>
+<xsl:template match="*" mode="xref-to-suffix">
+ <xsl:param name="referrer"/>
+ <xsl:param name="xrefstyle"/>
+ <xsl:param name="verbose" select="1"/>
+</xsl:template>
<xsl:template match="*" mode="xref-to">
<xsl:param name="referrer"/>
<xsl:param name="xrefstyle"/>
<xsl:param name="verbose" select="1"/>
-
<xsl:if test="$verbose != 0">
<xsl:message>
<xsl:text>Don't know what gentext to create for xref to: "</xsl:text>
Modified: trunk/xsl/html/xref.xsl
===================================================================
--- trunk/xsl/html/xref.xsl 2013-09-09 15:00:31 UTC (rev 9804)
+++ trunk/xsl/html/xref.xsl 2013-09-13 07:07:05 UTC (rev 9805)
@@ -96,7 +96,10 @@
<xsl:when test="$target">
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-prefix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
<xsl:apply-templates select="$target" mode="xref-to">
@@ -105,7 +108,10 @@
</xsl:apply-templates>
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-suffix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
</xsl:when>
@@ -308,8 +314,16 @@
<!-- ==================================================================== -->
-<xsl:template match="*" mode="xref-to-prefix"/>
-<xsl:template match="*" mode="xref-to-suffix"/>
+<xsl:template match="*" mode="xref-to-prefix">
+ <xsl:param name="referrer"/>
+ <xsl:param name="xrefstyle"/>
+ <xsl:param name="verbose" select="1"/>
+</xsl:template>
+<xsl:template match="*" mode="xref-to-suffix">
+ <xsl:param name="referrer"/>
+ <xsl:param name="xrefstyle"/>
+ <xsl:param name="verbose" select="1"/>
+</xsl:template>
<xsl:template match="*" mode="xref-to">
<xsl:param name="referrer"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2013-09-13 18:04:58
|
Revision: 9806
http://sourceforge.net/p/docbook/code/9806
Author: bobstayton
Date: 2013-09-13 18:04:54 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Add mode="xrefstyle" to replace many instances of redundant
code determining the xrefstyle with xsl:apply-templates
select="." mode="xrefstyle". Also allows stylesheet
customization to specify an xrefstyle per element type.
Modified Paths:
--------------
trunk/xsl/common/common.xsl
trunk/xsl/common/olink.xsl
trunk/xsl/common/titles.xsl
trunk/xsl/fo/xref.xsl
trunk/xsl/html/xref.xsl
Modified: trunk/xsl/common/common.xsl
===================================================================
--- trunk/xsl/common/common.xsl 2013-09-13 07:07:05 UTC (rev 9805)
+++ trunk/xsl/common/common.xsl 2013-09-13 18:04:54 UTC (rev 9806)
@@ -2107,4 +2107,16 @@
</xsl:choose>
</xsl:template>
+<xsl:template match="*" mode="xrefstyle">
+ <xsl:choose>
+ <xsl:when test="@role and not(@xrefstyle)
+ and $use.role.as.xrefstyle != 0">
+ <xsl:value-of select="@role"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@xrefstyle"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
</xsl:stylesheet>
Modified: trunk/xsl/common/olink.xsl
===================================================================
--- trunk/xsl/common/olink.xsl 2013-09-13 07:07:05 UTC (rev 9805)
+++ trunk/xsl/common/olink.xsl 2013-09-13 18:04:54 UTC (rev 9806)
@@ -640,15 +640,7 @@
<xsl:param name="olink.key" select="''"/>
<xsl:param name="referrer" select="."/>
<xsl:param name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle)
- and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="xrefstyle"/>
</xsl:param>
<xsl:choose>
@@ -1082,15 +1074,7 @@
<xsl:param name="target.database"/>
<xsl:param name="linkend" select="''"/>
<xsl:param name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle)
- and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="xrefstyle"/>
</xsl:param>
<xsl:variable name="targetdoc">
@@ -1142,15 +1126,7 @@
<xsl:param name="olink.lang" select="'en'"/>
<xsl:param name="target.database"/>
<xsl:param name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle)
- and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="xrefstyle"/>
</xsl:param>
<xsl:variable name="page">
@@ -1213,15 +1189,7 @@
<xsl:param name="linkend" select="@linkend"/>
<xsl:param name="target" select="key('id', $linkend)"/>
<xsl:param name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle)
- and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="." mode="xrefstyle"/>
</xsl:param>
<xsl:if test="not(starts-with(normalize-space($xrefstyle),'select:')
Modified: trunk/xsl/common/titles.xsl
===================================================================
--- trunk/xsl/common/titles.xsl 2013-09-13 07:07:05 UTC (rev 9805)
+++ trunk/xsl/common/titles.xsl 2013-09-13 18:04:54 UTC (rev 9806)
@@ -739,6 +739,9 @@
<xsl:variable name="targets" select="key('id',@linkend)|key('id',substring-after(@xlink:href,'#'))"/>
<xsl:variable name="target" select="$targets[1]"/>
<xsl:variable name="refelem" select="local-name($target)"/>
+ <xsl:variable name="xrefstyle">
+ <xsl:apply-templates select="." mode="xrefstyle"/>
+ </xsl:variable>
<xsl:call-template name="check.id.unique">
<xsl:with-param name="linkend" select="@linkend"/>
@@ -785,24 +788,20 @@
a title. See bugs #1811721 and #1838136. -->
<xsl:when test="not(ancestor::*[@id = $target/@id] or ancestor::*[@xml:id = $target/@xml:id])">
- <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-prefix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
<xsl:apply-templates select="$target" mode="xref-to">
-
<xsl:with-param name="referrer" select="."/>
- <xsl:with-param name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
</xsl:apply-templates>
- <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-suffix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:when>
<xsl:otherwise>
Modified: trunk/xsl/fo/xref.xsl
===================================================================
--- trunk/xsl/fo/xref.xsl 2013-09-13 07:07:05 UTC (rev 9805)
+++ trunk/xsl/fo/xref.xsl 2013-09-13 18:04:54 UTC (rev 9806)
@@ -56,19 +56,10 @@
<xsl:param name="linkend.targets" select="key('id',@linkend)"/>
<xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
<xsl:param name="refelem" select="local-name($target)"/>
+ <xsl:param name="xrefstyle">
+ <xsl:apply-templates select="." mode="xrefstyle"/>
+ </xsl:param>
- <xsl:variable name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle)
- and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:variable name="content">
<fo:inline xsl:use-attribute-sets="xref.properties">
<xsl:choose>
@@ -166,6 +157,10 @@
<xsl:variable name="target" select="$targets[1]"/>
<xsl:variable name="refelem" select="local-name($target)"/>
+ <xsl:variable name="xrefstyle">
+ <xsl:apply-templates select="." mode="xrefstyle"/>
+ </xsl:variable>
+
<xsl:call-template name="check.id.unique">
<xsl:with-param name="linkend" select="@linkend"/>
</xsl:call-template>
@@ -211,28 +206,25 @@
<xsl:otherwise>
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-prefix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
<fo:basic-link internal-destination="{@linkend}"
xsl:use-attribute-sets="xref.properties">
<xsl:apply-templates select="$target" mode="xref-to">
<xsl:with-param name="referrer" select="."/>
- <xsl:with-param name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
</xsl:apply-templates>
</fo:basic-link>
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-suffix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
@@ -445,10 +437,14 @@
</xsl:template>
<xsl:template match="biblioentry|bibliomixed" mode="xref-to-prefix">
+ <xsl:param name="referrer"/>
+ <xsl:param name="xrefstyle"/>
<xsl:text>[</xsl:text>
</xsl:template>
<xsl:template match="biblioentry|bibliomixed" mode="xref-to-suffix">
+ <xsl:param name="referrer"/>
+ <xsl:param name="xrefstyle"/>
<xsl:text>]</xsl:text>
</xsl:template>
@@ -859,19 +855,10 @@
<xsl:param name="linkend" select="@linkend"/>
<xsl:param name="targets" select="key('id',$linkend)"/>
<xsl:param name="target" select="$targets[1]"/>
+ <xsl:param name="xrefstyle">
+ <xsl:apply-templates select="." mode="xrefstyle"/>
+ </xsl:param>
- <xsl:variable name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle)
- and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:variable name="content">
<fo:inline xsl:use-attribute-sets="xref.properties">
<xsl:choose>
Modified: trunk/xsl/html/xref.xsl
===================================================================
--- trunk/xsl/html/xref.xsl 2013-09-13 07:07:05 UTC (rev 9805)
+++ trunk/xsl/html/xref.xsl 2013-09-13 18:04:54 UTC (rev 9806)
@@ -53,17 +53,9 @@
<xsl:param name="linkend.targets" select="key('id',@linkend)"/>
<xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
- <xsl:variable name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle)
- and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+ <xsl:param name="xrefstyle">
+ <xsl:apply-templates select="." mode="xrefstyle"/>
+ </xsl:param>
<xsl:call-template name="anchor"/>
@@ -140,6 +132,9 @@
<xsl:variable name="targets" select="key('id',@linkend)"/>
<xsl:variable name="target" select="$targets[1]"/>
<xsl:variable name="refelem" select="local-name($target)"/>
+ <xsl:variable name="xrefstyle">
+ <xsl:apply-templates select="." mode="xrefstyle"/>
+ </xsl:variable>
<xsl:call-template name="check.id.unique">
<xsl:with-param name="linkend" select="@linkend"/>
@@ -210,7 +205,10 @@
</xsl:variable>
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-prefix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
<a href="{$href}">
@@ -222,21 +220,15 @@
</xsl:if>
<xsl:apply-templates select="$target" mode="xref-to">
<xsl:with-param name="referrer" select="."/>
- <xsl:with-param name="xrefstyle">
- <xsl:choose>
- <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
- <xsl:value-of select="@role"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@xrefstyle"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
</xsl:apply-templates>
</a>
<xsl:if test="not(parent::citation)">
- <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+ <xsl:apply-templates select="$target" mode="xref-to-suffix">
+ <xsl:with-param name="referrer" select="."/>
+ <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
+ </xsl:apply-templates>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2013-09-13 18:43:44
|
Revision: 9807
http://sourceforge.net/p/docbook/code/9807
Author: bobstayton
Date: 2013-09-13 18:43:40 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Pass referrer and target params to mode="xrefstyle" to allow customizations
to be more specific.
Modified Paths:
--------------
trunk/xsl/common/common.xsl
trunk/xsl/common/olink.xsl
trunk/xsl/common/titles.xsl
trunk/xsl/fo/xref.xsl
trunk/xsl/html/xref.xsl
Modified: trunk/xsl/common/common.xsl
===================================================================
--- trunk/xsl/common/common.xsl 2013-09-13 18:04:54 UTC (rev 9806)
+++ trunk/xsl/common/common.xsl 2013-09-13 18:43:40 UTC (rev 9807)
@@ -2108,6 +2108,12 @@
</xsl:template>
<xsl:template match="*" mode="xrefstyle">
+ <xsl:param name="referrer" select="."/>
+ <xsl:param name="target"/>
+ <xsl:param name="olink.key"/>
+
+ <!-- normally uses the @xrefstyle attribute in xref, but could
+ be customized based on the target element type -->
<xsl:choose>
<xsl:when test="@role and not(@xrefstyle)
and $use.role.as.xrefstyle != 0">
Modified: trunk/xsl/common/olink.xsl
===================================================================
--- trunk/xsl/common/olink.xsl 2013-09-13 18:04:54 UTC (rev 9806)
+++ trunk/xsl/common/olink.xsl 2013-09-13 18:43:40 UTC (rev 9807)
@@ -640,7 +640,10 @@
<xsl:param name="olink.key" select="''"/>
<xsl:param name="referrer" select="."/>
<xsl:param name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="olink.key" select="$olink.key"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:param>
<xsl:choose>
@@ -1071,10 +1074,14 @@
<xsl:template name="olink.page.citation">
<xsl:param name="olink.key" select="''"/>
<xsl:param name="olink.lang" select="'en'"/>
+ <xsl:param name="referrer" select="."/>
<xsl:param name="target.database"/>
<xsl:param name="linkend" select="''"/>
<xsl:param name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="olink.key" select="$olink.key"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:param>
<xsl:variable name="targetdoc">
@@ -1122,11 +1129,15 @@
</xsl:template>
<xsl:template name="olink.document.citation">
+ <xsl:param name="referrer" select="."/>
<xsl:param name="olink.key" select="''"/>
<xsl:param name="olink.lang" select="'en'"/>
<xsl:param name="target.database"/>
<xsl:param name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="olink.key" select="$olink.key"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:param>
<xsl:variable name="page">
@@ -1186,10 +1197,14 @@
<xsl:template name="xref.page.citation">
<!-- Determine if this xref should have a page citation.
Context node is the xref or local olink element -->
+ <xsl:param name="referrer" select="."/>
<xsl:param name="linkend" select="@linkend"/>
<xsl:param name="target" select="key('id', $linkend)"/>
<xsl:param name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="target" select="$target"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:param>
<xsl:if test="not(starts-with(normalize-space($xrefstyle),'select:')
Modified: trunk/xsl/common/titles.xsl
===================================================================
--- trunk/xsl/common/titles.xsl 2013-09-13 18:04:54 UTC (rev 9806)
+++ trunk/xsl/common/titles.xsl 2013-09-13 18:43:40 UTC (rev 9807)
@@ -736,11 +736,15 @@
</xsl:template>
<xsl:template match="xref" mode="no.anchor.mode">
+ <xsl:variable name="referrer" select="."/>
<xsl:variable name="targets" select="key('id',@linkend)|key('id',substring-after(@xlink:href,'#'))"/>
<xsl:variable name="target" select="$targets[1]"/>
<xsl:variable name="refelem" select="local-name($target)"/>
<xsl:variable name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="target" select="$target"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:variable>
<xsl:call-template name="check.id.unique">
Modified: trunk/xsl/fo/xref.xsl
===================================================================
--- trunk/xsl/fo/xref.xsl 2013-09-13 18:04:54 UTC (rev 9806)
+++ trunk/xsl/fo/xref.xsl 2013-09-13 18:43:40 UTC (rev 9807)
@@ -56,8 +56,12 @@
<xsl:param name="linkend.targets" select="key('id',@linkend)"/>
<xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
<xsl:param name="refelem" select="local-name($target)"/>
+ <xsl:param name="referrer" select="."/>
<xsl:param name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="target" select="$target"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:param>
<xsl:variable name="content">
@@ -155,10 +159,14 @@
<xsl:template match="biblioref" name="biblioref">
<xsl:variable name="targets" select="key('id',@linkend)"/>
<xsl:variable name="target" select="$targets[1]"/>
+ <xsl:variable name="referrer" select="."/>
<xsl:variable name="refelem" select="local-name($target)"/>
<xsl:variable name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="target" select="$target"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:variable>
<xsl:call-template name="check.id.unique">
@@ -852,11 +860,15 @@
<!-- ==================================================================== -->
<xsl:template match="link" name="link">
+ <xsl:param name="referrer" select="."/>
<xsl:param name="linkend" select="@linkend"/>
<xsl:param name="targets" select="key('id',$linkend)"/>
<xsl:param name="target" select="$targets[1]"/>
<xsl:param name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="target" select="$target"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:param>
<xsl:variable name="content">
Modified: trunk/xsl/html/xref.xsl
===================================================================
--- trunk/xsl/html/xref.xsl 2013-09-13 18:04:54 UTC (rev 9806)
+++ trunk/xsl/html/xref.xsl 2013-09-13 18:43:40 UTC (rev 9807)
@@ -52,9 +52,13 @@
<xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
<xsl:param name="linkend.targets" select="key('id',@linkend)"/>
<xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
+ <xsl:param name="referrer" select="."/>
<xsl:param name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="target" select="$target"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:param>
<xsl:call-template name="anchor"/>
@@ -132,8 +136,12 @@
<xsl:variable name="targets" select="key('id',@linkend)"/>
<xsl:variable name="target" select="$targets[1]"/>
<xsl:variable name="refelem" select="local-name($target)"/>
+ <xsl:variable name="referrer" select="."/>
<xsl:variable name="xrefstyle">
- <xsl:apply-templates select="." mode="xrefstyle"/>
+ <xsl:apply-templates select="." mode="xrefstyle">
+ <xsl:with-param name="target" select="$target"/>
+ <xsl:with-param name="referrer" select="$referrer"/>
+ </xsl:apply-templates>
</xsl:variable>
<xsl:call-template name="check.id.unique">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2013-09-23 16:57:53
|
Revision: 9814
http://sourceforge.net/p/docbook/code/9814
Author: stilor
Date: 2013-09-23 16:57:50 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
1. Make page citations on <xref/> to paragraphs conditional on a new parameter,
$insert.xref.page.number.para, default to 'yes' (before, page citations were
added unconditionally). Remove similar special-casing for <link/>.
2. Disable page citations for @xrefstyle="template:..." (if needed, they
can be added with %p in the template - but they can't be disabled).
Modified Paths:
--------------
trunk/xsl/common/olink.xsl
trunk/xsl/fo/param.ent
trunk/xsl/fo/param.xweb
trunk/xsl/fo/xref.xsl
trunk/xsl/html/param.ent
trunk/xsl/html/param.xweb
trunk/xsl/xhtml-1_1/param.ent
trunk/xsl/xhtml-1_1/param.xweb
Modified: trunk/xsl/common/olink.xsl
===================================================================
--- trunk/xsl/common/olink.xsl 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/common/olink.xsl 2013-09-23 16:57:50 UTC (rev 9814)
@@ -1212,7 +1212,8 @@
or contains($xrefstyle, 'Page')))
and ( $insert.xref.page.number = 'yes'
or $insert.xref.page.number = '1')
- or local-name($target) = 'para'">
+ or ( local-name($target) = 'para'
+ and $insert.xref.page.number.para = 'yes')">
<xsl:apply-templates select="$target" mode="page.citation">
<xsl:with-param name="id" select="$linkend"/>
</xsl:apply-templates>
Modified: trunk/xsl/fo/param.ent
===================================================================
--- trunk/xsl/fo/param.ent 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/fo/param.ent 2013-09-23 16:57:50 UTC (rev 9814)
@@ -110,6 +110,7 @@
<!ENTITY informal.object.properties SYSTEM "../params/informal.object.properties.xml">
<!ENTITY index.preferred.page.properties SYSTEM "../params/index.preferred.page.properties.xml">
<!ENTITY insert.xref.page.number SYSTEM "../params/insert.xref.page.number.xml">
+<!ENTITY insert.xref.page.number.para SYSTEM "../params/insert.xref.page.number.para.xml">
<!ENTITY itemizedlist.properties SYSTEM "../params/itemizedlist.properties.xml">
<!ENTITY itemizedlist.label.properties SYSTEM "../params/itemizedlist.label.properties.xml">
<!ENTITY label.from.part SYSTEM "../params/label.from.part.xml">
Modified: trunk/xsl/fo/param.xweb
===================================================================
--- trunk/xsl/fo/param.xweb 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/fo/param.xweb 2013-09-23 16:57:50 UTC (rev 9814)
@@ -183,6 +183,7 @@
</reference>
<reference xml:id="xrefs"><title>Cross References</title>
&insert.xref.page.number;
+&insert.xref.page.number.para;
&xref.properties;
&xref.label-title.separator;
&xref.label-page.separator;
@@ -727,6 +728,7 @@
<src:fragref linkend="index.term.separator.frag"/>
<src:fragref linkend="insert.link.page.number.frag"/>
<src:fragref linkend="insert.xref.page.number.frag"/>
+<src:fragref linkend="insert.xref.page.number.para.frag"/>
<src:fragref linkend="itemizedlist.properties.frag"/>
<src:fragref linkend="itemizedlist.label.properties.frag"/>
<src:fragref linkend="itemizedlist.label.width.frag"/>
Modified: trunk/xsl/fo/xref.xsl
===================================================================
--- trunk/xsl/fo/xref.xsl 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/fo/xref.xsl 2013-09-23 16:57:50 UTC (rev 9814)
@@ -137,14 +137,18 @@
and contains($xrefstyle, 'nopage')">
<!-- negative xrefstyle in instance turns it off -->
</xsl:when>
+ <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
+ <!-- if page citation were wanted, it would've been in the template as %p -->
+ </xsl:when>
<!-- positive xrefstyle already handles it -->
<xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:')
and (contains($xrefstyle, 'page')
or contains($xrefstyle, 'Page')))
and ( $insert.xref.page.number = 'yes'
or $insert.xref.page.number = '1')
- or (local-name($target) = 'para' and
- $xrefstyle = '')">
+ or (local-name($target) = 'para'
+ and $xrefstyle = ''
+ and $insert.xref.page.number.para = 'yes')">
<xsl:apply-templates select="$target" mode="page.citation">
<xsl:with-param name="id" select="$target/@id|$target/@xml:id"/>
</xsl:apply-templates>
@@ -937,8 +941,7 @@
and (contains($xrefstyle, 'page')
or contains($xrefstyle, 'Page')))
or ( $insert.link.page.number = 'yes'
- or $insert.link.page.number = '1')
- or local-name($target) = 'para'">
+ or $insert.link.page.number = '1')">
<xsl:apply-templates select="$target" mode="page.citation">
<xsl:with-param name="id" select="$linkend"/>
</xsl:apply-templates>
Modified: trunk/xsl/html/param.ent
===================================================================
--- trunk/xsl/html/param.ent 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/html/param.ent 2013-09-23 16:57:50 UTC (rev 9814)
@@ -290,6 +290,7 @@
<!ENTITY eclipse.plugin.name SYSTEM "../params/eclipse.plugin.name.xml">
<!ENTITY eclipse.plugin.id SYSTEM "../params/eclipse.plugin.id.xml">
<!ENTITY eclipse.plugin.provider SYSTEM "../params/eclipse.plugin.provider.xml">
+<!ENTITY insert.xref.page.number.para SYSTEM "../params/insert.xref.page.number.para.xml">
<!ENTITY insert.xref.page.number SYSTEM "../params/insert.xref.page.number.xml">
<!ENTITY component.label.includes.part.label SYSTEM "../params/component.label.includes.part.label.xml">
<!ENTITY simplesect.in.toc SYSTEM "../params/simplesect.in.toc.xml">
Modified: trunk/xsl/html/param.xweb
===================================================================
--- trunk/xsl/html/param.xweb 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/html/param.xweb 2013-09-23 16:57:50 UTC (rev 9814)
@@ -221,6 +221,7 @@
<reference xml:id="xrefs"><title>Cross References</title>
&collect.xref.targets;
&insert.xref.page.number;
+&insert.xref.page.number.para;
&use.role.as.xrefstyle;
&xref.with.number.and.title;
&xref.label-page.separator;
@@ -633,6 +634,7 @@
<src:fragref linkend="insert.olink.page.number.frag"/>
<src:fragref linkend="insert.olink.pdf.frag.frag"/>
<src:fragref linkend="insert.xref.page.number.frag"/>
+<src:fragref linkend="insert.xref.page.number.para.frag"/>
<src:fragref linkend="javahelp.encoding.frag"/>
<src:fragref linkend="keep.relative.image.uris.frag"/>
<src:fragref linkend="l10n.gentext.default.language.frag"/>
Modified: trunk/xsl/xhtml-1_1/param.ent
===================================================================
--- trunk/xsl/xhtml-1_1/param.ent 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/xhtml-1_1/param.ent 2013-09-23 16:57:50 UTC (rev 9814)
@@ -294,6 +294,7 @@
<!ENTITY eclipse.plugin.name SYSTEM "../params/eclipse.plugin.name.xml">
<!ENTITY eclipse.plugin.id SYSTEM "../params/eclipse.plugin.id.xml">
<!ENTITY eclipse.plugin.provider SYSTEM "../params/eclipse.plugin.provider.xml">
+<!ENTITY insert.xref.page.number.para SYSTEM "../params/insert.xref.page.number.para.xml">
<!ENTITY insert.xref.page.number SYSTEM "../params/insert.xref.page.number.xml">
<!ENTITY component.label.includes.part.label SYSTEM "../params/component.label.includes.part.label.xml">
<!ENTITY simplesect.in.toc SYSTEM "../params/simplesect.in.toc.xml">
Modified: trunk/xsl/xhtml-1_1/param.xweb
===================================================================
--- trunk/xsl/xhtml-1_1/param.xweb 2013-09-21 23:29:39 UTC (rev 9813)
+++ trunk/xsl/xhtml-1_1/param.xweb 2013-09-23 16:57:50 UTC (rev 9814)
@@ -206,6 +206,7 @@
<reference xml:id="xrefs"><title>Cross References</title>
&collect.xref.targets;
&insert.xref.page.number;
+&insert.xref.page.number.para;
&use.role.as.xrefstyle;
&xref.with.number.and.title;
&xref.label-page.separator;
@@ -590,6 +591,7 @@
<src:fragref linkend="ignore.image.scaling.frag"/>
<src:fragref linkend="inherit.keywords.frag"/>
<src:fragref linkend="insert.xref.page.number.frag"/>
+<src:fragref linkend="insert.xref.page.number.para.frag"/>
<src:fragref linkend="javahelp.encoding.frag"/>
<src:fragref linkend="keep.relative.image.uris.frag"/>
<src:fragref linkend="l10n.gentext.default.language.frag"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2013-09-25 22:38:35
|
Revision: 9817
http://sourceforge.net/p/docbook/code/9817
Author: stilor
Date: 2013-09-25 22:38:32 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Make olink errors/warnings overridable in customizations.
Modified Paths:
--------------
trunk/xsl/common/olink.xsl
trunk/xsl/fo/xref.xsl
trunk/xsl/html/chunk-common.xsl
trunk/xsl/html/xref.xsl
trunk/xsl/website/olink.xsl
Modified: trunk/xsl/common/olink.xsl
===================================================================
--- trunk/xsl/common/olink.xsl 2013-09-24 03:35:07 UTC (rev 9816)
+++ trunk/xsl/common/olink.xsl 2013-09-25 22:38:32 UTC (rev 9817)
@@ -18,6 +18,40 @@
use="concat(ancestor::document/@targetdoc, '/',
@targetptr, '/', ancestor::document/@lang)" />
+<!-- Customize this template if you want olink errors to be fatal -->
+<xsl:template name="olink.error">
+ <xsl:param name="message"/>
+
+ <xsl:message>
+ <xsl:text>Olink error: </xsl:text>
+ <xsl:value-of select="$message"/>
+ </xsl:message>
+</xsl:template>
+
+<!-- Customize this template if you want olink warnings to be fatal -->
+<xsl:template name="olink.warning">
+ <xsl:param name="message"/>
+
+ <xsl:message>
+ <xsl:text>Olink warning: </xsl:text>
+ <xsl:value-of select="$message"/>
+ </xsl:message>
+</xsl:template>
+
+<!-- Customize this template if you want unresolved olink pointers to be fatal -->
+<xsl:template name="olink.unresolved">
+ <xsl:param name="targetdoc.att"/>
+ <xsl:param name="targetptr.att"/>
+
+ <xsl:message>
+ <xsl:text>Error: unresolved olink: targetdoc/targetptr = '</xsl:text>
+ <xsl:value-of select="$targetdoc.att"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="$targetptr.att"/>
+ <xsl:text>'.</xsl:text>
+ </xsl:message>
+</xsl:template>
+
<!-- Return filename of database -->
<xsl:template name="select.target.database">
<xsl:param name="targetdoc.att" select="''"/>
@@ -50,27 +84,33 @@
<xsl:choose>
<!-- Was the database document parameter not set? -->
<xsl:when test="$target.database.document = ''">
- <xsl:message>
- <xsl:text>Olinks not processed: must specify a </xsl:text>
- <xsl:text>$target.database.document parameter </xsl:text>
- <xsl:text>when using olinks with targetdoc </xsl:text>
- <xsl:text>and targetptr attributes.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>olinks not processed: must specify a </xsl:text>
+ <xsl:text>$target.database.document parameter </xsl:text>
+ <xsl:text>when using olinks with targetdoc </xsl:text>
+ <xsl:text>and targetptr attributes.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:when>
<xsl:when test="namespace-uri($target.database/*) != ''">
- <xsl:message>
- <xsl:text>Olink error: the targetset element and children in '</xsl:text>
- <xsl:value-of select="$target.database.document"/>
- <xsl:text>' should not be in any namespace.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>the targetset element and children in '</xsl:text>
+ <xsl:value-of select="$target.database.document"/>
+ <xsl:text>' should not be in any namespace.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:when>
<!-- Did it not open? Should be a targetset element -->
<xsl:when test="not($target.database/*)">
- <xsl:message>
- <xsl:text>Olink error: could not open target database '</xsl:text>
- <xsl:value-of select="$target.database.filename"/>
- <xsl:text>'.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>could not open target database '</xsl:text>
+ <xsl:value-of select="$target.database.filename"/>
+ <xsl:text>'.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$target.database.filename"/>
@@ -504,23 +544,27 @@
select="key('targetdoc-key', $current.docid)[1]/parent::dir"/>
<xsl:with-param name="targetdoc" select="$targetdoc"/>
</xsl:call-template>
- </xsl:for-each >
+ </xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink error: cannot compute relative </xsl:text>
- <xsl:text>sitemap path because $current.docid '</xsl:text>
- <xsl:value-of select="$current.docid"/>
- <xsl:text>' not found in target database.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>cannot compute relative </xsl:text>
+ <xsl:text>sitemap path because $current.docid '</xsl:text>
+ <xsl:value-of select="$current.docid"/>
+ <xsl:text>' not found in target database.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink warning: cannot compute relative </xsl:text>
- <xsl:text>sitemap path without $current.docid parameter</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>cannot compute relative </xsl:text>
+ <xsl:text>sitemap path without $current.docid parameter</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
<!-- In either case, add baseuri from its document entry-->
@@ -808,63 +852,71 @@
<xsl:value-of
select="$xref-number-and-title-context"/>
<xsl:if test="$olink.debug">
- <xsl:message>
- <xsl:text>Olink error: no gentext template</xsl:text>
- <xsl:text> exists for xrefstyle '</xsl:text>
- <xsl:value-of select="$xrefstyle"/>
- <xsl:text>' for element '</xsl:text>
- <xsl:value-of select="$target.elem"/>
- <xsl:text>' in language '</xsl:text>
- <xsl:value-of select="$lang"/>
- <xsl:text>' in context 'xref-number-and-title</xsl:text>
- <xsl:text>'. Using template without @style.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.warning">
+ <xsl:with-param name="message">
+ <xsl:text>no gentext template</xsl:text>
+ <xsl:text> exists for xrefstyle '</xsl:text>
+ <xsl:value-of select="$xrefstyle"/>
+ <xsl:text>' for element '</xsl:text>
+ <xsl:value-of select="$target.elem"/>
+ <xsl:text>' in language '</xsl:text>
+ <xsl:value-of select="$lang"/>
+ <xsl:text>' in context 'xref-number-and-title</xsl:text>
+ <xsl:text>'. Using template without @style.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
</xsl:when>
<xsl:when test="$xref-number-context != '' and
$xref.number != ''">
<xsl:value-of select="$xref-number-context"/>
<xsl:if test="$olink.debug">
- <xsl:message>
- <xsl:text>Olink error: no gentext template</xsl:text>
- <xsl:text> exists for xrefstyle '</xsl:text>
- <xsl:value-of select="$xrefstyle"/>
- <xsl:text>' for element '</xsl:text>
- <xsl:value-of select="$target.elem"/>
- <xsl:text>' in language '</xsl:text>
- <xsl:value-of select="$lang"/>
- <xsl:text>' in context 'xref-number</xsl:text>
- <xsl:text>'. Using template without @style.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.warning">
+ <xsl:with-param name="message">
+ <xsl:text>no gentext template</xsl:text>
+ <xsl:text> exists for xrefstyle '</xsl:text>
+ <xsl:value-of select="$xrefstyle"/>
+ <xsl:text>' for element '</xsl:text>
+ <xsl:value-of select="$target.elem"/>
+ <xsl:text>' in language '</xsl:text>
+ <xsl:value-of select="$lang"/>
+ <xsl:text>' in context 'xref-number</xsl:text>
+ <xsl:text>'. Using template without @style.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
</xsl:when>
<xsl:when test="$xref-context != ''">
<xsl:value-of select="$xref-context"/>
<xsl:if test="$olink.debug">
- <xsl:message>
- <xsl:text>Olink error: no gentext template</xsl:text>
+ <xsl:call-template name="olink.warning">
+ <xsl:with-param name="message">
+ <xsl:text>no gentext template</xsl:text>
+ <xsl:text> exists for xrefstyle '</xsl:text>
+ <xsl:value-of select="$xrefstyle"/>
+ <xsl:text>' for element '</xsl:text>
+ <xsl:value-of select="$target.elem"/>
+ <xsl:text>' in language '</xsl:text>
+ <xsl:value-of select="$lang"/>
+ <xsl:text>' in context 'xref</xsl:text>
+ <xsl:text>'. Using template without @style.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="olink.warning">
+ <xsl:with-param name="message">
+ <xsl:text>no gentext template</xsl:text>
<xsl:text> exists for xrefstyle '</xsl:text>
<xsl:value-of select="$xrefstyle"/>
<xsl:text>' for element '</xsl:text>
<xsl:value-of select="$target.elem"/>
<xsl:text>' in language '</xsl:text>
<xsl:value-of select="$lang"/>
- <xsl:text>' in context 'xref</xsl:text>
- <xsl:text>'. Using template without @style.</xsl:text>
- </xsl:message>
- </xsl:if>
- </xsl:when>
- <xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink error: no gentext template</xsl:text>
- <xsl:text> exists for xrefstyle '</xsl:text>
- <xsl:value-of select="$xrefstyle"/>
- <xsl:text>' for element '</xsl:text>
- <xsl:value-of select="$target.elem"/>
- <xsl:text>' in language '</xsl:text>
- <xsl:value-of select="$lang"/>
- <xsl:text>'. Trying '%t'.</xsl:text>
- </xsl:message>
+ <xsl:text>'. Trying '%t'.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
<xsl:value-of select="'%t'"/>
</xsl:otherwise>
</xsl:choose>
@@ -993,24 +1045,26 @@
<xsl:copy-of select="$xref.text"/>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink error: no generated text for </xsl:text>
- <xsl:text>targetdoc/targetptr/lang = '</xsl:text>
- <xsl:value-of select="$olink.key"/>
- <xsl:text>'.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>no generated text for targetdoc/targetptr/lang = '</xsl:text>
+ <xsl:value-of select="$olink.key"/>
+ <xsl:text>'.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
<xsl:text>????</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
<xsl:if test="$olink.key != ''">
- <xsl:message>
- <xsl:text>Olink error: no generated text for </xsl:text>
- <xsl:text>targetdoc/targetptr/lang = '</xsl:text>
- <xsl:value-of select="$olink.key"/>
- <xsl:text>'.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>no generated text for targetdoc/targetptr/lang = '</xsl:text>
+ <xsl:value-of select="$olink.key"/>
+ <xsl:text>'.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
<xsl:text>????</xsl:text>
</xsl:otherwise>
@@ -1043,7 +1097,13 @@
</xsl:when>
<!-- Have we reached the top without a match? -->
<xsl:when test="local-name($dirnode) != 'dir'" >
- <xsl:message>Olink error: cannot locate targetdoc <xsl:value-of select="$targetdoc"/> in sitemap</xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>cannot locate targetdoc </xsl:text>
+ <xsl:value-of select="$targetdoc"/>
+ <xsl:text> in sitemap</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:when>
<!-- Is the target in a descendant? -->
<xsl:when test="$dirnode/descendant::document/@targetdoc = $targetdoc">
Modified: trunk/xsl/fo/xref.xsl
===================================================================
--- trunk/xsl/fo/xref.xsl 2013-09-24 03:35:07 UTC (rev 9816)
+++ trunk/xsl/fo/xref.xsl 2013-09-25 22:38:32 UTC (rev 9817)
@@ -1178,14 +1178,10 @@
</xsl:variable>
<xsl:if test="string-length($olink.key) = 0">
- <xsl:message>
- <xsl:text>Error: unresolved olink: </xsl:text>
- <xsl:text>targetdoc/targetptr = '</xsl:text>
- <xsl:value-of select="$targetdoc.att"/>
- <xsl:text>/</xsl:text>
- <xsl:value-of select="$targetptr.att"/>
- <xsl:text>'.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.unresolved">
+ <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
+ <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
+ </xsl:call-template>
</xsl:if>
<xsl:variable name="href">
@@ -1557,11 +1553,13 @@
<fo:page-number-citation ref-id="{$linkend}"/>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink error: no page number linkend for local olink '</xsl:text>
- <xsl:value-of select="$olink.key"/>
- <xsl:text>'</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>no page number linkend for local olink '</xsl:text>
+ <xsl:value-of select="$olink.key"/>
+ <xsl:text>'</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
Modified: trunk/xsl/html/chunk-common.xsl
===================================================================
--- trunk/xsl/html/chunk-common.xsl 2013-09-24 03:35:07 UTC (rev 9816)
+++ trunk/xsl/html/chunk-common.xsl 2013-09-25 22:38:32 UTC (rev 9817)
@@ -1304,23 +1304,27 @@
select="key('targetdoc-key', $current.docid)[1]/parent::dir"/>
<xsl:with-param name="targetdoc" select="$targetdoc"/>
</xsl:call-template>
- </xsl:for-each >
+ </xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink error: cannot compute relative </xsl:text>
- <xsl:text>sitemap path because $current.docid '</xsl:text>
- <xsl:value-of select="$current.docid"/>
- <xsl:text>' not found in target database.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>cannot compute relative </xsl:text>
+ <xsl:text>sitemap path because $current.docid '</xsl:text>
+ <xsl:value-of select="$current.docid"/>
+ <xsl:text>' not found in target database.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink warning: cannot compute relative </xsl:text>
- <xsl:text>sitemap path without $current.docid parameter</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>cannot compute relative </xsl:text>
+ <xsl:text>sitemap path without $current.docid parameter</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
<!-- In either case, add baseuri from its document entry-->
Modified: trunk/xsl/html/xref.xsl
===================================================================
--- trunk/xsl/html/xref.xsl 2013-09-24 03:35:07 UTC (rev 9816)
+++ trunk/xsl/html/xref.xsl 2013-09-25 22:38:32 UTC (rev 9817)
@@ -1128,14 +1128,10 @@
</xsl:variable>
<xsl:if test="string-length($olink.key) = 0">
- <xsl:message>
- <xsl:text>Error: unresolved olink: </xsl:text>
- <xsl:text>targetdoc/targetptr = '</xsl:text>
- <xsl:value-of select="$targetdoc.att"/>
- <xsl:text>/</xsl:text>
- <xsl:value-of select="$targetptr.att"/>
- <xsl:text>'.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.unresolved">
+ <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
+ <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
+ </xsl:call-template>
</xsl:if>
<xsl:variable name="href">
Modified: trunk/xsl/website/olink.xsl
===================================================================
--- trunk/xsl/website/olink.xsl 2013-09-24 03:35:07 UTC (rev 9816)
+++ trunk/xsl/website/olink.xsl 2013-09-25 22:38:32 UTC (rev 9817)
@@ -211,23 +211,27 @@
select="key('targetdoc-key', $current.docid)/parent::dir"/>
<xsl:with-param name="targetdoc" select="$targetdoc"/>
</xsl:call-template>
- </xsl:for-each >
+ </xsl:for-each>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink error: cannot compute relative </xsl:text>
- <xsl:text>sitemap path because $current.docid '</xsl:text>
- <xsl:value-of select="$current.docid"/>
- <xsl:text>' not found in target database.</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>cannot compute relative </xsl:text>
+ <xsl:text>sitemap path because $current.docid '</xsl:text>
+ <xsl:value-of select="$current.docid"/>
+ <xsl:text>' not found in target database.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>Olink warning: cannot compute relative </xsl:text>
- <xsl:text>sitemap path without $current.docid parameter</xsl:text>
- </xsl:message>
+ <xsl:call-template name="olink.error">
+ <xsl:with-param name="message">
+ <xsl:text>cannot compute relative </xsl:text>
+ <xsl:text>sitemap path without $current.docid parameter</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
<!-- In either case, add baseuri from its document entry-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2013-10-18 20:39:28
|
Revision: 9821
http://sourceforge.net/p/docbook/code/9821
Author: stilor
Date: 2013-10-18 20:39:25 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
Remove autoguessing of the namespace for wrapper elements; determine namespace by prefix, if any.
Modified Paths:
--------------
trunk/xsl/fo/titlepage.templates.xml
trunk/xsl/html/titlepage.templates.xml
trunk/xsl/slides/fo/plain-titlepage.xml
trunk/xsl/slides/xhtml/plain-titlepage.xml
trunk/xsl/template/titlepage.xsl
trunk/xsl/webhelp/xsl/titlepage.templates.xml
Modified: trunk/xsl/fo/titlepage.templates.xml
===================================================================
--- trunk/xsl/fo/titlepage.templates.xml 2013-10-17 18:11:29 UTC (rev 9820)
+++ trunk/xsl/fo/titlepage.templates.xml 2013-10-18 20:39:25 UTC (rev 9821)
@@ -13,9 +13,10 @@
<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
]>
<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
- xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+ xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ t:copy-namespaces="fo">
<!-- ********************************************************************
$Id$
Modified: trunk/xsl/html/titlepage.templates.xml
===================================================================
--- trunk/xsl/html/titlepage.templates.xml 2013-10-17 18:11:29 UTC (rev 9820)
+++ trunk/xsl/html/titlepage.templates.xml 2013-10-18 20:39:25 UTC (rev 9821)
@@ -1,6 +1,7 @@
<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ t:missing-namespace-ok="yes">
<!-- ==================================================================== -->
Modified: trunk/xsl/slides/fo/plain-titlepage.xml
===================================================================
--- trunk/xsl/slides/fo/plain-titlepage.xml 2013-10-17 18:11:29 UTC (rev 9820)
+++ trunk/xsl/slides/fo/plain-titlepage.xml 2013-10-18 20:39:25 UTC (rev 9821)
@@ -14,8 +14,10 @@
]>
<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+ xmlns:dbs="http://docbook.org/ns/docbook-slides"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ t:copy-namespaces="dbs fo">
<!-- ==================================================================== -->
Modified: trunk/xsl/slides/xhtml/plain-titlepage.xml
===================================================================
--- trunk/xsl/slides/xhtml/plain-titlepage.xml 2013-10-17 18:11:29 UTC (rev 9820)
+++ trunk/xsl/slides/xhtml/plain-titlepage.xml 2013-10-18 20:39:25 UTC (rev 9821)
@@ -1,6 +1,9 @@
<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ xmlns:dbs="http://docbook.org/ns/docbook-slides"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ t:copy-namespaces="dbs">
<t:titlepage t:element="slides" t:wrapper="div" class="slide cover title">
<t:titlepage-content t:side="recto">
Modified: trunk/xsl/template/titlepage.xsl
===================================================================
--- trunk/xsl/template/titlepage.xsl 2013-10-17 18:11:29 UTC (rev 9820)
+++ trunk/xsl/template/titlepage.xsl 2013-10-18 20:39:25 UTC (rev 9821)
@@ -20,15 +20,6 @@
<!-- ==================================================================== -->
-<!-- Namespace for wrapper elements. Please set it for XHTML. -->
-<xsl:param name="ns">
- <!-- Guess correct setting for cases where parameter is not supplied -->
- <xsl:choose>
- <xsl:when test="//*[namespace-uri() = 'http://www.w3.org/1999/XSL/Format']">http://www.w3.org/1999/XSL/Format</xsl:when>
- <xsl:when test="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']">http://www.w3.org/1999/xhtml</xsl:when>
- </xsl:choose>
-</xsl:param>
-
<xsl:template match="/">
<xsl:text>
</xsl:text>
<xsl:apply-templates/>
@@ -60,7 +51,103 @@
<xsl:strip-space elements="xsl:* t:*"/>
<!-- ==================================================================== -->
+
+<doc:template name="get.namespace.prefix">
+<refpurpose>Obtain namespace prefix for an element identified by a string containing qualified name</refpurpose>
+<refdescription>
+<para>This template interprets a string containing a qualified name of an element
+and returns the namespace prefix, if any.</para>
+<para>Element name could be an XPath expression starting with the element name; this
+template will first determine if the occurrence of a colon is preceded by a valid
+NCName, assuming only ASCII characters.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template name="get.namespace.prefix">
+ <xsl:param name="element.name"/>
+
+ <xsl:if test="contains($element.name, ':') and
+ translate(substring-before($element.name, ':'),
+ 'ABCDEFGGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789','') = ''">
+ <xsl:value-of select="substring-before($element.name, ':')"/>
+ </xsl:if>
+</xsl:template>
+
+<doc:template name="get.namespace.uri">
+<refpurpose>Obtain URI for an element identified by a string containing qualified name</refpurpose>
+<refdescription>
+<para>This template interprets a string containing a qualified name of an element
+and returns the namespace URI for that element, looking for namespace prefixes
+starting from a reference node.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template name="get.namespace.uri">
+ <xsl:param name="element.name"/>
+ <xsl:param name="reference.node" select="."/>
+ <xsl:param name="missing.namespace.warning" select="not(/t:templates/@t:missing-namespace-ok = 'yes')"/>
+
+ <xsl:variable name="ns.prefix">
+ <xsl:call-template name="get.namespace.prefix">
+ <xsl:with-param name="element.name" select="$element.name"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$reference.node/ancestor-or-self::*/namespace::*[local-name(.) = $ns.prefix]">
+ <xsl:value-of select="$reference.node/ancestor-or-self::*/namespace::*[local-name(.) = $ns.prefix]"/>
+ </xsl:when>
+ <xsl:when test="$missing.namespace.warning">
+ <xsl:message>
+ <xsl:text>WARNING: Namespace '</xsl:text>
+ <xsl:value-of select="$ns.prefix"/>
+ <xsl:text>' not defined for t:element="</xsl:text>
+ <xsl:value-of select="$element.name"/>
+ <xsl:text>"; if this is intentional (output has is not in a namespace), add </xsl:text>
+ <xsl:text>t:missing-namespace-ok="yes" attribute to t:templates to suppress this warning.</xsl:text>
+ </xsl:message>
+ </xsl:when>
+ </xsl:choose>
+</xsl:template>
+
+<doc:template name="output.wrapper">
+<refpurpose>Output the wrapper element</refpurpose>
+
+<refdescription>
+<para>This template locates the namespace for the defined wrapper element
+and output it within that namespace. The content of the element is passed
+via the content argument.</para>
+<para>The attribute sets to use for the wrapper element and the element to
+copy non-template attributes from are also passed as arguments.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template name="output.wrapper">
+ <xsl:param name="wrapper" select="ancestor-or-self::t:titlepage[@t:wrapper]"/>
+ <xsl:param name="attr.copy.from" select="."/>
+ <xsl:param name="attr.sets" select="''"/>
+ <xsl:param name="content"/>
+
+ <xsl:variable name="ns.uri">
+ <xsl:call-template name="get.namespace.uri">
+ <xsl:with-param name="element.name" select="$wrapper/@t:wrapper"/>
+ <xsl:with-param name="reference.node" select="$wrapper"></xsl:with-param>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:element name="{$wrapper/@t:wrapper}" namespace="{$ns.uri}">
+ <xsl:if test="$attr.sets != ''">
+ <xsl:attribute name="xsl:use-attribute-sets"><xsl:value-of select="$attr.sets"/></xsl:attribute>
+ </xsl:if>
+ <xsl:for-each select="$attr.copy.from/@*">
+ <xsl:if test="not(starts-with(namespace-uri(.), 'http://nwalsh.com/docbook/xsl/template/1.0'))">
+ <xsl:copy/>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:copy-of select="$content"/>
+ </xsl:element>
+</xsl:template>
+
<doc:template match="t:templates" xmlns="" id="templates">
<refpurpose>Construct a stylesheet for the templates provided</refpurpose>
@@ -72,6 +159,11 @@
<para>If the <literal>t:templates</literal> element has a
<literal>base-stylesheet</literal> attribute, an
<literal>xsl:import</literal> statement is constructed for it.</para>
+
+<para>If the <literal>t:templates</literal> element has a
+<literal>copy-namespaces</literal> attribute, it is interpreted as a
+space-separated list of namespace prefixes to be copied from the template
+to the resulting stylesheet. Default namespace is always copied.</para>
</refdescription>
</doc:template>
@@ -82,6 +174,14 @@
<xsl:copy/>
</xsl:for-each>
+ <!-- Two spaces at the beginning of $copied.ns so that the default namespace will be copied -->
+ <xsl:variable name="copied.ns" select="concat(' ',@t:copy-namespaces,' ')"/>
+ <xsl:for-each select="namespace::*">
+ <xsl:if test="contains($copied.ns,concat(' ',local-name(.),' '))">
+ <xsl:copy/>
+ </xsl:if>
+ </xsl:for-each>
+
<xsl:attribute name="version">1.0</xsl:attribute>
<xsl:attribute name="exclude-result-prefixes">exsl</xsl:attribute>
@@ -187,139 +287,142 @@
<xsl:text>.titlepage</xsl:text>
</xsl:attribute>
<xsl:text>
 </xsl:text>
- <xsl:element name="{@t:wrapper}" namespace="{$ns}">
- <xsl:apply-templates select="@*" mode="copy.literal.atts"/>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:variable">
- <xsl:attribute name="name">recto.content</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:call-template">
- <xsl:attribute name="name">
- <xsl:value-of select="@t:element"/>
- <xsl:text>.titlepage.before.recto</xsl:text>
- </xsl:attribute>
+ <xsl:call-template name="output.wrapper">
+ <xsl:with-param name="content">
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:variable">
+ <xsl:attribute name="name">recto.content</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@t:element"/>
+ <xsl:text>.titlepage.before.recto</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@t:element"/>
+ <xsl:text>.titlepage.recto</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
</xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:call-template">
- <xsl:attribute name="name">
- <xsl:value-of select="@t:element"/>
- <xsl:text>.titlepage.recto</xsl:text>
- </xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:variable">
+ <xsl:attribute name="name">recto.elements.count</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:choose">
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:when">
+ <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
+ <xsl:element name="xsl:value-of">
+ <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:when">
+ <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:comment>Xalan quirk</xsl:comment>
+ <xsl:element name="xsl:value-of">
+ <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:otherwise">
+ <xsl:text>1</xsl:text>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
</xsl:element>
<xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:variable">
- <xsl:attribute name="name">recto.elements.count</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:choose">
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:when">
- <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
- <xsl:element name="xsl:value-of">
- <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
- </xsl:element>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:when">
- <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:comment>Xalan quirk</xsl:comment>
- <xsl:element name="xsl:value-of">
- <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
- </xsl:element>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:otherwise">
- <xsl:text>1</xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:if">
- <xsl:attribute name="test">(normalize-space($recto.content) != '') or ($recto.elements.count > 0)</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:element name="{@t:wrapper}" namespace="{$ns}">
- <xsl:apply-templates select="t:titlepage-content[@t:side='recto']/@*"
- mode="copy.literal.atts"/>
- <xsl:element name="xsl:copy-of">
- <xsl:attribute name="select">$recto.content</xsl:attribute>
+ <xsl:element name="xsl:if">
+ <xsl:attribute name="test">(normalize-space($recto.content) != '') or ($recto.elements.count > 0)</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:call-template name="output.wrapper">
+ <xsl:with-param name="attr.copy.from" select="t:titlepage-content[@t:side='recto']"/>
+ <xsl:with-param name="content">
+ <xsl:element name="xsl:copy-of">
+ <xsl:attribute name="select">$recto.content</xsl:attribute>
+ </xsl:element>
+ </xsl:with-param>
+ </xsl:call-template>
+ <xsl:text>
 </xsl:text>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:variable">
+ <xsl:attribute name="name">verso.content</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@t:element"/>
+ <xsl:text>.titlepage.before.verso</xsl:text>
+ </xsl:attribute>
</xsl:element>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@t:element"/>
+ <xsl:text>.titlepage.verso</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
</xsl:element>
<xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:variable">
- <xsl:attribute name="name">verso.content</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:call-template">
- <xsl:attribute name="name">
- <xsl:value-of select="@t:element"/>
- <xsl:text>.titlepage.before.verso</xsl:text>
- </xsl:attribute>
+ <xsl:element name="xsl:variable">
+ <xsl:attribute name="name">verso.elements.count</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:choose">
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:when">
+ <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
+ <xsl:element name="xsl:value-of">
+ <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:when">
+ <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:comment>Xalan quirk</xsl:comment>
+ <xsl:element name="xsl:value-of">
+ <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
+ </xsl:element>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:otherwise">
+ <xsl:text>1</xsl:text>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
</xsl:element>
- <xsl:text>
 </xsl:text>
+ <xsl:text>
 </xsl:text>
+ <xsl:element name="xsl:if">
+ <xsl:attribute name="test">(normalize-space($verso.content) != '') or ($verso.elements.count > 0)</xsl:attribute>
+ <xsl:text>
 </xsl:text>
+ <xsl:call-template name="output.wrapper">
+ <xsl:with-param name="attr.copy.from" select="t:titlepage-content[@t:side='verso']"/>
+ <xsl:with-param name="content">
+ <xsl:element name="xsl:copy-of">
+ <xsl:attribute name="select">$verso.content</xsl:attribute>
+ </xsl:element>
+ </xsl:with-param>
+ </xsl:call-template>
+ <xsl:text>
 </xsl:text>
+ </xsl:element>
+ <xsl:text>
 </xsl:text>
<xsl:element name="xsl:call-template">
<xsl:attribute name="name">
<xsl:value-of select="@t:element"/>
- <xsl:text>.titlepage.verso</xsl:text>
+ <xsl:text>.titlepage.separator</xsl:text>
</xsl:attribute>
</xsl:element>
- <xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:variable">
- <xsl:attribute name="name">verso.elements.count</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:choose">
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:when">
- <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
- <xsl:element name="xsl:value-of">
- <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
- </xsl:element>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:when">
- <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:comment>Xalan quirk</xsl:comment>
- <xsl:element name="xsl:value-of">
- <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
- </xsl:element>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:otherwise">
- <xsl:text>1</xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:if">
- <xsl:attribute name="test">(normalize-space($verso.content) != '') or ($verso.elements.count > 0)</xsl:attribute>
- <xsl:text>
 </xsl:text>
- <xsl:element name="{@t:wrapper}" namespace="{$ns}">
- <xsl:apply-templates select="t:titlepage-content[@t:side='verso']/@*"
- mode="copy.literal.atts"/>
- <xsl:element name="xsl:copy-of">
- <xsl:attribute name="select">$verso.content</xsl:attribute>
- </xsl:element>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- <xsl:element name="xsl:call-template">
- <xsl:attribute name="name">
- <xsl:value-of select="@t:element"/>
- <xsl:text>.titlepage.separator</xsl:text>
- </xsl:attribute>
- </xsl:element>
- <xsl:text>
 </xsl:text>
- </xsl:element>
+ <xsl:text>
 </xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
<xsl:text>
</xsl:text>
</xsl:element>
@@ -391,86 +494,60 @@
<xsl:text>.auto.mode</xsl:text>
</xsl:attribute>
<xsl:text>
</xsl:text>
- <xsl:element name="{../../@t:wrapper}" namespace="{$ns}">
- <xsl:attribute name="xsl:use-attribute-sets">
+ <xsl:call-template name="output.wrapper">
+ <xsl:with-param name="attr.sets">
<xsl:value-of select="../../@t:element"/>
<xsl:text>.titlepage.</xsl:text>
<xsl:value-of select="../@t:side"/>
<xsl:text>.style</xsl:text>
- </xsl:attribute>
- <xsl:for-each select="@*">
- <xsl:if test="not(starts-with(namespace-uri(.),
- 'http://nwalsh.com/docbook/xsl/template/1.0'))">
- <xsl:attribute name="{name(.)}" namespace="{namespace-uri(.)}">
- <xsl:value-of select="."/>
- </xsl:attribute>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
+ </xsl:with-param>
+ <xsl:with-param name="content">
+ <xsl:text>
</xsl:text>
- <xsl:choose>
- <xsl:when test="@t:named-template">
- <xsl:element name="xsl:call-template">
- <xsl:attribute name="name">
- <xsl:value-of select="@t:named-template"/>
- </xsl:attribute>
- <xsl:for-each select="@*">
- <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
- <xsl:text>
</xsl:text>
- <xsl:element name="xsl:with-param">
- <xsl:attribute name="name">
- <xsl:value-of select="local-name(.)"/>
- </xsl:attribute>
- <xsl:attribute name="select">
- <xsl:value-of select="."/>
- </xsl:attribute>
- </xsl:element>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="xsl:apply-templates">
- <xsl:attribute name="select">.</xsl:attribute>
- <xsl:attribute name="mode">
- <xsl:value-of select="../../@t:element"/>
- <xsl:text>.titlepage.</xsl:text>
- <xsl:value-of select="../@t:side"/>
- <xsl:text>.mode</xsl:text>
- </xsl:attribute>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="@t:named-template">
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@t:named-template"/>
+ </xsl:attribute>
+ <xsl:for-each select="@*">
+ <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
+ <xsl:text>
</xsl:text>
+ <xsl:element name="xsl:with-param">
+ <xsl:attribute name="name">
+ <xsl:value-of select="local-name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>
</xsl:text>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="xsl:apply-templates">
+ <xsl:attribute name="select">.</xsl:attribute>
+ <xsl:attribute name="mode">
+ <xsl:value-of select="../../@t:element"/>
+ <xsl:text>.titlepage.</xsl:text>
+ <xsl:value-of select="../@t:side"/>
+ <xsl:text>.mode</xsl:text>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
- <xsl:text>
</xsl:text>
- </xsl:element>
+ <xsl:text>
</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
<xsl:text>
</xsl:text>
</xsl:element>
</xsl:if>
</xsl:for-each>
</xsl:template>
-<doc:template match="@*" mode="copy.literal.atts" xmlns=""
- id="attr_star_in_copy.literal.atts">
-<refpurpose>Copy t:titlepage attributes</refpurpose>
-
-<refdescription>
-<para>This template copies all of the <quote>other</quote> attributes
-from a <literal>t:titlepage</literal> element onto the specified
-wrapper.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template match="@*" mode="copy.literal.atts">
- <xsl:if test="not(starts-with(namespace-uri(.),
- 'http://nwalsh.com/docbook/xsl/template/1.0'))">
- <xsl:attribute name="{name(.)}">
- <xsl:value-of select="."/>
- </xsl:attribute>
- </xsl:if>
-</xsl:template>
-
<!-- ==================================================================== -->
<doc:template match="t:titlepage-content" id="titlepage-content">
@@ -914,42 +991,36 @@
<xsl:when test="@t:force and @t:force != '0'">
<xsl:choose>
<xsl:when test="@t:named-template">
- <xsl:element name="{../../@t:wrapper}" namespace="{$ns}">
- <xsl:attribute name="xsl:use-attribute-sets">
+ <xsl:call-template name="output.wrapper">
+ <xsl:with-param name="attr.sets">
<xsl:value-of select="../../@t:element"/>
<xsl:text>.titlepage.</xsl:text>
<xsl:value-of select="../@t:side"/>
<xsl:text>.style</xsl:text>
- </xsl:attribute>
- <xsl:for-each select="@*">
- <xsl:if test="not(starts-with(namespace-uri(.),
- 'http://nwalsh.com/docbook/xsl/template/1.0'))">
- <xsl:attribute name="{name(.)}" namespace="{namespace-uri(.)}">
- <xsl:value-of select="."/>
+ </xsl:with-param>
+ <xsl:with-param name="content">
+ <xsl:text>
</xsl:text>
+ <xsl:element name="xsl:call-template">
+ <xsl:attribute name="name">
+ <xsl:value-of select="@t:named-template"/>
</xsl:attribute>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- <xsl:element name="xsl:call-template">
- <xsl:attribute name="name">
- <xsl:value-of select="@t:named-template"/>
- </xsl:attribute>
- <xsl:for-each select="@*">
- <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
- <xsl:text>
</xsl:text>
- <xsl:element name="xsl:with-param">
- <xsl:attribute name="name">
- <xsl:value-of select="local-name(.)"/>
- </xsl:attribute>
- <xsl:attribute name="select">
- <xsl:value-of select="."/>
- </xsl:attribute>
- </xsl:element>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
</xsl:text>
- </xsl:element>
- </xsl:element>
+ <xsl:for-each select="@*">
+ <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
+ <xsl:text>
</xsl:text>
+ <xsl:element name="xsl:with-param">
+ <xsl:attribute name="name">
+ <xsl:value-of select="local-name(.)"/>
+ </xsl:attribute>
+ <xsl:attribute name="select">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+ </xsl:for-each>
+ <xsl:text>
</xsl:text>
+ </xsl:element>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:message terminate="yes">
Modified: trunk/xsl/webhelp/xsl/titlepage.templates.xml
===================================================================
--- trunk/xsl/webhelp/xsl/titlepage.templates.xml 2013-10-17 18:11:29 UTC (rev 9820)
+++ trunk/xsl/webhelp/xsl/titlepage.templates.xml 2013-10-18 20:39:25 UTC (rev 9821)
@@ -1,6 +1,7 @@
<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ t:missing-namespace-ok="yes">
<!-- ==================================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2013-10-19 00:45:55
|
Revision: 9822
http://sourceforge.net/p/docbook/code/9822
Author: stilor
Date: 2013-10-19 00:45:49 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
Replace literal space inserted next to fo:leader in ToC with a padding. This
works around a bug in FOP (see FOP-1444).
Make ToC fo:leader properties configurable via attribute set.
Modified Paths:
--------------
trunk/xsl/fo/autotoc.xsl
trunk/xsl/fo/param.ent
trunk/xsl/fo/param.xweb
trunk/xsl/fo/toc.xsl
Added Paths:
-----------
trunk/xsl/params/toc.leader.properties.xml
Modified: trunk/xsl/fo/autotoc.xsl
===================================================================
--- trunk/xsl/fo/autotoc.xsl 2013-10-18 20:39:25 UTC (rev 9821)
+++ trunk/xsl/fo/autotoc.xsl 2013-10-19 00:45:49 UTC (rev 9822)
@@ -207,12 +207,7 @@
</fo:basic-link>
</fo:inline>
<fo:inline keep-together.within-line="always">
- <xsl:text> </xsl:text>
- <fo:leader leader-pattern="dots"
- leader-pattern-width="3pt"
- leader-alignment="reference-area"
- keep-with-next.within-line="always"/>
- <xsl:text> </xsl:text>
+ <fo:leader xsl:use-attribute-sets="toc.leader.properties"/>
<fo:basic-link internal-destination="{$id}">
<fo:page-number-citation ref-id="{$id}"/>
</fo:basic-link>
@@ -357,12 +352,7 @@
</fo:basic-link>
</fo:inline>
<fo:inline keep-together.within-line="always">
- <xsl:text> </xsl:text>
- <fo:leader leader-pattern="dots"
- leader-pattern-width="3pt"
- leader-alignment="reference-area"
- keep-with-next.within-line="always"/>
- <xsl:text> </xsl:text>
+ <fo:leader xsl:use-attribute-sets="toc.leader.properties"/>
<fo:basic-link internal-destination="{$id}">
<fo:page-number-citation ref-id="{$id}"/>
</fo:basic-link>
Modified: trunk/xsl/fo/param.ent
===================================================================
--- trunk/xsl/fo/param.ent 2013-10-18 20:39:25 UTC (rev 9821)
+++ trunk/xsl/fo/param.ent 2013-10-19 00:45:49 UTC (rev 9822)
@@ -214,6 +214,7 @@
<!ENTITY title.font.family SYSTEM "../params/title.font.family.xml">
<!ENTITY title.margin.left SYSTEM "../params/title.margin.left.xml">
<!ENTITY toc.indent.width SYSTEM "../params/toc.indent.width.xml">
+<!ENTITY toc.leader.properties SYSTEM "../params/toc.leader.properties.xml">
<!ENTITY toc.margin.properties SYSTEM "../params/toc.margin.properties.xml">
<!ENTITY toc.max.depth SYSTEM "../params/toc.max.depth.xml">
<!ENTITY toc.section.depth SYSTEM "../params/toc.section.depth.xml">
Modified: trunk/xsl/fo/param.xweb
===================================================================
--- trunk/xsl/fo/param.xweb 2013-10-18 20:39:25 UTC (rev 9821)
+++ trunk/xsl/fo/param.xweb 2013-10-19 00:45:49 UTC (rev 9822)
@@ -86,6 +86,7 @@
&toc.max.depth;
&toc.indent.width;
&toc.line.properties;
+&toc.leader.properties;
&toc.margin.properties;
&bridgehead.in.toc;
&simplesect.in.toc;
@@ -893,6 +894,7 @@
<src:fragref linkend="title.margin.left.frag"/>
<src:fragref linkend="toc.indent.width.frag"/>
<src:fragref linkend="toc.line.properties.frag"/>
+<src:fragref linkend="toc.leader.properties.frag"/>
<src:fragref linkend="toc.margin.properties.frag"/>
<src:fragref linkend="toc.max.depth.frag"/>
<src:fragref linkend="toc.section.depth.frag"/>
Modified: trunk/xsl/fo/toc.xsl
===================================================================
--- trunk/xsl/fo/toc.xsl 2013-10-18 20:39:25 UTC (rev 9821)
+++ trunk/xsl/fo/toc.xsl 2013-10-19 00:45:49 UTC (rev 9822)
@@ -188,10 +188,7 @@
<xsl:choose>
<xsl:when test="@linkend">
<fo:inline keep-together.within-line="always">
- <xsl:text> </xsl:text>
- <fo:leader leader-pattern="dots"
- keep-with-next.within-line="always"/>
- <xsl:text> </xsl:text>
+ <fo:leader xsl:use-attribute-sets="toc.leader.properties"/>
<fo:basic-link internal-destination="{@linkend}">
<xsl:choose>
<xsl:when test="@pagenum">
@@ -206,21 +203,10 @@
</xsl:when>
<xsl:when test="@pagenum">
<fo:inline keep-together.within-line="always">
- <xsl:text> </xsl:text>
- <fo:leader leader-pattern="dots"
- keep-with-next.within-line="always"/>
- <xsl:text> </xsl:text>
+ <fo:leader xsl:use-attribute-sets="toc.leader.properties"/>
<xsl:value-of select="@pagenum"/>
</fo:inline>
</xsl:when>
- <xsl:otherwise>
- <!-- just the leaders, what else can I do? -->
- <fo:inline keep-together.within-line="always">
- <xsl:text> </xsl:text>
- <fo:leader leader-pattern="space"
- keep-with-next.within-line="always"/>
- </fo:inline>
- </xsl:otherwise>
</xsl:choose>
</fo:block>
</xsl:template>
Added: trunk/xsl/params/toc.leader.properties.xml
===================================================================
--- trunk/xsl/params/toc.leader.properties.xml (rev 0)
+++ trunk/xsl/params/toc.leader.properties.xml 2013-10-19 00:45:49 UTC (rev 9822)
@@ -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="toc.leader.properties">
+<refmeta>
+<refentrytitle>toc.leader.properties</refentrytitle>
+<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>toc.leader.properties</refname>
+<refpurpose>How the leaders (rows of dots) are going to look like in ToC?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment xml:id="toc.leader.properties.frag">
+<xsl:attribute-set name="toc.leader.properties">
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
+ <xsl:attribute name="leader-pattern-width">3pt</xsl:attribute>
+ <xsl:attribute name="leader-alignment">reference-area</xsl:attribute>
+ <xsl:attribute name="padding-left">3pt</xsl:attribute>
+ <xsl:attribute name="padding-right">3pt</xsl:attribute>
+</xsl:attribute-set>
+</src:fragment>
+</refsynopsisdiv>
+<refsection><info><title>Description</title></info>
+<para>Specify leader pattern, </para>
+</refsection>
+</refentry>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2013-10-25 11:04:35
|
Revision: 9824
http://sourceforge.net/p/docbook/code/9824
Author: tom_schr
Date: 2013-10-25 11:04:31 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
Fixed ticket [#1315]: Add possibility to add a link to mediaobjects
Modified Paths:
--------------
trunk/xsl/html/graphics.xsl
trunk/xsl/html/param.ent
trunk/xsl/html/param.xweb
trunk/xsl/xhtml-1_1/param.ent
trunk/xsl/xhtml-1_1/param.xweb
Added Paths:
-----------
trunk/xsl/params/link.to.self.for.mediaobject.xml
Modified: trunk/xsl/html/graphics.xsl
===================================================================
--- trunk/xsl/html/graphics.xsl 2013-10-21 06:58:03 UTC (rev 9823)
+++ trunk/xsl/html/graphics.xsl 2013-10-25 11:04:31 UTC (rev 9824)
@@ -609,6 +609,18 @@
</object>
</xsl:when>
<xsl:otherwise>
+ <xsl:variable name="src">
+ <xsl:choose>
+ <xsl:when test="$img.src.path != '' and
+ $tag = 'img' and
+ not(starts-with($output_filename, '/')) and
+ not(contains($output_filename, '://'))">
+ <xsl:value-of select="$img.src.path"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:value-of select="$output_filename"/>
+ </xsl:variable>
+ <xsl:variable name="imgcontents">
<xsl:element name="{$tag}">
<xsl:if test="$tag = 'img' and ../../self::imageobjectco">
<xsl:variable name="mapname">
@@ -635,15 +647,7 @@
</xsl:if>
<xsl:attribute name="src">
- <xsl:choose>
- <xsl:when test="$img.src.path != '' and
- $tag = 'img' and
- not(starts-with($output_filename, '/')) and
- not(contains($output_filename, '://'))">
- <xsl:value-of select="$img.src.path"/>
- </xsl:when>
- </xsl:choose>
- <xsl:value-of select="$output_filename"/>
+ <xsl:value-of select="$src"/>
</xsl:attribute>
<xsl:if test="@align">
@@ -681,6 +685,18 @@
<xsl:with-param name="viewport" select="$viewport"/>
</xsl:call-template>
</xsl:element>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$link.to.self.for.mediaobject = 0">
+ <xsl:copy-of select="$imgcontents"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{$src}">
+ <xsl:copy-of select="$imgcontents"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
Modified: trunk/xsl/html/param.ent
===================================================================
--- trunk/xsl/html/param.ent 2013-10-21 06:58:03 UTC (rev 9823)
+++ trunk/xsl/html/param.ent 2013-10-25 11:04:31 UTC (rev 9824)
@@ -149,6 +149,7 @@
<!ENTITY linenumbering.separator SYSTEM "../params/linenumbering.separator.xml">
<!ENTITY linenumbering.width SYSTEM "../params/linenumbering.width.xml">
<!ENTITY link.mailto.url SYSTEM "../params/link.mailto.url.xml">
+<!ENTITY link.to.self.for.mediaobject SYSTEM "../params/link.to.self.for.mediaobject.xml">
<!ENTITY make.graphic.viewport SYSTEM "../params/make.graphic.viewport.xml">
<!ENTITY make.single.year.ranges SYSTEM "../params/make.single.year.ranges.xml">
<!ENTITY make.valid.html SYSTEM "../params/make.valid.html.xml">
Modified: trunk/xsl/html/param.xweb
===================================================================
--- trunk/xsl/html/param.xweb 2013-10-21 06:58:03 UTC (rev 9823)
+++ trunk/xsl/html/param.xweb 2013-10-25 11:04:31 UTC (rev 9824)
@@ -293,6 +293,7 @@
&use.embed.for.svg;
&make.graphic.viewport;
&preferred.mediaobject.role;
+&link.to.self.for.mediaobject;
&use.role.for.mediaobject;
&ignore.image.scaling;
</reference>
Added: trunk/xsl/params/link.to.self.for.mediaobject.xml
===================================================================
--- trunk/xsl/params/link.to.self.for.mediaobject.xml (rev 0)
+++ trunk/xsl/params/link.to.self.for.mediaobject.xml 2013-10-25 11:04:31 UTC (rev 9824)
@@ -0,0 +1,40 @@
+<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="link.to.self.for.mediaobject">
+ <refmeta>
+ <refentrytitle>link.to.self.for.mediaobject</refentrytitle>
+ <refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>link.to.self.for.mediaobject</refname>
+ <refpurpose>Include <tag>a</tag> element to image objects itself to go to a full-size, freely-zoomable version</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<src:fragment xml:id="link.to.self.for.mediaobject.frag">
+<xsl:param name="link.to.self.for.mediaobject" select="0"/>
+</src:fragment>
+ </refsynopsisdiv>
+
+ <refsection>
+ <info>
+ <title>Description</title>
+ </info>
+ <para>In some cases, it can be very helpful to be able to click on an embedded <tag>figure</tag>
+ or <tag>informalfigure</tag> to get a full-size, freely-zoomable version of an image, for
+ instance when targeting readers on smartphones. This is implemented for images only, but not
+ for audio or video objects. </para>
+
+ <para>If non-zero, the image will be wrapped in an <tag>a</tag> element, using the <tag class="attribute">href</tag>
+ attribute pointing to the image itself: </para>
+ <screen><a href="source/image">
+ <!-- the image object -->
+</a></screen>
+
+ <para> If the value of <parameter>link.to.self.for.mediaobject.xml</parameter> is zero
+ (default), then no <tag>a</tag> container is added. </para>
+ </refsection>
+</refentry>
Property changes on: trunk/xsl/params/link.to.self.for.mediaobject.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Modified: trunk/xsl/xhtml-1_1/param.ent
===================================================================
--- trunk/xsl/xhtml-1_1/param.ent 2013-10-21 06:58:03 UTC (rev 9823)
+++ trunk/xsl/xhtml-1_1/param.ent 2013-10-25 11:04:31 UTC (rev 9824)
@@ -147,6 +147,7 @@
<!ENTITY linenumbering.separator SYSTEM "../params/linenumbering.separator.xml">
<!ENTITY linenumbering.width SYSTEM "../params/linenumbering.width.xml">
<!ENTITY link.mailto.url SYSTEM "../params/link.mailto.url.xml">
+<!ENTITY link.to.self.for.mediaobject SYSTEM "../params/link.to.self.for.mediaobject.xml">
<!ENTITY make.graphic.viewport SYSTEM "../params/make.graphic.viewport.xml">
<!ENTITY make.single.year.ranges SYSTEM "../params/make.single.year.ranges.xml">
<!ENTITY make.valid.html SYSTEM "../params/make.valid.html.xml">
@@ -308,4 +309,4 @@
<!ENTITY index.method SYSTEM "../params/index.method.xml">
<!ENTITY reference.autolabel SYSTEM "../params/reference.autolabel.xml">
<!ENTITY glossary.sort SYSTEM "../params/glossary.sort.xml">
-<!ENTITY javahelp.encoding SYSTEM "../params/javahelp.encoding.xml">
\ No newline at end of file
+<!ENTITY javahelp.encoding SYSTEM "../params/javahelp.encoding.xml">
Modified: trunk/xsl/xhtml-1_1/param.xweb
===================================================================
--- trunk/xsl/xhtml-1_1/param.xweb 2013-10-21 06:58:03 UTC (rev 9823)
+++ trunk/xsl/xhtml-1_1/param.xweb 2013-10-25 11:04:31 UTC (rev 9824)
@@ -276,6 +276,7 @@
&use.embed.for.svg;
&make.graphic.viewport;
&preferred.mediaobject.role;
+&link.to.self.for.mediaobject;
&use.role.for.mediaobject;
&ignore.image.scaling;
</reference>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2014-02-10 19:18:14
|
Revision: 9890
http://sourceforge.net/p/docbook/code/9890
Author: bobstayton
Date: 2014-02-10 19:18:12 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Check in build files that were missing from svn tree.
Added Paths:
-----------
trunk/xsl/.CatalogManager.properties.example
trunk/xsl/.make-catalog.xsl
trunk/xsl/.urilist
trunk/xsl/install.sh
Added: trunk/xsl/.CatalogManager.properties.example
===================================================================
--- trunk/xsl/.CatalogManager.properties.example (rev 0)
+++ trunk/xsl/.CatalogManager.properties.example 2014-02-10 19:18:12 UTC (rev 9890)
@@ -0,0 +1,61 @@
+########################################################################
+# CatalogManager provides an interface to the catalog properties.
+# Properties can come from two places: from system properties or
+# from a CatalogManager.properties file. This class provides a
+# transparent interface to both, with system properties preferred
+# over property file values.
+
+#######################################################################
+# Catalog Files:
+# The semicolon-delimited list of catalog files.
+# Example: catalogs=/etc/xml/catalog;~/catalog.xml
+
+catalogs=
+
+#######################################################################
+# Relative Catalogs:
+# If false, relative catalog URIs are made absolute with respect to the
+# base URI of the CatalogManager.properties file. This setting only
+# applies to catalog URIs obtained from the catalogs property in the
+# CatalogManager.properties file
+# Example: relative-catalogs = [yes|no]
+
+relative-catalogs=yes
+
+#######################################################################
+# Verbosity:
+# If non-zero, the Catalog classes will print informative and debugging
+# messages. The higher the number, the more messages.
+# Example: verbosity = [0..99]
+
+verbosity=0
+
+#######################################################################
+# Prefer:
+# Which identifier is preferred, "public" or "system"?
+# Example: xml.catalog.prefer = [public|system]
+
+prefer=system
+
+#######################################################################
+# Static-catalog:
+# Should a single catalog be constructed for all parsing, or should a
+# different catalog be created for each parser?
+# Example: static-catalog = [yes|no]
+
+static-catalog=yes
+
+#######################################################################
+# Allow-oasis-xml-catalog-pi
+# If the source document contains "oasis-xml-catalog" processing
+# instructions, should they be used?
+# Example: allow-oasis-xml-catalog-pi = [yes|no]
+
+allow-oasis-xml-catalog-pi=yes
+
+#######################################################################
+# catalog-class-name
+# If you're using the convenience classes
+# org.apache.xml.resolver.tools.*, this setting allows you to specify
+# an alternate class name to use for the underlying catalog.
+# Example: catalog-class-name=org.apache.xml.resolver.Resolver
Added: trunk/xsl/.make-catalog.xsl
===================================================================
--- trunk/xsl/.make-catalog.xsl (rev 0)
+++ trunk/xsl/.make-catalog.xsl 2014-02-10 19:18:12 UTC (rev 9890)
@@ -0,0 +1,51 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
+ exclude-result-prefixes="fm"
+ version='1.0'>
+
+<xsl:output indent="yes"/>
+
+<!-- ********************************************************************
+ $Id: make-catalog.xsl 9627 2012-10-20 23:15:46Z dcramer $
+ ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
+<xsl:include href="VERSION.xsl"/>
+<xsl:param name="PROJECT">
+ <xsl:value-of select="string(document('VERSION.xsl')//fm:Project[1])"/>
+</xsl:param>
+<xsl:param name="BRANCH">
+ <xsl:value-of select="string(document('VERSION.xsl')//fm:Branch[1])"/>
+</xsl:param>
+<xsl:param name="URI_BASE">http://docbook.sourceforge.net/release</xsl:param>
+<xsl:param name="DISTRO"/>
+<xsl:param name="SUBDIR">current</xsl:param>
+
+<xsl:param name="COMMENT">
+ <xsl:text> XML Catalog file for </xsl:text>
+ <xsl:value-of select="$PROJECT"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$BRANCH"/>
+ <xsl:text> v</xsl:text><xsl:value-of select="$VERSION"/>
+ <xsl:text> </xsl:text>
+</xsl:param>
+
+<xsl:template match="/">
+
+ <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <xsl:text> </xsl:text>
+ <xsl:comment><xsl:value-of select="$COMMENT"/></xsl:comment>
+
+ <rewriteURI uriStartString="{$URI_BASE}/{$DISTRO}/{$SUBDIR}/" rewritePrefix="./"/>
+ <rewriteSystem systemIdStartString="{$URI_BASE}/{$DISTRO}/{$SUBDIR}/" rewritePrefix="./"/>
+
+ <rewriteURI uriStartString="{$URI_BASE}/{$DISTRO}/{$VERSION}/" rewritePrefix="./"/>
+ <rewriteSystem systemIdStartString="{$URI_BASE}/{$DISTRO}/{$VERSION}/" rewritePrefix="./"/>
+ </catalog>
+ <xsl:text> </xsl:text>
+
+</xsl:template>
+
+</xsl:stylesheet>
Added: trunk/xsl/.urilist
===================================================================
--- trunk/xsl/.urilist (rev 0)
+++ trunk/xsl/.urilist 2014-02-10 19:18:12 UTC (rev 9890)
@@ -0,0 +1 @@
+. http://docbook.sourceforge.net/release/xsl/current/
Added: trunk/xsl/install.sh
===================================================================
--- trunk/xsl/install.sh (rev 0)
+++ trunk/xsl/install.sh 2014-02-10 19:18:12 UTC (rev 9890)
@@ -0,0 +1,977 @@
+#!/bin/bash
+# $Id: install.sh 7942 2008-03-26 06:08:08Z xmldoc $
+# $Source$ #
+
+# install.sh - Set up user environment for a XML/XSLT distribution
+
+# This is as an interactive installer for updating your
+# environment to use an XML/XSLT distribution such as the DocBook
+# XSL Stylesheets. Its main purpose is to configure your
+# environment with XML catalog data and schema "locating rules"
+# data provided in the XML/XSLT distribution.
+#
+# Although this installer was created for the DocBook project, it
+# is a general-purpose tool that can be used with any XML/XSLT
+# distribution that provides XML/SGML catalogs and locating rules.
+#
+# This script is mainly intended to make things easier for you if
+# you want to install a particular XML/XSLT distribution that has
+# not (yet) been packaged for your OS distro (Debian, Fedora,
+# whatever), or to use "snapshot" or development releases
+#
+# It works by updating your shell startup file (e.g., .bashrc and
+# .cshrc) and .emacs file and by finding or creating a writable
+# CatalogManager.properties file to update.
+#
+# It makes backup copies of any files it touches, and also
+# generates a uninstall.sh script for reverting its changes.
+#
+# In the same directory where it is located, it expects to find
+# the following four files:
+# - locatingrules.xml
+# - catalog.xml
+# - catalog
+# - .urilist
+# And if it's unable to locate a CatalogManager.properties file in
+# your environment, it expects to find an "example" one in the
+# same directory as itself, which it copies over to your
+# ~/.resolver directory.
+#
+# If the distribution contains any executables, change the value
+# of the thisBinDir to a colon-separated list of the pathnames of
+# the directories that contain those executables.
+
+# mydir is the "canonical" absolute pathname for install.sh
+mydir=$(cd -P $(dirname $0) && pwd -P) || exit 1
+
+thisLocatingRules=$mydir/locatingrules.xml
+thisXmlCatalog=$mydir/catalog.xml
+thisSgmlCatalog=$mydir/catalog
+
+# .urilist file contains a list of pairs of local pathnames and
+# URIs to test for catalog resolution
+thisUriList=$mydir/.urilist
+exampleCatalogManager=$mydir/.CatalogManager.properties.example
+thisCatalogManager=$HOME/.resolver/CatalogManager.properties
+
+# thisBinDir directory is a colon-separated list of the pathnames
+# to all directories that contain executables provided with the
+# distribution (for example, the DocBook XSL Stylesheets
+# distribution contains a "docbook-xsl-update" convenience script
+# for rsync'ing up to the latest docbook-xsl snapshot). The
+# install.sh script adds the value of thisBinDir to your PATH
+# environment variable
+thisBinDir=$mydir/tools/bin
+
+emit_message() {
+ echo "$1" 1>&2
+}
+
+if [ ! "${*#--batch}" = "$*" ]; then
+ batchmode="Yes";
+else
+ batchmode="No";
+ emit_message
+ if [ ! "$1" = "--test" ]; then
+ emit_message "NOTE: For non-interactive installs/uninstalls, use --batch"
+ if [ ! "$1" = "--uninstall" ]; then
+ emit_message
+ fi
+ fi
+fi
+
+osName="Unidentified"
+if uname -s | grep -qi "cygwin"; then
+ osName="Cygwin"
+fi
+
+classPathSeparator=":"
+if [ "$osName" = "Cygwin" ]; then
+ thisJavaXmlCatalog=$(cygpath -m $thisXmlCatalog)
+ classPathSeparator=";"
+else
+ thisJavaXmlCatalog=$thisXmlCatalog
+fi
+
+main() {
+ removeOldFiles
+ checkRoot
+ updateCatalogManager
+ checkForResolver
+ writeDotFiles
+ updateUserStartupFiles
+ updateUserDotEmacs
+ writeUninstallFile
+ writeTestFile
+ printExitMessage
+}
+
+removeOldFiles() {
+ rm -f $mydir/.profile.incl
+ rm -f $mydir/.cshrc.incl
+ rm -f $mydir/.emacs.el
+}
+
+checkRoot() {
+ if [ $(id -u) == "0" ]; then
+ cat 1>&2 <<EOF
+
+WARNING: This install script is meant to be run as a non-root
+ user, but you are running it as root.
+
+EOF
+ read -s -n1 -p "Are you sure you want to continue? [No] "
+ emit_message "$REPLY"
+ case $REPLY in
+ [yY])
+ emit_message
+ ;;
+ *) emit_message "OK, exiting without making changes."
+ exit
+ ;;
+ esac
+ fi
+ return 0
+}
+
+updateCatalogManager() {
+
+ # - finds or creates a writable CatalogManager.properties file
+ #
+ # - adds the catalog.xml file for this distribution to the
+ # CatalogManager.properties file found
+
+ if [ -z "$CLASSPATH" ]; then
+ cat 1>&2 <<EOF
+
+NOTE: There is no CLASSPATH variable set in your environment.
+ No attempt was made to find a CatalogManager.properties
+ file. Using $thisCatalogManager instead
+EOF
+ else
+ # split CLASSPATH in a list of pathnames by replacing all separator
+ # characters with spaces
+ if [ "$osName" = "Cygwin" ]; then
+ pathnames=$(echo $CLASSPATH | tr ";" " ")
+ else
+ pathnames=$(echo $CLASSPATH | tr ":" " ")
+ fi
+ for path in $pathnames; do
+ if [ "$osName" = "Cygwin" ]; then
+ path=$(cygpath -u $path)
+ fi
+ # strip out trailing slash from pathname
+ path=$(echo $path | sed 's/\/$//')
+ # find CatalogManager.properties file
+ if [ -f $path/CatalogManager.properties ];
+ then
+ existingCatalogManager=$path/CatalogManager.properties
+ break
+ fi
+ done
+ fi
+ # end of CLASSPATH check
+
+ if [ -w "$existingCatalogManager" ]; then
+ # existing CatalogManager.properties was found and it is
+ # writable, so use it
+ myCatalogManager=$existingCatalogManager
+ else
+ if [ -f "$existingCatalogManager" ]; then
+ # a non-writable CatalogManager.properties exists, so emit a
+ # note saying that it won't be used
+ cat 1>&2 <<EOF
+NOTE: $existingCatalogManager file found,
+ but you don't have permission to write to it.
+ Will instead use:
+ $thisCatalogManager
+EOF
+ else
+ # CLASSPATH is set, but no CatalogManager.properties found
+ if [ -n "$CLASSPATH" ]; then
+ cat 1>&2 <<EOF
+NOTE: No CatalogManager.properties found from CLASSPATH.
+ Will instead use:
+ $thisCatalogManager
+EOF
+ fi
+ fi
+ if [ "$batchmode" = "Yes" ]; then
+ emit_message
+ fi
+ # end of check for existing writable CatalogManager.properties
+
+ if [ -f $thisCatalogManager ]; then
+ myCatalogManager=$thisCatalogManager
+ else
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ emit_message
+ read -s -n1 -p "Create $thisCatalogManager file? [Yes] "
+ emit_message "$REPLY"
+ emit_message
+ fi
+ case $REPLY in
+ [nNqQ])
+ emitNoChangeMsg
+ ;;
+ *)
+ if [ ! -d "${thisCatalogManager%/*}" ]; then
+ mkdir -p ${thisCatalogManager%/*}
+ fi
+ cp $mydir/.CatalogManager.properties.example $thisCatalogManager || exit 1
+ emit_message "NOTE: Created the following file:"
+ emit_message " $thisCatalogManager"
+ myCatalogManager=$thisCatalogManager
+ ;;
+ esac
+ # end of creating "private" CatalogManager.properties
+ fi
+ # end of check for "private" CatalogManager.properties
+ fi
+ # end of check finding/creating writable CatalogManager.properties
+
+ if [ -n "$myCatalogManager" ]; then
+ etcXmlCatalog=
+ catalogsLine=$(grep "^catalogs=" $myCatalogManager)
+ if [ -f /etc/xml/catalog ] && [ "$osName" != "Cygwin" ] \
+ && [ "${catalogsLine#*/etc/xml/catalog*}" = "$catalogsLine" ]; then
+ cat 1>&2 <<EOF
+
+WARNING: /etc/xml/catalog exists but was not found in:
+ $myCatalogManager
+ If /etc/xml/catalog file has content, you probably
+ should reference it in:
+ $myCatalogManager
+ This installer can automatically add it for you,
+ but BE WARNED that once it has been added, the
+ uninstaller for this distribution CANNOT REMOVE IT
+ automatically during uninstall. If you no longer want
+ it included, you will need to remove it manually.
+
+EOF
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ read -s -n1 -p "Add /etc/xml/catalog to $myCatalogManager? [Yes] "
+ emit_message "$REPLY"
+ fi
+ case $REPLY in
+ [nNqQ])
+ emit_message
+ ;;
+ *)
+ etcXmlCatalog=/etc/xml/catalog
+ ;;
+ esac
+ fi
+
+ catalogBackup="$myCatalogManager.$$.bak"
+ if [ ! -w "${myCatalogManager%/*}" ]; then
+ emit_message
+ emit_message "WARNING: ${myCatalogManager%/*} directory is not writable."
+ emit_message
+ emitNoChangeMsg
+ else
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ emit_message
+ emit_message "Add $thisJavaXmlCatalog"
+ read -s -n1 -p "to $myCatalogManager file? [Yes] "
+ emit_message "$REPLY"
+ emit_message
+ fi
+ case $REPLY in
+ [nNqQ])
+ emitNoChangeMsg
+ ;;
+ *)
+ if [ "$catalogsLine" ] ; then
+ if [ "${catalogsLine#*$thisJavaXmlCatalog*}" != "$catalogsLine" ]; then
+ emit_message "NOTE: $thisJavaXmlCatalog"
+ emit_message " already in:"
+ emit_message " $myCatalogManager"
+ else
+ mv $myCatalogManager $catalogBackup || exit 1
+ sed "s#^catalogs=\(.*\)\$#catalogs=$thisJavaXmlCatalog;\1;$etcXmlCatalog#" $catalogBackup \
+ | sed 's/;\+/;/' | sed 's/;$//' > $myCatalogManager || exit 1
+ emit_message "NOTE: Successfully updated the following file:"
+ emit_message " $myCatalogManager"
+ emit_message " Backup written to:"
+ emit_message " $catalogBackup"
+ fi
+ else
+ mv $myCatalogManager $catalogBackup || exit 1
+ cp $catalogBackup $myCatalogManager
+ echo "catalogs=$thisJavaXmlCatalog;$etcXmlCatalog" \
+ | sed 's/;\+/;/' | sed 's/;$//' >> $myCatalogManager || exit 1
+ emit_message "NOTE: \"catalogs=\" line added to $myCatalogManager."
+ emit_message " Backup written to $catalogBackup"
+ fi
+ ;;
+ esac
+ # end of backing up and updating CatalogManager.properties
+ fi
+ fi
+ # end of CatalogManager.properties updates
+
+ if [ "$osName" = "Cygwin" ]; then
+ myCatalogManager=$(cygpath -m $myCatalogManager)
+ fi
+ return 0
+}
+
+writeDotFiles() {
+ while read; do
+ echo "$REPLY" >> $mydir/.profile.incl
+ done <<EOF
+# $thisBinDir is not in PATH, so add it
+if [ "\${PATH#*$thisBinDir*}" = "\$PATH" ]; then
+ PATH="$thisBinDir:\$PATH"
+ export PATH
+fi
+if [ -z "\$XML_CATALOG_FILES" ]; then
+ XML_CATALOG_FILES="$thisXmlCatalog"
+else
+ # $thisXmlCatalog is not in XML_CATALOG_FILES, so add it
+ if [ "\${XML_CATALOG_FILES#*$thisXmlCatalog*}" = "\$XML_CATALOG_FILES" ]; then
+ XML_CATALOG_FILES="$thisXmlCatalog \$XML_CATALOG_FILES"
+ fi
+fi
+# /etc/xml/catalog exists but is not in XML_CATALOG_FILES, so add it
+if [ -f /etc/xml/catalog ] && \
+ [ "\${XML_CATALOG_FILES#*/etc/xml/catalog*}" = "\$XML_CATALOG_FILES" ]; then
+ XML_CATALOG_FILES="\$XML_CATALOG_FILES /etc/xml/catalog"
+fi
+export XML_CATALOG_FILES
+
+if [ -z "\$SGML_CATALOG_FILES" ]; then
+ SGML_CATALOG_FILES="$thisSgmlCatalog"
+else
+ # $thisSgmlCatalog is not in SGML_CATALOG_FILES, so add it
+ if [ "\${SGML_CATALOG_FILES#*$thisSgmlCatalog}" = "\$SGML_CATALOG_FILES" ]; then
+ SGML_CATALOG_FILES="$thisSgmlCatalog:\$SGML_CATALOG_FILES"
+ fi
+fi
+# /etc/sgml/catalog exists but is not in SGML_CATALOG_FILES, so add it
+if [ -f /etc/sgml/catalog ] && \
+ [ "\${SGML_CATALOG_FILES#*/etc/sgml/catalog*}" = "\$SGML_CATALOG_FILES" ]; then
+ SGML_CATALOG_FILES="\$SGML_CATALOG_FILES:/etc/sgml/catalog"
+fi
+export SGML_CATALOG_FILES
+EOF
+
+while read; do
+ echo "$REPLY" >> $mydir/.cshrc.incl
+done <<EOF
+# $thisBinDir is not in PATH, so add it
+if ( "\\\`echo \$PATH | grep -v $thisBinDir\\\`" != "" ) then
+ setenv PATH "$thisBinDir:\$PATH"
+endif
+if ( ! $\?XML_CATALOG_FILES ) then
+ setenv XML_CATALOG_FILES "$thisXmlCatalog"
+# $thisXmlCatalog is not in XML_CATALOG_FILES, so add it
+else if ( "\\\`echo \$XML_CATALOG_FILES | grep -v $thisXmlCatalog\\\`" != "" ) then
+ setenv XML_CATALOG_FILES "$thisXmlCatalog \$XML_CATALOG_FILES"
+endif
+endif
+# /etc/xml/catalog exists but is not in XML_CATALOG_FILES, so add it
+if ( -f /etc/xml/catalog && "\\\`echo \$XML_CATALOG_FILES | grep -v /etc/xml/catalog\\\`" != "" ) then
+ setenv XML_CATALOG_FILES "\$XML_CATALOG_FILES /etc/xml/catalog"
+endif
+
+endif
+if ( ! $\?SGML_CATALOG_FILES ) then
+ setenv SGML_CATALOG_FILES "$thisSgmlCatalog"
+else if ( "\\\`echo \$SGML_CATALOG_FILES | grep -v $thisSgmlCatalog\\\`" != "" ) then
+ setenv SGML_CATALOG_FILES "$thisSgmlCatalog:\$SGML_CATALOG_FILES"
+endif
+endif
+# /etc/SGML/catalog exists but is not in SGML_CATALOG_FILES, so add it
+if ( -f /etc/sgml/catalog && "\\\`echo \$SGML_CATALOG_FILES | grep -v /etc/sgml/catalog\\\`" != "" ) then
+ setenv SGML_CATALOG_FILES {\$SGML_CATALOG_FILES}:/etc/sgml/catalog
+endif
+EOF
+
+if [ -n "$myCatalogManager" ]; then
+ myCatalogManagerDir=${myCatalogManager%/*}
+ while read; do
+ echo "$REPLY" >> $mydir/.profile.incl
+ done <<EOF
+
+
+if [ -z "\$CLASSPATH" ]; then
+ CLASSPATH="$myCatalogManagerDir"
+else
+ # $myCatalogManagerDir is not in CLASSPATH, so add it
+ if [ "\${CLASSPATH#*$myCatalogManagerDir*}" = "\$CLASSPATH" ]; then
+ CLASSPATH="$myCatalogManagerDir$classPathSeparator\$CLASSPATH"
+ fi
+fi
+export CLASSPATH
+EOF
+
+ while read; do
+ echo "$REPLY" >> $mydir/.cshrc.incl
+ done <<EOF
+
+
+if ( ! $\?CLASSPATH ) then
+ setenv CLASSPATH "$myCatalogManagerDir"
+# $myCatalogManagerDir is not in CLASSPATH, so add it
+else if ( "\\\`echo \$CLASSPATH | grep -v $myCatalogManagerDir\\\`" != "" ) then
+ setenv CLASSPATH "$myCatalogManagerDir$classPathSeparator\$CLASSPATH"
+endif
+endif
+EOF
+
+fi
+
+while read; do
+ echo "$REPLY" >> $mydir/.emacs.el
+done <<EOF
+(add-hook
+ 'nxml-mode-hook
+ (lambda ()
+ (setq rng-schema-locating-files-default
+ (append '("$thisLocatingRules")
+ rng-schema-locating-files-default ))))
+EOF
+
+return 0
+}
+
+updateUserStartupFiles() {
+ if [ ! "$batchmode" = "Yes" ]; then
+ cat 1>&2 <<EOF
+
+NOTE: To source your environment correctly for using the catalog
+ files in this distribution, you need to update one or more
+ of your shell startup files. This installer can
+ automatically make the necessary changes. Or, if you prefer,
+ you can make the changes manually.
+
+EOF
+ else
+ emit_message
+ fi
+
+ # if running csh or tcsh, target .cshrc and .tcshrc files for
+ # update; otherwise, target .bash_* and .profiles
+
+ parent=$(ps -p $PPID | grep "/")
+ if [ "${parent#*csh}" != "$parent" ] || [ "${parent#*tcsh}" != "$parent" ]; then
+ myStartupFiles=".cshrc .tcshrc"
+ appendLine="source $mydir/.cshrc.incl"
+ else
+ myStartupFiles=".bash_profile .bash_login .profile .bashrc"
+ appendLine=". $mydir/.profile.incl"
+ fi
+
+ for file in $myStartupFiles; do
+ if [ -f "$HOME/$file" ]; then
+ dotFileBackup=$HOME/$file.$$.bak
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ read -s -n1 -p "Update $HOME/$file? [Yes] "
+ emit_message "$REPLY"
+ fi
+ case $REPLY in
+ [nNqQ])
+ cat 1>&2 <<EOF
+
+NOTE: No change made to $HOME/$file. You either need
+ to add the following line to it, or manually source
+ the shell environment for this distribution each
+ time you want use it.
+
+$appendLine
+
+EOF
+ ;;
+ *)
+ lineExists="$(grep "$appendLine" $HOME/$file )"
+ if [ ! "$lineExists" ]; then
+ mv $HOME/$file $dotFileBackup || exit 1
+ cp $dotFileBackup $HOME/$file || exit 1
+ echo "$appendLine" >> $HOME/$file || exit 1
+ cat 1>&2 <<EOF
+NOTE: Successfully updated the following file:
+ $HOME/$file
+ Backup written to:
+ $dotFileBackup
+
+EOF
+ else
+ cat 1>&2 <<EOF
+NOTE: The following file already contains information for this
+ distribution, so I did not update it.
+ $HOME/$file
+
+EOF
+ fi
+ ;;
+ esac
+ fi
+ done
+ if [ -z "$dotFileBackup" ]; then
+ if [ ! "$batchmode" = "Yes" ]; then
+ emit_message
+ fi
+ cat 1>&2 <<EOF
+NOTE: No shell startup files updated. You can source the
+ environment for this distribution manually, each time you
+ want to use it, by typing the following.
+
+$appendLine
+
+EOF
+ fi
+}
+
+updateUserDotEmacs() {
+ if [ -f $thisLocatingRules ]; then
+ cat 1>&2 <<EOF
+
+NOTE: This distribution includes a "schema locating rules" file
+ for Emacs/nXML. To use it, you should update either your
+ .emacs or .emacs.el file. This installer can automatically
+ make the necessary changes. Or, if you prefer, you can make
+ the changes manually.
+
+EOF
+
+ emacsAppendLine="(load-file \"$mydir/.emacs.el\")"
+ myEmacsFile=
+ for file in .emacs .emacs.el; do
+ if [ -f "$HOME/$file" ]; then
+ myEmacsFile=$HOME/$file
+ break
+ fi
+ done
+ if [ ! -f "$myEmacsFile" ]; then
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ read -s -n1 -p "No .emacs or .emacs.el file. Create one? [No] "
+ emit_message "$REPLY"
+ emit_message
+ fi
+ case $REPLY in
+ [yY])
+ myEmacsFile=$HOME/.emacs
+ touch $myEmacsFile
+ ;;
+ *)
+ cat 1>&2 <<EOF
+NOTE: No Emacs changes made. To use this distribution with,
+ Emacs/nXML, you can create a .emacs file and manually add
+ the following line to it, or you can run it as a command
+ within Emacs.
+
+$emacsAppendLine
+
+EOF
+ ;;
+ esac
+ fi
+ if [ -n "$myEmacsFile" ]; then
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ read -s -n1 -p "Update $myEmacsFile? [Yes] "
+ emit_message "$REPLY"
+ emit_message
+ fi
+ case $REPLY in
+ [nNqQ])
+ cat 1>&2 <<EOF
+
+NOTE: No change made to $myEmacsFile. To use this distribution
+ with Emacs/nXML, you can manually add the following line
+ to your $myEmacsFile, or you can run it as a command
+ within Emacs.
+
+$emacsAppendLine
+
+EOF
+ ;;
+ *)
+ lineExists="$(grep "$emacsAppendLine" $myEmacsFile)"
+ if [ ! "$lineExists" ]; then
+ dotEmacsBackup=$myEmacsFile.$$.bak
+ mv $myEmacsFile $dotEmacsBackup || exit 1
+ cp $dotEmacsBackup $myEmacsFile || exit 1
+ echo "$emacsAppendLine" >> $myEmacsFile || exit 1
+ cat 1>&2 <<EOF
+NOTE: Successfully updated the following file:
+ $myEmacsFile
+ Backup written to:
+ $dotEmacsBackup
+EOF
+ else
+ cat 1>&2 <<EOF
+
+NOTE: The following file already contains information for this
+ distribution, so I did not update it.
+ $myEmacsFile
+
+EOF
+ fi
+ ;;
+ esac
+ fi
+fi
+}
+
+uninstall() {
+ if [ ! "$batchmode" = "Yes" ]; then
+ cat 1>&2 <<EOF
+
+NOTE: To "uninstall" this distribution, the changes made to your
+ CatalogManagers.properties, startup files, and/or .emacs
+ file need to be reverted. This uninstaller can automatically
+ revert them. Or, if you prefer, you can revert them manually.
+
+EOF
+ fi
+
+ if [ "$osName" = "Cygwin" ]; then
+ thisXmlCatalog=$thisJavaXmlCatalog
+ fi
+
+ # make "escaped" version of PWD to use with sed and grep
+ escapedPwd=$(echo $mydir | sed "s#/#\\\\\/#g")
+
+ # check to see if a non-empty value for catalogManager was fed
+ # to uninstaller.
+ if [ -n ${1#--catalogManager=} ]; then
+ myCatalogManager=${1#--catalogManager=}
+ catalogBackup="$myCatalogManager.$$.bak"
+ catalogsLine=$(grep "^catalogs=" $myCatalogManager)
+ if [ "$catalogsLine" ] ; then
+ if [ "${catalogsLine#*$thisXmlCatalog*}" != "$catalogsLine" ]; then
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ read -s -n1 -p "Revert $myCatalogManager? [Yes] "
+ emit_message "$REPLY"
+ fi
+ case $REPLY in
+ [nNqQ]*)
+ cat 1>&2 <<EOF
+
+NOTE: No change made to $myCatalogManager. You need to manually
+ remove the following path from the "catalog=" line.
+
+ $thisXmlCatalog
+
+EOF
+ ;;
+ *)
+ mv $myCatalogManager $catalogBackup || exit 1
+ sed "s#^catalogs=\(.*\)$thisXmlCatalog\(.*\)\$#catalogs=\1\2#" $catalogBackup \
+ | sed 's/;\+/;/' | sed 's/;$//' | sed 's/=;/=/' > $myCatalogManager || exit 1
+ cat 1>&2 <<EOF
+NOTE: Successfully updated the following file:
+ $myCatalogManager
+ Backup written to:
+ $catalogBackup
+
+EOF
+ ;;
+ esac
+ else
+ emit_message "NOTE: No data for this distribution found in:"
+ emit_message " $myCatalogManager"
+ emit_message
+ fi
+ else
+ cat 1>&2 <<EOF
+NOTE: No data for this distribution was found in the following
+ file, so I did not revert it.
+ $myCatalogManager
+EOF
+ fi
+ fi
+
+ if [ -n "$myEmacsFile" ]; then
+ # check to see if a non-empty value for --dotEmacs file was fed
+ # to uninstaller.
+ if [ -n ${2#--dotEmacs=} ]; then
+ myEmacsFile=${2#--dotEmacs=}
+ revertLine="(load-file \"$escapedPwd\/\.emacs\.el\")"
+ loadLine="$(grep "$revertLine" "$myEmacsFile")"
+ if [ -n "$loadLine" ]; then
+ emit_message
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ read -s -n1 -p "Revert $myEmacsFile? [Yes] "
+ emit_message "$REPLY"
+ fi
+ case $REPLY in
+ [nNqQ]*)
+ cat 1>&2 <<EOF
+
+NOTE: No change made to $myEmacsFile. You need to manually
+remove the following line.
+
+(load-file \"$mydir/.emacs.el\")
+
+EOF
+ ;;
+ *)
+ dotEmacsBackup=$myEmacsFile.$$.bak
+ sed -e "/$revertLine/d" -i".$$.bak" $myEmacsFile || exit 1
+ cat 1>&2 <<EOF
+NOTE: successfully reverted the following file:
+ $myEmacsFile
+ Backup written to:
+ $dotEmacsBackup
+
+EOF
+ ;;
+ esac
+ else
+ emit_message "NOTE: No data for this distribution found in:"
+ emit_message " $myEmacsFile"
+ fi
+ fi
+ fi
+
+ # check all startup files
+ myStartupFiles=".bash_profile .bash_login .profile .bashrc .cshrc .tcshrc"
+ for file in $myStartupFiles; do
+ if [ -e "$HOME/$file" ]; then
+ case $file in
+ .tcshrc|.cshrc)
+ revertLine="source $mydir/.cshrc.incl"
+ revertLineEsc="source $escapedPwd\/\.cshrc\.incl"
+ ;;
+ *)
+ revertLine=". $mydir/.profile.incl"
+ revertLineEsc="\. $escapedPwd\/\.profile\.incl"
+ ;;
+ esac
+ lineExists="$(grep "$revertLineEsc" $HOME/$file )"
+ if [ "$lineExists" ]; then
+ REPLY=""
+ if [ ! "$batchmode" = "Yes" ]; then
+ read -s -n1 -p "Update $HOME/$file? [Yes] "
+ emit_message "$REPLY"
+ fi
+ case $REPLY in
+ [nNqQ]*)
+ cat 1>&2 <<EOF
+
+NOTE: No change made to $HOME/$file. You need to manually remove
+ the following line from it.
+
+ $revertLine
+
+EOF
+ ;;
+ *)
+ dotFileBackup=$HOME/$file.$$.bak
+ sed -e "/$revertLineEsc/d" -i".$$.bak" $HOME/$file || exit 1
+ cat 1>&2 <<EOF
+NOTE: Successfully updated the following file:
+ $HOME/$file
+ Backup written to:
+ $dotFileBackup
+
+EOF
+ ;;
+ esac
+ else
+ emit_message "NOTE: No data for this distribution found in:"
+ emit_message " $HOME/$file"
+ emit_message
+ fi
+ fi
+ done
+ removeOldFiles
+ emit_message "Done. Deleted uninstall.sh file."
+ rm -f $mydir/test.sh || exit 1
+ rm -f $mydir/uninstall.sh || exit 1
+}
+
+writeUninstallFile() {
+ uninstallFile=$mydir/uninstall.sh
+ echo '#!/bin/bash' > $uninstallFile || exit 1
+ echo 'mydir=$(cd -P $(dirname $0) && pwd -P)' >> $uninstallFile || exit 1
+ echo "\$mydir/install.sh \\" >> $uninstallFile || exit 1
+ echo " --uninstall \\" >> $uninstallFile || exit 1
+ echo " --catalogManager=$myCatalogManager \\" >> $uninstallFile || exit 1
+ echo " --dotEmacs='$myEmacsFile' \\" >> $uninstallFile || exit 1
+ echo ' $@' >> $uninstallFile || exit 1
+ chmod 755 $uninstallFile || exit 1
+}
+
+writeTestFile() {
+ testFile=$mydir/test.sh
+ echo "#!/bin/bash" > $testFile || exit 1
+ echo 'mydir=$(cd -P $(dirname $0) && pwd -P)' >> $testFile || exit 1
+ echo '$mydir/install.sh --test' >> $testFile || exit 1
+ chmod 755 $testFile || exit 1
+}
+
+printExitMessage() {
+ cat 1>&2 <<EOF
+To source your shell environment for this distribution, type the
+following:
+
+$appendLine
+
+EOF
+}
+
+checkForResolver() {
+ resolverResponse="$(java org.apache.xml.resolver.apps.resolver uri -u foo 2>/dev/null)"
+ if [ -z "$resolverResponse" ]; then
+ cat 1>&2 <<EOF
+
+NOTE: Your environment does not seem to contain the Apache XML
+ Commons Resolver; without that, you can't use XML catalogs
+ with Java applications. For more information, see the "How
+ to use a catalog file" section in Bob Stayton's "DocBook
+ XSL: The Complete Guide"
+
+ http://sagehill.net/docbookxsl/UseCatalog.html
+
+EOF
+ fi
+}
+
+emitNoChangeMsg() {
+ cat 1>&2 <<EOF
+
+NOTE: No changes were made to CatalogManagers.properties. To
+ provide your Java tools with XML catalog information for
+ this distribution, you will need to make the appropriate
+ changes manually.
+
+EOF
+}
+
+testCatalogs() {
+ if [ ! -f "$thisXmlCatalog" ]; then
+ cat 1>&2 <<EOF
+
+FATAL: $thisXmlCatalog file needed but not found. Stopping.
+EOF
+ exit
+ fi
+
+ if [ -z "$XML_CATALOG_FILES" ]; then
+ emit_message
+ emit_message "WARNING: XML_CATALOG_FILES not set. Not testing with xmlcatalog."
+ else
+ xmlCatalogResponse="$(xmlcatalog 2>/dev/null)"
+ if [ -z "$xmlCatalogResponse" ]; then
+ cat 1>&2 <<EOF
+
+WARNING: Cannot locate the "xmlcatalog" command. Make sure that
+ you have libxml2 and its associated utilities installed.
+
+ http://xmlsoft.org/
+
+EOF
+ else
+ emit_message "Testing with xmlcatalog..."
+ # read in pathname-uri pairs from .urilist file
+ while read pair; do
+ if [ ! "${pair%* *}" = "." ]; then
+ path=$mydir/${pair%* *}
+ else
+ path=$mydir/
+ fi
+ uri=${pair#* *}
+ emit_message
+ emit_message " Tested: $uri"
+ for catalog in $XML_CATALOG_FILES; do
+ response="$(xmlcatalog $catalog $uri| grep -v "No entry")"
+ if [ -n "$response" ]; then
+ if [ "$response" = "$path" ]; then
+ emit_message " Result: $path"
+ break
+ else
+ emit_message " Result: FAILED"
+ fi
+ fi
+ done
+ done < $mydir/.urilist
+ fi
+ fi
+
+ if [ -z "$CLASSPATH" ]; then
+ emit_message
+ emit_message "NOTE: CLASSPATH not set. Not testing with Apache XML Commons Resolver."
+ else
+ if [ "$(checkForResolver)" ]; then
+ checkForResolver
+ else
+ emit_message
+ emit_message "Testing with Apache XML Commons Resolver..."
+ # read in pathname-uri pairs from .urilist file
+ while read pair; do
+ if [ ! "${pair%* *}" = "." ]; then
+ path=$mydir/${pair%* *}
+ else
+ path=$mydir/
+ fi
+ uri=${pair#* *}
+ emit_message
+ emit_message " Tested: $uri"
+ if [ ${uri%.dtd} != $uri ]; then
+ response="$(java org.apache.xml.resolver.apps.resolver system -s $uri | grep "Result")"
+ else
+ response="$(java org.apache.xml.resolver.apps.resolver uri -u $uri | grep "Result")"
+ fi
+ if [ "$response" ]; then
+ if [ "${response#*$path}" != "$response" ]; then
+ emit_message " Result: $path"
+ else
+ emit_message " Result: FAILED"
+ fi
+ echo
+ fi
+ done < $mydir/.urilist
+ fi
+ fi
+}
+
+# get opts and execute appropriate function
+case $1 in
+ *-uninstall)
+ uninstall $2 $3 $4
+ ;;
+ *-test)
+ testCatalogs
+ ;;
+ *)
+ main
+ ;;
+esac
+
+# Copyright
+# ---------
+# Copyright 2005-2007 Michael(tm) Smith <sm...@si...>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# vim: number
Property changes on: trunk/xsl/install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2014-04-30 16:14:47
|
Revision: 9914
http://sourceforge.net/p/docbook/code/9914
Author: bobstayton
Date: 2014-04-30 16:14:44 +0000 (Wed, 30 Apr 2014)
Log Message:
-----------
Change the epigraph template to support schema extensions
by processing all of its children instead of specific elements.
Modified Paths:
--------------
trunk/xsl/fo/block.xsl
trunk/xsl/html/block.xsl
Modified: trunk/xsl/fo/block.xsl
===================================================================
--- trunk/xsl/fo/block.xsl 2014-03-28 10:22:18 UTC (rev 9913)
+++ trunk/xsl/fo/block.xsl 2014-04-30 16:14:44 UTC (rev 9914)
@@ -145,7 +145,7 @@
<xsl:template match="epigraph">
<fo:block>
<xsl:call-template name="anchor"/>
- <xsl:apply-templates select="para|simpara|formalpara|literallayout"/>
+ <xsl:apply-templates select="node()[not(local-name(attribution))]"/>
<xsl:if test="attribution">
<fo:inline>
<xsl:text>—</xsl:text>
Modified: trunk/xsl/html/block.xsl
===================================================================
--- trunk/xsl/html/block.xsl 2014-03-28 10:22:18 UTC (rev 9913)
+++ trunk/xsl/html/block.xsl 2014-04-30 16:14:44 UTC (rev 9914)
@@ -230,7 +230,7 @@
<div>
<xsl:call-template name="common.html.attributes"/>
<xsl:call-template name="id.attribute"/>
- <xsl:apply-templates select="para|simpara|formalpara|literallayout"/>
+ <xsl:apply-templates select="node()[not(local-name(attribution))]"/>
<xsl:if test="attribution">
<div class="attribution">
<span>—<xsl:apply-templates select="attribution"/></span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ko...@us...> - 2014-08-15 15:14:39
|
Revision: 9927
http://sourceforge.net/p/docbook/code/9927
Author: kosek
Date: 2014-08-15 15:14:31 +0000 (Fri, 15 Aug 2014)
Log Message:
-----------
Added ant build for HTML stylesheets
Modified Paths:
--------------
trunk/xsl/common/build.xml
trunk/xsl/tools/build-shared.xml
Added Paths:
-----------
trunk/xsl/html/build.xml
Modified: trunk/xsl/common/build.xml
===================================================================
--- trunk/xsl/common/build.xml 2014-08-15 13:36:48 UTC (rev 9926)
+++ trunk/xsl/common/build.xml 2014-08-15 15:14:31 UTC (rev 9927)
@@ -7,6 +7,8 @@
<target name="all">
<echo>Adding missing translations from English master localization...</echo>
<xslt style="../../gentext/xsl/xsl-primary-is-locale.xsl" destdir="." basedir="../../gentext/locale" force="true">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
<param name="en.locale.file" expression="en.xml"/>
<include name="*.xml"/>
<mapper type="flatten"/>
Added: trunk/xsl/html/build.xml
===================================================================
--- trunk/xsl/html/build.xml (rev 0)
+++ trunk/xsl/html/build.xml 2014-08-15 15:14:31 UTC (rev 9927)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DocBook XSLT 1.0 stylesheets - HTML" default="all">
+
+ <property name="dbroot.dir" value="${ant.file}/../.."/>
+ <import file="../tools/build-shared.xml"/>
+
+ <target name="all" depends="param, titlepage, profile">
+ </target>
+
+ <target name="param">
+ <echo>Building HTML parameters...</echo>
+ <antcall target="build-params">
+ <param name="condition" value="html"/>
+ </antcall>
+ </target>
+
+ <target name="titlepage">
+ <echo>Building HTML titlepage...</echo>
+ <xslt in="titlepage.templates.xml" out="titlepage.templates.xsl" style="../template/titlepage.xsl">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
+ </xslt>
+ </target>
+
+ <target name="profile">
+ <echo>Building profiling version of HTML stylesheet...</echo>
+ <xslt in="docbook.xsl" out="profile-docbook.xsl" style="../profiling/xsl2profile.xsl">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
+ </xslt>
+ </target>
+
+ <target name="clean">
+ <delete>
+ <fileset dir=".">
+ <!-- FIXME -->
+ </fileset>
+ </delete>
+ </target>
+
+</project>
Modified: trunk/xsl/tools/build-shared.xml
===================================================================
--- trunk/xsl/tools/build-shared.xml 2014-08-15 13:36:48 UTC (rev 9926)
+++ trunk/xsl/tools/build-shared.xml 2014-08-15 15:14:31 UTC (rev 9927)
@@ -5,6 +5,7 @@
<property name="libs" value="${dbroot.dir}/tools/lib"/>
<property name="saxon9.jar" value="${libs}/saxon9he.jar"/>
<property name="saxon.jar" value="${libs}/saxon.jar"/>
+ <property name="xerces.jar" value="${libs}/xercesImpl.jar"/>
<property name="saxon-ant.jar" value="${libs}/saxon9-ant.jar"/>
<property name="jing.jar" value="${libs}/jing.jar"/>
<property name="ant-contrib.jar" value="${libs}/ant-contrib-1.0b3.jar"/>
@@ -22,6 +23,7 @@
</path>
<path id="saxon.classpath">
+ <pathelement location="${xerces.jar}"/>
<pathelement location="${saxon.jar}"/>
<pathelement location="${extensions.jar}"/>
</path>
@@ -42,4 +44,31 @@
<classpath refid="saxon9.classpath"/>
</taskdef>
+ <target name="build-params">
+ <!-- FIXME parameter checking -->
+ <xslt in="param.xweb" out=".param.profiled" style="../profiling/profile.xsl">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
+ <param name="profile.condition" expression="${condition}"/>
+ </xslt>
+ <xslt in=".param.profiled" out=".param.stripped" style="../profiling/strip-attributes.xsl">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
+ <param name="attributes" expression="condition"/>
+ </xslt>
+ <xslt in=".param.stripped" out=".param.dbkns" style="../../releasetools/xtangle.xsl">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
+ </xslt>
+ <xslt in=".param.dbkns" out="param.xsl.tmp" style="../tools/xsl/build/fix-params-ns.xsl">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
+ </xslt>
+ <xslt in="param.xsl.tmp" out="param.xsl" style="../tools/xsl/build/addnewline.xsl">
+ <factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ <classpath refid="saxon.classpath"/>
+ </xslt>
+ <!-- FIXME: remove temporary files -->
+ </target>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X