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

[scribe at www.crosswire.org]

Author: scribe
Date: 2006-08-09 20:54:18 -0700 (Wed, 09 Aug 2006)
New Revision: 1955

Modified:
   trunk/src/modules/filters/osishtmlhref.cpp
Log:
Fixed divineName bug (DMSmith)


Modified: trunk/src/modules/filters/osishtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/osishtmlhref.cpp	2006-08-05 22:48:37 UTC (rev 1954)
+++ trunk/src/modules/filters/osishtmlhref.cpp	2006-08-10 03:54:18 UTC (rev 1955)
@@ -322,16 +322,14 @@
 
 		// divineName  
 		else if (!strcmp(tag.getName(), "divineName")) {
-			SWBuf type = tag.getAttribute("type");
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				if (type == "x-yhwh") {
-					u->inName = true;
-					u->suspendTextPassThru = true;
-				} else {
-					u->inName = false;
-				}
-			} else if (tag.isEndTag()) {
+				u->inName = true;
+				u->suspendTextPassThru = true;
+			}
+			else if (tag.isEndTag()) {
 				if(u->inName ) {
+					u->inName = false;
+					u->suspendTextPassThru = false;
 					char firstChar = *u->lastTextNode.c_str();
 					const char *name = u->lastTextNode.c_str();
 					++name;
@@ -341,8 +339,6 @@
 					for(int i=0;i<strlen(name);i++)
 						outText(toupper(name[i]), buf, u);
 					outText("</font>", buf, u);
-					u->inName = false;
-					u->suspendTextPassThru = false;
 				}
 			} 
 		}