[jsword-svn] r2281 - in trunk/bibledesktop: etc/jnlp src/main/resources/xsl/cswing
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Feb 28 06:31:32 MST 2013
Author: dmsmith
Date: 2013-02-28 06:31:31 -0700 (Thu, 28 Feb 2013)
New Revision: 2281
Modified:
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
Log:
BD-172 Add xalan to JNLP to fix WebStart.
Also: Improve xslt for poetry and titles.
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2013-02-27 22:38:10 UTC (rev 2280)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2013-02-28 13:31:31 UTC (rev 2281)
@@ -33,18 +33,21 @@
<jar href="jsword-common-swing- at release.version@.jar"/>
<jar href="jsword-common-aqua-1.0.6.jar"/>
<jar href="javatar-2.5.jar"/>
- <jar href="jdom-1.1.3.jar"/>
+ <jar href="jdom2-2.0.4.jar"/>
<jar href="commons-codec-1.7.jar"/>
<jar href="httpcore-4.2.3.jar"/>
<jar href="httpclient-4.2.3.jar"/>
- <jar href="slf4j-api-172.jar"/>
- <jar href="slf4j-jdk14-172.jar"/>
- <sjar href="jcl-over-slf4j-172.jar"/>
+ <jar href="slf4j-api-1.7.2.jar"/>
+ <jar href="slf4j-jdk14-1.7.2.jar"/>
+ <jar href="jcl-over-slf4j-1.7.2.jar"/>
<jar href="commons-net-3.2.jar"/>
<jar href="lucene-core-3.0.3.jar"/>
<jar href="lucene-snowball-3.0.3.jar"/>
<jar href="lucene-analyzers-3.0.3.jar"/>
<jar href="lucene-smartcn-3.0.3.jar"/>
+ <jar href="xercesImpl-2.11.0.jar"/>
+ <jar href="xalan-2.7.1.jar"/>
+ <jar href="serializer-2.7.1.jar"/>
<jar href="jlfgr-1_0.jar"/>
<property name="apple.laf.useScreenMenuBar" value="true"/>
<property name="com.apple.mrj.application.apple.menu.about.name" value="Bible Desktop"/>
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2013-02-27 22:38:10 UTC (rev 2280)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2013-02-28 13:31:31 UTC (rev 2281)
@@ -2,10 +2,10 @@
<!--
* Distribution License:
* JSword is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License, version 2.1 as published by
- * the Free Software Foundation. This program is distributed in the hope
- * that it will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * the terms of the GNU Lesser General Public License, version 2.1 or later
+ * as published by the Free Software Foundation. This program is distributed
+ * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
@@ -981,20 +981,48 @@
<xsl:template match="lg[@sID or @eID]"/>
<xsl:template match="lg[@sID or @eID]" mode="jesus"/>
- <xsl:template match="l[@sID]"/>
- <xsl:template match="l[@sID]" mode="jesus"/>
+ <xsl:template match="l[@sID]">
+ <xsl:call-template name="indent"/>
+ </xsl:template>
+ <xsl:template match="l[@sID]" mode="jesus">
+ <xsl:call-template name="indent"/>
+ </xsl:template>
+
<xsl:template match="l[@eID]"><br/></xsl:template>
<xsl:template match="l[@eID]" mode="jesus"><br/></xsl:template>
<xsl:template match="l">
- <xsl:apply-templates/><br/>
+ <xsl:call-template name="indent"/><xsl:apply-templates/><br/>
</xsl:template>
<xsl:template match="l" mode="jesus">
<xsl:apply-templates mode="jesus"/><br/>
</xsl:template>
+ <!-- Generate poetry indent. The x-indent values are from an old ESV module.
+ This mechanism is not ideal. The visual appearance does not account for verse numbers.
+ -->
+ <xsl:template name="indent">
+ <xsl:choose>
+ <xsl:when test="@level = '1'">
+ <xsl:text>    </xsl:text>
+ </xsl:when>
+ <xsl:when test="@level = '2' or @type = 'x-indent'">
+ <xsl:text>        </xsl:text>
+ </xsl:when>
+ <xsl:when test="@level = '3' or @type = 'x-indent-2'">
+ <xsl:text>            </xsl:text>
+ </xsl:when>
+ <xsl:when test="@level = '4'">
+ <xsl:text>                </xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>    </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
<!-- While a BR is a break, if it is immediately followed by punctuation,
indenting this rule can introduce whitespace.
-->
@@ -1113,10 +1141,6 @@
== screen Marks a preferred place for breaks in an on-screen rendering of the text.
== cQuote Marks the location of a continuation quote mark, with marker containing the publishers mark.
-->
- <!-- This is used by the KJV for paragraph markers. -->
- <xsl:template match="milestone[@type = 'x-p']"><xsl:text> </xsl:text><xsl:value-of select="@marker"/><xsl:text> </xsl:text></xsl:template>
- <xsl:template match="milestone[@type = 'x-p']" mode="jesus"><xsl:text> </xsl:text><xsl:value-of select="@marker"/><xsl:text> </xsl:text></xsl:template>
-
<xsl:template match="milestone[@type = 'cQuote']">
<xsl:value-of select="@marker"/>
</xsl:template>
More information about the jsword-svn
mailing list