[jsword-svn] bibledesktop/resource/xsl/cswing s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/bibledesktop/resource/xsl/cswing
In directory www.crosswire.org:/tmp/cvs-serv27099/resource/xsl/cswing

Modified Files:
	simple.xsl 
Log Message:
Fixed two display problems: 1) <tag/> not displaying properly and verse on separate lines had verse number on a preceding line.

Index: simple.xsl
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/xsl/cswing/simple.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** simple.xsl	21 Mar 2005 02:37:18 -0000	1.14
--- simple.xsl	23 Mar 2005 02:50:49 -0000	1.15
***************
*** 214,217 ****
--- 214,232 ----
        <h3><xsl:value-of select="$title"/></h3>
      </xsl:if>
+     <!-- Always output the verse -->
+     <xsl:choose>
+  	  <xsl:when test="$VLine = 'true'">
+         <div class="l"><xsl:call-template name="versenum"/><xsl:apply-templates/><xsl:text> </xsl:text></div>
+       </xsl:when>
+       <xsl:otherwise>
+         <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:otherwise>
+     </xsl:choose>
+   </xsl:template>
+ 
+   <xsl:template name="versenum">
      <!-- Are verse numbers wanted? -->
      <xsl:if test="$VNum = 'true'">
***************
*** 237,254 ****
        </xsl:choose>
      </xsl:if>
-     <!-- Always output the verse -->
-     <xsl:choose>
-  	  <xsl:when test="$VLine = 'true'">
-         <div class="l"><xsl:apply-templates/><xsl:text> </xsl:text></div>
-       </xsl:when>
-       <xsl:otherwise>
-         <xsl:apply-templates/>
-         <!-- Follow the verse with an extra space -->
-         <!-- when they don't start on lines to themselves -->
-         <xsl:text> </xsl:text>
-       </xsl:otherwise>
-     </xsl:choose>
    </xsl:template>
- 
    <!--=======================================================================-->
    <!-- Avoid adding whitespace -->
--- 252,256 ----