[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-serv1237/resource/xsl/cswing

Modified Files:
	simple.xsl 
Log Message:
Added some more view options for formatting of verse numbers.
Changed JSword to BibleDesktop in the license for BibleDesktop.
Added org.gnu.lgpl.License.
Updated GPL to use html taken from the GPL website.

Index: simple.xsl
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/xsl/cswing/simple.xsl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** simple.xsl	6 Jun 2005 17:09:32 -0000	1.22
--- simple.xsl	22 Jun 2005 03:50:49 -0000	1.23
***************
*** 34,40 ****
    <xsl:param name="XRef" select="'true'"/>
  
!   <!-- Whether to output verse numbers or not -->
    <xsl:param name="VNum" select="'true'"/>
  
    <!-- Whether to output superscript verse numbers or normal size ones -->
    <xsl:param name="TinyVNum" select="'true'"/>
--- 34,49 ----
    <xsl:param name="XRef" select="'true'"/>
  
!   <!-- Whether to output no Verse numbers -->
!   <xsl:param name="NoVNum" select="'false'"/>
! 
!   <!-- Whether to output Verse numbers or not -->
    <xsl:param name="VNum" select="'true'"/>
  
+   <!-- Whether to output Chapter and Verse numbers or not -->
+   <xsl:param name="CVNum" select="'false'"/>
+ 
+   <!-- Whether to output Book, Chapter and Verse numbers or not -->
+   <xsl:param name="BCVNum" select="'false'"/>
+ 
    <!-- Whether to output superscript verse numbers or normal size ones -->
    <xsl:param name="TinyVNum" select="'true'"/>
***************
*** 236,242 ****
    <xsl:template name="versenum">
      <!-- Are verse numbers wanted? -->
!     <xsl:if test="$VNum = 'true'">
        <xsl:variable name="versenum">
!         <xsl:value-of select="substring-after(substring-after(@osisID, '.'), '.')"/>
        </xsl:variable>
        <xsl:choose>
--- 245,264 ----
    <xsl:template name="versenum">
      <!-- Are verse numbers wanted? -->
!     <xsl:if test="$NoVNum = 'false'">
!       <xsl:variable name="book" select="substring-before(@osisID, '.')"/>
!       <xsl:variable name="chapter" select="substring-before(substring-after(@osisID, '.'), '.')"/>
!       <xsl:variable name="verse" select="substring-after(substring-after(@osisID, '.'), '.')"/>
        <xsl:variable name="versenum">
!         <xsl:choose>
!           <xsl:when test="$BCVNum = 'true'">
!           	<xsl:value-of select="concat($book, '&#160;', $chapter, ':', $verse)"/>
!           </xsl:when>
!           <xsl:when test="$CVNum = 'true'">
!           	<xsl:value-of select="concat($chapter, ':', $verse)"/>
!           </xsl:when>
!           <xsl:otherwise>
!           	<xsl:value-of select="$verse"/>
!           </xsl:otherwise>
!         </xsl:choose>
        </xsl:variable>
        <xsl:choose>
***************
*** 248,256 ****
        	</xsl:when>
          <xsl:when test="$TinyVNum = 'false' and $Notes = 'true'">
!       	  <a name="{@osisID}"><xsl:value-of select="$versenum"/></a>
        	  <xsl:text> </xsl:text>
        	</xsl:when>
        	<xsl:otherwise>
!       	  <xsl:value-of select="$versenum"/>
        	  <xsl:text> </xsl:text>
        	</xsl:otherwise>
--- 270,278 ----
        	</xsl:when>
          <xsl:when test="$TinyVNum = 'false' and $Notes = 'true'">
!       	  <a name="{@osisID}">(<xsl:value-of select="$versenum"/>)</a>
        	  <xsl:text> </xsl:text>
        	</xsl:when>
        	<xsl:otherwise>
!       	  (<xsl:value-of select="$versenum"/>)
        	  <xsl:text> </xsl:text>
        	</xsl:otherwise>