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

[refdoc at crosswire.org]

Author: refdoc
Date: 2015-03-14 09:17:42 -0700 (Sat, 14 Mar 2015)
New Revision: 3345

Modified:
   trunk/src/modules/filters/osishtmlhref.cpp
   trunk/src/modules/filters/osislatex.cpp
   trunk/src/modules/filters/osisplain.cpp
   trunk/src/modules/filters/osisrtf.cpp
   trunk/src/modules/filters/osiswebif.cpp
Log:
fixes API-179 - maltreatment of osis glosses - the colon should not have been used as a seperator, the whole attribute content is the gloss


Modified: trunk/src/modules/filters/osishtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/osishtmlhref.cpp	2015-03-14 16:05:20 UTC (rev 3344)
+++ trunk/src/modules/filters/osishtmlhref.cpp	2015-03-14 16:17:42 UTC (rev 3345)
@@ -201,10 +201,8 @@
 					
 					outText("<ruby><rb>", buf, u);
 					outText(lastText, buf, u);
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
 					outText("</rb><rp>(</rp><rt>", buf, u);
-					outText(val, buf, u);
+					outText(attrib, buf, u);
 					outText("</rt><rp>)</rp></ruby>", buf, u);
 				}
 				if (!morphFirst) {

Modified: trunk/src/modules/filters/osislatex.cpp
===================================================================
--- trunk/src/modules/filters/osislatex.cpp	2015-03-14 16:05:20 UTC (rev 3344)
+++ trunk/src/modules/filters/osislatex.cpp	2015-03-14 16:17:42 UTC (rev 3345)
@@ -214,10 +214,8 @@
 					
 					outText("\\ruby{", buf, u);
 					outText(lastText, buf, u);
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
 					outText("}{", buf, u);
-					outText(val, buf, u);
+					outText(attrib, buf, u);
 					outText("}", buf, u);
 				}
 				if (!morphFirst) {

Modified: trunk/src/modules/filters/osisplain.cpp
===================================================================
--- trunk/src/modules/filters/osisplain.cpp	2015-03-14 16:05:20 UTC (rev 3344)
+++ trunk/src/modules/filters/osisplain.cpp	2015-03-14 16:17:42 UTC (rev 3345)
@@ -107,10 +107,8 @@
 				buf.append('>');
 			}
 			if ((attrib = u->tag.getAttribute("gloss"))) {
-				val = strchr(attrib, ':');
-				val = (val) ? (val + 1) : attrib;
 				buf.append(" <");
-				buf.append(val);
+				buf.append(attrib);
 				buf.append('>');
 			}
 			if ((attrib = u->tag.getAttribute("lemma"))) {

Modified: trunk/src/modules/filters/osisrtf.cpp
===================================================================
--- trunk/src/modules/filters/osisrtf.cpp	2015-03-14 16:05:20 UTC (rev 3344)
+++ trunk/src/modules/filters/osisrtf.cpp	2015-03-14 16:17:42 UTC (rev 3345)
@@ -178,9 +178,7 @@
 					outText(scratch.c_str(), buf, u);
 				}
 				if ((attrib = tag.getAttribute("gloss"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					scratch.setFormatted(" {\\fs15 <%s>}", val);
+					scratch.setFormatted(" {\\fs15 <%s>}", attrib);
 					outText(scratch.c_str(), buf, u);
 				}
 				if ((attrib = tag.getAttribute("lemma"))) {

Modified: trunk/src/modules/filters/osiswebif.cpp
===================================================================
--- trunk/src/modules/filters/osiswebif.cpp	2015-03-14 16:05:20 UTC (rev 3344)
+++ trunk/src/modules/filters/osiswebif.cpp	2015-03-14 16:17:42 UTC (rev 3345)
@@ -81,9 +81,7 @@
 //					buf.appendFormatted(" %s", val);
 				}
 				if ((attrib = tag.getAttribute("gloss"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
+					buf.appendFormatted(" %s", attrib);
 				}
 				if ((attrib = tag.getAttribute("lemma"))) {
 					int count = tag.getAttributePartCount("lemma", ' ');