[sword-svn] r3075 - in trunk: cmake lib/vcppmake src/mgr src/modules/filters

[chrislit at crosswire.org]

Author: chrislit
Date: 2014-03-04 19:27:33 -0700 (Tue, 04 Mar 2014)
New Revision: 3075

Modified:
   trunk/cmake/sources.cmake
   trunk/lib/vcppmake/libsword.vcxproj
   trunk/src/mgr/markupfiltmgr.cpp
   trunk/src/modules/filters/Makefile.am
Log:
integrated TEILaTeX into projects & MarkupFilterMgr

Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake	2014-03-05 00:30:21 UTC (rev 3074)
+++ trunk/cmake/sources.cmake	2014-03-05 02:27:33 UTC (rev 3075)
@@ -96,6 +96,7 @@
 	src/modules/filters/teirtf.cpp
 	src/modules/filters/teixhtml.cpp
 	src/modules/filters/teihtmlhref.cpp
+	src/modules/filters/teilatex.cpp
 
 	src/modules/filters/gbfthml.cpp
 	src/modules/filters/gbfosis.cpp
@@ -383,6 +384,7 @@
 	include/teirtf.h
 	include/teixhtml.h
 	include/teihtmlhref.h
+	include/teilatex.h
 
 	include/treekey.h
 	include/treekeyidx.h

Modified: trunk/lib/vcppmake/libsword.vcxproj
===================================================================
--- trunk/lib/vcppmake/libsword.vcxproj	2014-03-05 00:30:21 UTC (rev 3074)
+++ trunk/lib/vcppmake/libsword.vcxproj	2014-03-05 02:27:33 UTC (rev 3075)
@@ -143,6 +143,7 @@
     <ClCompile Include="..\..\src\modules\filters\osisxlit.cpp" />
     <ClCompile Include="..\..\src\modules\filters\osisreferencelinks.cpp" />
     <ClCompile Include="..\..\src\modules\filters\scsuutf8.cpp" />
+    <ClCompile Include="..\..\src\modules\filters\teilatex.cpp" />
     <ClCompile Include="..\..\src\modules\filters\thmllatex.cpp" />
     <ClCompile Include="..\..\src\utilfuns\win32\dirent.cpp" />
     <ClCompile Include="..\..\src\mgr\encfiltmgr.cpp" />
@@ -413,6 +414,7 @@
     <ClInclude Include="..\..\include\swtext.h" />
     <ClInclude Include="..\..\include\swversion.h" />
     <ClInclude Include="..\..\include\sysdata.h" />
+    <ClInclude Include="..\..\include\teilatex.h" />
     <ClInclude Include="..\..\include\teixhtml.h" />
     <ClInclude Include="..\..\include\teihtmlhref.h" />
     <ClInclude Include="..\..\include\teiplain.h" />

Modified: trunk/src/mgr/markupfiltmgr.cpp
===================================================================
--- trunk/src/mgr/markupfiltmgr.cpp	2014-03-05 00:30:21 UTC (rev 3074)
+++ trunk/src/mgr/markupfiltmgr.cpp	2014-03-05 02:27:33 UTC (rev 3075)
@@ -52,6 +52,7 @@
 #include <teixhtml.h>
 #include <gbflatex.h>
 #include <thmllatex.h>
+#include <teilatex.h>
  
 #include <markupfiltmgr.h>
 
@@ -287,7 +288,7 @@
 		fromthml  = new ThMLLaTeX();
 		fromgbf   = new GBFLaTeX();
 		fromosis  = new OSISLaTeX();
-		fromtei   = NULL;
+		fromtei   = new TEILaTeX();
 		break;
 
 	case FMT_OSIS:

Modified: trunk/src/modules/filters/Makefile.am
===================================================================
--- trunk/src/modules/filters/Makefile.am	2014-03-05 00:30:21 UTC (rev 3074)
+++ trunk/src/modules/filters/Makefile.am	2014-03-05 02:27:33 UTC (rev 3075)
@@ -37,6 +37,7 @@
 TEIFIL += $(filtersdir)/teirtf.cpp
 TEIFIL += $(filtersdir)/teihtmlhref.cpp
 TEIFIL += $(filtersdir)/teixhtml.cpp
+TEIFIL += $(filtersdir)/teilatex.cpp
 
 CONVFIL = $(filtersdir)/gbfthml.cpp
 CONVFIL += $(filtersdir)/gbfosis.cpp