[sword-cvs] r20 - trunk/app/src/org/crosswire/modedit

[Apache]

Author: 
Date: 2004-09-10 19:47:13 -0700 (Fri, 10 Sep 2004)
New Revision: 20

Modified:
   trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
Log:
- Added the rest of the vowels for consideration
  when adding a breathing...


Modified: trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java	2004-09-10 03:25:29 UTC (rev 19)
+++ trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java	2004-09-11 02:47:13 UTC (rev 20)
@@ -2,7 +2,7 @@
 //
 // Gtk2ClassicalGreekIM.java
 //
-// Input Method to match the Emacs cgreek package.
+// Input Method to match GTK2's im-classasicalgreek.
 //
 // Copyright : 2004 CrossWire Bible Society http://crosswire.org
 //
@@ -166,10 +166,15 @@
 
             } else if( ( 'j' == getState( ) ) || ( 'j' == getState( ) ) ) {
 
+                // Smooth Breathing
+
                 returnValue.append( characterMap.get( new Integer( input ) ) );
 
                 if( ( 'A' == inputUpper ) ||
+                    ( 'E' == inputUpper ) ||
                     ( 'Q' == inputUpper ) ||
+                    ( 'I' == inputUpper ) ||
+                    ( 'O' == inputUpper ) ||
                     ( 'W' == inputUpper ) ) {
 
                     returnValue.append( new char [ ] { 0x0313 } );
@@ -182,10 +187,15 @@
 
             } else if( ( 'h' == getState( ) ) || ( 'H' == getState( ) ) ) {
 
+                // Rough Breathing
+
                 returnValue.append( characterMap.get( new Integer( input ) ) );
 
                 if( ( 'A' == inputUpper ) ||
+                    ( 'E' == inputUpper ) ||
                     ( 'Q' == inputUpper ) ||
+                    ( 'I' == inputUpper ) ||
+                    ( 'O' == inputUpper ) ||
                     ( 'W' == inputUpper ) ) {
 
                     returnValue.append( new char [ ] { 0x0314 } );
@@ -196,6 +206,12 @@
                 setState( 0 );
                 return returnValue.toString( );
 
+            } else {
+
+                // Something is WRONG!  The current state is NOT valid...
+                setState( 0 );
+                return null;
+
             }
 
         } else {