[sword-cvs] sword/src/modules/filters gbffootnotes.cpp,1.24,1.25 gbfhtmlhref.cpp,1.25,1.26 osisfootnotes.cpp,1.14,1.15 osisheadings.cpp,1.11,1.12 osishtmlhref.cpp,1.20,1.21 osislemma.cpp,1.5,1.6 osismorph.cpp,1.10,1.11 osisplain.cpp,1.14,1.15 osisredletterwords.cpp,1.7,1.8 osisrtf.cpp,1.28,1.29 osisscripref.cpp,1.6,1.7 osiswebif.cpp,1.8,1.9 thmlfootnotes.cpp,1.16,1.17 thmlheadings.cpp,1.14,1.15 thmlhtml.cpp,1.31,1.32 thmlhtmlhref.cpp,1.47,1.48 thmlrtf.cpp,1.43,1.44 thmlscripref.cpp,1.18,1.19 thmlwebif.cpp,1.11,1.12

sword@www.crosswire.org sword@www.crosswire.org
Sat, 24 Jan 2004 11:42:42 -0700 

Update of /cvs/core/sword/src/modules/filters
In directory www:/tmp/cvs-serv31594/src/modules/filters

Modified Files:
	gbffootnotes.cpp gbfhtmlhref.cpp osisfootnotes.cpp 
	osisheadings.cpp osishtmlhref.cpp osislemma.cpp osismorph.cpp 
	osisplain.cpp osisredletterwords.cpp osisrtf.cpp 
	osisscripref.cpp osiswebif.cpp thmlfootnotes.cpp 
	thmlheadings.cpp thmlhtml.cpp thmlhtmlhref.cpp thmlrtf.cpp 
	thmlscripref.cpp thmlwebif.cpp 
Log Message:
Rolled back yesterdays changes


Index: gbffootnotes.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/gbffootnotes.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gbffootnotes.cpp	24 Jan 2004 03:11:50 -0000	1.24
+++ gbffootnotes.cpp	24 Jan 2004 18:42:40 -0000	1.25
@@ -60,14 +60,14 @@
 			intoken = false;
 
 			XMLTag tag(token);
