[sword-svn] r2129 - in trunk: src/modules/filters utilities

[scribe at www.crosswire.org]

Author: scribe
Date: 2008-01-09 09:52:50 -0700 (Wed, 09 Jan 2008)
New Revision: 2129

Modified:
   trunk/src/modules/filters/osisrtf.cpp
   trunk/src/modules/filters/thmlrtf.cpp
   trunk/utilities/imp2vs.cpp
Log:
synced output of <p /> to be consistent
removed "Mode 1" debug output from imp2vs


Modified: trunk/src/modules/filters/osisrtf.cpp
===================================================================
--- trunk/src/modules/filters/osisrtf.cpp	2008-01-06 07:45:24 UTC (rev 2128)
+++ trunk/src/modules/filters/osisrtf.cpp	2008-01-09 16:52:50 UTC (rev 2129)
@@ -267,7 +267,7 @@
 				userData->supressAdjacentWhitespace = true;
 			}
 			else {					// empty paragraph break marker
-				outText("{\\par\\par}", buf, u);
+				outText("{\\pard\\par\\par}", buf, u);
 				userData->supressAdjacentWhitespace = true;
 			}
 		}

Modified: trunk/src/modules/filters/thmlrtf.cpp
===================================================================
--- trunk/src/modules/filters/thmlrtf.cpp	2008-01-06 07:45:24 UTC (rev 2128)
+++ trunk/src/modules/filters/thmlrtf.cpp	2008-01-09 16:52:50 UTC (rev 2129)
@@ -148,7 +148,7 @@
 	addTokenSubstitute("b", "{\\b1 ");
 	addTokenSubstitute("/b", "}");
 	addTokenSubstitute("p", "{\\fi200\\par}");
-	addTokenSubstitute("p /", "\\par\\pard ");
+	addTokenSubstitute("p /", "\\pard\\par\\par ");
 
 	//we need uppercase forms for the moment to support a few early ThML modules that aren't XHTML compliant
 	addTokenSubstitute("BR", "\\line ");

Modified: trunk/utilities/imp2vs.cpp
===================================================================
--- trunk/utilities/imp2vs.cpp	2008-01-06 07:45:24 UTC (rev 2128)
+++ trunk/utilities/imp2vs.cpp	2008-01-09 16:52:50 UTC (rev 2129)
@@ -62,7 +62,6 @@
   RawText4 * modRaw4;
   
   if (mode == 1) {
-	std::cout << "Mode 1\n";
           RawText::createModule(modname.c_str());
           modRaw= new RawText(modname.c_str());
           mod = modRaw;