[sword-svn] r2328 - in trunk: . bindings/swig/vstudio include lib/bcppmake lib/vcppmake/vc8 src/mgr src/modules/filters tests tests/bcppmake utilities utilities/bcppmake utilities/diatheke utilities/kylixmake
scribe at crosswire.org
scribe at crosswire.org
Wed Apr 22 05:00:23 MST 2009
Author: scribe
Date: 2009-04-22 05:00:23 -0700 (Wed, 22 Apr 2009)
New Revision: 2328
Added:
trunk/include/utf8arabicpoints.h
trunk/src/modules/filters/utf8arabicpoints.cpp
Modified:
trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj
trunk/include/Makefile.am
trunk/lib/bcppmake/libsword.bdsproj
trunk/lib/bcppmake/libsword.bpf
trunk/lib/bcppmake/libsword.bpr
trunk/lib/bcppmake/libsword6icu.bpf
trunk/lib/bcppmake/libsword6icu.bpr
trunk/lib/vcppmake/vc8/libsword.vcproj
trunk/src/mgr/swmgr.cpp
trunk/src/modules/filters/Makefile.am
trunk/sword.kdevprj
trunk/tests/Makefile.am
trunk/tests/bcppmake/libsword.bpf
trunk/tests/bcppmake/libsword.bpr
trunk/utilities/bcppmake/libsword.bpf
trunk/utilities/bcppmake/libsword.bpr
trunk/utilities/diatheke/corediatheke.h
trunk/utilities/diatheke/diatheke.cpp
trunk/utilities/kylixmake/libsword.bpr
trunk/utilities/mod2osis.cpp
Log:
Applied Peter von Kaehne's patch to add Arabic point filter and small cleanups
Modified: trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj
===================================================================
--- trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/bindings/swig/vstudio/libsword_csharpsword.vcproj 2009-04-22 12:00:23 UTC (rev 2328)
@@ -892,6 +892,10 @@
>
</File>
<File
+ RelativePath="..\..\..\include\utf8arabicpoints.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\include\utf8html.h"
>
</File>
Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/include/Makefile.am 2009-04-22 12:00:23 UTC (rev 2328)
@@ -139,6 +139,7 @@
pkginclude_HEADERS += $(swincludedir)/utf8cantillation.h
pkginclude_HEADERS += $(swincludedir)/utf8greekaccents.h
pkginclude_HEADERS += $(swincludedir)/utf8hebrewpoints.h
+pkginclude_HEADERS += $(swincludedir)/utf8arabicpoints.h
pkginclude_HEADERS += $(swincludedir)/utf8html.h
pkginclude_HEADERS += $(swincludedir)/utf8latin1.h
pkginclude_HEADERS += $(swincludedir)/utf8nfc.h
Added: trunk/include/utf8arabicpoints.h
===================================================================
--- trunk/include/utf8arabicpoints.h (rev 0)
+++ trunk/include/utf8arabicpoints.h 2009-04-22 12:00:23 UTC (rev 2328)
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ * $Id: utf8arabicpoints.h 1688 2008-11-30 04:42:26Z refdoc $
+ *
+ * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#ifndef UTF8ARABICPOINTS_H
+#define UTF8ARABICPOINTS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides Arabic vowel points in UTF8 text
+ */
+class SWDLLEXPORT UTF8ArabicPoints : public SWOptionFilter {
+public:
+ UTF8ArabicPoints();
+ virtual ~UTF8ArabicPoints();
+ virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
Modified: trunk/lib/bcppmake/libsword.bdsproj
===================================================================
--- trunk/lib/bcppmake/libsword.bdsproj 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/lib/bcppmake/libsword.bdsproj 2009-04-22 12:00:23 UTC (rev 2328)
@@ -506,6 +506,7 @@
<FILE FILENAME="..\..\src\modules\filters\utf8cantillation.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8cantillation" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8greekaccents.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8greekaccents" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8hebrewpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8hebrewpoints" FORMNAME="" DESIGNCLASS=""/>
+ <FILE FILENAME="..\..\src\modules\filters\utf8arabicpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8arabicpoints" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8html.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8html" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8latin1.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8latin1" FORMNAME="" DESIGNCLASS=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8nfc.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8nfc" FORMNAME="" DESIGNCLASS=""/>
Modified: trunk/lib/bcppmake/libsword.bpf
===================================================================
--- trunk/lib/bcppmake/libsword.bpf 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/lib/bcppmake/libsword.bpf 2009-04-22 12:00:23 UTC (rev 2328)
@@ -1,3 +1,4 @@
+
//---------------------------------------------------------------------------
//#include <vcl.h>
@@ -105,6 +106,7 @@
USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
USEUNIT("..\..\src\modules\filters\utf8html.cpp");
USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/lib/bcppmake/libsword.bpr 2009-04-22 12:00:23 UTC (rev 2328)
@@ -87,6 +87,7 @@
..\..\src\modules\filters\utf8cantillation.obj
..\..\src\modules\filters\utf8greekaccents.obj
..\..\src\modules\filters\utf8hebrewpoints.obj
+ ..\..\src\modules\filters\utf8arabicpoints.obj
..\..\src\modules\filters\utf8html.obj
..\..\src\modules\filters\utf8latin1.obj
..\..\src\modules\filters\utf8nfc.obj
Modified: trunk/lib/bcppmake/libsword6icu.bpf
===================================================================
--- trunk/lib/bcppmake/libsword6icu.bpf 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/lib/bcppmake/libsword6icu.bpf 2009-04-22 12:00:23 UTC (rev 2328)
@@ -78,6 +78,7 @@
USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
USEUNIT("..\..\src\modules\filters\utf8html.cpp");
USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
Modified: trunk/lib/bcppmake/libsword6icu.bpr
===================================================================
--- trunk/lib/bcppmake/libsword6icu.bpr 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/lib/bcppmake/libsword6icu.bpr 2009-04-22 12:00:23 UTC (rev 2328)
@@ -32,6 +32,7 @@
..\..\obj\utf8arshaping.obj ..\..\obj\utf8bidireorder.obj
..\..\obj\utf8cantillation.obj ..\..\obj\utf8greekaccents.obj
..\..\obj\utf8hebrewpoints.obj ..\..\obj\utf8html.obj
+ ...\..\obj\utf8arabicpoints.obj
..\..\obj\utf8latin1.obj ..\..\obj\utf8nfc.obj ..\..\obj\utf8nfkd.obj
..\..\obj\utf8transliterator.obj ..\..\obj\zcom.obj ..\..\obj\rawld4.obj
..\..\obj\zipcomprs.obj ..\..\obj\zld.obj ..\..\obj\entriesblk.obj
@@ -177,6 +178,7 @@
<FILE FILENAME="..\..\src\modules\filters\utf8cantillation.cpp" FORMNAME="" UNITNAME="utf8cantillation" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8greekaccents.cpp" FORMNAME="" UNITNAME="utf8greekaccents" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8hebrewpoints.cpp" FORMNAME="" UNITNAME="utf8hebrewpoints" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\src\modules\filters\utf8arabicpoints.cpp" FORMNAME="" UNITNAME="utf8arabicpoints" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8html.cpp" FORMNAME="" UNITNAME="utf8html" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8latin1.cpp" FORMNAME="" UNITNAME="utf8latin1" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\modules\filters\utf8nfc.cpp" FORMNAME="" UNITNAME="utf8nfc" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/lib/vcppmake/vc8/libsword.vcproj
===================================================================
--- trunk/lib/vcppmake/vc8/libsword.vcproj 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/lib/vcppmake/vc8/libsword.vcproj 2009-04-22 12:00:23 UTC (rev 2328)
@@ -5480,6 +5480,53 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\modules\filters\utf8arabicpoints.cpp"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\src\modules\filters\utf8html.cpp"
>
<FileConfiguration
@@ -6816,6 +6863,10 @@
>
</File>
<File
+ RelativePath="..\..\..\include\utf8arabicpoints.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\include\utf8html.h"
>
</File>
Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/src/mgr/swmgr.cpp 2009-04-22 12:00:23 UTC (rev 2328)
@@ -76,6 +76,7 @@
#include <utf8greekaccents.h>
#include <utf8cantillation.h>
#include <utf8hebrewpoints.h>
+#include <utf8arabicpoints.h>
#include <greeklexattribs.h>
#include <swfiltermgr.h>
#include <swcipher.h>
@@ -214,6 +215,10 @@
optionFilters.insert(OptionFilterMap::value_type("UTF8HebrewPoints", tmpFilter));
cleanupFilters.push_back(tmpFilter);
+ tmpFilter = new UTF8ArabicPoints();
+ optionFilters.insert(OptionFilterMap::value_type("UTF8ArabicPoints", tmpFilter));
+ cleanupFilters.push_back(tmpFilter);
+
tmpFilter = new UTF8Cantillation();
optionFilters.insert(OptionFilterMap::value_type("UTF8Cantillation", tmpFilter));
cleanupFilters.push_back(tmpFilter);
Modified: trunk/src/modules/filters/Makefile.am
===================================================================
--- trunk/src/modules/filters/Makefile.am 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/src/modules/filters/Makefile.am 2009-04-22 12:00:23 UTC (rev 2328)
@@ -64,6 +64,7 @@
libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp
libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8arabicpoints.cpp
libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp
libsword_la_SOURCES += $(filtersdir)/cipherfil.cpp
Added: trunk/src/modules/filters/utf8arabicpoints.cpp
===================================================================
--- trunk/src/modules/filters/utf8arabicpoints.cpp (rev 0)
+++ trunk/src/modules/filters/utf8arabicpoints.cpp 2009-04-22 12:00:23 UTC (rev 2328)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ * UTF8ArabicPoints - SWFilter descendant to remove UTF-8 Arabic vowel points
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <utf8arabicpoints.h>
+
+SWORD_NAMESPACE_START
+
+const char oName[] = "Arabic Vowel Points";
+const char oTip[] = "Toggles Arabic Vowel Points";
+
+const SWBuf choices[3] = {"On", "Off", ""};
+const StringList oValues(&choices[0], &choices[2]);
+
+UTF8ArabicPoints::UTF8ArabicPoints() : SWOptionFilter(oName, oTip, &oValues) {
+ setOptionValue("On");
+}
+
+UTF8ArabicPoints::~UTF8ArabicPoints(){};
+
+
+char UTF8ArabicPoints::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+ if (!option) {
+ //The UTF-8 range 0xFC 0xE5 to 0xFC 0x63 consist of Arabic vowel marks so block those out.
+ // Also ranges 0xFE70 til OxFE7F and 0x064b-0x0655
+ SWBuf orig = text;
+ const unsigned char* from = (unsigned char*)orig.c_str();
+ for (text = ""; *from; from++) {
+ if (((*from == 0xFC) && (*(from + 1) >= 0xE5 && *(from + 1) <= 0x63)) || ((*from == 0xFE) && (*(from + 1) >= 0x70 && *(from + 1) <= 0x7F)) || ((*from == 0x06) && (*(from + 1) >= 0x4B && *(from + 1) <= 0x55))){
+ from++;
+ }
+ else {
+ text += *from;
+ }
+ }
+ }
+ return 0;
+}
+
+SWORD_NAMESPACE_END
Modified: trunk/sword.kdevprj
===================================================================
--- trunk/sword.kdevprj 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/sword.kdevprj 2009-04-22 12:00:23 UTC (rev 2328)
@@ -50,7 +50,7 @@
type=HEADER
[include/Makefile.am]
-files=include/canon.h,include/cipherfil.h,include/defs.h,include/echomod.h,include/entriesblk.h,include/femain.h,include/filemgr.h,include/gbffootnotes.h,include/gbfheadings.h,include/gbfhtml.h,include/swfilter.h,include/gbfhtmlhref.h,include/gbfmorph.h,include/gbfplain.h,include/gbfrtf.h,include/gbfstrongs.h,include/gbfthml.h,include/Greek2Greek.h,include/GreekChars.h,include/hrefcom.h,include/latin1utf16.h,include/latin1utf8.h,include/listkey.h,include/localemgr.h,include/lzsscomprs.h,include/plainfootnotes.h,include/plainhtml.h,include/rawcom.h,include/rawfiles.h,include/rawld.h,include/rawld4.h,include/rawstr.h,include/rawstr4.h,include/rawtext.h,include/rawverse.h,include/regex.h,include/roman.h,include/rtfhtml.h,include/rwphtml.h,include/rwprtf.h,include/sapphire.h,include/scsuutf8.h,include/strkey.h,include/swbasicfilter.h,include/swbyteswap.h,include/swcipher.h,include/swcom.h,include/swcomprs.h,include/swconfig.h,include/swdisp.h,include/swdisprtf.h,include/swdisprtfchap.h,include/swencodingmgr.h,include/swkey.h,include/swld.h,include/swlocale.h,include/swlog.h,include/swmacs.h,include/swmarkupmgr.h,include/swmgr.h,include/swmodule.h,include/swobject.h,include/swtext.h,include/swunicod.h,include/swwinlog.h,include/tbdisp.h,include/thmlgbf.h,include/thmlhtml.h,include/thmlhtmlhref.h,include/thmlplain.h,include/thmlrtf.h,include/unicodertf.h,include/unixstr.h,include/untgz.h,include/utf16utf8.h,include/utf8cantillation.h,include/utf8greekaccents.h,include/utf8hebrewpoints.h,include/utf8html.h,include/utf8latin1.h,include/utf8transliterator.h,include/utf8utf16.h,include/utilconf.h,include/utilfuns.h,include/utilstr.h,include/versekey.h,include/zcom.h,include/zconf.h,include/zipcomprs.h,include/zlib.h,include/ztext.h,include/zverse.h,include/thmlfootnotes.h,include/thmlheadings.h,include/thmllemma.h,include/thmlmorph.h,include/thmlscripref.h,include/thmlstrongs.h,include/utf8cnormalizer.h,include/utf8arshaping.h,include/utf8bidireorder.h,include/utf8nfc.h,include/utf8nfkd.h,include/encfiltmgr.h,include/swversion.h,include/swfiltermgr.h,include/markupfiltmgr.h,include/rawgenbook.h,include/swgenbook.h,include/treekey.h,include/thmlvariants.h,include/treekeyidx.h,include/zld.h,include/zstr.h,include/swinputmeth.h,include/nullim.h,include/hebrewmcim.h,include/flatapi.h,include/cdsourcemgr.h,include/ftpparse.h,include/gbfosis.h,include/gbfredletterwords.h,include/greeklexattribs.h,include/installmgr.h,include/osismorph.h,include/osisstrongs.h,include/remotesourcemgr.h,include/multimapwdef.h,include/swcacher.h,include/swinstallmgr.h,include/swremotemgr.h,include/swsourcemgr.h,include/sysdata.h,include/thmlosis.h,include/swbuf.h,include/osisplain.h,include/osisrtf.h
+files=include/canon.h,include/cipherfil.h,include/defs.h,include/echomod.h,include/entriesblk.h,include/femain.h,include/filemgr.h,include/gbffootnotes.h,include/gbfheadings.h,include/gbfhtml.h,include/swfilter.h,include/gbfhtmlhref.h,include/gbfmorph.h,include/gbfplain.h,include/gbfrtf.h,include/gbfstrongs.h,include/gbfthml.h,include/Greek2Greek.h,include/GreekChars.h,include/hrefcom.h,include/latin1utf16.h,include/latin1utf8.h,include/listkey.h,include/localemgr.h,include/lzsscomprs.h,include/plainfootnotes.h,include/plainhtml.h,include/rawcom.h,include/rawfiles.h,include/rawld.h,include/rawld4.h,include/rawstr.h,include/rawstr4.h,include/rawtext.h,include/rawverse.h,include/regex.h,include/roman.h,include/rtfhtml.h,include/rwphtml.h,include/rwprtf.h,include/sapphire.h,include/scsuutf8.h,include/strkey.h,include/swbasicfilter.h,include/swbyteswap.h,include/swcipher.h,include/swcom.h,include/swcomprs.h,include/swconfig.h,include/swdisp.h,include/swdisprtf.h,include/swdisprtfchap.h,include/swencodingmgr.h,include/swkey.h,include/swld.h,include/swlocale.h,include/swlog.h,include/swmacs.h,include/swmarkupmgr.h,include/swmgr.h,include/swmodule.h,include/swobject.h,include/swtext.h,include/swunicod.h,include/swwinlog.h,include/tbdisp.h,include/thmlgbf.h,include/thmlhtml.h,include/thmlhtmlhref.h,include/thmlplain.h,include/thmlrtf.h,include/unicodertf.h,include/unixstr.h,include/untgz.h,include/utf16utf8.h,include/utf8cantillation.h,include/utf8greekaccents.h,include/utf8arabicpoints.h,include/utf8hebrewpoints.h,include/utf8html.h,include/utf8latin1.h,include/utf8transliterator.h,include/utf8utf16.h,include/utilconf.h,include/utilfuns.h,include/utilstr.h,include/versekey.h,include/zcom.h,include/zconf.h,include/zipcomprs.h,include/zlib.h,include/ztext.h,include/zverse.h,include/thmlfootnotes.h,include/thmlheadings.h,include/thmllemma.h,include/thmlmorph.h,include/thmlscripref.h,include/thmlstrongs.h,include/utf8cnormalizer.h,include/utf8arshaping.h,include/utf8bidireorder.h,include/utf8nfc.h,include/utf8nfkd.h,include/encfiltmgr.h,include/swversion.h,include/swfiltermgr.h,include/markupfiltmgr.h,include/rawgenbook.h,include/swgenbook.h,include/treekey.h,include/thmlvariants.h,include/treekeyidx.h,include/zld.h,include/zstr.h,include/swinputmeth.h,include/nullim.h,include/hebrewmcim.h,include/flatapi.h,include/cdsourcemgr.h,include/ftpparse.h,include/gbfosis.h,include/gbfredletterwords.h,include/greeklexattribs.h,include/installmgr.h,include/osismorph.h,include/osisstrongs.h,include/remotesourcemgr.h,include/multimapwdef.h,include/swcacher.h,include/swinstallmgr.h,include/swremotemgr.h,include/swsourcemgr.h,include/sysdata.h,include/thmlosis.h,include/swbuf.h,include/osisplain.h,include/osisrtf.h
sub_dirs=
type=normal
@@ -756,6 +756,12 @@
install_location=
type=HEADER
+[include/utf8arabicpoints.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
[include/utf8html.h]
dist=true
install=false
@@ -1208,7 +1214,7 @@
type=SOURCE
[src/modules/filters/Makefile.am]
-files=src/modules/filters/cipherfil.cpp,src/modules/filters/gbffootnotes.cpp,src/modules/filters/gbfheadings.cpp,src/modules/filters/gbfhtml.cpp,src/modules/filters/gbfhtmlhref.cpp,src/modules/filters/gbfmorph.cpp,src/modules/filters/gbfplain.cpp,src/modules/filters/gbfrtf.cpp,src/modules/filters/gbfstrongs.cpp,src/modules/filters/gbfthml.cpp,src/modules/filters/latin1utf16.cpp,src/modules/filters/latin1utf8.cpp,src/modules/filters/plainfootnotes.cpp,src/modules/filters/plainhtml.cpp,src/modules/filters/rtfhtml.cpp,src/modules/filters/rwphtml.cpp,src/modules/filters/rwprtf.cpp,src/modules/filters/scsuutf8.cpp,src/modules/filters/swbasicfilter.cpp,src/modules/filters/thmlgbf.cpp,src/modules/filters/thmlhtml.cpp,src/modules/filters/thmlhtmlhref.cpp,src/modules/filters/thmlplain.cpp,src/modules/filters/thmlrtf.cpp,src/modules/filters/unicodertf.cpp,src/modules/filters/utf16utf8.cpp,src/modules/filters/utf8cantillation.cpp,src/modules/filters/utf8greekaccents.cpp,src/modules/filters/utf8hebrewpoints.cpp,src/modules/filters/utf8html.cpp,src/modules/filters/utf8latin1.cpp,src/modules/filters/utf8transliterator.cpp,src/modules/filters/utf8utf16.cpp,src/modules/filters/thmlfootnotes.cpp,src/modules/filters/thmlheadings.cpp,src/modules/filters/thmllemma.cpp,src/modules/filters/thmlmorph.cpp,src/modules/filters/thmlscripref.cpp,src/modules/filters/thmlstrongs.cpp,src/modules/filters/utf8nfc.cpp,src/modules/filters/utf8nfkd.cpp,src/modules/filters/utf8arshaping.cpp,src/modules/filters/utf8bidireorder.cpp,src/modules/filters/thmlvariants.cpp,src/modules/filters/gbfosis.cpp,src/modules/filters/gbfredletterwords.cpp,src/modules/filters/greeklexattribs.cpp,src/modules/filters/osismorph.cpp,src/modules/filters/osisstrongs.cpp,src/modules/filters/thmlosis.cpp,src/modules/filters/osisplain.cpp,src/modules/filters/osisrtf.cpp,src/modules/filters/gbfwebif.cpp,src/modules/filters/osisfootnotes.cpp,src/modules/filters/osisheadings.cpp,src/modules/filters/osishtmlhref.cpp,src/modules/filters/osislemma.cpp,src/modules/filters/osisredletterwords.cpp,src/modules/filters/osisscripref.cpp,src/modules/filters/osiswebif.cpp,src/modules/filters/swoptfilter.cpp,src/modules/filters/thmlwebif.cpp
+files=src/modules/filters/cipherfil.cpp,src/modules/filters/gbffootnotes.cpp,src/modules/filters/gbfheadings.cpp,src/modules/filters/gbfhtml.cpp,src/modules/filters/gbfhtmlhref.cpp,src/modules/filters/gbfmorph.cpp,src/modules/filters/gbfplain.cpp,src/modules/filters/gbfrtf.cpp,src/modules/filters/gbfstrongs.cpp,src/modules/filters/gbfthml.cpp,src/modules/filters/latin1utf16.cpp,src/modules/filters/latin1utf8.cpp,src/modules/filters/plainfootnotes.cpp,src/modules/filters/plainhtml.cpp,src/modules/filters/rtfhtml.cpp,src/modules/filters/rwphtml.cpp,src/modules/filters/rwprtf.cpp,src/modules/filters/scsuutf8.cpp,src/modules/filters/swbasicfilter.cpp,src/modules/filters/thmlgbf.cpp,src/modules/filters/thmlhtml.cpp,src/modules/filters/thmlhtmlhref.cpp,src/modules/filters/thmlplain.cpp,src/modules/filters/thmlrtf.cpp,src/modules/filters/unicodertf.cpp,src/modules/filters/utf16utf8.cpp,src/modules/filters/utf8cantillation.cpp,src/modules/filters/utf8greekaccents.cpp,src/modules/filters/utf8hebrewpoints.cpp,src/modules/filters/utf8arabicpoints.cpp,src/modules/filters/utf8html.cpp,src/modules/filters/utf8latin1.cpp,src/modules/filters/utf8transliterator.cpp,src/modules/filters/utf8utf16.cpp,src/modules/filters/thmlfootnotes.cpp,src/modules/filters/thmlheadings.cpp,src/modules/filters/thmllemma.cpp,src/modules/filters/thmlmorph.cpp,src/modules/filters/thmlscripref.cpp,src/modules/filters/thmlstrongs.cpp,src/modules/filters/utf8nfc.cpp,src/modules/filters/utf8nfkd.cpp,src/modules/filters/utf8arshaping.cpp,src/modules/filters/utf8bidireorder.cpp,src/modules/filters/thmlvariants.cpp,src/modules/filters/gbfosis.cpp,src/modules/filters/gbfredletterwords.cpp,src/modules/filters/greeklexattribs.cpp,src/modules/filters/osismorph.cpp,src/modules/filters/osisstrongs.cpp,src/modules/filters/thmlosis.cpp,src/modules/filters/osisplain.cpp,src/modules/filters/osisrtf.cpp,src/modules/filters/gbfwebif.cpp,src/modules/filters/osisfootnotes.cpp,src/modules/filters/osisheadings.cpp,src/modules/filters/osishtmlhref.cpp,src/modules/filters/osislemma.cpp,src/modules/filters/osisredletterwords.cpp,src/modules/filters/osisscripref.cpp,src/modules/filters/osiswebif.cpp,src/modules/filters/swoptfilter.cpp,src/modules/filters/thmlwebif.cpp
sharedlib_LDFLAGS=-version-info 0:0:1
sharedlib_rootname=filters
sub_dirs=
@@ -1550,6 +1556,12 @@
install_location=
type=SOURCE
+[src/modules/filters/utf8arabicpoints.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
[src/modules/filters/utf8html.cpp]
dist=true
install=false
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/tests/Makefile.am 2009-04-22 12:00:23 UTC (rev 2328)
@@ -56,6 +56,7 @@
romantest_SOURCES = romantest.cpp
testblocks_SOURCES = testblocks.cpp
filtertest_SOURCES = filtertest.cpp
+arabicfiltertest_SOURCES = arabicfiltertest.cpp
lextest_SOURCES = lextest.cpp
rawldidxtest_SOURCES = rawldidxtest.cpp
swaptest_SOURCES = swaptest.cpp
Modified: trunk/tests/bcppmake/libsword.bpf
===================================================================
--- trunk/tests/bcppmake/libsword.bpf 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/tests/bcppmake/libsword.bpf 2009-04-22 12:00:23 UTC (rev 2328)
@@ -79,6 +79,7 @@
USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
USEUNIT("..\..\src\modules\filters\utf8html.cpp");
USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
Modified: trunk/tests/bcppmake/libsword.bpr
===================================================================
--- trunk/tests/bcppmake/libsword.bpr 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/tests/bcppmake/libsword.bpr 2009-04-22 12:00:23 UTC (rev 2328)
@@ -64,6 +64,7 @@
..\..\src\modules\filters\utf8cantillation.obj
..\..\src\modules\filters\utf8greekaccents.obj
..\..\src\modules\filters\utf8hebrewpoints.obj
+ ..\..\src\modules\filters\utf8arabicpoints.obj
..\..\src\modules\filters\utf8html.obj
..\..\src\modules\filters\utf8latin1.obj
..\..\src\modules\filters\utf8nfc.obj
Modified: trunk/utilities/bcppmake/libsword.bpf
===================================================================
--- trunk/utilities/bcppmake/libsword.bpf 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/utilities/bcppmake/libsword.bpf 2009-04-22 12:00:23 UTC (rev 2328)
@@ -79,6 +79,7 @@
USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
USEUNIT("..\..\src\modules\filters\utf8html.cpp");
USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
Modified: trunk/utilities/bcppmake/libsword.bpr
===================================================================
--- trunk/utilities/bcppmake/libsword.bpr 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/utilities/bcppmake/libsword.bpr 2009-04-22 12:00:23 UTC (rev 2328)
@@ -64,6 +64,7 @@
..\..\src\modules\filters\utf8cantillation.obj
..\..\src\modules\filters\utf8greekaccents.obj
..\..\src\modules\filters\utf8hebrewpoints.obj
+ ..\..\src\modules\filters\utf8arabicpoints.obj
..\..\src\modules\filters\utf8html.obj
..\..\src\modules\filters\utf8latin1.obj
..\..\src\modules\filters\utf8nfc.obj
Modified: trunk/utilities/diatheke/corediatheke.h
===================================================================
--- trunk/utilities/diatheke/corediatheke.h 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/utilities/diatheke/corediatheke.h 2009-04-22 12:00:23 UTC (rev 2328)
@@ -47,7 +47,7 @@
#define OP_BIDI 2048
#define OP_VARIANTS 4096
#define OP_RED 8192
-
+#define OP_ARABICPOINTS 16384
#define ST_NONE 0
#define ST_REGEX 1 //0
#define ST_PHRASE 2 // -1
Modified: trunk/utilities/diatheke/diatheke.cpp
===================================================================
--- trunk/utilities/diatheke/diatheke.cpp 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/utilities/diatheke/diatheke.cpp 2009-04-22 12:00:23 UTC (rev 2328)
@@ -46,7 +46,7 @@
fprintf (stderr, "Valid search_type values are: regex, multiword, and phrase(def).\n");
fprintf (stderr, "Valid option_filters values are: n (Strong's numbers),\n");
fprintf (stderr, " f (Footnotes), m (Morphology), h (Section Headings),\n");
- fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents),\n");
+ fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents), p (Arabic Vowels)\n");
fprintf (stderr, " l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping,\n");
fprintf (stderr, " b (Bi-Directional Reordering), x (Red Words of Christ)\n");
@@ -143,6 +143,8 @@
optionfilters |= OP_BIDI;
if (strchr(argv[i+1], 'x'))
optionfilters |= OP_RED;
+ if (strchr(argv[i+1], 'p'))
+ optionfilters |= OP_ARABICPOINTS;
i++;
}
}
Modified: trunk/utilities/kylixmake/libsword.bpr
===================================================================
--- trunk/utilities/kylixmake/libsword.bpr 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/utilities/kylixmake/libsword.bpr 2009-04-22 12:00:23 UTC (rev 2328)
@@ -60,6 +60,7 @@
../../src/modules/filters/utf8cantillation.o
../../src/modules/filters/utf8greekaccents.o
../../src/modules/filters/utf8hebrewpoints.o
+ ../../src/modules/filters/utf8arabicpoints.o
../../src/modules/filters/utf8html.o
../../src/modules/filters/utf8latin1.o ../../src/modules/filters/utf8nfc.o
../../src/modules/filters/utf8nfkd.o
Modified: trunk/utilities/mod2osis.cpp
===================================================================
--- trunk/utilities/mod2osis.cpp 2009-04-22 11:42:33 UTC (rev 2327)
+++ trunk/utilities/mod2osis.cpp 2009-04-22 12:00:23 UTC (rev 2328)
@@ -95,7 +95,7 @@
int lastBook = 9999;
int lastChap = 9999;
if (!vkey) {
- cerr << "Currently mod2zmod only works with verse keyed modules\n\n";
+ cerr << "Currently mod2osis only works with verse keyed modules\n\n";
exit(-1);
}
More information about the sword-cvs
mailing list