From dmsmith at crosswire.org  Sat Mar 19 09:22:27 2016
From: dmsmith at crosswire.org (dmsmith at crosswire.org)
Date: Sat, 19 Mar 2016 09:22:27 -0700
Subject: [jsword-svn] r2329 - in trunk/bibledesktop: . etc/installer/macosx
	etc/installer/macosx/Bible Desktop.app/Contents
	etc/installer/macosx/Bible Desktop.app/Contents/MacOS
	etc/installer/macosx/Bible Desktop.app/Contents/Resources
	etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj
	etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj
	etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj
Message-ID: <E1ahJdz-0005x3-Mr@crosswire.org>

Author: dmsmith
Date: 2016-03-19 09:22:27 -0700 (Sat, 19 Mar 2016)
New Revision: 2329

Added:
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Java/
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings
Removed:
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist
Modified:
   trunk/bibledesktop/build.xml
   trunk/bibledesktop/etc/installer/macosx/readme.txt
Log:
Update MacOSX app for Java 7 and above. Source is still Java 5 compatible.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2016-01-23 16:54:30 UTC (rev 2328)
+++ trunk/bibledesktop/build.xml	2016-03-19 16:22:27 UTC (rev 2329)
@@ -50,7 +50,7 @@
 
 	<!--=======================================================================-->
 	<target	name="package.extra"
-			depends="package.webstart, package.macosx, package.windows"/>
+			depends="package.macosx, package.windows"/> <!-- package.webstart, -->
 
 	<!-- Package the command-line distribution -->
 	<target name="package.bin">
@@ -126,7 +126,7 @@
     <target name="package.macosx">
 		<mkdir dir="${package.bd.dir}"/>
 		<copy	verbose="${verbose.copy}"
-				file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
+				file="${etc.dir}/installer/macosx/Bible Desktop.app/Contents/Info.plist"
 				toFile="${package.bd.dir}/Info.plist"
 				preservelastmodified="true">
 			<filterset>
@@ -134,28 +134,28 @@
 			</filterset>
 		</copy>
 
-		<zip destfile="${package.bd.dir}/BibleDesktop.app.zip" update="true">
+		<zip destfile="${package.bd.dir}/Bible Desktop.app.zip" update="true">
 			<!-- Copy everything but the executable (zip will not preserve permissions)
 			  == And Info.plist, which needs to be filtered.
 			  -->
 			<zipfileset
-					prefix="BibleDesktop.app"
-					dir="${etc.dir}/installer/macosx/BibleDesktop.app">
-				<exclude name="**/*JavaApplicationStub*"/>
+					prefix="Bible Desktop.app"
+					dir="${etc.dir}/installer/macosx/Bible Desktop.app">
+				<exclude name="**/*JavaAppLauncher*"/>
 				<exclude name="**/*Info.plist"/>
 			</zipfileset>
 			<!-- Copy the executable and set the right permissions -->
 			<zipfileset
-					prefix="BibleDesktop.app/Contents/MacOS"
+					prefix="Bible Desktop.app/Contents/MacOS"
 					filemode="755"
-					file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
+					file="${etc.dir}/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher"/>
 			<!-- Copy the filtered Info.plist file -->
 			<zipfileset
-					prefix="BibleDesktop.app/Contents"
+					prefix="Bible Desktop.app/Contents"
 					file="${package.bd.dir}/Info.plist"/>
 			<!-- Add in all the unsigned jars -->
 			<zipfileset
-					prefix="BibleDesktop.app/Contents/Resources/Java"
+					prefix="Bible Desktop.app/Contents/Java"
 					dir="${lib.dir}">
 				<patternset refid="patternset.runtime"/>
 			</zipfileset>
@@ -163,6 +163,36 @@
 		<delete file="${package.bd.dir}/Info.plist"/>
     </target>
 
