[sword-cvs] swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse Parser.java, 1.4, 1.5 Words.java, 1.2, 1.3

[sword at www.crosswire.org]

Committed by: mgruner

Update of /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse
In directory www:/tmp/cvs-serv14129/WLC2OSIS/Parse

Modified Files:
	Parser.java Words.java 
Log Message:
mgruner: further updates to the WLC converter


Index: Parser.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Parser.java	7 Jun 2004 19:24:49 -0000	1.4
+++ Parser.java	10 Jun 2004 12:00:19 -0000	1.5
@@ -75,6 +75,7 @@
     m = new Markers(A, this) ;
     wkq = new WKQ(this) ;
     new MC() ;
+    Note.setNotes();
     }    
 //------------------------------------------------------------------------------
 

Index: Words.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Words.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Words.java	7 Jun 2004 19:32:21 -0000	1.2
+++ Words.java	10 Jun 2004 12:00:19 -0000	1.3
@@ -96,7 +96,7 @@
 //----------------------------------------------------------------------------------
 
 public void writeWord(String Word, String Type) {
-        
+
 // Check for any exception markers ]x 
    
    String Out = "" ;
@@ -106,15 +106,29 @@
            k++ ;
            char ExceptionValue = Word.charAt(k) ;
            Out = Out + "<x>" + ExceptionValue +"</x>" ;
+	   System.out.println("Exception occured");
            }
        else{
            Out = Out + c ;
            }
        }
-// MG: HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + " "       
-    A.w.writeString(Type, 4, Out + " ") ;
+       
+    if (Type.charAt(0) == 'w') {
+        A.w.appendText(Out + " ") ;
+    }
+    else if (Type.charAt(0) == 'k') {
+        A.w.appendText("["+ Out + " " + H.kaf + "] ") ;
+    }
+    else if (Type.charAt(0) == 'q') {
+        A.w.appendText("(" + Out + " " + H.qof+ ") ") ;
+    }
+    else {
+        System.out.println("Warning: unknown word type!");
+	P.printPosition();
+    }
     P.MarkerWritten = false ;
     }
 }
+
 //==============================================================================
 //==============================================================================