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

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-23 20:04:07 -0700 (Wed, 23 Apr 2014)
New Revision: 3196

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/include/thmlxhtml.h
   branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp
Log:
Merging r3192 - thml/xhtml titles in line with OSIS



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-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-3155,3190-3191
   + /trunk:2989-2991,2997,3001-3004,3006,3010-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-3155,3190-3192

Modified: branches/sword-1-7-x/include/thmlxhtml.h
===================================================================
--- branches/sword-1-7-x/include/thmlxhtml.h	2014-04-24 03:03:26 UTC (rev 3195)
+++ branches/sword-1-7-x/include/thmlxhtml.h	2014-04-24 03:04:07 UTC (rev 3196)
@@ -38,7 +38,7 @@
 	public:
 		MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {}
 		bool inscriptRef;
-		bool SecHead;
+		char SecHead;
 		bool BiblicalText;
 		SWBuf version;
 		XMLTag startTag;

Modified: branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp	2014-04-24 03:03:26 UTC (rev 3195)
+++ branches/sword-1-7-x/src/modules/filters/thmlxhtml.cpp	2014-04-24 03:04:07 UTC (rev 3196)
@@ -299,17 +299,19 @@
 		}
 		else if (tag.getName() && !strcmp(tag.getName(), "div")) {
 			if (tag.isEndTag() && u->SecHead) {
-				buf += "</i></b><br />";
+				buf += "</h";
+				buf += u->SecHead;
+				buf += ">";
 				u->SecHead = false;
 			}
 			else if (tag.getAttribute("class")) {
 				if (!stricmp(tag.getAttribute("class"), "sechead")) {
-					u->SecHead = true;
-					buf += "<br /><b><i>";
+					u->SecHead = '3';
+					buf += "<h3>";
 				}
 				else if (!stricmp(tag.getAttribute("class"), "title")) {
-					u->SecHead = true;
-					buf += "<br /><b><i>";
+					u->SecHead = '2';
+					buf += "<h2>";
 				}
 				else {
 					buf += tag;