+	<target name="package.macosx.bundler"
+	    depends="appbundler.task"
+        if="appbundler.available">
+		<mkdir dir="${package.bd.dir}"/>
+        <bundleapp
+            jrepreferred="true"
+        	outputdirectory="${package.bd.dir}"
+            name="Bible Desktop"
+            displayname="Bible Desktop"
+            identifier="org.crosswire.jsword"
+            mainclassname="org.crosswire.bibledesktop.desktop.Desktop"
+        	icon="${etc.dir}/installer/macosx/Bible Desktop.app/Contents/Resources/BibleDesktop.icns"
+        	shortversion="@release.version@"
+        	version="@release.version@"
+        	copyright="Bible Desktop v at release.version@ (c) 2016"
+        >
+          <classpath dir="${lib.dir}">
+			<patternset refid="patternset.runtime"/>
+          </classpath>
+          <option value="-Xdock:name=Bible Desktop"/>
+          <option value="-Dapple.laf.useScreenMenuBar=true"/>
+          <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
+          <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
+          <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Bible Desktop"/>
+          <option value="-Dcom.apple.smallTabs=true"/>
+          <option value="-Dfile.encoding=UTF-8"/>
+          <option value="-Xmx1024M" name="Xmx"/>
+        </bundleapp>
+    </target>
+
 	<!-- Build the Windows installers -->
 	<target	name="package.windows"
 			depends="nsis.task"

Deleted: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.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/Bible Desktop.app/Contents/Info.plist	2016-03-19 16:22:27 UTC (rev 2329)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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>
-	<key>CFBundleIdentifier</key>
-	<string>org.crosswire.jsword</string>
-	<key>CFBundleVersion</key>
-	<string>@release.version@</string>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<string>true</string>
-	<key>CFBundleExecutable</key>
-	<string>JavaApplicationStub</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Bible Desktop v at release.version@ (c) 2015</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIconFile</key>
-	<string>BibleDesktop.icns</string>
-	<key>Java</key>
-	<dict>
-		<key>WorkingDirectory</key>
-		<string>$APP_PACKAGE/Contents/Resources/Java</string>
-		<key>VMOptions</key>
-		<string>-Xmx512Mm</string>
-		<key>MainClass</key>
-		<string>org.crosswire.bibledesktop.desktop.Desktop</string>
-		<key>JVMVersion</key>
-		<string>1.6</string>
-		<key>ClassPath</key>
-		<array>
-			<string>$JAVAROOT/bibledesktop- at release.version@.jar</string>
-			<string>$JAVAROOT/jsword- 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/jdom2-2.0.6.jar</string>
-			<string>$JAVAROOT/icu4j-54.1.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/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/jlfgr-1_0.jar</string>
-		</array>
-		<key>Properties</key>
-		<dict>
-			<key>apple.laf.useScreenMenuBar</key>
-			<string>true</string>
-		</dict>
-	</dict>
-</dict>
-</plist>

