[sword-svn] r2230 - trunk/utilities/diatheke

[chrislit at crosswire.org]

Author: chrislit
Date: 2009-01-30 18:30:13 -0700 (Fri, 30 Jan 2009)
New Revision: 2230

Modified:
   trunk/utilities/diatheke/diathekemgr.cpp
Log:
removed no longer necessary #includes
generalized Arabic shaper (will apply whenever enabled, not just when the module lang=ar)
minor cleanup


Modified: trunk/utilities/diatheke/diathekemgr.cpp
===================================================================
--- trunk/utilities/diatheke/diathekemgr.cpp	2009-01-26 05:12:35 UTC (rev 2229)
+++ trunk/utilities/diatheke/diathekemgr.cpp	2009-01-31 01:30:13 UTC (rev 2230)
@@ -1,21 +1,6 @@
 //---------------------------------------------------------------------------
-#include <thmlplain.h>
-#include <gbfplain.h>
-#include <thmlgbf.h>
-#include <gbfthml.h>
-#include <thmlhtml.h>
-#include <gbfhtml.h>
-#include <plainhtml.h>
-#include <thmlhtmlhref.h>
-#include <gbfhtmlhref.h>
-#include <thmlrtf.h>
-#include <gbfrtf.h>
-#include <utilstr.h>
 #include <swmodule.h>
 
-#include <swconfig.h>
-#include "diafiltmgr.h"
-
 #ifdef _ICU_
 #include <utf8arshaping.h>
 #include <utf8bidireorder.h>
@@ -27,8 +12,6 @@
 #endif
 
 #include "diathekemgr.h"
-#include "gbfcgi.h"
-#include "thmlcgi.h"
 
 //---------------------------------------------------------------------------
 DiathekeMgr::DiathekeMgr (SWConfig * iconfig, SWConfig * isysconfig, bool autoload, char enc, char mark, bool ibidi, bool ishape)
@@ -38,9 +21,9 @@
 	shape = ishape;
 
 #ifdef _ICU_
-    arshaping = new UTF8arShaping();
+	arshaping = new UTF8arShaping();
 	bidireorder = new UTF8BiDiReorder();
-    transliterator = new UTF8Transliterator();
+	transliterator = new UTF8Transliterator();
 #endif
 	Load();
 
@@ -78,10 +61,8 @@
 	rtl = ((entry = section.find("Direction")) != section.end()) ? ((*entry).second == "RtoL") : false;
 
 #ifdef _ICU_
-    if (shape && !strnicmp(lang.c_str(), "ar", 2)) {
-		module->AddRenderFilter(arshaping);
-	}
-    if (bidi && rtl) {
+        module->AddRenderFilter(arshaping);
+	if (bidi && rtl) {
 		module->AddRenderFilter(bidireorder);
 	}
 #endif