[sword-svn] r2843 - in trunk: bindings/java-jni/jni bindings/swig bindings/swig/vstudio src/mgr utilities/diatheke

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-06-29 04:22:27 -0700 (Sat, 29 Jun 2013)
New Revision: 2843

Modified:
   trunk/bindings/java-jni/jni/Android.mk
   trunk/bindings/swig/osishtmlhref.i
   trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj
   trunk/src/mgr/markupfiltmgr.cpp
   trunk/utilities/diatheke/diafiltmgr.cpp
Log:
removed PLAINHTML and PLAINFootnotes filters, which assumed plaintext modules had a very specific format that they do not in fact have


Modified: trunk/bindings/java-jni/jni/Android.mk
===================================================================
--- trunk/bindings/java-jni/jni/Android.mk	2013-06-29 11:12:59 UTC (rev 2842)
+++ trunk/bindings/java-jni/jni/Android.mk	2013-06-29 11:22:27 UTC (rev 2843)
@@ -67,7 +67,6 @@
 ../../../src/modules/filters/utf8greekaccents.cpp \
 ../../../src/modules/filters/utf16utf8.cpp \
 ../../../src/modules/filters/gbfwebif.cpp \
-../../../src/modules/filters/plainfootnotes.cpp \
 ../../../src/modules/filters/utf8transliterator.cpp \
 ../../../src/modules/filters/gbfstrongs.cpp \
 ../../../src/modules/filters/osisplain.cpp \
@@ -129,7 +128,6 @@
 ../../../src/modules/filters/osismorphsegmentation.cpp \
 ../../../src/modules/filters/thmlwebif.cpp \
 ../../../src/modules/filters/thmlvariants.cpp \
-../../../src/modules/filters/plainhtml.cpp \
 ../../../src/modules/filters/thmllemma.cpp \
 ../../../src/modules/filters/gbfmorph.cpp \
 ../../../src/modules/filters/teiplain.cpp \

Modified: trunk/bindings/swig/osishtmlhref.i
===================================================================
--- trunk/bindings/swig/osishtmlhref.i	2013-06-29 11:12:59 UTC (rev 2842)
+++ trunk/bindings/swig/osishtmlhref.i	2013-06-29 11:22:27 UTC (rev 2843)
@@ -1,7 +1,6 @@
 %{
 #include <swbasicfilter.h>
 #include <osishtmlhref.h>
-#include <plainhtml.h>
 #include <thmlhtmlhref.h>
 #include <gbfhtmlhref.h>
 #include "utf8html.h"
@@ -9,7 +8,6 @@
 
 %include <swbasicfilter.h>
 %include "osishtmlhref.h"
-%include "plainhtml.h"
 %include "thmlhtmlhref.h"
 %include "gbfhtmlhref.h"
 %include "utf8html.h"

Modified: trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj
===================================================================
--- trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj	2013-06-29 11:12:59 UTC (rev 2842)
+++ trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj	2013-06-29 11:22:27 UTC (rev 2843)
@@ -572,14 +572,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\plainfootnotes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\plainhtml.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\include\rawcom.h"
 				>
 			</File>

Modified: trunk/src/mgr/markupfiltmgr.cpp
===================================================================
--- trunk/src/mgr/markupfiltmgr.cpp	2013-06-29 11:12:59 UTC (rev 2842)
+++ trunk/src/mgr/markupfiltmgr.cpp	2013-06-29 11:22:27 UTC (rev 2843)
@@ -30,7 +30,6 @@
 #include <gbfthml.h>
 #include <thmlhtml.h>
 #include <gbfhtml.h>
-#include <plainhtml.h>
 #include <thmlhtmlhref.h>
 #include <gbfhtmlhref.h>
 #include <teihtmlhref.h>
@@ -254,14 +253,14 @@
                         fromtei = NULL;
                         break;
                 case FMT_HTML:
-                        fromplain = new PLAINHTML();
+                        fromplain = NULL;
                         fromthml = new ThMLHTML();
                         fromgbf = new GBFHTML();
                         fromosis = NULL;
                         fromtei = NULL;
                         break;
                 case FMT_HTMLHREF:
-                        fromplain = new PLAINHTML();
+                        fromplain = NULL;
                         fromthml = new ThMLHTMLHREF();
                         fromgbf = new GBFHTMLHREF();
                         fromosis = new OSISHTMLHREF();
@@ -296,7 +295,7 @@
                         fromtei = NULL;
                         break;
                 case FMT_XHTML:
-                        fromplain = new PLAINHTML();
+                        fromplain = NULL;
                         fromthml = new ThMLXHTML();
                         fromgbf = new GBFXHTML();
                         fromosis = new OSISXHTML();

Modified: trunk/utilities/diatheke/diafiltmgr.cpp
===================================================================
--- trunk/utilities/diatheke/diafiltmgr.cpp	2013-06-29 11:12:59 UTC (rev 2842)
+++ trunk/utilities/diatheke/diafiltmgr.cpp	2013-06-29 11:22:27 UTC (rev 2843)
@@ -26,7 +26,6 @@
 #include <gbfthml.h>
 #include <thmlhtml.h>
 #include <gbfhtml.h>
-#include <plainhtml.h>
 #include <thmlhtmlhref.h>
 #include <gbfhtmlhref.h>
 #include <thmlrtf.h>
@@ -203,7 +202,7 @@
                         fromosis = NULL;
                         break;
                 case FMT_HTML:
-                        fromplain = new PLAINHTML();
+                        fromplain = NULL;
                         fromthml = new ThMLHTML();
                         fromgbf = new GBFHTML();
                         fromosis = NULL;