[jsword-svn]
jsword/java/jsword/org/crosswire/jsword/book/filter/gbf s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Wed Apr 13 18:27:45 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf
In directory www.crosswire.org:/tmp/cvs-serv24715/java/jsword/org/crosswire/jsword/book/filter/gbf
Modified Files:
ParagraphTagBuilder.java JustifyTagBuilder.java
PoetryTagBuilder.java CrossRefTagBuilder.java
TextTagBuilder.java PsalmTitleTagBuilder.java
IgnoredTagBuilder.java ItalicTagBuilder.java
HeaderTagBuilder.java EndOfLineTagBuilder.java
Log Message:
Fixed an extraneous diagnostic in GBFFilter. Cleaned up docs in it
Changed Latin1 from IS08859-1 to Windows 1252 because Sword mods use it.
Optimized converting unsigned byte to int in SwordUtil.
Index: HeaderTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/HeaderTagBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HeaderTagBuilder.java 30 Aug 2004 09:27:07 -0000 1.5
--- HeaderTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.6
***************
*** 7,11 ****
/**
! * Handle Footnotes: FR and Fr.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 7,11 ----
/**
! * Handle Headers: TS and Ts.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
Index: EndOfLineTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/EndOfLineTagBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EndOfLineTagBuilder.java 11 May 2004 23:54:19 -0000 1.3
--- EndOfLineTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.4
***************
*** 7,11 ****
/**
! * Represent a trunc of bible text without any tags.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 7,11 ----
/**
! * End of Line: CL
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
***************
*** 46,53 ****
public void updateOsisStack(LinkedList stack)
{
- Element p = OSISUtil.factory().createP();
if (stack.size() == 0)
{
stack.addFirst(p);
// log.warn("failing to add to element on empty stack");
--- 46,53 ----
public void updateOsisStack(LinkedList stack)
{
if (stack.size() == 0)
{
+ Element p = OSISUtil.factory().createLB();
stack.addFirst(p);
// log.warn("failing to add to element on empty stack");
***************
*** 55,58 ****
--- 55,59 ----
else
{
+ Element p = OSISUtil.factory().createP();
Element ele = (Element) stack.get(0);
ele.addContent(p);
Index: TextTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/TextTagBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TextTagBuilder.java 11 May 2004 23:54:19 -0000 1.3
--- TextTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.4
***************
*** 43,47 ****
{
stack.addFirst(name);
- // log.warn("failing to add to element on empty stack");
}
else
--- 43,46 ----
Index: ParagraphTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/ParagraphTagBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ParagraphTagBuilder.java 11 May 2004 23:54:19 -0000 1.4
--- ParagraphTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.5
***************
*** 3,7 ****
import java.util.LinkedList;
- import org.crosswire.jsword.book.DataPolice;
import org.crosswire.jsword.book.OSISUtil;
import org.jdom.Element;
--- 3,6 ----
***************
*** 50,62 ****
public void updateOsisStack(LinkedList stack)
{
- Element p = OSISUtil.factory().createP();
if (stack.size() == 0)
{
stack.addFirst(p);
- DataPolice.report("failing to add to element on empty stack"); //$NON-NLS-1$
}
else
{
Element ele = (Element) stack.get(0);
ele.addContent(p);
--- 49,61 ----
public void updateOsisStack(LinkedList stack)
{
if (stack.size() == 0)
{
+ Element p = OSISUtil.factory().createLB();
stack.addFirst(p);
}
else
{
+ Element p = OSISUtil.factory().createP();
Element ele = (Element) stack.get(0);
ele.addContent(p);
Index: PsalmTitleTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/PsalmTitleTagBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PsalmTitleTagBuilder.java 30 Aug 2004 09:27:07 -0000 1.5
--- PsalmTitleTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.6
***************
*** 7,11 ****
/**
! * Handle Footnotes: FR and Fr.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 7,11 ----
/**
! * Handle Psalm Titles: TB and Tb.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
Index: JustifyTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/JustifyTagBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JustifyTagBuilder.java 21 Sep 2004 17:46:24 -0000 1.7
--- JustifyTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.8
***************
*** 7,11 ****
/**
! * Handle Footnotes: FR and Fr.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 7,11 ----
/**
! * Handle Justification: JR and JL.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
***************
*** 60,64 ****
public void updateOsisStack(LinkedList stack)
{
- stack.removeFirst();
}
};
--- 60,63 ----
Index: CrossRefTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/CrossRefTagBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CrossRefTagBuilder.java 16 Aug 2004 22:08:44 -0000 1.8
--- CrossRefTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.9
***************
*** 12,16 ****
/**
! * Handle Footnotes: FR and Fr.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 12,16 ----
/**
! * Handle Cross References: RX and Rx.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
Index: ItalicTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/ItalicTagBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ItalicTagBuilder.java 1 Apr 2005 17:09:46 -0000 1.8
--- ItalicTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.9
***************
*** 7,11 ****
/**
! * Handle Footnotes: FI and Fi.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 7,11 ----
/**
! * Handle Italic: FI and Fi.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
Index: PoetryTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/PoetryTagBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PoetryTagBuilder.java 30 Aug 2004 09:27:07 -0000 1.6
--- PoetryTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.7
***************
*** 7,11 ****
/**
! * Handle Footnotes: FR and Fr.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 7,11 ----
/**
! * Handle Poetry: PP and Pp.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
***************
*** 44,48 ****
{
// LATER(joe): is speech the right thing?
! Element speech = OSISUtil.factory().createSpeech();
Element current = (Element) stack.get(0);
--- 44,48 ----
{
// LATER(joe): is speech the right thing?
! Element speech = OSISUtil.factory().createLG();
Element current = (Element) stack.get(0);
Index: IgnoredTagBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/IgnoredTagBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IgnoredTagBuilder.java 10 Apr 2004 10:11:02 -0000 1.3
--- IgnoredTagBuilder.java 14 Apr 2005 01:27:42 -0000 1.4
***************
*** 4,8 ****
/**
! * Represent a trunc of bible text without any tags.
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 4,8 ----
/**
! * Body Tags (that are ignored): BA, BC, BI, BN, BO, BP
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
More information about the jsword-svn
mailing list