From c3fc2108262762d1c4c54fac4b7376e65eb7689e Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sat, 30 Jan 2016 09:37:41 +0000 Subject: update hunspell pt1 git-svn-id: http://svn.miranda-ng.org/main/trunk@16191 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- libs/hunspell/hunspell.rc | Bin 0 -> 2598 bytes libs/hunspell/hunspell.vcxproj | 12 +- libs/hunspell/hunspell.vcxproj.filters | 333 +++++++++++++++++++++++++++++++++ libs/hunspell/include/hunspell.hpp | 16 ++ libs/hunspell/src/Hunspell.rc | 32 ---- libs/hunspell/src/config.h | 2 +- libs/hunspell/src/hunspell.hxx | 5 +- libs/hunspell/src/replist.hxx | 1 + 8 files changed, 363 insertions(+), 38 deletions(-) create mode 100644 libs/hunspell/hunspell.rc create mode 100644 libs/hunspell/include/hunspell.hpp delete mode 100644 libs/hunspell/src/Hunspell.rc (limited to 'libs') diff --git a/libs/hunspell/hunspell.rc b/libs/hunspell/hunspell.rc new file mode 100644 index 0000000000..bbb3f9870b Binary files /dev/null and b/libs/hunspell/hunspell.rc differ 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 @@ - - - - + + + + + + + + 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 @@ h;hpp;hxx;hm;inl + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + + + + + + + + + + + + + + Header Files + + + + + Source Files + + \ 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 - -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); -- cgit v1.2.3