[sword-svn] r2152 - in trunk: include src/modules/filters utilities/diatheke

[scribe at www.crosswire.org]

Author: scribe
Date: 2008-05-03 20:52:06 -0700 (Sat, 03 May 2008)
New Revision: 2152

Modified:
   trunk/include/flatapi.h
   trunk/src/modules/filters/gbfwordjs.cpp
   trunk/src/modules/filters/thmlheadings.cpp
   trunk/utilities/diatheke/corediatheke.cpp
   trunk/utilities/diatheke/corediatheke.h
   trunk/utilities/diatheke/diatheke.cpp
   trunk/utilities/diatheke/osiscgi.cpp
Log:
Applied charcoal's patch to fix thmlheadings
Applied Deji Akingunola's patch to fix compiling on GCC 4.3



Modified: trunk/include/flatapi.h
===================================================================
--- trunk/include/flatapi.h	2008-04-28 05:02:24 UTC (rev 2151)
+++ trunk/include/flatapi.h	2008-05-04 03:52:06 UTC (rev 2152)
@@ -24,6 +24,7 @@
 #define SWORDAPI_H
 
 #include <defs.h>
+#include <inttypes.h>
 #ifdef __cplusplus
 #endif
 

Modified: trunk/src/modules/filters/gbfwordjs.cpp
===================================================================
--- trunk/src/modules/filters/gbfwordjs.cpp	2008-04-28 05:02:24 UTC (rev 2151)
+++ trunk/src/modules/filters/gbfwordjs.cpp	2008-05-04 03:52:06 UTC (rev 2152)
@@ -6,6 +6,7 @@
 
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <gbfwordjs.h>
 #include <swmodule.h>
 #include <ctype.h>

Modified: trunk/src/modules/filters/thmlheadings.cpp
===================================================================
--- trunk/src/modules/filters/thmlheadings.cpp	2008-04-28 05:02:24 UTC (rev 2151)
+++ trunk/src/modules/filters/thmlheadings.cpp	2008-05-04 03:52:06 UTC (rev 2152)
@@ -33,6 +33,7 @@
 char ThMLHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
 	SWBuf token;
 	bool intoken    = false;
+	bool isheader   = false;
 	bool hide       = false;
 	bool preverse   = false;
 	bool withinDiv  = false;
@@ -89,6 +90,8 @@
 				}
 				if (tag.getAttribute("class") && ((!stricmp(tag.getAttribute("class"), "sechead"))
 										 ||  (!stricmp(tag.getAttribute("class"), "title")))) {
+
+					isheader = true;
 					
 					if (!tag.isEndTag()) { //start tag
 						if (!tag.isEmpty()) {
@@ -117,9 +120,11 @@
 					}
 */
 				}
+				else
+					isheader = false;
 			}
 
-			if (withinDiv) {
+			if (withinDiv && isheader) {
 				header.append('<');
 				header.append(token);
 				header.append('>');

Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp	2008-04-28 05:02:24 UTC (rev 2151)
+++ trunk/utilities/diatheke/corediatheke.cpp	2008-05-04 03:52:06 UTC (rev 2152)
@@ -6,7 +6,6 @@
 
 #include "corediatheke.h"
 #include <regex.h>
-#include <iostream>
 #include <list>
 #include <utilstr.h>
 #include <versekey.h>

Modified: trunk/utilities/diatheke/corediatheke.h
===================================================================
--- trunk/utilities/diatheke/corediatheke.h	2008-04-28 05:02:24 UTC (rev 2151)
+++ trunk/utilities/diatheke/corediatheke.h	2008-05-04 03:52:06 UTC (rev 2152)
@@ -4,6 +4,7 @@
 // see accompanying LICENSE file for license details
 
 #include <stdio.h>
+#include <iostream>
 
 #include "diathekemgr.h"
 #include <localemgr.h>

Modified: trunk/utilities/diatheke/diatheke.cpp
===================================================================
--- trunk/utilities/diatheke/diatheke.cpp	2008-04-28 05:02:24 UTC (rev 2151)
+++ trunk/utilities/diatheke/diatheke.cpp	2008-05-04 03:52:06 UTC (rev 2152)
@@ -8,7 +8,6 @@
 #include "corediatheke.h"
 #include "diathekemgr.h"
 #include "diafiltmgr.h"
-#include <iostream>
 #include <utilstr.h>
 
 using std::cout;

Modified: trunk/utilities/diatheke/osiscgi.cpp
===================================================================
--- trunk/utilities/diatheke/osiscgi.cpp	2008-04-28 05:02:24 UTC (rev 2151)
+++ trunk/utilities/diatheke/osiscgi.cpp	2008-05-04 03:52:06 UTC (rev 2152)
@@ -19,9 +19,7 @@
 #include <utilxml.h>
 #include <versekey.h>
 #include <swmodule.h>
-#ifdef WIN32
 #include <ctype.h>
-#endif
 
 SWORD_NAMESPACE_START