[jsword-svn] bibledesktop/resource/xsl/cswing s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Aug 14 09:06:16 MST 2005
Update of /cvs/jsword/bibledesktop/resource/xsl/cswing
In directory www.crosswire.org:/tmp/cvs-serv19157/resource/xsl/cswing
Modified Files:
cutandpaste.xsl cutandpaste2.xsl simple.xsl
Log Message:
Added lgpl to xsl and xml files.
Fixed a problem in VerseRange.
Index: cutandpaste.xsl
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/xsl/cswing/cutandpaste.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cutandpaste.xsl 26 Sep 2004 10:14:35 -0000 1.1
--- cutandpaste.xsl 14 Aug 2005 16:06:14 -0000 1.2
***************
*** 1,3 ****
--- 1,61 ----
<?xml version="1.0"?>
+ <!--
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2005
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ -->
+ <!--
+ * Transforms OSIS to HTML for viewing within JSword browsers.
+ * Note: There are custom protocols which the browser must handle.
+ *
+ * @see gnu.lgpl.License for license details.
+ * The copyright to this program is held by it's authors.
+ * @author Joe Walker [joe at eireneh dot com]
+ <!--
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2005
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ -->
+ <!--
+ * Transforms OSIS to HTML for viewing within JSword browsers.
+ * Note: There are custom protocols which the browser must handle.
+ *
+ * @see gnu.lgpl.License for license details.
+ * The copyright to this program is held by it's authors.
+ * @author Joe Walker [joe at eireneh dot com]
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ -->
<xsl:stylesheet xmlns="http://www.w3.org/TR/REC-html40" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
Index: cutandpaste2.xsl
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/xsl/cswing/cutandpaste2.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cutandpaste2.xsl 26 Sep 2004 10:14:35 -0000 1.1
--- cutandpaste2.xsl 14 Aug 2005 16:06:14 -0000 1.2
***************
*** 1,3 ****
--- 1,33 ----
<?xml version="1.0"?>
+ <!--
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2005
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ -->
+ <!--
+ * Transforms OSIS to HTML for viewing within JSword browsers.
+ * Note: There are custom protocols which the browser must handle.
+ *
+ * @see gnu.lgpl.License for license details.
+ * The copyright to this program is held by it's authors.
+ * @author Joe Walker [joe at eireneh dot com]
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ -->
<xsl:stylesheet xmlns="http://www.w3.org/TR/REC-html40" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
Index: simple.xsl
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/xsl/cswing/simple.xsl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** simple.xsl 11 Aug 2005 21:09:27 -0000 1.25
--- simple.xsl 14 Aug 2005 16:06:14 -0000 1.26
***************
*** 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"
--- 1,34 ----
<?xml version="1.0"?>
! <!--
! * Distribution License:
! * JSword is free software; you can redistribute it and/or modify it under
! * the terms of the GNU Lesser General Public License, version 2.1 as published by
! * the Free Software Foundation. This program is distributed in the hope
! * that it will be useful, but WITHOUT ANY WARRANTY; without even the
! * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! * See the GNU Lesser General Public License for more details.
! *
! * The License is available on the internet at:
! * http://www.gnu.org/copyleft/lgpl.html
! * or by writing to:
! * Free Software Foundation, Inc.
! * 59 Temple Place - Suite 330
! * Boston, MA 02111-1307, USA
! *
! * Copyright: 2005
! * The copyright to this program is held by it's authors.
! *
! * ID: $Id$
! -->
! <!--
! * Transforms OSIS to HTML for viewing within JSword browsers.
! * Note: There are custom protocols which the browser must handle.
! *
! * @see gnu.lgpl.License for license details.
! * The copyright to this program is held by it's authors.
! * @author Joe Walker [joe at eireneh dot com]
! * @author DM Smith [dmsmith555 at yahoo dot com]
! -->
! <xsl:stylesheet
xmlns="http://www.w3.org/TR/REC-html40"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
***************
*** 83,86 ****
--- 113,119 ----
<xsl:variable name="fontspec" select="concat($fontfamily, $fontsize, $fontweight, $fontstyle)"/>
+ <!-- Create a global key factory from which OSIS ids will be generated -->
+ <xsl:variable name="keyf" select="jsword:org.crosswire.jsword.passage.PassageKeyFactory.instance()"/>
+
<!--=======================================================================-->
<xsl:template match="/osis">
***************
*** 197,201 ****
<!--=======================================================================-->
! <xsl:template match="verse">
<!-- If the verse don't start on their own line and -->
<!-- the verse is not the first verse of a set of siblings, -->
--- 230,235 ----
<!--=======================================================================-->
! <!-- Handle verses as containers and as a start verse. -->
! <xsl:template match="verse[not(@eID)]">
<!-- If the verse don't start on their own line and -->
<!-- the verse is not the first verse of a set of siblings, -->
***************
*** 225,231 ****
<!-- 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>
--- 259,277 ----
<!-- Are verse numbers wanted? -->
<xsl:if test="$NoVNum = 'false'">
! <!-- An osisID can be a space separated list of them -->
! <xsl:variable name="firstOsisID" select="substring-before(concat(@osisID, ' '), ' ')"/>
! <xsl:variable name="book" select="substring-before($firstOsisID, '.')"/>
! <xsl:variable name="chapter" select="substring-before(substring-after($firstOsisID, '.'), '.')"/>
! <!-- If n is present use it for the number -->
! <xsl:variable name="verse">
! <xsl:choose>
! <xsl:when test="@n">
! <xsl:value-of select="@n"/>
! </xsl:when>
! <xsl:otherwise>
! <xsl:value-of select="substring-after(substring-after($firstOsisID, '.'), '.')"/>
! </xsl:otherwise>
! </xsl:choose>
! </xsl:variable>
<xsl:variable name="versenum">
<xsl:choose>
***************
*** 265,271 ****
<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" />
--- 311,317 ----
<xsl:template match="verse" mode="print-notes">
<xsl:if test="./note">
! <xsl:variable name="passage" select="jsword:getValidKey($keyf, @osisID)"/>
! <a href="#{substring-before(concat(@osisID, ' '), ' ')}">
! <xsl:value-of select="jsword:getName($passage)"/>
</a>
<xsl:apply-templates select="./note" mode="print-notes" />
More information about the jsword-svn
mailing list