1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
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,58 @@
-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
+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
|
