Revert "drop unused get_csconv"

This reverts commit 2efae03.
hunspell · Nov 27, 2016 · ab0079d · jbeich · Nov 28, 2016 · dimztimz
1 parent 1f6e2fb
commit ab0079d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/man/hunspell.3 b/man/hunspell.3
@@ -49,6 +49,8 @@
 .sp
 .BI "unsigned short * get_wordchars_utf16(int *" len);
 .sp
+.BI "struct cs_info * get_csconv(" );
+.sp
 .BI "const char * get_version(" );
 .SH DESCRIPTION
 The \fBHunspell\fR library routines give the user word-level
@@ -137,6 +139,9 @@ as a model of the enabled affixation of the new word.
 The get_dic_encoding() function returns "ISO8859-1" or the character
 encoding defined in the affix file with the "SET" keyword.
 .PP
+The get_csconv() function returns the 8-bit character case table of the
+encoding of the dictionary.
+.PP
 The get_wordchars() and get_wordchars_utf16() return the 
 extra word characters definied in affix file for tokenization by
 the "WORDCHARS" keyword.

diff --git a/src/hunspell/Makefile.am b/src/hunspell/Makefile.am
@@ -10,7 +10,7 @@ libhunspell_1_5_la_SOURCES=affentry.cxx affixmgr.cxx csutil.cxx \
 	             phonet.hxx filemgr.hxx hunzip.hxx replist.hxx
 
 libhunspell_1_5_include_HEADERS=hunspell.hxx hunspell.h hunvisapi.h \
-		                w_char.hxx atypes.hxx
+		                w_char.hxx atypes.hxx csutil.hxx
 
 libhunspell_1_5_la_DEPENDENCIES=utf_info.cxx
 libhunspell_1_5_la_LDFLAGS=-no-undefined

diff --git a/src/hunspell/Makefile.in b/src/hunspell/Makefile.in
@@ -431,7 +431,7 @@ libhunspell_1_5_la_SOURCES = affentry.cxx affixmgr.cxx csutil.cxx \
 	             phonet.hxx filemgr.hxx hunzip.hxx replist.hxx
 
 libhunspell_1_5_include_HEADERS = hunspell.hxx hunspell.h hunvisapi.h \
-		                w_char.hxx atypes.hxx
+		                w_char.hxx atypes.hxx csutil.hxx
 
 libhunspell_1_5_la_DEPENDENCIES = utf_info.cxx
 libhunspell_1_5_la_LDFLAGS = -no-undefined

diff --git a/src/hunspell/hunspell.cxx b/src/hunspell/hunspell.cxx
@@ -109,6 +109,7 @@ class HunspellImpl
   int add_with_affix(const std::string& word, const std::string& example);
   int remove(const std::string& word);
   const std::string& get_version() const;
+  struct cs_info* get_csconv();
 
 
 private:
@@ -1339,6 +1340,14 @@ const std::string& HunspellImpl::get_version() const {
   return pAMgr->get_version();
 }
 
+struct cs_info* HunspellImpl::get_csconv() {
+  return csconv;
+}
+
+struct cs_info* Hunspell::get_csconv() {
+  return m_Impl->get_csconv();
+}
+
 void HunspellImpl::cat_result(std::string& result, const std::string& st) {
   if (!st.empty()) {
     if (!result.empty())
@@ -1675,7 +1684,7 @@ bool Hunspell::input_conv(const std::string& word, std::string& dest) {
 
 int Hunspell::input_conv(const char* word, char* dest, size_t destsize) {
   std::string d;
-  int ret = input_conv(word, d);
+  bool ret = input_conv(word, d);
   if (ret && d.size() < destsize) {
     strncpy(dest, d.c_str(), destsize);
     return 1;

diff --git a/src/hunspell/hunspell.hxx b/src/hunspell/hunspell.hxx
@@ -76,6 +76,7 @@
 #include "hunvisapi.h"
 #include "w_char.hxx"
 #include "atypes.hxx"
+#include "csutil.hxx"
 #include <string>
 #include <vector>
 
@@ -214,6 +215,8 @@ class LIBHUNSPELL_DLL_EXPORTED Hunspell {
   const std::string& get_wordchars_cpp() const;
   const std::vector<w_char>& get_wordchars_utf16() const;
 
+  struct cs_info* get_csconv();
+
   const char* get_version() const;
   const std::string& get_version_cpp() const;