The following commit has been merged in the hunspell_1.3.1 branch:
commit f450b3d3ac782a01896f5b199ba56e51ce0f98f7
Author: Rene Engelhard <r...@debian.org>
Date: Tue Feb 15 00:12:19 2011 +0100
oops
diff --git a/patches/18_fix_mkallcap_calls.dpatch
b/patches/18_fix_mkallcap_calls.dpatch
deleted file mode 100644
index f9debd4..0000000
--- a/patches/18_fix_mkallcap_calls.dpatch
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_fix_mkallcap_calls.dpatch by <r...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
hunspell-1.2.14~/src/hunspell/suggestmgr.cxx
hunspell-1.2.14/src/hunspell/suggestmgr.cxx
---- hunspell-1.2.14~/src/hunspell/suggestmgr.cxx 2011-02-10
11:47:04.000000000 +0000
-+++ hunspell-1.2.14/src/hunspell/suggestmgr.cxx 2011-02-10
11:50:16.000000000 +0000
-@@ -1043,8 +1043,15 @@
- char target[MAXSWUTF8L];
- char candidate[MAXSWUTF8L];
- if (ph) {
-- strcpy(candidate, word);
-- mkallcap(candidate, csconv);
-+ if (utf8) {
-+ w_char _w[MAXSWL];
-+ int _wl = u8_u16(_w, MAXSWL, word);
-+ mkallcap_utf(_w, _wl, langnum);
-+ u16_u8(candidate, MAXSWUTF8L, _w, _wl);
-+ } else {
-+ strcpy(candidate, word);
-+ mkallcap(candidate, csconv);
-+ }
- phonet(candidate, target, n, *ph);
- }
-
-@@ -1067,11 +1074,18 @@
- }
-
- if (ph && (sc > 2) && (abs(n - (int) hp->clen) <= 3)) {
-- char target2[MAXSWUTF8L];
-+ char target2[MAXSWUTF8L];
-+ if (utf8) {
-+ w_char _w[MAXSWL];
-+ int _wl = u8_u16(_w, MAXSWL, HENTRY_WORD(hp));
-+ mkallcap_utf(_w, _wl, langnum);
-+ u16_u8(candidate, MAXSWUTF8L, _w, _wl);
-+ } else {
- strcpy(candidate, HENTRY_WORD(hp));
- mkallcap(candidate, csconv);
-- phonet(candidate, target2, -1, *ph);
-- scphon = 2 * ngram(3, target, target2, NGRAM_LONGER_WORSE);
-+ }
-+ phonet(candidate, target2, -1, *ph);
-+ scphon = 2 * ngram(3, target, target2, NGRAM_LONGER_WORSE);
- }
-
- if (sc > scores[lp]) {
--
Hunspell packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pp7dh-0002fc...@alioth.debian.org
