[jsword-svn] r1174 - in trunk: bibledesktop/etc/installer/win32 bibledesktop-web/src/web/stable jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/filter/thml
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sat Oct 21 17:45:45 MST 2006
Author: dmsmith
Date: 2006-10-21 17:44:33 -0700 (Sat, 21 Oct 2006)
New Revision: 1174
Added:
trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/BigTag.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/TtTag.java
Removed:
trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.exe
Modified:
trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/AnonymousTag.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/IgnoreTag.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SmallTag.java
Log:
Fixed a ThML bug
Built the Win32 installer
Deleted: trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.exe
===================================================================
(Binary files differ)
Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi 2006-10-22 00:44:33 UTC (rev 1174)
@@ -2,7 +2,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0.4"
+!define PRODUCT_VERSION "1.0.5"
!define PRODUCT_PUBLISHER "Crosswire Bible Society"
!define PRODUCT_WEB_SITE "http://www.crosswire.org/bibledesktop/index.html"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
Added: trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java 2006-10-22 00:44:33 UTC (rev 1174)
@@ -111,16 +111,36 @@
public static final String HI_X_CAPS = "x-caps"; //$NON-NLS-1$
/**
+ * Constant for rendering big text
+ */
+ public static final String HI_X_BIG = "x-big"; //$NON-NLS-1$
+
+ /**
+ * Constant for rendering small text
+ */
+ public static final String HI_X_SMALL = "x-small"; //$NON-NLS-1$
+
+ /**
+ * Constant for rendering tt text
+ */
+ public static final String HI_X_TT = "x-tt"; //$NON-NLS-1$
+
+ /**
* Constant to help narrow down what we use seg for. In this case the justify right tag
*/
public static final String SEG_JUSTIFYRIGHT = "text-align: right;"; //$NON-NLS-1$
/**
- * Constant to help narrow down what we use seg for. In this case the justify right tag
+ * Constant to help narrow down what we use seg for. In this case the thml center tag
*/
public static final String SEG_CENTER = "text-align: center;"; //$NON-NLS-1$
/**
+ * Constant to help narrow down what we use div for. In this case the thml pre tag
+ */
+ public static final String DIV_PRE = "x-pre"; //$NON-NLS-1$
+
+ /**
* Constant to help narrow down what we use seg for. In this case the color tag
*/
public static final String SEG_COLORPREFIX = "color: "; //$NON-NLS-1$
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/AnonymousTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/AnonymousTag.java 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/AnonymousTag.java 2006-10-22 00:44:33 UTC (rev 1174)
@@ -31,7 +31,7 @@
*
* @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]
*/
public class AnonymousTag extends AbstractTag
{
Added: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/BigTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/BigTag.java 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/BigTag.java 2006-10-22 00:44:33 UTC (rev 1174)
@@ -0,0 +1,56 @@
+/**
+ * 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: CenterTag.java 1068 2006-04-07 22:20:41 -0400 (Fri, 07 Apr 2006) dmsmith $
+ */
+package org.crosswire.jsword.book.filter.thml;
+
+import org.crosswire.jsword.book.OSISUtil;
+import org.jdom.Element;
+import org.xml.sax.Attributes;
+
+/**
+ * THML Tag to process the center element.
+ *
+ * @see gnu.lgpl.License for license details.
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class BigTag extends AbstractTag
+{
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.filter.thml.Tag#getTagName()
+ */
+ public String getTagName()
+ {
+ return "big"; //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.filter.thml.Tag#processTag(org.jdom.Element, org.xml.sax.Attributes)
+ */
+ /* @Override */
+ public Element processTag(Element ele, Attributes attrs)
+ {
+ Element hiEle = OSISUtil.factory().createHI();
+ hiEle.setAttribute(OSISUtil.OSIS_ATTR_TYPE, OSISUtil.HI_X_BIG);
+ ele.addContent(hiEle);
+ return hiEle;
+ }
+}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/CustomHandler.java 2006-10-22 00:44:33 UTC (rev 1174)
@@ -190,8 +190,10 @@
new BlockquoteTag(),
new BrTag(),
new BTag(),
+ new BigTag(),
new CenterTag(),
new CitationTag(),
+ new ColTag(),
new DivTag(),
new ForeignTag(),
new FontTag(),
@@ -205,6 +207,7 @@
new PTag(),
new PbTag(),
new RootTag(),
+ new RowTag(),
new ScriptureTag(),
new ScripRefTag(),
new SmallTag(),
@@ -212,14 +215,15 @@
new SupTag(),
new SyncTag(),
new TableTag(),
- new RowTag(),
- new ColTag(),
new TdTag(),
new TermTag(),
new ThTag(),
new TrTag(),
+ new TtTag(),
new UTag(),
new UlTag(),
+ new AliasTag("em", new ITag()), //$NON-NLS-1$
+ new AliasTag("strong", new BTag()), //$NON-NLS-1$
new AliasTag("h1", new BTag()), //$NON-NLS-1$
new AliasTag("h2", new BTag()), //$NON-NLS-1$
new AliasTag("h3", new BTag()), //$NON-NLS-1$
@@ -313,7 +317,6 @@
new AnonymousTag("point16"), //$NON-NLS-1$
new AnonymousTag("point18"), //$NON-NLS-1$
new AnonymousTag("point20"), //$NON-NLS-1$
- new AnonymousTag("tt"), //$NON-NLS-1$
new AnonymousTag("hw"), //$NON-NLS-1$
};
for (int i = 0; i < tags.length; i++)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/IgnoreTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/IgnoreTag.java 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/IgnoreTag.java 2006-10-22 00:44:33 UTC (rev 1174)
@@ -23,7 +23,7 @@
/**
- * THML Tag to process the pb element.
+ * THML Tag to process the content of an element but to ignore the tag itself.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SmallTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SmallTag.java 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SmallTag.java 2006-10-22 00:44:33 UTC (rev 1174)
@@ -49,7 +49,7 @@
public Element processTag(Element ele, Attributes attrs)
{
Element hi = OSISUtil.factory().createHI();
- hi.setAttribute(OSISUtil.OSIS_ATTR_TYPE, OSISUtil.HI_SMALL_CAPS);
+ hi.setAttribute(OSISUtil.OSIS_ATTR_TYPE, OSISUtil.HI_X_SMALL);
ele.addContent(hi);
return hi;
}
Added: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/TtTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/TtTag.java 2006-10-21 02:57:52 UTC (rev 1173)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/TtTag.java 2006-10-22 00:44:33 UTC (rev 1174)
@@ -0,0 +1,56 @@
+/**
+ * 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: SmallTag.java 1113 2006-08-01 12:17:46 +0000 (Tue, 01 Aug 2006) dmsmith $
+ */
+package org.crosswire.jsword.book.filter.thml;
+
+import org.crosswire.jsword.book.OSISUtil;
+import org.jdom.Element;
+import org.xml.sax.Attributes;
+
+/**
+ * THML Tag to process the tt (tele-type) element.
+ *
+ * @see gnu.lgpl.License for license details.
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class TtTag extends AbstractTag
+{
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.filter.thml.Tag#getTagName()
+ */
+ public String getTagName()
+ {
+ return "tt"; //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.filter.thml.Tag#processTag(org.jdom.Element, org.xml.sax.Attributes)
+ */
+ /* @Override */
+ public Element processTag(Element ele, Attributes attrs)
+ {
+ Element hi = OSISUtil.factory().createHI();
+ hi.setAttribute(OSISUtil.OSIS_ATTR_TYPE, OSISUtil.HI_X_TT);
+ ele.addContent(hi);
+ return hi;
+ }
+}
More information about the jsword-svn
mailing list