[sword-svn] r3018 - trunk/src/modules/filters

[chrislit at crosswire.org]

Author: chrislit
Date: 2014-01-23 02:27:45 -0700 (Thu, 23 Jan 2014)
New Revision: 3018

Modified:
   trunk/src/modules/filters/osislatex.cpp
   trunk/src/modules/filters/osisplain.cpp
   trunk/src/modules/filters/osisrtf.cpp
Log:
more fixes related to (API-164)


Modified: trunk/src/modules/filters/osislatex.cpp
===================================================================
--- trunk/src/modules/filters/osislatex.cpp	2014-01-23 09:21:50 UTC (rev 3017)
+++ trunk/src/modules/filters/osislatex.cpp	2014-01-23 09:27:45 UTC (rev 3018)
@@ -185,7 +185,7 @@
 		// Milestoned paragraph, created by osis2mod
 		// <div type="paragraph"  sID... />
 		// <div type="paragraph"  eID... />
-		else if (!strcmp(u->tag.getName(), "div") && u->tag.getAttribute("type") && !strcmp(u->tag.getAttribute("type"), "paragraph") &&
+		else if (!strcmp(u->tag.getName(), "div") && u->tag.getAttribute("type") && (!strcmp(u->tag.getAttribute("type"), "x-p") || !strcmp(u->tag.getAttribute("type"), "paragraph")) &&
 			(u->tag.isEmpty() && (u->tag.getAttribute("sID") || u->tag.getAttribute("eID")))) {
 				userData->supressAdjacentWhitespace = true;
 				buf.append('\n');

Modified: trunk/src/modules/filters/osisplain.cpp
===================================================================
--- trunk/src/modules/filters/osisplain.cpp	2014-01-23 09:21:50 UTC (rev 3017)
+++ trunk/src/modules/filters/osisplain.cpp	2014-01-23 09:27:45 UTC (rev 3018)
@@ -185,7 +185,7 @@
 		// Milestoned paragraph, created by osis2mod
 		// <div type="paragraph"  sID... />
 		// <div type="paragraph"  eID... />
-		else if (!strcmp(u->tag.getName(), "div") && u->tag.getAttribute("type") && !strcmp(u->tag.getAttribute("type"), "paragraph") &&
+		else if (!strcmp(u->tag.getName(), "div") && u->tag.getAttribute("type") && (!strcmp(u->tag.getAttribute("type"), "x-p") || !strcmp(u->tag.getAttribute("type"), "paragraph")) &&
 			(u->tag.isEmpty() && (u->tag.getAttribute("sID") || u->tag.getAttribute("eID")))) {
 				userData->supressAdjacentWhitespace = true;
 				buf.append('\n');

Modified: trunk/src/modules/filters/osisrtf.cpp
===================================================================
--- trunk/src/modules/filters/osisrtf.cpp	2014-01-23 09:21:50 UTC (rev 3017)
+++ trunk/src/modules/filters/osisrtf.cpp	2014-01-23 09:27:45 UTC (rev 3018)
@@ -284,7 +284,7 @@
 		// Milestoned paragraphs, created by osis2mod
 		// <div type="paragraph" sID.../>
 		// <div type="paragraph" eID.../>
-		else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) {
+		else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && (!strcmp(tag.getAttribute("type"), "x-p") || !strcmp(tag.getAttribute("type"), "paragraph"))) {
 			// <div type="paragraph"  sID... />
 			if (tag.getAttribute("sID")) {	// non-empty start tag
 				outText("{\\fi200\\par}", buf, u);