1 files changed, 83 insertions, 65 deletions

diff --git a/src/modules/filters/gbfstrongs.cpp b/src/modules/filters/gbfstrongs.cpp
index 40fc958..bd5088a 100644
--- a/src/modules/filters/gbfstrongs.cpp
+++ b/src/modules/filters/gbfstrongs.cpp
@@ -1,98 +1,116 @@
 /******************************************************************************
  *
- * gbfstrongs -	SWFilter decendant to hide or show strongs number
+ * gbfstrongs -	SWFilter descendant to hide or show strongs number
  *			in a GBF module.
  */
 
 
 #include <stdlib.h>
-#include <string.h>
 #include <gbfstrongs.h>
+#include <swmodule.h>
 #ifndef __GNUC__
 #else
 #include <unixstr.h>
 #endif
+#include <ctype.h>
 
+SWORD_NAMESPACE_START
 
-const char GBFStrongs::on[] = "On";
-const char GBFStrongs::off[] = "Off";
-const char GBFStrongs::optName[] = "Strong's Numbers";
-const char GBFStrongs::optTip[] = "Toggles Strong's Numbers On and Off if they exist";
+const char oName[] = "Strong's Numbers";
+const char oTip[] = "Toggles Strong's Numbers On and Off if they exist";
 
+const SWBuf choices[3] = {"On", "Off", ""};
+const StringList oValues(&choices[0], &choices[2]);
 
-GBFStrongs::GBFStrongs() {
-	option = false;
-	options.push_back(on);
-	options.push_back(off);
+GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, &oValues) {
+	setOptionValue("Off");
 }
 
 
 GBFStrongs::~GBFStrongs() {
 }
 
-void GBFStrongs::setOptionValue(const char *ival)
-{
-	option = (!stricmp(ival, on));
-}
 
-const char *GBFStrongs::getOptionValue()
-{
-	return (option) ? on:off;
-}
+char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	char token[2048]; // cheese.  Fix.
+	int tokpos = 0;
+	bool intoken = false;
+	int len;
+	bool lastspace = false;
+	int word = 1;
+	char val[128];
+	char wordstr[5];
+	char *valto;
+	char *ch;
+	unsigned int textStart = 0, textEnd = 0;
+	bool newText = false;
+	SWBuf tmp;
+	const char *from;
 
-char GBFStrongs::ProcessText(char *text, int maxlen, const SWKey *key, const SWModule *module)
-{
-	if (!option) {	// if we don't want strongs
-		char *to, *from, token[2048]; // cheese.  Fix.
-		int tokpos = 0;
-		bool intoken = false;
-		int len;
-		bool lastspace = false;
+	SWBuf orig = text;
+	from = orig.c_str();
 
-		len = strlen(text) + 1;	// shift string to right of buffer
-		if (len < maxlen) {
-			memmove(&text[maxlen - len], text, len);
-			from = &text[maxlen - len];
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			textEnd = text.size();
+			continue;
 		}
-		else	from = text;	// -------------------------------
+		if (*from == '>') {	// process tokens
+			intoken = false;
 
-		for (to = text; *from; from++) {
-			if (*from == '<') {
-				intoken = true;
-				tokpos = 0;
-				token[0] = 0;
-				token[1] = 0;
-				token[2] = 0;
-				continue;
-			}
-			if (*from == '>') {	// process tokens
-				intoken = false;
-				if (*token == 'W' && (token[1] == 'G' || token[1] == 'H')) {	// Strongs
-				  if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
-				    if (lastspace)
-				      to--;
-				  }
-				  continue;
+			if (*token == 'W' && (token[1] == 'G' || token[1] == 'H')) {	// Strongs
+				if (module->isProcessEntryAttributes()) {
+					valto = val;
+					for (unsigned int i = 2; ((token[i]) && (i < 150)); i++)
+						*valto++ = token[i];
+					*valto = 0;
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						// normal strongs number
+						sprintf(wordstr, "%03d", word++);
+						module->getEntryAttributes()["Word"][wordstr]["Strongs"] = val;
+						tmp = "";
+						tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
+						module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
+						newText = true;
+					}
+					else {
+						// verb morph
+						sprintf(wordstr, "%03d", word-1);
+						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+					}
+				}
+				if (!option) {
+					if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
+						if (lastspace)
+							text--;
+					}
+					if (newText) {textStart = text.size(); newText = false; }
+					continue;
 				}
-				// if not a strongs token, keep token in text
-				*to++ = '<';
-				for (char *tok = token; *tok; tok++)
-					*to++ = *tok;
-				*to++ = '>';
-				continue;
-			}
-			if (intoken) {
-				if (tokpos < 2045)
-					token[tokpos++] = *from;
-					token[tokpos+2] = 0;
-			}
-			else	{
-				*to++ = *from;
-				lastspace = (*from == ' ');
 			}
+			// if not a strongs token, keep token in text
+			text += '<';
+			text += token;
+			text += '>';
+			if (newText) {textStart = text.size(); newText = false; }
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else	{
+			text += *from;
+			lastspace = (*from == ' ');
 		}
-		*to++ = 0;
-		*to = 0;
 	}
 	return 0;
 }
+
+SWORD_NAMESPACE_END