summaryrefslogtreecommitdiff
path: root/hyphen
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-04 09:51:42 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-04 09:51:42 +0000
commit414b6e019b959f64f637d9295edf971bff404054 (patch)
treefce2dffda1b004353bbe4ed5f07147fade1dad07 /hyphen
parent737d42f25fb44d30223ef9be492537e67856169a (diff)
CWS-TOOLING: integrate CWS hunspell4thesaurus
2009-02-02 16:45:01 +0100 hjs r267278 : #i98415# - kick touch here - go for the root cause elsewhere 2009-02-02 12:09:15 +0100 hjs r267257 : #i98415# - fix parameters of touch 2009-01-23 23:13:00 +0100 mba r266855 : fixed warning 2009-01-23 18:59:55 +0100 mba r266848 : #i98415#: touch copied files 2009-01-21 09:58:05 +0100 nemeth r266633 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@266428 (milestone: DEV300:m39) 2009-01-21 09:04:48 +0100 nemeth r266629 : Issue: #19563 Submitted by: nemeth Reviewed by: nemeth Patch: handle bad dictionary items for back compatibility (affix separator without affix flags) 2009-01-20 20:04:10 +0100 nemeth r266622 : Issue: #19563 Submitted by: nemeth Reviewed by:nemeth Add two small fixes for SF.net Hunspell Bug ID 2487684 2519814 2008-12-10 00:21:41 +0100 nemeth r265141 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@264807 (milestone: DEV300:m37) 2008-12-09 16:12:56 +0100 nemeth r265113 : #i19563#: fixed stemming, and #i90028#: fixed and improved hyphenation 2008-11-26 23:09:05 +0100 nemeth r264438 : #i90028#: CWS hunspell4thesaurus: Windows fixes of the Hunspell patch. 2008-11-26 22:51:03 +0100 nemeth r264436 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@264325 (milestone: DEV300:m36) 2008-11-22 09:02:20 +0100 nemeth r264182 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@263288 (milestone: DEV300:m35) 2008-11-22 08:23:10 +0100 nemeth r264181 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@263288 (milestone: DEV300:m35) 2008-11-21 22:15:21 +0100 nemeth r264176 : #i90028#: migrate CWS hunspell4thesaurus to SVN.
Diffstat (limited to 'hyphen')
-rw-r--r--hyphen/hyphen-2.3.patch133
-rw-r--r--hyphen/hyphen-2.4.patch172
-rw-r--r--hyphen/makefile.mk6
-rw-r--r--hyphen/prj/d.lst4
4 files changed, 177 insertions, 138 deletions
diff --git a/hyphen/hyphen-2.3.patch b/hyphen/hyphen-2.3.patch
deleted file mode 100644
index fe8215785649..000000000000
--- a/hyphen/hyphen-2.3.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- misc/hyphen-2.3.1/Makefile.am Tue Feb 19 01:58:34 2008
-+++ misc/build/hyphen-2.3.1/Makefile.am Wed May 7 10:25:03 2008
-@@ -24,7 +24,7 @@
-
- hyphen.us:
- cp -f $(srcdir)/hyphen.tex hyphen.us
-- patch < $(srcdir)/hyphen.patch
-+ $(GNUPATCH) < $(srcdir)/hyphen.patch
-
- hyph_en_US.dic: hyphen.us
- perl $(srcdir)/substrings.pl hyphen.us hyph_en_US.dic ISO8859-1 > /dev/null
---- misc/hyphen-2.3.1/Makefile.in Tue Feb 19 01:58:38 2008
-+++ misc/build/hyphen-2.3.1/Makefile.in Wed May 7 10:25:26 2008
-@@ -795,7 +795,7 @@
-
- hyphen.us:
- cp -f $(srcdir)/hyphen.tex hyphen.us
-- patch < $(srcdir)/hyphen.patch
-+ $(GNUPATCH) < $(srcdir)/hyphen.patch
-
- hyph_en_US.dic: hyphen.us
- perl $(srcdir)/substrings.pl hyphen.us hyph_en_US.dic ISO8859-1 > /dev/null
---- misc/hyphen-2.3.1/csutil.c Sun Jun 1 02:04:00 2003
-+++ misc/build/hyphen-2.3.1/csutil.c Wed May 7 10:23:59 2008
-@@ -3493,7 +3493,7 @@
- };
-
-
--struct enc_entry encds[] = {
-+static struct enc_entry encds[] = {
- {"ISO8859-1",iso1_tbl},
- {"ISO8859-2",iso2_tbl},
- {"ISO8859-3",iso3_tbl},
---- misc/hyphen-2.3.1/hyphen.c Tue Feb 19 00:58:09 2008
-+++ misc/build/hyphen-2.3.1/hyphen.c Wed May 7 10:23:59 2008
-@@ -298,7 +298,7 @@
- } else {
- hnj_strchomp(repl + 1);
- replindex = 0;
-- replcut = strlen(buf);
-+ replcut = (signed char) strlen(buf);
- }
- repl = hnj_strdup(repl + 1);
- }
-@@ -331,10 +331,10 @@
- if ((((unsigned char) word[pc]) >> 6) != 2) pu++;
- if ((ps < 0) && (replindex == pu)) {
- ps = replindex;
-- replindex = pc;
-+ replindex = (signed char) pc;
- }
- if ((ps >= 0) && ((pu - ps) == replcut)) {
-- replcut = (pc - replindex);
-+ replcut = (signed char) (pc - replindex);
- break;
- }
- }
-@@ -351,7 +351,7 @@
- dict->states[state_num].repl = repl;
- dict->states[state_num].replindex = replindex;
- if (!replcut) {
-- dict->states[state_num].replcut = strlen(word);
-+ dict->states[state_num].replcut = (signed char) strlen(word);
- } else {
- dict->states[state_num].replcut = replcut;
- }
---- misc/hyphen-2.3.1/makefile.mk Wed May 7 10:27:43 2008
-+++ misc/build/hyphen-2.3.1/makefile.mk Wed May 7 10:27:33 2008
-@@ -1,1 +1,63 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: hyphen-2.3.patch,v $
-+#
-+# $Revision: 1.8 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ = ..$/..$/..$/..
-+
-+PRJNAME = hyphen
-+TARGET = hyphen
-+CFLAGSCALL=gsd
-+
-+USE_DEFFILE=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+# !! not to be compiled because those belong to a stand alone programs: !!
-+# $(SLO)$/createfp.obj\
-+# $(SLO)$/testtextcat.obj
-+
-+SLOFILES= \
-+ $(SLO)$/hyphen.obj\
-+ $(SLO)$/hnjalloc.obj\
-+ $(SLO)$/csutil.obj
-+
-+# --- Targets ------------------------------------------------------
-+
-+ALL: hyph_en_US.dic ALLTAR
-+
-+.INCLUDE : target.mk
-+
-+hyph_en_US.dic : hyphen.tex
-+ $(COPY) hyphen.tex hyphen.us
-+ $(GNUPATCH) < hyphen.patch
-+ $(PERL) substrings.pl hyphen.us hyph_en_US.dic ISO8859.-1
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch
new file mode 100644
index 000000000000..27f7085946a3
--- /dev/null
+++ b/hyphen/hyphen-2.4.patch
@@ -0,0 +1,172 @@
+diff -u misc/hyphen-2.4/csutil.c misc/build/hyphen-2.4/csutil.c
+--- misc/hyphen-2.4/csutil.c 2003-06-01 02:04:00.000000000 +0200
++++ misc/build/hyphen-2.4/csutil.c 2008-06-04 10:03:40.000000000 +0200
+@@ -3493,7 +3493,7 @@
+ };
+
+
+-struct enc_entry encds[] = {
++static struct enc_entry encds[] = {
+ {"ISO8859-1",iso1_tbl},
+ {"ISO8859-2",iso2_tbl},
+ {"ISO8859-3",iso3_tbl},
+Common subdirectories: misc/hyphen-2.4/doc and misc/build/hyphen-2.4/doc
+diff -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c
+--- misc/hyphen-2.4/hyphen.c 2008-05-01 02:18:15.000000000 +0200
++++ misc/build/hyphen-2.4/hyphen.c 2008-06-04 10:06:57.000000000 +0200
+@@ -326,7 +326,7 @@
+ } else {
+ hnj_strchomp(repl + 1);
+ replindex = 0;
+- replcut = strlen(buf);
++ replcut = (signed char) strlen(buf);
+ }
+ repl = hnj_strdup(repl + 1);
+ }
+@@ -359,10 +359,10 @@
+ if ((((unsigned char) word[pc]) >> 6) != 2) pu++;
+ if ((ps < 0) && (replindex == pu)) {
+ ps = replindex;
+- replindex = pc;
++ replindex = (signed char) pc;
+ }
+ if ((ps >= 0) && ((pu - ps) == replcut)) {
+- replcut = (pc - replindex);
++ replcut = (signed char) (pc - replindex);
+ break;
+ }
+ }
+@@ -379,7 +379,7 @@
+ dict[k]->states[state_num].repl = repl;
+ dict[k]->states[state_num].replindex = replindex;
+ if (!replcut) {
+- dict[k]->states[state_num].replcut = strlen(word);
++ dict[k]->states[state_num].replcut = (signed char) strlen(word);
+ } else {
+ dict[k]->states[state_num].replcut = replcut;
+ }
+@@ -702,7 +702,7 @@
+ prep_word[j++] = '.';
+ prep_word[j] = '\0';
+
+- for (i = 0; i < j; i++)
++ for (i = 0; i < word_size + 5; i++)
+ hyphens[i] = '0';
+
+ #ifdef VERBOSE
+@@ -941,13 +941,13 @@
+ int hnj_hyphen_norm(const char *word, int word_size, char * hyphens,
+ char *** rep, int ** pos, int ** cut)
+ {
++ int i, j, k;
+ if ((((unsigned char) word[0]) >> 6) == 2) {
+ fprintf(stderr, "error - bad, non UTF-8 input: %s\n", word);
+ return 1;
+ }
+
+ /* calculate UTF-8 character positions */
+- int i, j, k;
+ for (i = 0, j = -1; i < word_size; i++) {
+ /* beginning of an UTF-8 character (not '10' start bits) */
+ if ((((unsigned char) word[i]) >> 6) != 2) j++;
+diff -u misc/hyphen-2.4/Makefile.am misc/build/hyphen-2.4/Makefile.am
+--- misc/hyphen-2.4/Makefile.am 2008-04-30 12:33:44.000000000 +0200
++++ misc/build/hyphen-2.4/Makefile.am 2008-06-04 11:33:23.000000000 +0200
+@@ -24,12 +24,12 @@
+
+ hyphen.us3:
+ cp -f $(srcdir)/hyphen.tex hyphen.us
+- patch < $(srcdir)/hyphen.patch
++ $(GNUPATCH) < $(srcdir)/hyphen.patch
+ $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
+ cat hyphen.us hyphen.us2 >hyphen.us3
+
+-hyph_en_US.dic: hyphen.us3
+- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic ISO8859-1 2 3 >/dev/null
++hyph_en_US.dic:
++ @echo "hyph_en_US.txt distributed with Hyphen library"
+
+ clean-local:
+ rm -rf hyphen.us* hyph_en_US.dic
+diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
+--- misc/hyphen-2.4/Makefile.in 2008-04-30 14:29:57.000000000 +0200
++++ misc/build/hyphen-2.4/Makefile.in 2008-06-04 11:33:44.000000000 +0200
+@@ -795,12 +795,12 @@
+
+ hyphen.us3:
+ cp -f $(srcdir)/hyphen.tex hyphen.us
+- patch < $(srcdir)/hyphen.patch
++ $(GNUPATCH) < $(srcdir)/hyphen.patch
+ $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
+ cat hyphen.us hyphen.us2 >hyphen.us3
+
+-hyph_en_US.dic: hyphen.us3
+- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic ISO8859-1 2 3 >/dev/null
++hyph_en_US.dic:
++ @echo "hyph_en_US.txt distributed with Hyphen library"
+
+ clean-local:
+ rm -rf hyphen.us* hyph_en_US.dic
+diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
+--- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200
++++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200
+@@ -1 +1,57 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: hyphen-2.4.patch,v $
++#
++# $Revision: 1.1.4.2 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org. If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ = ..$/..$/..$/..
++
++PRJNAME = hyphen
++TARGET = hyphen
++CFLAGSCALL=gsd
++
++USE_DEFFILE=TRUE
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++
++.INCLUDE : settings.mk
++
++# --- Files --------------------------------------------------------
++
++# !! not to be compiled because those belong to a stand alone programs: !!
++# $(SLO)$/createfp.obj\
++# $(SLO)$/testtextcat.obj
++
++SLOFILES= \
++ $(SLO)$/hyphen.obj\
++ $(SLO)$/hnjalloc.obj
++
++# --- Targets ------------------------------------------------------
++
++ALL: ALLTAR
++
++.INCLUDE : target.mk
+Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 770f3d5e8592..6ba6f1064c5a 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.8.2.3 $
#
# This file is part of OpenOffice.org.
#
@@ -40,11 +40,11 @@ TARGET=hyphen
# --- Files --------------------------------------------------------
-TARFILE_NAME=hyphen-2.3.1
+TARFILE_NAME=hyphen-2.4
ADDITIONAL_FILES += makefile.mk
-PATCH_FILES=hyphen-2.3.patch
+PATCH_FILES=hyphen-2.4.patch
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst
index d1e4fd273404..0223cc608198 100644
--- a/hyphen/prj/d.lst
+++ b/hyphen/prj/d.lst
@@ -1,5 +1,5 @@
..\%__SRC%\slb\hyphen.lib %_DEST%\lib%_EXT%\hyphen.lib
..\%__SRC%\inc\hyphen.h %_DEST%\inc%_EXT%\hyphen.h
-..\%__SRC%\misc\build\hyphen-2.3.1\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a
-..\%__SRC%\misc\build\hyphen-2.3.1\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic
+..\%__SRC%\misc\build\hyphen-2.4\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a
+..\%__SRC%\misc\build\hyphen-2.4\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic