pool/hunspell
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- make hunspell work with emacs and utf-8 [bnc#883505]

Browse Source 
- added patches:
  * hunspell-emacs-utf8.patch

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hunspell?expand=0&rev=40
This commit is contained in:
Petr Gajdos 2014-08-01 06:24:58 +00:00 committed by Git OBS Bridge
parent 5d42180376
commit 7d23558465
3 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hunspell-emacs-utf8.patch Normal file
View File

@ -0,0 +1,56 @@
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7781#31
--- src/tools/hunspell.cxx~0 2011-01-21 19:01:29.000000000 +0200
+++ src/tools/hunspell.cxx 2013-02-07 10:11:54.443610900 +0200
@@ -710,13 +748,22 @@ if (pos >= 0) {
fflush(stdout);
} else {
char ** wlst = NULL;
- int ns = pMS[d]->suggest(&wlst, token);
+ int byte_offset = parser->get_tokenpos() + pos;
+ int char_offset = 0;
+ if (strcmp(io_enc, "UTF-8") == 0) {
+ for (int i = 0; i < byte_offset; i++) {
+ if ((buf[i] & 0xc0) != 0x80)
+ char_offset++;
+ }
+ } else {
+ char_offset = byte_offset;
+ }
+ int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
if (ns == 0) {
- fprintf(stdout,"# %s %d", token,
- parser->get_tokenpos() + pos);
+ fprintf(stdout,"# %s %d", token, char_offset);
} else {
fprintf(stdout,"& %s %d %d: ", token, ns,
- parser->get_tokenpos() + pos);
+ char_offset);
fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], io_enc));
}
for (int j = 1; j < ns; j++) {
@@ -745,13 +792,23 @@ if (pos >= 0) {
if (root) free(root);
} else {
char ** wlst = NULL;
+ int byte_offset = parser->get_tokenpos() + pos;
+ int char_offset = 0;
+ if (strcmp(io_enc, "UTF-8") == 0) {
+ for (int i = 0; i < byte_offset; i++) {
+ if ((buf[i] & 0xc0) != 0x80)
+ char_offset++;
+ }
+ } else {
+ char_offset = byte_offset;
+ }
int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
if (ns == 0) {
fprintf(stdout,"# %s %d", chenc(token, io_enc, ui_enc),
- parser->get_tokenpos() + pos);
+ char_offset);
} else {
fprintf(stdout,"& %s %d %d: ", chenc(token, io_enc, ui_enc), ns,
- parser->get_tokenpos() + pos);
+ char_offset);
fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], ui_enc));
}
for (int j = 1; j < ns; j++) {

7
hunspell.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 1 06:16:05 UTC 2014 - pgajdos@suse.com
- make hunspell work with emacs and utf-8 [bnc#883505]
- added patches:
* hunspell-emacs-utf8.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 23 12:54:06 UTC 2014 - pgajdos@suse.com Mon Jun 23 12:54:06 UTC 2014 - pgajdos@suse.com

2
hunspell.spec
View File

@ -26,6 +26,7 @@ Group: System/Libraries
Url: http://hunspell.sourceforge.net/ Url: http://hunspell.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/%{name}/Hunspell/%{version}/%{name}-%{version}.tar.gz Source0: http://downloads.sourceforge.net/project/%{name}/Hunspell/%{version}/%{name}-%{version}.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Patch0: hunspell-emacs-utf8.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -65,6 +66,7 @@ Includes and definitions for developing with hunspell.
%prep %prep
%setup -q %setup -q
%patch0
%build %build
autoreconf -vi autoreconf -vi