[jsword-svn] r1874 - in trunk: bibledesktop/src/main/resources/xsl/cswing jsword/src/main/java/org/crosswire/jsword/book/filter/thml

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2008-06-10 14:40:19 -0700 (Tue, 10 Jun 2008)
New Revision: 1874

Modified:
   trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
   trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/DivTag.java
Log:
Fixed a bug that affected WHNU from showing the first variant.

Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl	2008-06-10 15:51:55 UTC (rev 1873)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl	2008-06-10 21:40:19 UTC (rev 1874)
@@ -705,7 +705,7 @@
         <font size="{substring-before(substring-after(@type, 'font-size: '), ';')}"><xsl:apply-templates/></font>
       </xsl:when>
       <xsl:when test="@type = 'x-variant'">
-        <xsl:if test="@subType = 'x-class:1'">
+        <xsl:if test="@subType = 'x-class-1'">
           <xsl:apply-templates/>
         </xsl:if>
       </xsl:when>

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/DivTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/DivTag.java	2008-06-10 15:51:55 UTC (rev 1873)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/DivTag.java	2008-06-10 21:40:19 UTC (rev 1874)
@@ -57,7 +57,7 @@
             String classAttr = attrs.getValue("class"); //$NON-NLS-1$
             if (classAttr != null)
             {
-                seg.setAttribute(OSISUtil.OSIS_ATTR_SUBTYPE, OSISUtil.VARIANT_CLASS + classAttr);
+                seg.setAttribute(OSISUtil.OSIS_ATTR_SUBTYPE, OSISUtil.VARIANT_CLASS + '-' + classAttr);
             }
 
             if (ele != null)