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

[greg.hellings at crosswire.org]

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

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/src/modules/filters/osishtmlhref.cpp
   branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp
Log:
Merging r3119 - Regularization of overline filters.



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
   + /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-3119

Modified: branches/sword-1-7-x/src/modules/filters/osishtmlhref.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/filters/osishtmlhref.cpp	2014-04-17 04:19:48 UTC (rev 3172)
+++ branches/sword-1-7-x/src/modules/filters/osishtmlhref.cpp	2014-04-17 04:20:33 UTC (rev 3173)
@@ -481,7 +481,7 @@
 				if (type == "bold" || type == "b" || type == "x-b") {
 					outText("<b>", buf, u);
 				}
-				else if (type == "ol") {
+				else if (type == "ol" || type == "overline" || type == "x-overline") {
 					outText("<span style=\"text-decoration:overline\">", buf, u);
 				}
 				else if (type == "super") {

Modified: branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp	2014-04-17 04:19:48 UTC (rev 3172)
+++ branches/sword-1-7-x/src/modules/filters/osisxhtml.cpp	2014-04-17 04:20:33 UTC (rev 3173)
@@ -560,7 +560,7 @@
 				// but we have used "ol" in the past, as well.  Once a valid
 				// OSIS overline attribute is made available, these should all
 				// eventually be deprecated and never documented that they are supported.
-				else if (type == "ol"  || type == "overline" || type == "x-overline") {
+				else if (type == "ol" || type == "overline" || type == "x-overline") {
 					outText("<span style=\"text-decoration:overline\">", buf, u);
 				}