-			if ((tag.getName()) && !strcmp(tag.getName(), "RF")) {
+			if (!strcmp(tag.getName(), "RF")) {
 				refs = "";
 				startTag = tag;
 				hide = true;
 				tagText = "";
 				continue;
 			}
-			else if ((tag.getName()) && !strcmp(tag.getName(), "Rf")) {
+			else if (!strcmp(tag.getName(), "Rf")) {
 				if (module->isProcessEntryAttributes()) {
 					if(tagText.length() == 1 || !strcmp(module->Name(), "IGNT")) {
 						if (option) { // for ASV marks text in verse then put explanation at end of verse

Index: gbfhtmlhref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/gbfhtmlhref.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gbfhtmlhref.cpp	24 Jan 2004 03:11:50 -0000	1.25
+++ gbfhtmlhref.cpp	24 Jan 2004 18:42:40 -0000	1.26
@@ -153,7 +153,7 @@
 			buf += "</a>)</em></small>";
 		}
 
-		else if ((tag.getName()) && !strcmp(tag.getName(), "RX")) {
+		else if (!strcmp(tag.getName(), "RX")) {
 			buf += "<a href=\"";
 			for (tok = token + 3; *tok; tok++) {
 			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
@@ -165,7 +165,7 @@
 			}
 			buf += "\">";
 		}
-		else if ((tag.getName()) && !strcmp(tag.getName(), "RF")) {
+		else if (!strcmp(tag.getName(), "RF")) {
 			SWBuf type = tag.getAttribute("type");
 			SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
 			VerseKey *vkey;
@@ -181,7 +181,7 @@
 			}
 			u->suspendTextPassThru = true;
 		}
-		else if ((tag.getName()) && !strcmp(tag.getName(), "Rf")) {
+		else if (!strcmp(tag.getName(), "Rf")) {
 			u->suspendTextPassThru = false;
 		}
 /*

Index: osisfootnotes.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osisfootnotes.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- osisfootnotes.cpp	24 Jan 2004 03:11:50 -0000	1.14
+++ osisfootnotes.cpp	24 Jan 2004 18:42:40 -0000	1.15
@@ -66,7 +66,7 @@
 			intoken = false;
 
 			XMLTag tag(token);
-			if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+			if (!strcmp(tag.getName(), "note")) {
 				if (!tag.isEndTag()) {
 					if (SWBuf("strongsMarkup") == tag.getAttribute("type")) {  // handle bug in KJV2003 module where some note open tags were <note ... />
 						tag.setEmpty(false);
@@ -105,7 +105,7 @@
 			}
 
 			// if not a heading token, keep token in text
-			if ((tag.getName()) && (!strcmp(tag.getName(), "reference")) && (!tag.isEndTag())) {
+			if ((!strcmp(tag.getName(), "reference")) && (!tag.isEndTag())) {
 				SWBuf osisRef = tag.getAttribute("osisRef");
 				if (refs.length())
 					refs += "; ";

Index: osisheadings.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osisheadings.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- osisheadings.cpp	24 Jan 2004 03:11:50 -0000	1.11
+++ osisheadings.cpp	24 Jan 2004 18:42:40 -0000	1.12
@@ -54,8 +54,7 @@
 			intoken = false;
 
 			XMLTag tag(token);
-			SWBuf name = tag.getName();
-			if (name == "title") {
+			if (!stricmp(tag.getName(), "title")) {
 				if ((tag.getAttribute("subtype")) && (!stricmp(tag.getAttribute("subtype"), "x-preverse"))) {
 					hide = true;
 					preverse = true;
@@ -95,6 +94,7 @@
 					preverse = false;
 				}
 			}
+
 			// if not a heading token, keep token in text
 			if (!hide) {
 				text += '<';

Index: osishtmlhref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osishtmlhref.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- osishtmlhref.cpp	24 Jan 2004 03:11:50 -0000	1.20
+++ osishtmlhref.cpp	24 Jan 2004 18:42:40 -0000	1.21
@@ -56,7 +56,7 @@
 		XMLTag tag(token);
 
 		// <w> tag
-		if ((tag.getName()) && !strcmp(tag.getName(), "w")) {
+		if (!strcmp(tag.getName(), "w")) {
 
 			// start <w> tag
 			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
@@ -134,7 +134,7 @@
 		}
 
 		// <note> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+		else if (!strcmp(tag.getName(), "note")) {
 			if (!tag.isEndTag()) {
 				if (!tag.isEmpty()) {
 					SWBuf type = tag.getAttribute("type");
@@ -161,7 +161,7 @@
 		}
 
 		// <p> paragraph tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "p")) {
+		else if (!strcmp(tag.getName(), "p")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
 				buf += "<!P><br />";
 			}
@@ -176,7 +176,7 @@
 		}
 
 		// <reference> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "reference")) {
+		else if (!strcmp(tag.getName(), "reference")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				buf += "<a href=\"\">";
 			}
@@ -186,7 +186,7 @@
 		}
 
 		// <l> poetry, etc
-		else if ((tag.getName()) && !strcmp(tag.getName(), "l")) {
+		else if (!strcmp(tag.getName(), "l")) {
 			if (tag.isEmpty()) {
 				buf += "<br />";
 			}
@@ -199,13 +199,13 @@
 		}
 
 		// <milestone type="line"/>
-		else if ((tag.getName()) && (!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
+		else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
 			buf += "<br />";
 			userData->supressAdjacentWhitespace = true;
 		}
 
 		// <title>
-		else if ((tag.getName()) && !strcmp(tag.getName(), "title")) {
+		else if (!strcmp(tag.getName(), "title")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				buf += "<b>";
 			}
@@ -215,7 +215,7 @@
 		}
 
 		// <hi> hi?  hi contrast?
-		else if ((tag.getName()) && !strcmp(tag.getName(), "hi")) {
+		else if (!strcmp(tag.getName(), "hi")) {
 			SWBuf type = tag.getAttribute("type");
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				if (type == "b" || type == "x-b") {
@@ -241,7 +241,7 @@
 		}
 
 		// <q> quote
-		else if ((tag.getName()) && !strcmp(tag.getName(), "q")) {
+		else if (!strcmp(tag.getName(), "q")) {
 			SWBuf type = tag.getAttribute("type");
 			SWBuf who = tag.getAttribute("who");
 			const char *lev = tag.getAttribute("level");
@@ -272,7 +272,7 @@
 		}
 
 		// <transChange>
-		else if ((tag.getName()) && !strcmp(tag.getName(), "transChange")) {
+		else if (!strcmp(tag.getName(), "transChange")) {
 			SWBuf type = tag.getAttribute("type");
 			
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
@@ -289,7 +289,7 @@
 		}
 
 		// image
-		else if ((tag.getName()) && !strcmp(tag.getName(), "figure")) {
+		else if (!strcmp(tag.getName(), "figure")) {
 			const char *src = tag.getAttribute("src");
 			if (!src)		// assert we have a src attribute
 				return false;

Index: osislemma.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osislemma.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- osislemma.cpp	24 Jan 2004 03:11:50 -0000	1.5
+++ osislemma.cpp	24 Jan 2004 18:42:40 -0000	1.6
@@ -50,7 +50,7 @@
 			if (*from == '>') {	// process tokens
 				intoken = false;
 				XMLTag tag(token);
-				if ((tag.getName()) && (!strcmp(tag.getName(), "w")) && (!tag.isEndTag())) {	// Lemma
+				if ((!strcmp(tag.getName(), "w")) && (!tag.isEndTag())) {	// Lemma
 					SWBuf lemma = tag.getAttribute("lemma");
 					if (lemma.length()) {
 						tag.setAttribute("lemma", 0);

Index: osismorph.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osismorph.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- osismorph.cpp	24 Jan 2004 03:11:50 -0000	1.10
+++ osismorph.cpp	24 Jan 2004 18:42:40 -0000	1.11
@@ -50,7 +50,7 @@
 			if (*from == '>') {	// process tokens
 				intoken = false;
 				XMLTag tag(token);
-				if ((tag.getName()) && (!strcmp(tag.getName(), "w")) && (!tag.isEndTag())) {	// Morph
+				if ((!strcmp(tag.getName(), "w")) && (!tag.isEndTag())) {	// Morph
 					if (tag.getAttribute("morph"))
 						tag.setAttribute("morph", 0);
 				}

Index: osisplain.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osisplain.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- osisplain.cpp	24 Jan 2004 03:11:50 -0000	1.14
+++ osisplain.cpp	24 Jan 2004 18:42:40 -0000	1.15
@@ -135,7 +135,7 @@
 		}
 
                 // <milestone type="line"/>
-                else if ((tag.getName()) && (!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
+                else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
 			userData->supressAdjacentWhitespace = true;
         		buf += "\n";
                 }

Index: osisredletterwords.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osisredletterwords.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- osisredletterwords.cpp	24 Jan 2004 03:11:50 -0000	1.7
+++ osisredletterwords.cpp	24 Jan 2004 18:42:40 -0000	1.8
@@ -50,8 +50,7 @@
 			intoken = false;
 
 			XMLTag tag(token);
-			SWBuf name = tag.getName();
-			if (name == "q") {
+			if (!stricmp(tag.getName(), "q")) {
 				if ((tag.getAttribute("who")) && (!stricmp(tag.getAttribute("who"), "Jesus"))) {
 					tag.setAttribute("who", 0);
 					text += tag;	// tag toString already has < and >

Index: osisrtf.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osisrtf.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- osisrtf.cpp	24 Jan 2004 03:11:50 -0000	1.28
+++ osisrtf.cpp	24 Jan 2004 18:42:40 -0000	1.29
@@ -62,7 +62,7 @@
 		XMLTag tag(token);
 
 		// <w> tag
-		if ((tag.getName()) && !strcmp(tag.getName(), "w")) {
+		if (!strcmp(tag.getName(), "w")) {
 
 			// start <w> tag
 			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
@@ -139,7 +139,7 @@
 		}
 
 		// <note> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+		else if (!strcmp(tag.getName(), "note")) {
 			if (!tag.isEndTag()) {
 				if (!tag.isEmpty()) {
 					SWBuf type = tag.getAttribute("type");
@@ -168,7 +168,7 @@
 		}
 
 		// <p> paragraph tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "p")) {
+		else if (!strcmp(tag.getName(), "p")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
 				buf += "{\\par ";
 			}
@@ -183,7 +183,7 @@
 		}
 
 		// <reference> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "reference")) {
+		else if (!strcmp(tag.getName(), "reference")) {
 			if (!u->inXRefNote) {	// only show these if we're not in an xref note
 				if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 					buf += "{<a href=\"\">";
@@ -195,7 +195,7 @@
 		}
 
 		// <l> poetry
-		else if ((tag.getName()) && !strcmp(tag.getName(), "l")) {
+		else if (!strcmp(tag.getName(), "l")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				buf += "{";
 			}
@@ -208,13 +208,13 @@
 		}
 
 		// <milestone type="line"/>
-		else if ((tag.getName()) && (!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
+		else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line"))) {
 			buf += "{\\par}";
 			userData->supressAdjacentWhitespace = true;
 		}
 
 		// <title>
-		else if ((tag.getName()) && !strcmp(tag.getName(), "title")) {
+		else if (!strcmp(tag.getName(), "title")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				buf += "{\\par\\i1\\b1 ";
 			}
@@ -224,7 +224,7 @@
 		}
 
 		// <hi>
-		else if ((tag.getName()) && !strcmp(tag.getName(), "hi")) {
+		else if (!strcmp(tag.getName(), "hi")) {
 			SWBuf type = tag.getAttribute("type");
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				if (type == "b" || type == "x-b")
@@ -238,7 +238,7 @@
 		}
 
 		// <q> quote
-		else if ((tag.getName()) && !strcmp(tag.getName(), "q")) {
+		else if (!strcmp(tag.getName(), "q")) {
 			SWBuf type = tag.getAttribute("type");
 			SWBuf who = tag.getAttribute("who");
 			const char *lev = tag.getAttribute("level");
@@ -268,7 +268,7 @@
 		}
 
 		// <transChange>
-		else if ((tag.getName()) && !strcmp(tag.getName(), "transChange")) {
+		else if (!strcmp(tag.getName(), "transChange")) {
 			SWBuf type = tag.getAttribute("type");
 
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
@@ -283,7 +283,7 @@
 		}
 
 		// image
-		else if ((tag.getName()) && !strcmp(tag.getName(), "figure")) {
+		else if (!strcmp(tag.getName(), "figure")) {
 			const char *src = tag.getAttribute("src");
 			if (!src)		// assert we have a src attribute
 				return false;

Index: osisscripref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osisscripref.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- osisscripref.cpp	24 Jan 2004 03:11:50 -0000	1.6
+++ osisscripref.cpp	24 Jan 2004 18:42:40 -0000	1.7
@@ -54,7 +54,7 @@
 			intoken = false;
 
 			XMLTag tag(token);
-			if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+			if (!strcmp(tag.getName(), "note")) {
 				if (!tag.isEndTag() && (!tag.isEmpty())) {
 					startTag = tag;
 					if ((tag.getAttribute("type")) &&	(!strcmp(tag.getAttribute("type"), "crossReference"))) {

Index: osiswebif.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/osiswebif.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- osiswebif.cpp	24 Jan 2004 03:11:50 -0000	1.8
+++ osiswebif.cpp	24 Jan 2004 18:42:40 -0000	1.9
@@ -36,7 +36,7 @@
 		XMLTag tag(token);
 
 		// <w> tag
-		if ((tag.getName()) && !strcmp(tag.getName(), "w")) {
+		if (!strcmp(tag.getName(), "w")) {
 
 			// start <w> tag
 			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
@@ -114,7 +114,7 @@
 		}
 
 		// <note> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+		else if (!strcmp(tag.getName(), "note")) {
 			if (!tag.isEndTag()) {
 				if (!tag.isEmpty()) {
 					SWBuf type = tag.getAttribute("type");
@@ -140,7 +140,7 @@
 			}
 		}
 		// <title>
-		else if ((tag.getName()) && !strcmp(tag.getName(), "title")) {
+		else if (!strcmp(tag.getName(), "title")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				buf += "<h3>";
 			}
@@ -150,7 +150,7 @@
 		}
 
 		// <q> quote
-		else if ((tag.getName()) && !strcmp(tag.getName(), "q")) {
+		else if (!strcmp(tag.getName(), "q")) {
 			SWBuf type = tag.getAttribute("type");
 			SWBuf who = tag.getAttribute("who");
 			const char *lev = tag.getAttribute("level");
@@ -181,7 +181,7 @@
 		}
 
 		// <transChange>
-		else if ((tag.getName()) && !strcmp(tag.getName(), "transChange")) {
+		else if (!strcmp(tag.getName(), "transChange")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
 				SWBuf type = tag.getAttribute("type");
 				u->lastTransChange = type;

Index: thmlfootnotes.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlfootnotes.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- thmlfootnotes.cpp	24 Jan 2004 03:11:50 -0000	1.16
+++ thmlfootnotes.cpp	24 Jan 2004 18:42:40 -0000	1.17
@@ -57,7 +57,7 @@
 			intoken = false;
 
 			XMLTag tag(token);
-			if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+			if (!strcmp(tag.getName(), "note")) {
 				if (!tag.isEndTag()) {
 					if (!tag.isEmpty()) {
 						refs = "";
@@ -95,7 +95,7 @@
 			}
 
 			// if not a note token, keep token in text
-			if ((tag.getName()) && (!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
+			if ((!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
 				SWBuf osisRef = tag.getAttribute("passage");
 				if (refs.length())
 					refs += "; ";

Index: thmlheadings.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlheadings.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- thmlheadings.cpp	24 Jan 2004 03:11:50 -0000	1.14
+++ thmlheadings.cpp	24 Jan 2004 18:42:40 -0000	1.15
@@ -54,7 +54,7 @@
 
 				XMLTag tag(token);
 
-				if ((tag.getName()) && !stricmp(tag.getName(), "div")) { //we only want a div tag
+				if (!stricmp(tag.getName(), "div")) { //we only want a div tag
 					//std::cout << tag.toString() << " " << tag.isEndTag() << std::endl;
 
 					if (tag.getAttribute("class") && !stricmp(tag.getAttribute("class"), "sechead")) {

Index: thmlhtml.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlhtml.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- thmlhtml.cpp	24 Jan 2004 03:11:50 -0000	1.31
+++ thmlhtml.cpp	24 Jan 2004 18:42:40 -0000	1.32
@@ -138,7 +138,7 @@
 	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
 		MyUserData *u = (MyUserData *)userData;
 		XMLTag tag(token);
-		if ((tag.getName()) && !strcmp(tag.getName(), "sync")) {
+		if (!strcmp(tag.getName(), "sync")) {
 			if (tag.getAttribute("type") && tag.getAttribute("value") && !strcmp(tag.getAttribute("type"), "Strongs")) {
 				const char* value = tag.getAttribute("value");
 				if (*value == 'H' || *value == 'G' || *value == 'A') {
@@ -166,7 +166,7 @@
 				buf += ")</em></small>";
 			}
 		}
-		else if ((tag.getName()) && !strcmp(tag.getName(), "div")) {
+		else if (!strcmp(tag.getName(), "div")) {
 			if (tag.isEndTag() && (u->SecHead)) {
 				buf += "</i></b><br />";
 				u->SecHead = false;
@@ -182,7 +182,7 @@
 				}
 			}
 		}
-		else if ((tag.getName()) && !strcmp(tag.getName(), "img")) {
+		else if (!strcmp(tag.getName(), "img")) {
 			const char *src = strstr(token, "src");
 			if (!src)		// assert we have a src attribute
 				return false;
@@ -208,7 +208,7 @@
 			}
 			buf += '>';
 		}
-		else if ((tag.getName()) && !strcmp(tag.getName(), "scripRef")) { //do nothing with scrip refs, we leave them out
+		else if (!strcmp(tag.getName(), "scripRef")) { //do nothing with scrip refs, we leave them out
 
 		}
 		else {

Index: thmlhtmlhref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlhtmlhref.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- thmlhtmlhref.cpp	24 Jan 2004 03:11:50 -0000	1.47
+++ thmlhtmlhref.cpp	24 Jan 2004 18:42:40 -0000	1.48
@@ -85,7 +85,7 @@
 				
 		}
 		// <note> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+		else if (!strcmp(tag.getName(), "note")) {
 			if (!tag.isEndTag()) {
 				if (!tag.isEmpty()) {
 					SWBuf type = tag.getAttribute("type");
@@ -109,7 +109,7 @@
 			}
 		}
 		// <scripRef> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "scripRef")) {
+		else if (!strcmp(tag.getName(), "scripRef")) {
 			if (!tag.isEndTag()) {
 				if (!tag.isEmpty()) {
 					u->suspendTextPassThru = true;

Index: thmlrtf.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlrtf.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- thmlrtf.cpp	24 Jan 2004 03:11:50 -0000	1.43
+++ thmlrtf.cpp	24 Jan 2004 18:42:40 -0000	1.44
@@ -210,7 +210,7 @@
 			}
 		}
 		// <note> tag
-		else if ((tag.getName()) && !strcmp(tag.getName(), "note")) {
+		else if (!strcmp(tag.getName(), "note")) {
 			if (!tag.isEndTag()) {
 				if (!tag.isEmpty()) {
 					SWBuf type = tag.getAttribute("type");
@@ -235,7 +235,7 @@
 		}
 
 
-		else if ((tag.getName()) && !strcmp(tag.getName(), "scripRef")) {
+		else if (!strcmp(tag.getName(), "scripRef")) {
 			if (!tag.isEndTag()) {
 				if (!tag.isEmpty()) {
 					u->suspendTextPassThru = true;

Index: thmlscripref.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlscripref.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- thmlscripref.cpp	24 Jan 2004 03:11:50 -0000	1.18
+++ thmlscripref.cpp	24 Jan 2004 18:42:40 -0000	1.19
@@ -56,7 +56,7 @@
 			intoken = false;
 
 			XMLTag tag(token);
-			if ((tag.getName()) && !strcmp(tag.getName(), "scripRef")) {
+			if (!strcmp(tag.getName(), "scripRef")) {
 				if (!tag.isEndTag()) {
 					if (!tag.isEmpty()) {
 						refs = "";
@@ -94,7 +94,7 @@
 			}
 
 			// if not a scripRef token, keep token in text
-			if ((tag.getName()) && (!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
+			if ((!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
 				SWBuf osisRef = tag.getAttribute("passage");
 				if (refs.length())
 					refs += "; ";

Index: thmlwebif.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/filters/thmlwebif.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- thmlwebif.cpp	24 Jan 2004 03:11:50 -0000	1.11
+++ thmlwebif.cpp	24 Jan 2004 18:42:40 -0000	1.12
@@ -34,7 +34,7 @@
 		MyUserData *u = (MyUserData *)userData;
 		XMLTag tag(token);
 		SWBuf url;
-		if ((tag.getName()) && !strcmp(tag.getName(), "sync")) {
+		if (!strcmp(tag.getName(), "sync")) {
 			const char* value = tag.getAttribute("value");
 			url = value;
 			if ((url.length() > 1) && strchr("GH", url[0])) {
@@ -66,7 +66,7 @@
 				buf += "&gt; </em></small>";
 			}
 		}
-		else if ((tag.getName()) && !strcmp(tag.getName(), "scripRef")) {
+		else if (!strcmp(tag.getName(), "scripRef")) {
 			if (tag.isEndTag()) {
 				if (u->inscriptRef) { // like  "<scripRef passage="John 3:16">John 3:16</scripRef>"
 					u->inscriptRef = false;