[jsword-svn] r2280 - in trunk/bibledesktop: etc/installer/macosx/BibleDesktop.app/Contents src/main/java/org/crosswire/bibledesktop/desktop src/main/resources/xsl/cswing
dmsmith at crosswire.org
dmsmith at crosswire.org
Wed Feb 27 15:38:10 MST 2013
Author: dmsmith
Date: 2013-02-27 15:38:10 -0700 (Wed, 27 Feb 2013)
New Revision: 2280
Modified:
trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
Log:
update to JDom 2.0.4
Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2013-02-27 12:24:28 UTC (rev 2279)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2013-02-27 22:38:10 UTC (rev 2280)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
<dict>
<key>CFBundleName</key>
<string>Bible Desktop</string>
@@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleGetInfoString</key>
- <string>Bible Desktop v at release.version@ (c) 2006</string>
+ <string>Bible Desktop v at release.version@ (c) 2013</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIconFile</key>
@@ -35,16 +35,16 @@
<key>JVMVersion</key>
<string>1.5+</string>
<key>ClassPath</key>
- <array>
+ <array>
<string>$JAVAROOT/bibledesktop- at release.version@.jar</string>
<string>$JAVAROOT/jsword- at release.version@.jar</string>
<string>$JAVAROOT/jsword-common-swing- at release.version@.jar</string>
<string>$JAVAROOT/jsword-common-aqua-1.0.6.jar</string>
<string>$JAVAROOT/lucene-core-3.0.3.jar</string>
<string>$JAVAROOT/lucene-snowball-3.0.3.jar</string>
- <string>$JAVAROOT/lucene-analyzers-3.0.3.jar</string>
- <string>$JAVAROOT/lucene-smartcn-3.0.3.jar</string>
- <string>$JAVAROOT/jdom-1.1.3.jar</string>
+ <string>$JAVAROOT/lucene-analyzers-3.0.3.jar</string>
+ <string>$JAVAROOT/lucene-smartcn-3.0.3.jar</string>
+ <string>$JAVAROOT/jdom2-2.0.4.jar</string>
<string>$JAVAROOT/commons-codec-1.7.jar</string>
<string>$JAVAROOT/httpcore-4.2.3.jar</string>
<string>$JAVAROOT/httpclient-4.2.3.jar</string>
@@ -54,7 +54,7 @@
<string>$JAVAROOT/commons-net-3.2.jar</string>
<string>$JAVAROOT/javatar-2.5.jar</string>
<string>$JAVAROOT/jlfgr-1_0.jar</string>
- </array>
+ </array>
<key>Properties</key>
<dict>
<key>apple.laf.useScreenMenuBar</key>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2013-02-27 12:24:28 UTC (rev 2279)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2013-02-27 22:38:10 UTC (rev 2280)
@@ -107,8 +107,8 @@
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.NoSuchKeyException;
import org.crosswire.jsword.util.ConverterFactory;
-import org.jdom.Document;
-import org.jdom.JDOMException;
+import org.jdom2.Document;
+import org.jdom2.JDOMException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2013-02-27 12:24:28 UTC (rev 2279)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2013-02-27 22:38:10 UTC (rev 2280)
@@ -306,19 +306,8 @@
<!--=======================================================================-->
<!-- Handle verses as containers and as a start verse. -->
<xsl:template match="verse[not(@eID)]">
- <!-- output each preverse element in turn -->
- <xsl:for-each select=".//*[@subType = 'x-preverse' or @subtype = 'x-preverse']">
- <xsl:choose>
- <xsl:when test="local-name() = 'title'">
- <xsl:call-template name="render-title"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
<!-- Handle the KJV paragraph marker. -->
- <xsl:if test="milestone[@type = 'x-p']"><br/><br/></xsl:if>
+ <xsl:if test="milestone[@type = 'x-p'] or q[@who = 'Jesus']/milestone[@type = 'x-p']"><br/><br/></xsl:if>
<!-- If the verse doesn't start on its own line and -->
<!-- the verse is not the first verse of a set of siblings, -->
<!-- output an extra space. -->
@@ -794,27 +783,14 @@
</xsl:template>
<!--=======================================================================-->
- <xsl:template match="title[@subType ='x-preverse' or @subtype = 'x-preverse']" priority="1">
- <!-- Done by a line in [verse]
+ <xsl:template match="title">
<xsl:call-template name="render-title"/>
- -->
</xsl:template>
- <xsl:template match="title[@subType ='x-preverse' or @subtype = 'x-preverse']" priority="1" mode="jesus">
- <!-- Done by a line in [verse]
+ <xsl:template match="title" mode="jesus">
<xsl:call-template name="render-title"/>
- -->
</xsl:template>
-
- <!--=======================================================================-->
- <xsl:template match="title" priority="0">
- <xsl:call-template name="render-title"/>
- </xsl:template>
- <xsl:template match="title" priority="0" mode="jesus">
- <xsl:call-template name="render-title"/>
- </xsl:template>
-
<!--=======================================================================-->
<xsl:template name="render-title">
<!-- Always show canonical titles or if headings is turned on -->
More information about the jsword-svn
mailing list