update hunspell pt1

git-svn-id: http://svn.miranda-ng.org/main/trunk@16191 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 363 insertions, 38 deletions

diff --git a/libs/hunspell/hunspell.rc b/libs/hunspell/hunspell.rc
new file mode 100644
index 0000000000..bbb3f9870b
--- /dev/null
+++ b/libs/hunspell/hunspell.rc
diff --git a/libs/hunspell/hunspell.vcxproj b/libs/hunspell/hunspell.vcxproj
index b0d1096454..97e7c44b15 100644
--- a/libs/hunspell/hunspell.vcxproj
+++ b/libs/hunspell/hunspell.vcxproj
@@ -116,14 +116,18 @@
     <ClCompile Include="src\hashmgr.cxx" />

     <ClCompile Include="src\hunspell.cxx" />

     <ClCompile Include="src\suggestmgr.cxx" />

-	<ClCompile Include="src\filemgr.cxx" />

-	<ClCompile Include="src\phonet.cxx" />

-	<ClCompile Include="src\hunzip.cxx" />

-	<ClCompile Include="src\replist.cxx" />

+    <ClCompile Include="src\filemgr.cxx" />

+    <ClCompile Include="src\phonet.cxx" />

+    <ClCompile Include="src\hunzip.cxx" />

+    <ClCompile Include="src\replist.cxx" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="resource.h" />

     <ClInclude Include="src\*.hxx" />

   </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Hunspell.rc" />

+  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/libs/hunspell/hunspell.vcxproj.filters b/libs/hunspell/hunspell.vcxproj.filters
index 307161251b..8208048148 100644
--- a/libs/hunspell/hunspell.vcxproj.filters
+++ b/libs/hunspell/hunspell.vcxproj.filters
@@ -10,4 +10,337 @@
       <Extensions>h;hpp;hxx;hm;inl</Extensions>

     </Filter>

   </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="src\affentry.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\affixmgr.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\csutil.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\dictmgr.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\hashmgr.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\hunspell.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\suggestmgr.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\filemgr.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\phonet.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\hunzip.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\replist.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="src\affentry.hxx">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\affixmgr.hxx" />

+    <ClInclude Include="src\atypes.hxx" />

+    <ClInclude Include="src\baseaffix.hxx" />

+    <ClInclude Include="src\csutil.hxx" />

+    <ClInclude Include="src\dictmgr.hxx" />

+    <ClInclude Include="src\filemgr.hxx" />

+    <ClInclude Include="src\hashmgr.hxx" />

+    <ClInclude Include="src\htypes.hxx" />

+    <ClInclude Include="src\hunspell.hxx" />

+    <ClInclude Include="src\hunzip.hxx" />

+    <ClInclude Include="src\langnum.hxx" />

+    <ClInclude Include="src\phonet.hxx" />

+    <ClInclude Include="src\replist.hxx" />

+    <ClInclude Include="src\suggestmgr.hxx" />

+    <ClInclude Include="src\w_char.hxx" />

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Hunspell.rc">

+      <Filter>Source Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/libs/hunspell/include/hunspell.hpp b/libs/hunspell/include/hunspell.hpp
new file mode 100644
index 0000000000..7d5ec5c771
--- /dev/null
+++ b/libs/hunspell/include/hunspell.hpp
@@ -0,0 +1,16 @@
+#include "../src/hunspell.h"

+#include "../src/hunspell.hxx"

+#include "../src/affentry.hxx"

+#include "../src/config.h"

+#include "../src/hunspell.hxx"

+#include "../src/csutil.hxx"

+#include "../src/affixmgr.hxx"

+#include "../src/langnum.hxx"

+#include "../src/atypes.hxx"

+#include "../src/dictmgr.hxx"

+#include "../src/filemgr.hxx"

+#include "../src/hashmgr.hxx"

+#include "../src/hunzip.hxx"

+#include "../src/phonet.hxx"

