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

Modified Files:
	simple.xsl 
Log Message:
Some corrections and additions to Bible book names.
Added java calls to simple.xsl

Index: simple.xsl
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/xsl/cswing/simple.xsl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** simple.xsl	22 Jun 2005 03:50:49 -0000	1.23
--- simple.xsl	11 Aug 2005 11:27:58 -0000	1.24
***************
*** 1,4 ****
  <?xml version="1.0"?>
! <xsl:stylesheet xmlns="http://www.w3.org/TR/REC-html40" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  
    <xsl:output method="html" omit-xml-declaration="yes" indent="no"/>
--- 1,9 ----
  <?xml version="1.0"?>
! <xsl:stylesheet
!   xmlns="http://www.w3.org/TR/REC-html40"
!   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
!   version="1.0"
!   xmlns:jsword="http://xml.apache.org/xalan/java"
!   extension-element-prefixes="jsword">
  
    <xsl:output method="html" omit-xml-declaration="yes" indent="no"/>
***************
*** 78,111 ****
    <xsl:variable name="fontspec" select="concat($fontfamily, $fontsize, $fontweight, $fontstyle)"/>
  
-   <!--
-   For now, we assume that all the works inside a corpus are of the
-   same type.
-   -->
-   <xsl:variable name="osis-id-type" select="substring-before((//osisText)[1]/@osisIDWork, '.')"/>
- 
-   <xsl:variable name="page-div-type">
-     <xsl:choose>
-       <!--
-       KJV is a special case. It should be Bible.KJV, but some OSIS
-       transcriptions just use KJV instead.
-       -->
-       <xsl:when test="$osis-id-type = 'Bible' or $osis-id-type = 'KJV'">
-         <xsl:text>chapter</xsl:text>
-       </xsl:when>
-       <xsl:when test="$osis-id-type = 'Dictionary'">
-         <xsl:text>x-lexeme</xsl:text>
-       </xsl:when>
-       <xsl:when test="$osis-id-type = 'Lexicon'">
-         <xsl:text>x-lemma</xsl:text>
-       </xsl:when>
-       <xsl:when test="$osis-id-type = 'Morph'">
-         <xsl:text>x-tag</xsl:text>
-       </xsl:when>
-       <xsl:otherwise>
-         <xsl:text>FIXME</xsl:text>
-       </xsl:otherwise>
-     </xsl:choose>
-   </xsl:variable>
- 
    <!--=======================================================================-->
    <xsl:template match="/osis">
--- 83,86 ----
***************
*** 286,294 ****
    <xsl:template match="verse" mode="print-notes">
      <xsl:if test="./note">
!       <xsl:variable name="book" select="substring-before(@osisID, '.')"/>
!       <xsl:variable name="chapter" select="substring-before(substring-after(@osisID, '.'), '.')"/>
!       <xsl:variable name="versenum" select="substring-after(substring-after(@osisID, '.'), '.')"/>
        <a href="#{@osisID}">
!         <xsl:value-of select="concat($book, '&#160;', $chapter, ':', $versenum)"/>
        </a>
        <xsl:apply-templates select="./note" mode="print-notes" />
--- 261,267 ----
    <xsl:template match="verse" mode="print-notes">
      <xsl:if test="./note">
!       <xsl:variable name="verse" select="jsword:org.crosswire.jsword.passage.VerseFactory.fromString(@osisID)"/>
        <a href="#{@osisID}">
!         <xsl:value-of select="jsword:getName($verse)"/>
        </a>
        <xsl:apply-templates select="./note" mode="print-notes" />