[sword-svn] r1749 - trunk/utilities

[jansorg at crosswire.org]

Author: jansorg
Date: 2005-03-20 14:08:22 -0700 (Sun, 20 Mar 2005)
New Revision: 1749

Modified:
   trunk/utilities/osis2mod.cpp
Log:
reverted removal of chapter /div end tag, modules should use /chapter. But we still need a good solution for this.

Modified: trunk/utilities/osis2mod.cpp
===================================================================
--- trunk/utilities/osis2mod.cpp	2005-03-20 20:54:21 UTC (rev 1748)
+++ trunk/utilities/osis2mod.cpp	2005-03-20 21:08:22 UTC (rev 1749)
@@ -328,13 +328,14 @@
 		text = "";
 		return true;
 	}
-/*        else if (!inVerse && (token.isEndTag() || (token.getAttribute("eID"))) && (!strcmp(token.getName(), "p") || !strcmp(token.getName(), "div") || !strcmp(token.getName(), "q")  || !strcmp(token.getName(), "l") || !strcmp(token.getName(), "lg"))) {*/
+        else if (!inVerse && (token.isEndTag() || (token.getAttribute("eID"))) && (!strcmp(token.getName(), "p") || !strcmp(token.getName(), "div") || !strcmp(token.getName(), "q")  || !strcmp(token.getName(), "l") || !strcmp(token.getName(), "lg"))) {
      
-//we really should decide how to handle end tags /e.g. of a chapter). There's no way for frontends to
-//see to what OSIS tag the end tag (which is added to the verse text!) belongs. It mixes up the rendering as a result 
-//excluded /div for now (jansorg)
-	else if (!inVerse && (token.isEndTag() || (token.getAttribute("eID"))) && (!strcmp(token.getName(), "p") || !strcmp(token.getName(), "q")  || !strcmp(token.getName(), "l") || !strcmp(token.getName(), "lg"))) {
-        	//text.append( token );
+// we really should decide how to handle end tags /e.g. of a chapter). There's no way for frontends to
+// see to what OSIS tag the end tag (which is added to the verse text!) belongs. It mixes up the rendering as a result 
+// included /div for now (jansorg)
+//	else if (!inVerse && (token.isEndTag() || (token.getAttribute("eID"))) && (!strcmp(token.getName(), "p") || !strcmp(token.getName(), "q")  || !strcmp(token.getName(), "l") || !strcmp(token.getName(), "lg"))) {
+
+        	text.append( token );
 		writeEntry(*currentVerse, text, true);
 		text = "";
                 return true;