+#include "../src/replist.hxx"

+#include "../src/suggestmgr.hxx" 
\ No newline at end of file
diff --git a/libs/hunspell/src/Hunspell.rc b/libs/hunspell/src/Hunspell.rc
deleted file mode 100644
index b8465bc150..0000000000
--- a/libs/hunspell/src/Hunspell.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-

-#include <windows.h>

-

-VS_VERSION_INFO VERSIONINFO

-FILEVERSION 1,3,4,0

-PRODUCTVERSION 1,3,4,0

-FILEFLAGSMASK 0x17L

-FILEFLAGS 0

-FILEOS VOS_NT_WINDOWS32

-FILETYPE VFT_APP

-FILESUBTYPE VFT2_UNKNOWN

-BEGIN

-	BLOCK	"VarFileInfo"

-	BEGIN

-		VALUE	"Translation",	0x409,	1200

-	END

-	BLOCK	"StringFileInfo"

-	BEGIN

-		BLOCK "040904b0"

-		BEGIN

-            VALUE "Comments", "Hunspell (http://hunspell.github.io/) by László Németh"

-            VALUE "CompanyName", "http://hunspell.github.io/"

-            VALUE "FileDescription", "libhunspell"

-            VALUE "FileVersion", "1.3.4"

-            VALUE "InternalName", "libhunspell"

-            VALUE "LegalCopyright", "Copyright (c) 2007-2011"

-            VALUE "OriginalFilename", "libhunspell.dll"

-            VALUE "ProductName", "Hunspell Dynamic Link Library"

-            VALUE "ProductVersion", "1.3.4"

-		END

-	END

-END

diff --git a/libs/hunspell/src/config.h b/libs/hunspell/src/config.h
index 1ba48a798b..f1963148b6 100644
--- a/libs/hunspell/src/config.h
+++ b/libs/hunspell/src/config.h
@@ -180,7 +180,7 @@
 #define HAVE___ARGZ_STRINGIFY 1
 
 /* "Define if you use exterimental functions" */
-#undef HUNSPELL_EXPERIMENTAL
+//#define HUNSPELL_EXPERIMENTAL 1
 
 /* "Define if you need warning messages" */
 #define HUNSPELL_WARNING_ON
diff --git a/libs/hunspell/src/hunspell.hxx b/libs/hunspell/src/hunspell.hxx
index 12124e1db0..259d44f86c 100644
--- a/libs/hunspell/src/hunspell.hxx
+++ b/libs/hunspell/src/hunspell.hxx
@@ -117,7 +117,6 @@ class LIBHUNSPELL_DLL_EXPORTED Hunspell {
    * long path names (without the long path prefix Hunspell will use fopen()
    * with system-dependent character encoding instead of _wfopen()).
    */
-
   Hunspell(const char* affpath, const char* dpath, const char* key = NULL);
   ~Hunspell();
 
@@ -226,6 +225,10 @@ class LIBHUNSPELL_DLL_EXPORTED Hunspell {
   /* need for putdic */
   int input_conv(const char* word, char* dest, size_t destsize);
 
+  inline char *get_try_string()
+  {
+	  return pAMgr->get_try_string();
+  }
 /* experimental and deprecated functions */
 
 #ifdef HUNSPELL_EXPERIMENTAL
diff --git a/libs/hunspell/src/replist.hxx b/libs/hunspell/src/replist.hxx
index fe51b8a3b6..319eb03fb0 100644
--- a/libs/hunspell/src/replist.hxx
+++ b/libs/hunspell/src/replist.hxx
@@ -96,6 +96,7 @@ class LIBHUNSPELL_DLL_EXPORTED RepList {
   int get_pos();
   int add(char* pat1, char* pat2);
   replentry* item(int n);
+#undef near
   int near(const char* word);
   int match(const char* word, int n);
   int conv(const char* word, char* dest, size_t destsize);