summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMartin Gruner <mg.pub@gmx.net>2004-06-05 17:08:57 +0000
committerMartin Gruner <mg.pub@gmx.net>2004-06-05 17:08:57 +0000
commitb7f97a267028fc22c7484861b0533ab30e923998 (patch)
tree61c633161d69230a8e70096ab19d961ebc5ec335 /modules
parent9cf2798126c922f61a6e91431478fd6246d6bc7a (diff)
downloadsword-tools-b7f97a267028fc22c7484861b0533ab30e923998.tar.gz
mgruner: converter generates something that looks like OSIS now.
git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@19 07627401-56e2-0310-80f4-f8cd0041bdcd
Diffstat (limited to 'modules')
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/GUI/Messages.java27
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java31
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Chapters.java14
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java18
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java15
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Header.java65
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Index.java71
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/Test.java3
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/XMLWriter.java40
-rw-r--r--modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java1
10 files changed, 125 insertions, 160 deletions
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/GUI/Messages.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/GUI/Messages.java
index 8c1e770..8f217a8 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/GUI/Messages.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/GUI/Messages.java
@@ -25,38 +25,17 @@ public Messages(WLC2OSIS A){
}
public void initialMessage(){
String IntroMessage = "WLC2OSIS ("+ A.ProgramDate
- + "): Conversion of WHI text files to XML files.\n\n"
+ + "): Conversion of WHI text files to OSIS.\n\n"
+ "Important messages will be written to command window.\n"
+ "Please be ready to write them down.\n\n" ;
JOptionPane.showMessageDialog(A.OverallContainer, IntroMessage) ;
}
public void doneMessage(){
- String DoneMessage = "The 40 output files appear to have been written\n"
+ String DoneMessage = "The output file appears to have been written\n"
+ "normally. Please examine the Java Console for possible errors.\n"
- + "If any errors have occured please make a careful note of them.\n\n"
- + "If no errors occurred and the 11 supporting files, \n\n"
- + " CC.somerights.gif,\n"
- + " Sarissa.js,\n"
- + " SBL_Hebrew.ttf,\n"
- + " SBL_Hebrew_readme.txt,\n"
- + " Tanach.Counts.html,\n"
- + " Tanach.License.html,\n"
- + " Tanach.Version.html,\n"
- + " Tanach.xsd,\n"
- + " Tanach.xsl.xml,\n"
- + " WHIbanner.gif,\n"
- + " WLC2OSIS.jar,\n\n"
- + "are in the output directory, then press \"OK\" to see the index file.\n\n";
+ + "If any errors have occured please make a careful note of them.\n\n";
JOptionPane.showMessageDialog(A.OverallContainer, DoneMessage) ;
}
-public void endMessage(){
- String EndMessage = "\nWLC2OSIS: Normal end.\n\n"
- + "Don't forget to update Tanach.Version.html to reflect\n"
- + "the fact that the text has been updated.\n\n"
- + "Then ZIP all 51 files into Tanach.zip\n"
- + "and place Tanach.zip in output directory.\n\n";
- JOptionPane.showMessageDialog(A.OverallContainer, EndMessage) ;
- }
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
}
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java
index a02597f..7994356 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java
@@ -43,15 +43,18 @@ public void start(String BookCode){
P.ChapterNumber = 0 ;
P.VerseNumber = 0 ;
P.WordNumber = 0 ;
- A.w.openTag("tanach", 0) ;
- A.w.openTag("book", 1) ;
- A.w.openTag("names", 2) ;
- A.w.writeString("name", 3, BookObject.name ) ;
- A.w.writeString("abbrev", 3, BookObject.abbrev) ;
- A.w.writeInt("number", 3, BookObject.number) ;
- A.w.writeString("filename", 3, BookObject.filename) ;
- A.w.writeString("hebrewname", 3, BookObject.hebrewname) ;
- A.w.closeTag("names", 2) ;
+// A.w.openTag("tanach", 0) ;
+ A.w.openTag("div type=\"book\"", 1) ;
+ A.w.writeAttributedString("title", 2, "type=\"main\" short=\"" +
+ BookObject.name +"\"", BookObject.name);
+
+// A.w.openTag("names", 2) ;
+// A.w.writeString("name", 3, BookObject.name ) ;
+// A.w.writeString("abbrev", 3, BookObject.abbrev) ;
+// A.w.writeInt("number", 3, BookObject.number) ;
+// A.w.writeString("filename", 3, BookObject.filename) ;
+// A.w.writeString("hebrewname", 3, BookObject.hebrewname) ;
+// A.w.closeTag("names", 2) ;
}
//------------------------------------------------------------------------------
@@ -63,13 +66,13 @@ public void end(){
P.BookChapterCount = P.ChapterNumber ;
P.TanachChapterCount = P.TanachChapterCount + P.ChapterNumber ;
- A.w.writeInt("vs", 2, P.BookVerseCount) ;
- A.w.writeInt("cs", 2, P.BookChapterCount) ;
- A.w.closeTag("book", 1) ;
- A.w.closeTag("tanach", 0) ;
+// A.w.writeInt("vs", 2, P.BookVerseCount) ;
+// A.w.writeInt("cs", 2, P.BookChapterCount) ;
+ A.w.closeTag("div", 1) ;
+// A.w.closeTag("tanach", 0) ;
// Add the transcription notes.
- Note.writeNotes(A.w) ;
+// Note.writeNotes(A.w) ;
// A.w.close() ;
System.out.println( BookObject.filename + " has been written." ) ;
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Chapters.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Chapters.java
index 03068a9..4451dfb 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Chapters.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Chapters.java
@@ -25,7 +25,10 @@ public void start(){
P.ChapterNumber = P.ChapterNumber + 1 ;
P.VerseNumber = 0 ;
P.WordNumber = 0 ;
- A.w.openAttributedTag("c", 2, "n", new Integer(P.ChapterNumber).toString() ) ;
+ String num = new Integer(P.ChapterNumber).toString();
+ A.w.writeMarker("chapter sID=\""+P.Book+"."+num+
+ "\" osisID=\""+P.Book+"."+num+
+ "\" n=\""+num+"\"", 2) ;
// System.out.println("\nChapter " + A.F.i(P.ChapterNumber,2) + " start." ) ;
}
//------------------------------------------------------------------------------
@@ -37,8 +40,13 @@ public void end(){
P.ChapterVerseCount = P.VerseNumber ;
P.BookVerseCount = P.BookVerseCount + P.VerseNumber ;
P.TanachVerseCount = P.TanachVerseCount + P.VerseNumber ;
- A.w.writeInt("vs", 3, P.VerseNumber) ;
- A.w.closeTag("c", 2) ;
+
+ String num = new Integer(P.ChapterNumber).toString();
+ A.w.writeMarker("chapter eID=\""+P.Book+"."+num+"\"", 2) ;
+
+
+// A.w.writeInt("vs", 3, P.VerseNumber) ;
+// A.w.closeTag("c", 2) ;
// System.out.println("Chapter " + A.F.i(P.ChapterNumber,2) + " ends with "
// + A.F.i(P.VerseNumber,2) + " verses." ) ;
}
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java
index 086109a..c425de2 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java
@@ -18,7 +18,7 @@ Tokenizer t ;
// Working classes
-Tanach tanach ;
+// Tanach tanach ;
public Books b ;
Chapters c ;
Verses v ;
@@ -32,7 +32,7 @@ public WKQ wkq ;
public boolean MarkerWritten ; // Indicates a marker has been written
// between two words.
-String BookName ;
+// String BookName ;
String Book ;
int Chapter ;
@@ -66,7 +66,7 @@ public Parser(WLC2OSIS A) {
t = new Tokenizer(A) ;
// Set up the Tanach, Books, Chapters, Verses, Words, and Markers classes.
- tanach = new Tanach(A, this) ;
+// tanach = new Tanach(A, this) ;
b = new Books(A, this) ;
c = new Chapters(A, this) ;
v = new Verses(A, this) ;
@@ -86,12 +86,12 @@ public void parse(){
boolean PreviousEOL = true ;
System.out.println("\n") ;
- A.w = new XMLWriter(A.OutputDirectory, "WLC_OSIS", "Tanach", "Tanach", "" ) ;
+ A.w = new XMLWriter(A.OutputDirectory, "WLC_OSIS") ;
// Write the header
Header.writeHeader(A, A.w) ;
- tanach.start() ;
+// tanach.start() ;
for (int k = 0; k < A.InputChars.length ; k++){
@@ -183,7 +183,13 @@ public void parse(){
v.end() ;
c.end() ;
b.end() ;
- tanach.end() ;
+// tanach.end() ;
+
+ // Write the footer
+ Header.writeFooter(A, A.w) ;
+
+
+ A.w.close();
return ;
}
//----------------------------------------------------------------------------
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java
index 99e172d..5871ae9 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java
@@ -23,7 +23,13 @@ public Verses(WLC2OSIS A, Parser P ) {
public void start(){
P.VerseNumber = P.VerseNumber + 1 ;
P.WordNumber = 0 ;
- A.w.openAttributedTag("v", 3, "n", new Integer(P.VerseNumber).toString() ) ;
+
+ String chapternum = new Integer(P.ChapterNumber).toString();
+ String versenum = new Integer(P.VerseNumber).toString();
+ A.w.writeMarker("verse sID=\""+P.Book+"."+chapternum+"."+versenum+
+ "\" osisID=\""+P.Book+"."+chapternum+"."+versenum+"\"", 3) ;
+
+// A.w.openAttributedTag("v", 3, "n", ) ;
// System.out.println("\nVerse " + A.F.i(P.VerseNumber,2) + " start." ) ;
}
//------------------------------------------------------------------------------
@@ -32,7 +38,12 @@ public void start(){
public void end(){
if( P.VerseNumber != 0){
- A.w.closeTag("v", 3) ;
+
+ String chapternum = new Integer(P.ChapterNumber).toString();
+ String versenum = new Integer(P.VerseNumber).toString();
+ A.w.writeMarker("verse eID=\""+P.Book+"."+chapternum+"."+versenum+"\"", 3) ;
+
+// A.w.closeTag("v", 3) ;
// System.out.println("Verse " + A.F.i(P.VerseNumber,2) + " ends with "
// + A.F.i(P.WordNumber,2) + " words." ) ;
}
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Header.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Header.java
index 9260fa1..cb03511 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Header.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Header.java
@@ -4,8 +4,8 @@ import WLC2OSIS.* ;
import WLC2OSIS.Translate.* ;
import WLC2OSIS.Utilities.* ;
-import java.util.Date ;
-import java.text.SimpleDateFormat ;
+// import java.util.Date ;
+// import java.text.SimpleDateFormat ;
//==============================================================================
/**
* <b>Header information for Tanach.</b><p>
@@ -13,8 +13,8 @@ import java.text.SimpleDateFormat ;
//==============================================================================
public class Header{
-static SimpleDateFormat DateFormat = new SimpleDateFormat("dd MMM yyyy") ;
-static String DateTime ;
+// static SimpleDateFormat DateFormat = new SimpleDateFormat("dd MMM yyyy") ;
+// static String DateTime ;
public Header(){
}
@@ -23,24 +23,47 @@ public Header(){
// Writes the Notes to the XML file.
public static void writeHeader(WLC2OSIS A, XMLWriter w) {
- Date DT = new Date() ;
- DateTime = DateFormat.format(DT) ;
+// Date DT = new Date() ;
+// DateTime = DateFormat.format(DT) ;
+ A.w.openTag("osisText osisIDWork=\"WLC\" osisRefWork=\"bible\" xml:lang=\"he\"", 0) ;
A.w.openTag("header", 0) ;
- A.w.writeString("name", 1, "Tanach") ;
- A.w.writeString("hebrewname", 1, H.Tnk) ;
- A.w.writeString("title", 1, A.Title) ;
- A.w.writeString("shortdescription", 1, A.ShortDescription) ;
- for (int i =0; i < A.Description.length; i++){
- A.w.writeString("description", 1, A.Description[i]) ;
- }
- //A.w.writeString("date", 1, A.Date) ;
- A.w.writeString("transcriptiondate", 1, DateTime) ;
- A.w.writeString("copyright", 1, "\u00A9 C. V. Kimball 2004") ;
- A.w.writeString("filename", 1, A.InputFilename) ;
- A.w.closeTag("header", 0) ;
+
+ A.w.openTag("work osisWork=\"WLC", 1) ;
+
+ A.w.writeString("title", 2, "Westminster Leningrad Codex");
+ A.w.writeAttributedString("contributor", 2, "role=\"encoder\"", "Martin Gruner");
+ A.w.writeAttributedString("type", 2, "type=\"OSIS\"", "Bible");
+ A.w.writeAttributedString("identifier", 2, "type=\"OSIS\"", "Bible.he.WLC.2004");
+ A.w.writeAttributedString("rights", 2, "type=\"x-copyright\"",
+ "The WLC is maintained by the Westminster Hebrew Institute, Philadelphia, PA (http://whi.wts.edu/WHI)");
+ A.w.writeString("scope", 2, "Hebrew Bible, Old Testament");
+ A.w.writeString("refSystem", 2, "Tanach");
+
+ A.w.closeTag("work", 1);
+
+ A.w.closeTag("header", 0);
+
+// A.w.writeString("hebrewname", 1, H.Tnk) ;
+// A.w.writeString("title", 1, A.Title) ;
+// A.w.writeString("shortdescription", 1, A.ShortDescription) ;
+// for (int i =0; i < A.Description.length; i++){
+// A.w.writeString("description", 1, A.Description[i]) ;
+// }
+// //A.w.writeString("date", 1, A.Date) ;
+// A.w.writeString("transcriptiondate", 1, DateTime) ;
+// A.w.writeString("copyright", 1, "\u00A9 C. V. Kimball 2004") ;
+// A.w.writeString("filename", 1, A.InputFilename) ;
+//
+// A.w.closeTag("header", 0) ;
+ }
+
+//==============================================================================
+
+public static void writeFooter(WLC2OSIS A, XMLWriter w) {
+
+ A.w.closeTag("osisWork", 0);
+
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-}
-//==============================================================================
-//==============================================================================
+}//==============================================================================
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Index.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Index.java
deleted file mode 100644
index 6e5bd95..0000000
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Translate/Index.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package WLC2OSIS.Translate ;
-
-import WLC2OSIS.* ;
-import WLC2OSIS.Parse.* ;
-import WLC2OSIS.Utilities.* ;
-
-import java.util.Date ;
-import java.text.SimpleDateFormat ;
-//==============================================================================
-/**
- * <b>Writes the Tanach.xml file containing only the index.</b><p>
- *
- * Special to WLC
- */
-//==============================================================================
-public class Index{
-
-public Index(){
- }
-//-----------------------------------------------------------------------------
-
-// Writes the index to the Tanach.xml file.
-
-public static void writeIndex(WLC2OSIS A) {
-
- A.w = new XMLWriter(A.OutputDirectory,
- "Tanach", "Tanach",
- "Tanach", "" ) ;
- Header.writeHeader(A, A.w) ;
- A.w.openTag("index", 0) ;
- A.w.writeInt("n", 1, A.p.TanachBookCount) ;
- A.w.openTag("books", 1) ;
-
- for (int i = 1; i <= A.p.TanachBookCount; i++){
-
-// Place the books out in their usual, not MCW order
-
- boolean Found = false;
- int k = 0 ;
- for (int j = 1; j <= A.p.TanachBookCount; j++){
- if(A.p.b.BookNames[j].number == i){
- Found = true ;
- k = j ;
- }
- }
- if(!Found){
- System.out.println("Index: Index " + i + " not found in BookNames table.") ;
- }
-
- A.w.openTag("names", 2) ;
- A.w.writeString("name", 3, A.p.b.BookNames[k].name ) ;
- A.w.writeString("abbrev", 3, A.p.b.BookNames[k].abbrev) ;
- A.w.writeInt("number", 3, A.p.b.BookNames[k].number) ;
- A.w.writeString("filename", 3, A.p.b.BookNames[k].filename) ;
- A.w.writeString("hebrewname", 3, A.p.b.BookNames[k].hebrewname) ;
- A.w.closeTag("names", 2) ;
- }
-
- A.w.closeTag("books", 1) ;
- A.w.writeInt("vs", 1, A.p.TanachVerseCount) ;
- A.w.writeInt("cs", 1, A.p.TanachChapterCount) ;
- A.w.closeTag("index", 0) ;
- UnicodeChar.writeUnicodeChars(A.w) ;
- Note.writeNotes(A.w) ;
- A.w.close() ;
- }
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-}
-//==============================================================================
-//==============================================================================
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/Test.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/Test.java
index fe7b913..3b2ceb1 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/Test.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/Test.java
@@ -26,8 +26,7 @@ public static void test(WLC2OSIS A, String MC){
A.p = new Parser(A) ;
Translate T = new Translate(A, A.p) ;
String Word = T.translate(MC) ;
- A.w = new XMLWriter("C:\\kimball\\JavaProjects\\WLC2OSIS\\Tanach", "Test", "Test",
- "Test", "" ) ;
+ A.w = new XMLWriter("C:\\kimball\\JavaProjects\\WLC2OSIS\\Tanach", "Test") ;
A.w.writeString("mc", 1, MC) ;
A.p.w.writeWord(Word, "w") ;
A.w.close() ;
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/XMLWriter.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/XMLWriter.java
index ef89155..a83a656 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/XMLWriter.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Utilities/XMLWriter.java
@@ -18,24 +18,20 @@ FileOutputStream FOS ;
OutputStreamWriter OSW ;
char[] CharBuffer ;
Fmt F = new Fmt() ;
-String XMLTag ;
+// String XMLTag ;
//-----------------------------------------------------------------------------
/**
* Writes an XML file.
*
* @param Directory String giving directory WITHOUT final \.
* @param Filename String giving file name WITHOUT extension.
- * @param XMLTag String giving XML tag.
- * @param XSLXSDName String giving .xsl and xsd file names WITHOUT extension.
- * @param ToXSL String giving route to .xsl file and .xsd file, i.e. "..\\"
- * or ".." + File.separator.
*
*/
-public XMLWriter(String Directory, String Filename, String XMLTag, String XSLXSDName, String ToXSL){
+public XMLWriter(String Directory, String Filename){
- this.Directory = Directory ;
- this.Filename = Filename ;
- this.XMLTag = XMLTag ;
+ this.Directory = Directory ;
+ this.Filename = Filename ;
+// this.XMLTag = XMLTag ;
try{
FOS = new FileOutputStream(Directory + File.separator + Filename + ".xml") ;
@@ -44,12 +40,10 @@ public XMLWriter(String Directory, String Filename, String XMLTag, String XSLXSD
catch(IOException e){
System.out.println("XMLWriter: Error in opening output file.\n" + e) ;
}
- writeString("<?xml version = \"1.0\" encoding=\"UTF-8\"?>");
- writeString("\n<?xml-stylesheet type=\"text/xsl\" href=\"" + ToXSL + XSLXSDName + ".xsl.xml\"?>");
- writeString("\n<" + XMLTag
- + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
- + "xsi:noNamespaceSchemaLocation =\"" + ToXSL + XSLXSDName + ".xsd\">" ) ;
- writeString("\n<!-- Copyright C.V.Kimball 2004 -->" ) ;
+ writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+ writeString("<osis xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\" "+
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "+
+ "xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespaceosisCore.2.0.xsd\">\n");
}
//-----------------------------------------------------------------------------
public void writeString(String Tag, int Level, String S){
@@ -62,6 +56,19 @@ public void writeString(String Tag, int Level, String S){
s = s + "</" + Tag + ">" ;
writeString(s) ;
}
+
+//-----------------------------------------------------------------------------
+public void writeAttributedString(String Tag, int Level, String AttributeString, String S){
+ String s = "\n" ;
+ for (int k = 0; k < Level; k++){
+ s = s + IndentString ;
+ }
+ s = s + "<" + Tag + " " + AttributeString + ">" ;
+ s = s + S ;
+ s = s + "</" + Tag + ">" ;
+ writeString(s) ;
+ }
+
//-----------------------------------------------------------------------------
public void writeBoolean(String Tag, int Level, boolean B){
String s = "\n" ;
@@ -132,7 +139,8 @@ public void writeException( char Exception){
}
//-----------------------------------------------------------------------------
public void close(){
- writeString("\n</" + XMLTag + ">") ;
+// writeString("\n</" + XMLTag + ">") ;
+ closeTag("osis", 0);
try{
OSW.close() ;
}
diff --git a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java
index a1f117a..7b6c099 100644
--- a/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java
+++ b/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/WLC2OSIS.java
@@ -164,7 +164,6 @@ public void stop() {
* Universal exit.
*/
public void done(){
- M.endMessage() ;
System.out.println("\nWLC2OSIS: Normal end.") ;
F.bar("=", 80) ;
if(!SC.isApplet()){