[sword-cvs] r32 - in trunk: app/src/org/crosswire/modedit lessons/mounce

[Apache]

Author: 
Date: 2004-09-15 18:56:53 -0700 (Wed, 15 Sep 2004)
New Revision: 32

Added:
   trunk/lessons/mounce/Chapter07.flash
Modified:
   trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
Log:
- Gtk2ClassicalGreekIM.java, minor fixes.
- Chapter07.flash, Mounce vocabulary for Chapter 7.


Modified: trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java	2004-09-15 23:26:04 UTC (rev 31)
+++ trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java	2004-09-16 01:56:53 UTC (rev 32)
@@ -123,6 +123,7 @@
 
                 // ph => phi
                 // Ph,PH => Phi
+                // anything else => pi or Pi
 
                 if( 'H' == inputUpper ) {
 
@@ -135,8 +136,18 @@
 
                     if( 'P' == getState( ) ) { returnValue.append( new char [ ] { 0x03a0 } ); }
                     else if( 'p' == getState( ) ) { returnValue.append( new char [ ] { 0x03c0 } ); }
-                    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( ) );
@@ -157,14 +168,25 @@
                 } else {
 
                     returnValue.append( new char [ ] { 0x03c2 } );
+                    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 if( ( 'j' == getState( ) ) || ( 'j' == getState( ) ) ) {
+            } else if( ( 'j' == getState( ) ) || ( 'J' == getState( ) ) ) {
 
                 // Smooth Breathing
 
@@ -175,6 +197,7 @@
                     ( 'Q' == inputUpper ) ||
                     ( 'I' == inputUpper ) ||
                     ( 'O' == inputUpper ) ||
+                    ( 'U' == inputUpper ) ||
                     ( 'W' == inputUpper ) ) {
 
                     returnValue.append( new char [ ] { 0x0313 } );
@@ -196,6 +219,7 @@
                     ( 'Q' == inputUpper ) ||
                     ( 'I' == inputUpper ) ||
                     ( 'O' == inputUpper ) ||
+                    ( 'U' == inputUpper ) ||
                     ( 'W' == inputUpper ) ) {
 
                     returnValue.append( new char [ ] { 0x0314 } );
@@ -242,7 +266,7 @@
 
                 }
 
-                System.out.println( "Returning : " + returnValue.toString( ) );
+                //System.out.println( "Returning : " + returnValue.toString( ) );
                 setState( 0 );
                 return returnValue.toString( );
 

Added: trunk/lessons/mounce/Chapter07.flash
===================================================================
--- trunk/lessons/mounce/Chapter07.flash	2004-09-15 23:26:04 UTC (rev 31)
+++ trunk/lessons/mounce/Chapter07.flash	2004-09-16 01:56:53 UTC (rev 32)
@@ -0,0 +1,39 @@
+#Flash Lesson
+#Wed Sep 15 20:59:40 CDT 2004
+fileName=Chapter07.flash
+lessonTitle=Chapter 7
+word9=\u0399\u0313\u03B7\u03C3\u03BF\u03C5\u0311\u03C2,\u03BF\u03C5\u0311,\u03BF\u0314
+word8=\u03B5\u03C5\u0313\u03B1\u03B3\u03B3\u03B5\u0301\u03BB\u03B9\u03BF\u03BD,\u03BF\u03C5,\u03C4o\u0301
+word7=\u03B5\u0313\u03BE\u03BF\u03C5\u03C3\u03B9\u0301\u03B1,\u03B1\u03C2,\u03B7\u0314
+word6=\u03B5\u03B9\u0313\u03C3\u03B9\u0301\u03BD
+word5=\u03B5\u03B9\u0313\u03C2
+word4=\u03B5\u03B9\u0313\u0311\u03C0\u03B5\u03BD
+word3=\u03B5\u03B9\u0313\u0311
+word2=\u03B3\u03B1\u0301\u03C1
+word1=\u03B1\u0313\u03C1\u03C7\u03B7\u0301,\u03B7\u0311\u03C2,\u03B7\u0314
+word0=\u03B1\u0313\u03BC\u03B1\u03C1\u03C4\u03B9\u0301\u03B1,\u03B1\u03C2,\u03B7\u0314
+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
+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
+answers9=Jesus,Joshua
+answers8=good news,Gospel
+answers7=authority,power
+answers6=they are
+answers5=into,in,among
+answers4=he/she/it said
+answers3=you are
+answers2=for,then
+wordCount=17
+answers1=beginning,ruler
+answers0=sin
+answers16=therefore,so that
+answers15=son,descendant
+answers14=you sg.
+answers13=sg. this pl. these
+answers12=heaven,sky
+answers11=not,lest
+answers10=Lord,lord,master,sir