[sword-cvs] sword/src/modules/filters thmlhtmlhref.cpp,1.44,1.45 thmlrtf.cpp,1.40,1.41

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/src/modules/filters
In directory www:/tmp/cvs-serv5579/src/modules/filters

Modified Files:
	thmlhtmlhref.cpp thmlrtf.cpp 
Log Message:
no message

Index: thmlhtmlhref.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlhtmlhref.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- thmlhtmlhref.cpp	22 Dec 2003 04:28:09 -0000	1.44
+++ thmlhtmlhref.cpp	22 Dec 2003 21:33:32 -0000	1.45
@@ -59,9 +59,9 @@
 	
 				//const char* value = tag.getAttribute("value");
 				buf += " value=";
-				buf += (value.length()) ? value : "";
+				buf += (value.length()) ? value.c_str() : "";
 				buf += "\">";
-				buf += (value.length()) ? value : "";
+				buf += (value.length()) ? value.c_str() : "";
 				buf += "</a>) </em></small>";
 			}
 			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) {
@@ -71,10 +71,10 @@
 	
 				//const char* value = tag.getAttribute("value");
 				buf += " value=";
-				buf += (value.length()) ? value : "";
+				buf += (value.length()) ? value.c_str() : "";
 				buf += "\">";
 				value<<1;
-				buf += (value.length()) ? value : "";
+				buf += (value.length()) ? value.c_str() : "";
 				buf += "</a>&gt; </em></small>";
 			}
 			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) {

Index: thmlrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlrtf.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- thmlrtf.cpp	22 Dec 2003 20:24:30 -0000	1.40
+++ thmlrtf.cpp	22 Dec 2003 21:33:32 -0000	1.41
@@ -186,6 +186,8 @@
 	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
 		MyUserData *u = (MyUserData *)userData;		
 		XMLTag tag(token);
+		if ((!tag.isEndTag()) && (!tag.isEmpty()))
+			u->startTag = tag;
 		if (tag.getName() && !strcmp(tag.getName(), "sync")) {
 			SWBuf value = tag.getAttribute("value");
 			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //&gt;