[sword-svn] r3186 - in branches/sword-1-7-x: . src/modules/filters

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-16 21:33:19 -0700 (Wed, 16 Apr 2014)
New Revision: 3186

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/src/modules/filters/osismorphsegmentation.cpp
Log:
Merging r3153 - fixed osis morph handling



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153

Modified: branches/sword-1-7-x/src/modules/filters/osismorphsegmentation.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/filters/osismorphsegmentation.cpp	2014-04-17 04:32:00 UTC (rev 3185)
+++ branches/sword-1-7-x/src/modules/filters/osismorphsegmentation.cpp	2014-04-17 04:33:19 UTC (rev 3186)
@@ -78,13 +78,15 @@
 			if (!strncmp(token.c_str(), "seg ", 4) || !strncmp(token.c_str(), "/seg", 4)) {
 				tag = token;
 
-				if (!tag.isEndTag() && tag.getAttribute("type") && !strcmp("morph", tag.getAttribute("type"))) {  //<seg type="morph"> start tag
+				if (!tag.isEndTag() && tag.getAttribute("type") &&
+					(  !strcmp("morph", tag.getAttribute("type"))
+					|| !strcmp("x-morph", tag.getAttribute("type")))) {  //<seg type="morph"> start tag
 					hide = !option; //only hide if option is Off
 					tagText = "";
 					inMorpheme = true;
 				}
 
-				if (tag.isEndTag()) {
+				if (tag.isEndTag() && inMorpheme) {
 						buf.setFormatted("%.3d", morphemeNum++);
 						module->getEntryAttributes()["Morpheme"][buf]["body"] = tagText;
 						inMorpheme = false;