summaryrefslogtreecommitdiff
path: root/hyphen
diff options
context:
space:
mode:
Diffstat (limited to 'hyphen')
-rw-r--r--hyphen/hyphen-2.4.patch169
-rw-r--r--hyphen/makefile.mk106
-rw-r--r--hyphen/prj/build.lst3
-rw-r--r--hyphen/prj/d.lst5
4 files changed, 283 insertions, 0 deletions
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch
new file mode 100644
index 000000000000..33947f550a88
--- /dev/null
+++ b/hyphen/hyphen-2.4.patch
@@ -0,0 +1,169 @@
+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,54 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2000, 2010 Oracle and/or its affiliates.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# 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
++UWINAPILIB=
++
++.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
new file mode 100644
index 000000000000..dea814e50447
--- /dev/null
+++ b/hyphen/makefile.mk
@@ -0,0 +1,106 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# 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
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=hyphen-2.4
+
+ADDITIONAL_FILES += makefile.mk
+
+PATCH_FILES=hyphen-2.4.patch
+
+.IF "$(GUI)"=="UNX"
+CONFIGURE_DIR=$(BUILD_DIR)
+
+#relative to CONFIGURE_DIR
+# still needed also in system-hyphen case as it creates the makefile
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+
+.IF "$(COM)"=="C52" && "$(CPU)"=="U"
+LCL_CONFIGURE_CFLAGS+=-m64
+.ENDIF
+
+.IF "$(SYSBASE)"!=""
+.IF "$(EXTRA_CFLAGS)"!=""
+LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
+CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
+.ENDIF # "$(EXTRA_CFLAGS)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+.ENDIF
+
+.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
+CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
+.ENDIF
+
+.IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
+BUILD_ACTION=make hyph_en_US.dic
+.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
+@all:
+ echo "Nothing to do here."
+.ELSE
+BUILD_ACTION=make
+OUT2INC += hyphen.h
+.ENDIF
+
+.ENDIF # "$(GUI)"=="UNX"
+
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+
+BUILD_ACTION=make
+
+.ELSE
+BUILD_ACTION=dmake
+.ENDIF # "$(COM)"=="GCC"
+OUT2INC += hyphen.h
+.ENDIF # "$(GUI)"=="WNT"
+
+.IF "$(GUI)"=="OS2"
+BUILD_ACTION=dmake
+OUT2INC += hyphen.h
+.ENDIF # "$(GUI)"=="OS2"
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst
new file mode 100644
index 000000000000..c953a5725f70
--- /dev/null
+++ b/hyphen/prj/build.lst
@@ -0,0 +1,3 @@
+hyp hyphen : soltools solenv NULL
+hyp hyphen usr1 - all hyp_mkout NULL
+hyp hyphen nmake - all hyp_hyphen NULL
diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst
new file mode 100644
index 000000000000..0223cc608198
--- /dev/null
+++ b/hyphen/prj/d.lst
@@ -0,0 +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.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