[sword-svn] r2736 - in trunk: bindings/java-jni/jni cmake include lib/bcppmake lib/vcppmake/vc8 src/mgr src/modules/filters
charcoal at crosswire.org
charcoal at crosswire.org
Sun Sep 23 15:55:18 MST 2012
Author: charcoal
Date: 2012-09-23 15:55:18 -0700 (Sun, 23 Sep 2012)
New Revision: 2736
Modified:
trunk/bindings/java-jni/jni/Android.mk
trunk/cmake/sources.cmake
trunk/include/Makefile.am
trunk/lib/bcppmake/libsword.bpf
trunk/lib/bcppmake/libsword.bpr
trunk/lib/vcppmake/vc8/libsword.vcxproj
trunk/src/mgr/markupfiltmgr.cpp
trunk/src/modules/filters/Makefile.am
Log:
clone teihtmlhref into teixhtml.
Modified: trunk/bindings/java-jni/jni/Android.mk
===================================================================
--- trunk/bindings/java-jni/jni/Android.mk 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/bindings/java-jni/jni/Android.mk 2012-09-23 22:55:18 UTC (rev 2736)
@@ -97,6 +97,7 @@
../../../src/modules/filters/thmlhtml.cpp \
../../../src/modules/filters/gbfthml.cpp \
../../../src/modules/filters/teihtmlhref.cpp \
+../../../src/modules/filters/teixhtml.cpp \
../../../src/modules/filters/gbfrtf.cpp \
../../../src/modules/filters/gbfosis.cpp \
../../../src/modules/filters/teirtf.cpp \
Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/cmake/sources.cmake 2012-09-23 22:55:18 UTC (rev 2736)
@@ -92,6 +92,7 @@
src/modules/filters/teiplain.cpp
src/modules/filters/teirtf.cpp
+ src/modules/filters/teixhtml.cpp
src/modules/filters/teihtmlhref.cpp
src/modules/filters/gbfthml.cpp
@@ -363,6 +364,7 @@
include/teiplain.h
include/teirtf.h
+ include/teixhtml.h
include/teihtmlhref.h
include/treekey.h
Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/include/Makefile.am 2012-09-23 22:55:18 UTC (rev 2736)
@@ -131,6 +131,7 @@
pkginclude_HEADERS += $(swincludedir)/teiplain.h
pkginclude_HEADERS += $(swincludedir)/teirtf.h
+pkginclude_HEADERS += $(swincludedir)/teixhtml.h
pkginclude_HEADERS += $(swincludedir)/teihtmlhref.h
pkginclude_HEADERS += $(swincludedir)/treekey.h
Modified: trunk/lib/bcppmake/libsword.bpf
===================================================================
--- trunk/lib/bcppmake/libsword.bpf 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/lib/bcppmake/libsword.bpf 2012-09-23 22:55:18 UTC (rev 2736)
@@ -156,6 +156,7 @@
USEUNIT("..\..\src\modules\filters\gbfxhtml.cpp");
USEUNIT("..\..\src\modules\filters\osisxhtml.cpp");
USEUNIT("..\..\src\modules\filters\thmlxhtml.cpp");
+USEUNIT("..\..\src\modules\filters\teixhtml.cpp");
//---------------------------------------------------------------------------
#define Library
Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/lib/bcppmake/libsword.bpr 2012-09-23 22:55:18 UTC (rev 2736)
@@ -122,7 +122,8 @@
..\..\src\modules\filters\osisruby.obj ..\..\src\mgr\curlhttpt.obj
..\..\src\modules\filters\gbfxhtml.obj
..\..\src\modules\filters\osisxhtml.obj
- ..\..\src\modules\filters\thmlxhtml.obj"/>
+ ..\..\src\modules\filters\thmlxhtml.obj
+ ..\..\src\modules\filters\teixhtml.obj"/>
<RESFILES value=""/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -305,4 +306,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
+</PROJECT>
Modified: trunk/lib/vcppmake/vc8/libsword.vcxproj
===================================================================
--- trunk/lib/vcppmake/vc8/libsword.vcxproj 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/lib/vcppmake/vc8/libsword.vcxproj 2012-09-23 22:55:18 UTC (rev 2736)
@@ -1626,6 +1626,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
+ <ClCompile Include="..\..\..\src\modules\filters\teixhtml.cpp" />
<ClCompile Include="..\..\..\src\modules\filters\teihtmlhref.cpp" />
<ClCompile Include="..\..\..\src\modules\filters\teiplain.cpp" />
<ClCompile Include="..\..\..\src\modules\filters\teirtf.cpp" />
@@ -2480,6 +2481,7 @@
<ClInclude Include="..\..\..\include\swwinlog.h" />
<ClInclude Include="..\..\..\include\sysdata.h" />
<ClInclude Include="..\..\..\include\tbdisp.h" />
+ <ClInclude Include="..\..\..\include\teixhtml.h" />
<ClInclude Include="..\..\..\include\teihtmlhref.h" />
<ClInclude Include="..\..\..\include\teiplain.h" />
<ClInclude Include="..\..\..\include\teirtf.h" />
@@ -2535,4 +2537,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/src/mgr/markupfiltmgr.cpp
===================================================================
--- trunk/src/mgr/markupfiltmgr.cpp 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/src/mgr/markupfiltmgr.cpp 2012-09-23 22:55:18 UTC (rev 2736)
@@ -46,6 +46,7 @@
#include <thmlxhtml.h>
#include <gbfxhtml.h>
#include <osisxhtml.h>
+#include <teixhtml.h>
#include <markupfiltmgr.h>
@@ -292,11 +293,11 @@
fromtei = NULL;
break;
case FMT_XHTML:
- fromplain = NULL;
+ fromplain = new PLAINHTML();
fromthml = new ThMLXHTML();
fromgbf = new GBFXHTML();
fromosis = new OSISXHTML();
- fromtei = NULL;
+ fromtei = new TEIXHTML();
break;
}
Modified: trunk/src/modules/filters/Makefile.am
===================================================================
--- trunk/src/modules/filters/Makefile.am 2012-09-16 00:05:37 UTC (rev 2735)
+++ trunk/src/modules/filters/Makefile.am 2012-09-23 22:55:18 UTC (rev 2736)
@@ -34,6 +34,7 @@
TEIFIL = $(filtersdir)/teiplain.cpp
TEIFIL += $(filtersdir)/teirtf.cpp
TEIFIL += $(filtersdir)/teihtmlhref.cpp
+TEIFIL += $(filtersdir)/teixhtml.cpp
CONVFIL = $(filtersdir)/gbfthml.cpp
CONVFIL += $(filtersdir)/gbfosis.cpp
More information about the sword-cvs
mailing list