Copied: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist (from rev 2326, trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist)
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist	                        (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist	2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>JavaAppLauncher</string>
+	<key>CFBundleIconFile</key>
+	<string>BibleDesktop.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.crosswire.jsword</string>
+	<key>CFBundleDisplayName</key>
+	<string>Bible Desktop</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Bible Desktop</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@release.version@</string>
+	<key>CFBundleVersion</key>
+	<string>@release.version@</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Bible Desktop v at release.version@ (c) 2016</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+	<key>JVMVersion</key>
+	<string>1.7</string>
+	<key>JREPreferred</key>
+	<true/>
+	<key>JVMMainClassName</key>
+	<string>org.crosswire.bibledesktop.desktop.Desktop</string>
+	<key>CFBundleDocumentTypes</key>
+	<array/>
+	<key>LSArchitecturePriority</key>
+	<array/>
+	<key>LSEnvironment</key>
+	<dict>
+		<key>LC_CTYPE</key>
+		<string>UTF-8</string>
+	</dict>
+	<key>JVMOptions</key>
+	<array>
+		<string>-Xdock:name=Bible Desktop</string>
+		<string>-Dapple.laf.useScreenMenuBar=true</string>
+		<string>-Dcom.apple.macos.use-file-dialog-packages=true</string>
+		<string>-Dcom.apple.macos.useScreenMenuBar=true</string>
+		<string>-Dcom.apple.mrj.application.apple.menu.about.name=Bible Desktop</string>
+		<string>-Dcom.apple.smallTabs=true</string>
+		<string>-Dfile.encoding=UTF-8</string>
+	</array>
+	<key>JVMDefaultOptions</key>
+	<dict>
+		<key>Xmx</key>
+		<string>-Xmx1024M</string>
+	</dict>
+	<key>JVMArguments</key>
+	<array/>
+</dict>
+</plist>

Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings	                        (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings	2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,7 @@
+"JRELoadError" = "Die Java Laufzeitumgebung konnte nicht geladen werden.";
+"JRExLoadError" = "Die Java %d Laufzeitumgebung konnte nicht geladen werden.";
+"JRExLoadFullError" = "Diese Anwendung ben?tigt die Java %d Laufzeitumgebung oder h?her auf Ihrem Computer installiert sein. Bitte installieren Sie die neueste Version von Java von www.java.com und erneut versuchen.";
+"JDKxLoadFullError" = "Diese Anwendung ben?tigt die Java %d Laufzeitumgebung oder h?her auf Ihrem Computer installiert sein. Bitte installieren Sie die neueste JDK von Oracle.com und erneut versuchen.";
+"MainClassNameRequired" = "Hauptklassenname ist erforderlich.";
+"JavaDirectoryNotFound" = "Das Java Verzeichnis ist nicht vorhanden.";
+"BundlePathContainsColon" = "Kann nicht vom einem Ordner aus starten, der \"/\" in seinem Namen enth?lt.";

Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings	                        (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings	2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,7 @@
+"JRELoadError" = "Unable to load Java Runtime Environment.";
+"JRExLoadError" = "Unable to load a Java %d Runtime Environment.";
+"JRExLoadFullError" = "This application requires that Java %d or later be installed on your computer. Please download and install the latest version of Java from www.java.com and try again.";
+"JDKxLoadFullError" = "This application requires that a Java %d JDK or later be installed on your computer. Please download and install the latest Java JDK from Oracle.com and try again.";
+"MainClassNameRequired" = "Main class name is required.";
+"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
+"BundlePathContainsColon" = "Cannot launch from folder that contains a \"/\" in its name.";

Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings	                        (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings	2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,7 @@
+"JRELoadError" = "Impossible d'utiliser un environnement Java.";
+"JRExLoadError" = "Impossible d'utiliser un environnement Java %d.";
+"JRExLoadFullError" = "Ce logiciel n?cessite que Java %d ou plus r?cent ?tre install?s sur votre ordinateur. S'il vous pla?t t?l?charger et installer la derni?re version de Java ? partir de www.java.com et essayez ? nouveau.";
+"JDKxLoadFullError" = "Ce logiciel n?cessite que Java %d JDK ou plus r?cent ?tre install?s sur votre ordinateur. S'il vous pla?t t?l?charger et installer le JDK plus r?cente de Oracle.com et essayez ? nouveau.";
+"MainClassNameRequired" = "Principal nom de classe est n?cessaire.";
+"JavaDirectoryNotFound" = "Impossible d'?num?rer r?pertoire Java contenu.";
+"BundlePathContainsColon" = "Pas de commencer ? partir d'un dossier qui contient un \"/\" dans son nom.";
\ No newline at end of file

Modified: trunk/bibledesktop/etc/installer/macosx/readme.txt
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/readme.txt	2016-01-23 16:54:30 UTC (rev 2328)
+++ trunk/bibledesktop/etc/installer/macosx/readme.txt	2016-03-19 16:22:27 UTC (rev 2329)
@@ -5,11 +5,11 @@
 Instructions:
 
 Building the App:
-Info.plist is the "app" control file. When 3rd party jar names change, it needs to change.
+Info.plist is the "app" control file.
 Use Ant to build the "app" into the installation target directory.
 This does two things:
 1) It updates the release version number for the BibleDesktop and JSword jars.
-2) It puts the jars in BibleDesktop.app/Contents/Resources/Java
+2) It puts the jars in BibleDesktop.app/Contents/Java
 
 Building the Distribution:
 DMG is a Mac Disk Image that can only be built on the Mac.



From dmsmith at crosswire.org  Sat Mar 19 09:27:09 2016
From: dmsmith at crosswire.org (dmsmith at crosswire.org)
Date: Sat, 19 Mar 2016 09:27:09 -0700
Subject: [jsword-svn] r2330 -
	trunk/bibledesktop/src/main/resources/xsl/cswing
Message-ID: <E1ahJiX-00061E-Pt@crosswire.org>

Author: dmsmith
Date: 2016-03-19 09:27:09 -0700 (Sat, 19 Mar 2016)
New Revision: 2330

Modified:
   trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
Log:
Improve simple.xslt for styling of tables, notes.

Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl	2016-03-19 16:22:27 UTC (rev 2329)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl	2016-03-19 16:27:09 UTC (rev 2330)
@@ -137,20 +137,25 @@
           SUB.strongs { font-size: 75%; color: red; }
           SUB.morph { font-size: 75%; color: blue; }
           SUB.lemma { font-size: 75%; color: orange; }
-          SUP.verse { font-size: 75%; color: gray; }
-          SUP.note { font-size: 75%; color: green; }
+          .verse { color: gray;}
+          SUP   { font-size: 75%; }
+          .note { color: green; }
+          SUP.note { font-size: 75%; }
+          FONT.note { font-weight: bold;}
           FONT.lex { color: orange; }
           FONT.jesus { color: red; }
           FONT.speech { color: blue; }
           FONT.strike { text-decoration: line-through; }
           FONT.small-caps { font-variant: small-caps; }
+          FONT.spaced-letters { letter-spacing: 1em; }
           FONT.inscription { font-weight: bold; font-variant: small-caps; }
           FONT.divineName { font-variant: small-caps; }
           FONT.normal { font-variant: normal; }
           FONT.caps { text-transform: uppercase; }
-          FONT.catchword { font-weight: bold; }
+          FONT.catchword { font-weight: bold; font-style: italic; }
+          FONT.illuminated { font-weight: bold; font-style: italic; }
           FONT.rdg { font-style: italic; }
-          H1 { font-size: 115%; font-weight: bold; }
+          H1 { font-size: 130%; font-weight: bold; }
           H2 { font-size: 110%; font-weight: bold; }
           H3 { font-size: 100%; font-weight: bold; }
           H4 { font-size:  90%; font-weight: bold; }
@@ -159,8 +164,8 @@
           .heading { color: #669966; text-align: center; }
           .canonical { color: #666699; text-align: center; }
           .gen { color: #996666; }
-          div.margin { font-size:90%; }
-          TABLE { width:100% }
+          DIV.margin { font-size: 90%; }
+          TABLE { width:100%; }
           TD.notes { width:20%; background:#f4f4e8; }
           TD.text { width:80%; }
           <!-- the following are for dictionary entries -->
@@ -179,7 +184,7 @@
           <xsl:when test="$Notes = 'true' and //note[not(@type = 'x-strongsMarkup')]">
             <xsl:choose>
               <xsl:when test="$direction != 'rtl'">
-                <table cols="2" cellpadding="5" cellspacing="5">
+                <table cols="2" cellpadding="10" cellspacing="0">
                   <tr>
                     <!-- The two rows are swapped until the bug is fixed. -->
                     <td valign="top" class="notes">
@@ -194,7 +199,7 @@
               </xsl:when>
               <xsl:otherwise>
                 <!-- reverse the table for Right to Left languages -->
-                <table cols="2" cellpadding="5" cellspacing="5">
+                <table cols="2" cellpadding="10" cellspacing="0">
                   <!-- In a right to left, the alignment should be reversed too -->
                   <tr align="right">
                     <td valign="top" class="text">
@@ -360,7 +365,7 @@
         <xsl:call-template name="versenum"/><xsl:apply-templates/>
         <!-- Follow the verse with an extra space -->
         <!-- when they don't start on lines to themselves -->
-        <xsl:text> </xsl:text>
+        <xsl:text>&#160;&#160;</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -394,7 +399,7 @@
         <xsl:call-template name="versenum"/><xsl:apply-templates mode="jesus"/>
         <!-- Follow the verse with an extra space -->
         <!-- when they don't start on lines to themselves -->
-        <xsl:text> </xsl:text>
+        <xsl:text>&#160;&#160;</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -450,16 +455,16 @@
         -->
       <xsl:choose>
         <xsl:when test="$TinyVNum = 'true' and $Notes = 'true'">
-          <a name="{@osisID}"><sup class="verse"><font><xsl:value-of select="$versenum"/></font></sup></a><xsl:text> </xsl:text>
+          <a name="{@osisID}"><font class="verse"><sup><xsl:value-of select="$versenum"/></sup></font></a><xsl:text>&#160;</xsl:text>
         </xsl:when>
         <xsl:when test="$TinyVNum = 'true' and $Notes = 'false'">
-          <sup class="verse"><font><xsl:value-of select="$versenum"/></font></sup><xsl:text> </xsl:text>
+          <font class="verse"><sup><xsl:value-of select="$versenum"/></sup></font><xsl:text>&#160;</xsl:text>
         </xsl:when>
         <xsl:when test="$TinyVNum = 'false' and $Notes = 'true'">
-          <a name="{@osisID}">(<font><xsl:value-of select="$versenum"/></font>)</a><xsl:text> </xsl:text>
+          <a name="{@osisID}"><font class="verse">(<xsl:value-of select="$versenum"/>)</font></a><xsl:text>&#160;</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-          (<font><xsl:value-of select="$versenum"/></font>)<xsl:text> </xsl:text>
+          <font class="verse">(<xsl:value-of select="$versenum"/>)</font><xsl:text>&#160;</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:if>
@@ -519,7 +524,7 @@
   <!--=======================================================================-->
   <xsl:template match="note" mode="print-notes">
     <div class="margin">
-      <strong><xsl:call-template name="generateNoteXref"/></strong>
+      <font class="note"><xsl:call-template name="generateNoteXref"/></font>
       <a name="note-{generate-id(.)}">
         <xsl:text> </xsl:text>
       </a>
@@ -871,6 +876,13 @@
         <xsl:when test="@level = '6'">
           <h6 class="{$heading}"><xsl:apply-templates/></h6>
         </xsl:when>
+        <!-- Level supercedes type -->
+        <xsl:when test="@type = 'main'">
+          <h1 class="{$heading}"><xsl:apply-templates/></h1>
+        </xsl:when>
+        <xsl:when test="@type = 'chapter'">
+          <h2 class="{$heading}"><xsl:apply-templates/></h2>
+        </xsl:when>
         <xsl:otherwise>
           <h3 class="{$heading}"><xsl:apply-templates /></h3>
         </xsl:otherwise>
@@ -1332,7 +1344,8 @@
 
   <xsl:template match="table">
     <table class="table">
-      <xsl:copy-of select="@rows|@cols"/>
+      <xsl:copy-of select="@rows|@cols|@border"/>
+      <xsl:attribute name="cellspacing">0</xsl:attribute>
       <xsl:if test="head">
         <thead class="head"><xsl:apply-templates select="head"/></thead>
       </xsl:if>
@@ -1430,7 +1443,7 @@
         <em><xsl:apply-templates/></em>
       </xsl:when>
       <xsl:when test="$style = 'illuminated'">
-        <strong><em><xsl:apply-templates/></em></strong>
+        <font class="illuminated"><xsl:apply-templates/></font>
       </xsl:when>
       <xsl:when test="$style = 'italic'">
         <em><xsl:apply-templates/></em>
@@ -1444,6 +1457,9 @@
       <xsl:when test="$style = 'small-caps'">
         <font class="small-caps"><xsl:apply-templates mode="small-caps"/></font>
       </xsl:when>
+      <xsl:when test="$style = 'spaced-letters'">
+        <font class="spaced-letters"><xsl:call-template name="spaced-letters"><xsl:with-param name="text" select="text()"/></xsl:call-template></font>
+      </xsl:when>
       <xsl:when test="$style = 'sub'">
         <sub><xsl:apply-templates/></sub>
       </xsl:when>
@@ -1578,6 +1594,16 @@
     <xsl:value-of select="translate(., 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
   </xsl:template>
 
+  <xsl:template name="spaced-letters">
+    <xsl:param name="text"/>
+    <xsl:value-of select="substring($text,1,1)"/>
+    <xsl:if test="string-length($text) > 1">
+      <xsl:text>&#160;</xsl:text>
+      <xsl:call-template name="spaced-letters"><xsl:with-param name="text" select="substring($text,2)"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
   <!--
     Generate a css or an inline style representation of a font spec.
     The fontspec that is passed in is in one of two forms:



From dmsmith at crosswire.org  Sat Mar 19 10:12:54 2016
From: dmsmith at crosswire.org (dmsmith at crosswire.org)
Date: Sat, 19 Mar 2016 10:12:54 -0700
Subject: [jsword-svn] r2331 - in trunk/bibledesktop/etc/installer/macosx: .
	Bible Desktop.app/Contents Bible Desktop.app/Contents/MacOS
	Bible Desktop.app/Contents/Resources
Message-ID: <E1ahKQo-0006r2-Fj@crosswire.org>

Author: dmsmith
Date: 2016-03-19 10:12:54 -0700 (Sat, 19 Mar 2016)
New Revision: 2331

Removed:
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaApplicationStub
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources Disabled/
   trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/Java/
   trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/
Log:
cleanup of macosx app

Deleted: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaApplicationStub
===================================================================
(Binary files differ)