[jsword-svn] r2326 - in trunk/bibledesktop: . etc/installer/macosx/BibleDesktop.app/Contents src/main/java/org/crosswire/bibledesktop/book/install src/main/resources/xsl/cswing
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Jan 21 08:09:56 MST 2016
Author: dmsmith
Date: 2016-01-21 08:09:56 -0700 (Thu, 21 Jan 2016)
New Revision: 2326
Modified:
trunk/bibledesktop/.classpath
trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java
trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
Log:
Update to latest check in of JSword.
Add styling for catchWord and rdg.
Update installer for mac to latest 3rd-party jars.
Modified: trunk/bibledesktop/.classpath
===================================================================
--- trunk/bibledesktop/.classpath 2016-01-18 21:13:49 UTC (rev 2325)
+++ trunk/bibledesktop/.classpath 2016-01-21 15:09:56 UTC (rev 2326)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="jar/jlfgr-1.0/jlfgr-1_0.jar"/>
<classpathentry exported="true" kind="src" path="/jsword"/>
<classpathentry kind="src" path="src/main/resources"/>
Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2016-01-18 21:13:49 UTC (rev 2325)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2016-01-21 15:09:56 UTC (rev 2326)
@@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleGetInfoString</key>
- <string>Bible Desktop v at release.version@ (c) 2015</string>
+ <string>Bible Desktop v at release.version@ (c) 2016</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIconFile</key>
@@ -44,18 +44,16 @@
<string>$JAVAROOT/lucene-analyzers-3.0.3.jar</string>
<string>$JAVAROOT/lucene-smartcn-3.0.3.jar</string>
<string>$JAVAROOT/jdom2-2.0.6.jar</string>
- <string>$JAVAROOT/icu4j-54.1.1.jar</string>
+ <string>$JAVAROOT/icu4j-56.1.jar</string>
<string>$JAVAROOT/commons-codec-1.10.jar</string>
- <string>$JAVAROOT/commons-collections4-4.0.jar</string>
- <string>$JAVAROOT/commons-compress-1.9.jar</string>
- <string>$JAVAROOT/commons-configuration-1.10.jar</string>
- <string>$JAVAROOT/commons-net-3.3.jar</string>
+ <string>$JAVAROOT/commons-compress-1.10.jar</string>
+ <string>$JAVAROOT/commons-net-3.4.jar</string>
<string>$JAVAROOT/httpcore-4.4.jar</string>
- <string>$JAVAROOT/httpclient-4.4.jar</string>
- <string>$JAVAROOT/slf4j-api-1.7.6.jar</string>
- <string>$JAVAROOT/slf4j-jdk14-1.7.6.jar</string>
- <string>$JAVAROOT/jcl-over-slf4j-1.7.6.jar</string>
- <string>$JAVAROOT/xz-1.4.jar</string>
+ <string>$JAVAROOT/httpclient-4.5.jar</string>
+ <string>$JAVAROOT/slf4j-api-1.7.13.jar</string>
+ <string>$JAVAROOT/slf4j-jdk14-1.7.13.jar</string>
+ <string>$JAVAROOT/jcl-over-slf4j-1.7.13.jar</string>
+ <string>$JAVAROOT/xz-1.5.jar</string>
<string>$JAVAROOT/jlfgr-1_0.jar</string>
</array>
<key>Properties</key>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java 2016-01-18 21:13:49 UTC (rev 2325)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java 2016-01-21 15:09:56 UTC (rev 2326)
@@ -34,6 +34,7 @@
import org.crosswire.common.xml.TransformingSAXEventProvider;
import org.crosswire.common.xml.XMLUtil;
import org.crosswire.jsword.book.Book;
+import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.util.ConverterFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +70,7 @@
}
try {
-
+ book.getBookMetaData().reload();
SAXEventProvider osissep = new JDOMSAXEventProvider(book.toOSIS());
TransformingSAXEventProvider htmlsep = (TransformingSAXEventProvider) converter.convert(osissep);
XSLTProperty.FONT.setProperty(htmlsep);
@@ -81,6 +82,8 @@
Reporter.informUser(this, e);
} catch (TransformerException e) {
Reporter.informUser(this, e);
+ } catch (BookException e) {
+ Reporter.informUser(this, e);
}
}
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2016-01-18 21:13:49 UTC (rev 2325)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2016-01-21 15:09:56 UTC (rev 2326)
@@ -149,6 +149,8 @@
FONT.divineName { font-variant: small-caps; }
FONT.normal { font-variant: normal; }
FONT.caps { text-transform: uppercase; }
+ FONT.catchword { font-weight: bold; }
+ FONT.rdg { font-style: italic; }
H1 { font-size: 115%; font-weight: bold; }
H2 { font-size: 110%; font-weight: bold; }
H3 { font-size: 100%; font-weight: bold; }
@@ -477,11 +479,12 @@
</xsl:template>
<!--=======================================================================-->
- <!-- When we encounter a note, we merely output a link to the note. -->
+ <!-- x-strongsMarkup is a note in the KJV that should not be shown. -->
<xsl:template match="note[@type = 'x-strongsMarkup']"/>
<xsl:template match="note[@type = 'x-strongsMarkup']" mode="jesus"/>
<xsl:template match="note[@type = 'x-strongsMarkup']" mode="print-notes"/>
+ <!-- When we encounter a note, we merely output a link to the note. -->
<xsl:template match="note">
<xsl:if test="$Notes = 'true'">
<!-- If there is a following sibling that is a note, emit a separator -->
@@ -909,11 +912,11 @@
</xsl:template>
<xsl:template match="catchWord">
- <xsl:apply-templates/>
+ <font class="catchword"><xsl:apply-templates/></font>
</xsl:template>
<xsl:template match="catchWord" mode="jesus">
- <xsl:apply-templates mode="jesus"/>
+ <font class="catchword"><xsl:apply-templates mode="jesus"/></font>
</xsl:template>
<!--
@@ -1292,11 +1295,11 @@
<!-- An alternate reading. -->
<xsl:template match="rdg">
- <xsl:apply-templates/>
+ <font class="rdg"><xsl:apply-templates/></font>
</xsl:template>
- <xsl:template match="rdg" mode="jesus">
- <xsl:apply-templates mode="jesus"/>
+ <xsl:template match="rdg" mode="jesus">
+ <font class="catchword"><xsl:apply-templates mode="jesus"/></font>
</xsl:template>
<!--
@@ -1573,7 +1576,7 @@
</xsl:template>
<xsl:template match="text()" mode="small-caps">
- <xsl:value-of select="translate(., 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+ <xsl:value-of select="translate(., 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
</xsl:template>
<!--
More information about the jsword-svn
mailing list