[sword-cvs] r34 - in trunk: app app/src/org/crosswire/modedit
lessons/mounce
Apache
apache at crosswire.org
Thu Sep 16 10:48:24 MST 2004
Author:
Date: 2004-09-16 10:48:24 -0700 (Thu, 16 Sep 2004)
New Revision: 34
Added:
trunk/lessons/mounce/Chapter08.flash
trunk/lessons/mounce/Chapter09.flash
Modified:
trunk/app/GNUmakefile
trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
trunk/app/src/org/crosswire/modedit/Ibycus4IM.java
trunk/lessons/mounce/Chapter06.flash
trunk/lessons/mounce/Chapter07.flash
Log:
- trunk/app/GNUmakefile, added -Xlint:all
- Ibycus4IM.java and Gtk2ClassicalGreekIM.java, minor
fixes
- Fixes for Chapter06.flash/Chapter07.flash
- New Chapter08.flash/Chapter09.flash
Modified: trunk/app/GNUmakefile
===================================================================
--- trunk/app/GNUmakefile 2004-09-16 02:52:37 UTC (rev 33)
+++ trunk/app/GNUmakefile 2004-09-16 17:48:24 UTC (rev 34)
@@ -35,7 +35,7 @@
classes : clean
@$(CHECK_CLASSES_DIRECTORY)
- $(JAVAC) -g -source 1.4 -d $(CLASSES_DIRECTORY) `find . -type f -name '*.java'`
+ $(JAVAC) -g -source 1.4 -Xlint:all -d $(CLASSES_DIRECTORY) `find . -type f -name '*.java'`
cd src ; \
tar cf - `find . -type f | egrep -v '\.svn'` | ( cd $(CLASSES_DIRECTORY) ; tar xf - )
cd .. ; \
Modified: trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java 2004-09-16 02:52:37 UTC (rev 33)
+++ trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java 2004-09-16 17:48:24 UTC (rev 34)
@@ -111,8 +111,18 @@
if( 'T' == getState( ) ) { returnValue.append( new char [ ] { 0x03a4 } ); }
else if( 't' == getState( ) ) { returnValue.append( new char [ ] { 0x03c4 } ); }
- returnValue.append( new String( ) + input );
+ String translation = ( String ) characterMap.get( new Integer( input ) );
+ if( null == translation ) {
+
+ returnValue.append( input );
+
+ } else {
+
+ returnValue.append( translation );
+
+ }
+
}
//System.out.println( "Returning : " + returnValue.toString( ) );
Modified: trunk/app/src/org/crosswire/modedit/Ibycus4IM.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/Ibycus4IM.java 2004-09-16 02:52:37 UTC (rev 33)
+++ trunk/app/src/org/crosswire/modedit/Ibycus4IM.java 2004-09-16 17:48:24 UTC (rev 34)
@@ -93,10 +93,38 @@
char inputUpper = Character.toUpperCase( input );
StringBuffer returnValue = new StringBuffer( );
- //System.out.println( "state=" + getState( ) + " input=" + input + " inputUpper=" + inputUpper );
+ //System.out.println( "state=" + getState( ) +
+ // " input=" + Integer.toHexString( ( int ) input ) );
- if( 0 < getState( ) ) {
+ if( 0 == getState( ) ) {
+ if( ( 'S' == inputUpper ) ) {
+
+ // Sigma
+ setState( input );
+
+ } else {
+
+ String translation = ( String ) characterMap.get( new Integer( input ) );
+
+ if( null == translation ) {
+
+ returnValue.append( input );
+
+ } else {
+
+ returnValue.append( translation );
+
+ }
+
+ //System.out.println( "Returning : " + returnValue.toString( ) );
+ setState( 0 );
+ return returnValue.toString( );
+
+ }
+
+ } else {
+
// Second character of a multi-character sequence
if( ( 's' == getState( ) ) || ( 'S' == getState( ) ) ) {
@@ -144,36 +172,6 @@
}
- } else {
-
- // A new start
-
- // Handle sigma
-
- if( ( 'S' == inputUpper ) ) {
-
- setState( input );
-
- } else {
-
- String translation = ( String ) characterMap.get( new Integer( input ) );
-
- if( null == translation ) {
-
- returnValue.append( input );
-
- } else {
-
- returnValue.append( translation );
-
- }
-
- //System.out.println( "Returning : " + returnValue.toString( ) );
- setState( 0 );
- return returnValue.toString( );
-
- }
-
}
return null;
@@ -218,8 +216,8 @@
characterMap.put( new Integer( 'P' ), new String( new char [ ] { 0x03a0 } ) );
characterMap.put( new Integer( 'r' ), new String( new char [ ] { 0x03c1 } ) );
characterMap.put( new Integer( 'R' ), new String( new char [ ] { 0x03a1 } ) );
- characterMap.put( new Integer( 't' ), new String( new char [ ] { 0x03c3 } ) );
- characterMap.put( new Integer( 'T' ), new String( new char [ ] { 0x03a3 } ) );
+ characterMap.put( new Integer( 't' ), new String( new char [ ] { 0x03c4 } ) );
+ characterMap.put( new Integer( 'T' ), new String( new char [ ] { 0x03a4 } ) );
characterMap.put( new Integer( 'u' ), new String( new char [ ] { 0x03c5 } ) );
characterMap.put( new Integer( 'U' ), new String( new char [ ] { 0x03a5 } ) );
characterMap.put( new Integer( 'f' ), new String( new char [ ] { 0x03c6 } ) );
Modified: trunk/lessons/mounce/Chapter06.flash
===================================================================
--- trunk/lessons/mounce/Chapter06.flash 2004-09-16 02:52:37 UTC (rev 33)
+++ trunk/lessons/mounce/Chapter06.flash 2004-09-16 17:48:24 UTC (rev 34)
@@ -1,5 +1,5 @@
#Flash Lesson
-#Wed Sep 15 17:10:04 CDT 2004
+#Thu Sep 16 12:49:25 CDT 2004
word13=\u03BF\u0314\u0313\u03C4\u03B9
word1=\u03B1\u0313\u0301\u03BB\u03BB\u03BF\u03C2,\u03B7,\u03BF
word12=\u03BF\u0314,\u03B7\u0314,\u03C4\u03BF\u0301
@@ -19,19 +19,19 @@
answers5=I am,exist,live,am present
answers4=but,and
answers3=kingdom
-answers2=sg. he,she,it pl. they
wordCount=16
+answers2=he/she/it,they
answers1=other,another
answers0=love
word9=\u03B7\u0313\u0311\u03BD
+word8=\u03B5\u0313\u03C3\u03C4\u03B9\u0301\u03BD
lessonTitle=Chapter 6
-word8=\u03B5\u0313\u03C3\u03C4\u03B9\u0301\u03BD
word7=\u03B5\u0313\u0301\u03C1\u03B3\u03BF\u03BD,\u03BF\u03C5,\u03C4\u03BF\u0301
word6=\u03B5\u0313\u03BD
word5=\u03B5\u03B9\u0313\u03BC\u03B9\u0301
+word4=\u03B4\u03B5\u0301
fileName=Chapter06.flash
-word4=\u03B4\u03B5\u0301
+word15=\u03C9\u0314\u0301\u03C1\u03B1,\u03B1\u03C2,\u03B7\u0314
word3=\u03B2\u03B1\u03C3\u03B9\u03BB\u03B5\u03B9\u0301\u03B1,\u03B1\u03C2,\u03B7\u0314
-word15=\u03C9\u0314\u0301\u03C1\u03B1,\u03B1\u03C2,\u03B7\u0314
+word14=\u03BF\u03C5\u0313,\u03BF\u03C5\u0313\u03BA,\u03BF\u03C5\u0313\u03C7
word2=\u03B1\u03C5\u0313\u03C4\u03BF\u0301\u03C2,\u03B7\u0301,\u03BF\u0301
-word14=\u03BF\u03C5\u0313,\u03BF\u03C5\u0313\u03BA,\u03BF\u03C5\u0313\u03C7
Modified: trunk/lessons/mounce/Chapter07.flash
===================================================================
--- trunk/lessons/mounce/Chapter07.flash 2004-09-16 02:52:37 UTC (rev 33)
+++ trunk/lessons/mounce/Chapter07.flash 2004-09-16 17:48:24 UTC (rev 34)
@@ -1,5 +1,5 @@
#Flash Lesson
-#Wed Sep 15 20:59:40 CDT 2004
+#Thu Sep 16 12:48:38 CDT 2004
fileName=Chapter07.flash
lessonTitle=Chapter 7
word9=\u0399\u0313\u03B7\u03C3\u03BF\u03C5\u0311\u03C2,\u03BF\u03C5\u0311,\u03BF\u0314
@@ -15,7 +15,7 @@
word16=\u03C9\u0313\u0301\u03C3\u03C4e
word15=\u03C5\u03B9\u0314\u03BF\u03C2,\u03BF\u03C5\u0311,\u03BF\u0314
word14=\u03C3\u03C5\u0301
-word13=\u03BF\u03C5\u0314\u0311\u03C4o\u03C2
+word13=\u03BF\u03C5\u0314\u0311\u03C4o\u03C2,\u03B1\u03C5\u0314\u0301\u03C4\u03B7,\u03C4\u03BF\u03C5\u0311\u03C4\u03BF
word12=\u03BF\u03C5\u0313\u03C1\u03B1\u03BD\u03BF\u0301\u03C2,\u03BF\u03C5\u0311,\u03BF\u0314
word11=\u03BC\u03B7\u0301
word10=\u03BA\u03C5\u0301\u03C1\u03B9\u03BF\u03C2,\u03BF\u03C5,\u03BF\u0314
@@ -33,7 +33,7 @@
answers16=therefore,so that
answers15=son,descendant
answers14=you sg.
-answers13=sg. this pl. these
+answers13=this,these
answers12=heaven,sky
answers11=not,lest
answers10=Lord,lord,master,sir
Added: trunk/lessons/mounce/Chapter08.flash
===================================================================
--- trunk/lessons/mounce/Chapter08.flash 2004-09-16 02:52:37 UTC (rev 33)
+++ trunk/lessons/mounce/Chapter08.flash 2004-09-16 17:48:24 UTC (rev 34)
@@ -0,0 +1,51 @@
+#Flash Lesson
+#Thu Sep 16 12:33:11 CDT 2004
+word22=\u03C5\u0314\u03C0\u03BF\u0301,\u03C5\u0314\u03C0',\u03C5\u0314\u03C6' acc.
+word21=\u03C0\u03C1\u03BF\u0301\u03C2 acc.
+word20=\u03C0\u03B1\u03C1\u03B1\u0301,\u03C0\u03B1\u03C1' acc.
+fileName=Chapter08.flash
+lessonTitle=Chapter 8
+word9=\u03BB\u03B5\u0301\u03B3\u03C9
+word8=\u0399\u0314\u03C9\u03B1\u0301\u03BD\u03BD\u03B7\u03C2,\u03BF\u03C5,\u03BF\u0314
+word7=\u03B9\u0314\u0301\u03BD\u03B1
+word6=\u03B8\u03B1\u0301\u03BD\u03B1\u03C3\u03BF\u03C2,\u03BF\u03C5,\u03BF\u0314
+word5=\u03B8\u03B1\u0301\u03BB\u03B1\u03C3\u03C3\u03B1,\u03B7\u03C2,\u03B7\u0314
+word4=\u03B7\u0314\u03BC\u03B5\u0301\u03C1\u03B1,\u03B1\u03C2,\u03B7\u0314
+answers22=under
+word3=\u03B5\u0313\u03BA,\u03B5\u0313\u03BE gen.
+answers21=to,towards,with
+word2=\u03B4\u03B9\u03B1\u0301,\u03B4\u03B9' gen.
+answers20=alongside of
+word1=\u03B1\u0313\u03C0\u03BF,\u03B1\u0313\u03C0',\u03B1\u0313\u03C6' gen.
+word19=\u03C0\u03B1\u03C1\u03B1\u0301,\u03C0\u03B1\u03C1' dat.
+word0=\u03B1\u0313\u03BB\u03BB\u03B1
+word18=\u03BC\u03B5\u03C4\u03B1\u0301,\u03BC\u03B5\u03C4',\u03BC\u03B5\u03B8' acc.
+word17=\u03B4\u03B9\u03B1\u0301,\u03B4\u03B9' acc.
+word16=\u03C5\u0314\u03C0\u03BF\u0301,\u03C5\u0314\u03C0',\u03C5\u0314\u03C6' gen.
+word15=\u03C0\u03B1\u03C1\u03B1\u03B2\u03BF\u03BB\u03B7\u0301,\u03B7\u0311\u03C2,\u03B7\u0314
+word14=\u03C0\u03B1\u03C1\u03B1\u0301,\u03C0\u03B1\u03C1' gen.
+word13=\u03BF\u0313\u0301\u03C7\u03BB\u03BF\u03C2,\u03BF\u03C5,\u03BF\u0314
+word12=\u03BF\u03B9\u0313\u0311\u03BA\u03BF\u03C2,\u03BF\u03C5,\u03BF\u0314
+word11=\u03BF\u03B9\u0313\u03BA\u03B9\u0301\u03B1,\u03B1\u03C2,\u03B7\u0314
+word10=\u03BC\u03B5\u03C4\u03B1\u0301,\u03BC\u03B5\u03C4',\u03BC\u03B5\u03B8' gen.
+answers9=I say,speak
+answers8=John
+answers7=in order that,that
+answers6=death
+answers5=sea,lake
+answers4=day
+answers3=from,out of
+answers2=through
+wordCount=23
+answers1=(away) from
+answers0=but,yet,except
+answers19=beside,in the presence of
+answers18=after
+answers17=on account of
+answers16=by
+answers15=parable
+answers14=from
+answers13=crowd,multitude
+answers12=house,home
+answers11=house,home
+answers10=with
Added: trunk/lessons/mounce/Chapter09.flash
===================================================================
--- trunk/lessons/mounce/Chapter09.flash 2004-09-16 02:52:37 UTC (rev 33)
+++ trunk/lessons/mounce/Chapter09.flash 2004-09-16 17:48:24 UTC (rev 34)
@@ -0,0 +1,41 @@
+#Flash Lesson
+#Thu Sep 16 12:46:35 CDT 2004
+fileName=Chapter09.flash
+lessonTitle=Chapter 9
+word9=\u03BA\u03B1\u03B8\u03C9\u0301\u03C2
+word8=\u03B5\u0313\u03BD\u03C4o\u03BB\u03B7\u0301,\u03B7\u0311\u03C2,\u03B7\u0314
+word7=\u03B5\u0313\u03BC\u03BF\u0301\u03C2,\u03B5\u0313\u03BC\u03B7\u0301,\u03B5\u0313\u03BC\u03BF\u0301\u03BD
+word6=\u03B5\u0313\u03B1\u0301\u03BD
+word5=\u03B4\u03BF\u03C5\u0311\u03BB\u03BF\u03C2,\u03BF\u03C5,\u03BF\u0314
+word4=\u03B1\u0313\u03C0\u03B5\u03BA\u03C1\u03B9\u0301\u03B8\u03B7
+word3=\u03B1\u0313\u03BB\u03BB\u03B7\u0301\u03BB\u03C9\u03BD
+word2=\u03B1\u03B9\u0313\u03C9\u0301\u03BD\u03B9\u03BF\u03C2,\u03BF\u03BD
+word1=\u03B1\u0313\u03B3\u03B1\u03C0\u03B7\u03C4o\u0301\u03C2,\u03B7\u0301,\u03BF\u0301\u03BD
+word0=\u03B1\u0313\u03B3\u03B1\u03B8\u03BF\u0301\u03C2,\u03B7\u0301,\u03BF\u0301\u03BD
+word17=\u03C4\u03C1\u03B9\u0301\u03C4\u03BF\u03C2,\u03B7,\u03BF\u03BD
+word16=\u03C0\u03C1\u03C9\u0311\u03C4o\u03C2,\u03B7,\u03BF\u03BD
+word15=\u03C0\u03BF\u03BD\u03B7\u03C1\u03BF\u0301\u03C2,\u03B1\u0301,\u03BF\u0301\u03BD
+word14=\u03C0\u03B9\u03C3\u03C4o\u0301\u03C2,\u03B7\u0301,\u03BF\u0301\u03BD
+word13=\u03BD\u03B5\u03BA\u03C1\u0301\u03C2,\u03B1\u0301,\u03BF\u0301\u03BD n.
+word12=\u03BD\u03B5\u03BA\u03C1\u03BF\u0301\u03C2,\u03B1\u0301,\u03BF\u0301\u03BD adj.
+word11=\u03BC\u03BF\u03C5,\u03B5\u0313\u03BC\u03BF\u03C5\u0311
+word10=\u03BA\u03B1\u03BA\u03BF\u0301\u03C2,\u03B7\u0301,\u03BF\u0301\u03BD
+answers9=as,even as
+answers8=commandment
+answers7=my,mine
+answers6=if,when,introduces a dependent clause
+answers5=slave,servant
+answers4=he/she/it answered
+answers3=one another
+answers2=eternal
+wordCount=18
+answers1=beloved
+answers0=good,useful
+answers17=third
+answers16=first,earlier
+answers15=evil,bad
+answers14=faithful,believing
+answers13=dead body,corpse
+answers12=dead
+answers11=my
+answers10=bad,evil
More information about the sword-cvs
mailing list