fixed greek article processing

git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@121 07627401-56e2-0310-80f4-f8cd0041bdcd

1 files changed, 4 insertions, 2 deletions

diff --git a/flashtools/flash.cpp b/flashtools/flash.cpp
index def5e99..48d7b72 100644
--- a/flashtools/flash.cpp
+++ b/flashtools/flash.cpp
@@ -310,7 +310,7 @@ vector<Word> processWords(const char *range, bool addAll = true) {
 				if (parts > 1) lemKey.appendFormatted(".%d", i);
 				SWBuf strong = word->second[lemKey];
 				SWBuf text = word->second["Text"];
-				if ((parts > 2) && (strong == "G3588")) {
+				if (strong == "G3588") {
 					text = "[article]";
 				}
 				else {
@@ -321,10 +321,12 @@ vector<Word> processWords(const char *range, bool addAll = true) {
 				}
 				Phrase p;
 				p.phrase = text;
-				if (parts > 1) {
+				if ((parts > 1) && (strong != "G3588")) {
 					// lets build our 'with' list excluding ourselves
 					list<SWBuf> withoutMe = lemmas;
 					withoutMe.remove(strong);
+					// special handling of article.  We don't want [+ 3588] all over the place
+					withoutMe.remove("G3588");
 					p.with = vector<SWBuf>(withoutMe.begin(), withoutMe.end());
 				}
 				wordList[strong].kjvFreq[p]++;