-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathkdelibs-3.5.8-kspell-hunspell.patch
303 lines (293 loc) · 9.54 KB
/
kdelibs-3.5.8-kspell-hunspell.patch
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
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
diff -ur kdelibs-3.5.8/kdeui/ksconfig.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp
--- kdelibs-3.5.8/kdeui/ksconfig.cpp 2007-10-08 11:52:12.000000000 +0200
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp 2007-12-22 01:45:47.000000000 +0100
@@ -1,6 +1,7 @@
/* This file is part of the KDE libraries
Copyright (C) 1997 David Sweet <[email protected]>
Copyright (C) 2000-2001 Wolfram Diestel <[email protected]>
+ Copyright (C) 2007 Kevin Kofler <[email protected]>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -149,6 +150,7 @@
clientcombo->insertItem( i18n("Aspell") );
clientcombo->insertItem( i18n("Hspell") );
clientcombo->insertItem( i18n("Zemberek") );
+ clientcombo->insertItem( i18n("Hunspell") );
connect( clientcombo, SIGNAL (activated(int)), this,
SLOT (sChangeClient(int)) );
glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 );
@@ -240,8 +242,10 @@
dictcombo->insertItem( i18n("Turkish") );
sChangeEncoding( KS_E_UTF8 );
}
- else
+ else if ( iclient == KS_CLIENT_ASPELL )
getAvailDictsAspell();
+ else
+ getAvailDictsHunspell();
}
emit configChanged();
}
@@ -399,8 +403,10 @@
langfnames.append("");
dictcombo->insertItem( i18n("Turkish") );
}
- else
+ else if ( iclient == KS_CLIENT_ASPELL )
getAvailDictsAspell();
+ else
+ getAvailDictsHunspell();
// select the used dictionary in the list
int whichelement=-1;
@@ -583,6 +589,62 @@
}
}
+void KSpellConfig::getAvailDictsHunspell () {
+
+ langfnames.clear();
+ dictcombo->clear();
+ langfnames.append(""); // Default
+ dictcombo->insertItem( i18n("Hunspell Default") );
+
+ // dictionary path
+ QFileInfo dir ("/usr/share/myspell");
+ if (!dir.exists() || !dir.isDir())
+ dir.setFile ("/usr/share/hunspell");
+ if (!dir.exists() || !dir.isDir()) return;
+
+ kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
+ << dir.filePath() << " " << dir.dirPath() << endl;
+
+ const QDir thedir (dir.filePath(),"*.dic");
+ const QStringList entryList = thedir.entryList();
+
+ kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
+ kdDebug(750) << "entryList().count()="
+ << entryList.count() << endl;
+
+ QStringList::const_iterator entryListItr = entryList.constBegin();
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
+
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
+ {
+ QString fname, lname, hname;
+ fname = *entryListItr;
+
+ // remove .dic
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
+
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
+ { // This one is the KDE default language
+ // so place it first in the lists (overwrite "Default")
+
+ langfnames.remove ( langfnames.begin() );
+ langfnames.prepend ( fname );
+
+ hname=i18n("default spelling dictionary"
+ ,"Default - %1 [%2]").arg(hname).arg(fname);
+
+ dictcombo->changeItem (hname,0);
+ }
+ else
+ {
+ langfnames.append (fname);
+ hname=hname+" ["+fname+"]";
+
+ dictcombo->insertItem (hname);
+ }
+ }
+}
+
void
KSpellConfig::fillDicts( QComboBox* box, QStringList* dictionaries )
{
@@ -661,8 +723,7 @@
box->insertItem( i18n("Turkish") );
langfnames.append("");
sChangeEncoding( KS_E_UTF8 );
- }
- else {
+ } else if ( iclient == KS_CLIENT_ASPELL ) {
box->clear();
langfnames.append(""); // Default
box->insertItem (i18n("ASpell Default"));
@@ -741,6 +802,58 @@
}
}
}
+ } else {
+ box->clear();
+ langfnames.append(""); // Default
+ box->insertItem( i18n("Hunspell Default") );
+
+ // dictionary path
+ QFileInfo dir ("/usr/share/myspell");
+ if (!dir.exists() || !dir.isDir())
+ dir.setFile ("/usr/share/hunspell");
+ if (!dir.exists() || !dir.isDir()) return;
+
+ kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
+ << dir.filePath() << " " << dir.dirPath() << endl;
+
+ const QDir thedir (dir.filePath(),"*.dic");
+ const QStringList entryList = thedir.entryList();
+
+ kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
+ kdDebug(750) << "entryList().count()="
+ << entryList.count() << endl;
+
+ QStringList::const_iterator entryListItr = entryList.constBegin();
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
+
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
+ {
+ QString fname, lname, hname;
+ fname = *entryListItr;
+
+ // remove .dic
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
+
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
+ { // This one is the KDE default language
+ // so place it first in the lists (overwrite "Default")
+
+ langfnames.remove ( langfnames.begin() );
+ langfnames.prepend ( fname );
+
+ hname=i18n("default spelling dictionary"
+ ,"Default - %1 [%2]").arg(hname).arg(fname);
+
+ box->changeItem (hname,0);
+ }
+ else
+ {
+ langfnames.append (fname);
+ hname=hname+" ["+fname+"]";
+
+ box->insertItem (hname);
+ }
+ }
}
int whichelement = langfnames.findIndex(qsdict);
if ( whichelement >= 0 ) {
diff -ur kdelibs-3.5.8/kdeui/ksconfig.h kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h
--- kdelibs-3.5.8/kdeui/ksconfig.h 2005-10-10 17:06:38.000000000 +0200
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h 2007-12-22 01:35:25.000000000 +0100
@@ -1,5 +1,6 @@
/* This file is part of the KDE libraries
Copyright (C) 1997 David Sweet <[email protected]>
+ Copyright (C) 2007 Kevin Kofler <[email protected]>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -61,7 +62,8 @@
KS_CLIENT_ISPELL=0,
KS_CLIENT_ASPELL=1,
KS_CLIENT_HSPELL=2,
- KS_CLIENT_ZEMBEREK=3
+ KS_CLIENT_ZEMBEREK=3,
+ KS_CLIENT_HUNSPELL=4
};
/**
@@ -283,6 +285,7 @@
KSpellConfigPrivate *d;
void getAvailDictsIspell();
void getAvailDictsAspell();
+ void getAvailDictsHunspell();
};
#endif // KDELIBS_KSCONFIG_H
diff -ur kdelibs-3.5.8/kdeui/kspell.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp
--- kdelibs-3.5.8/kdeui/kspell.cpp 2005-10-10 17:06:38.000000000 +0200
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp 2007-12-22 02:26:29.000000000 +0100
@@ -2,6 +2,7 @@
Copyright (C) 1997 David Sweet <[email protected]>
Copyright (C) 2000-2001 Wolfram Diestel <[email protected]>
Copyright (C) 2003 Zack Rusin <[email protected]>
+ Copyright (C) 2007 Kevin Kofler <[email protected]>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -181,9 +182,14 @@
*proc << "zpspell";
kdDebug(750) << "Using zemberek(zpspell)" << endl;
break;
+ case KS_CLIENT_HUNSPELL:
+ *proc << "hunspell";
+ kdDebug(750) << "Using hunspell" << endl;
+ break;
}
- if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL )
+ // Hunspell doesn't need all of these options, but it'll ignore those it doesn't understand.
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
{
*proc << "-a" << "-S";
@@ -201,8 +207,8 @@
*proc << "-t";
break;
case Nroff:
- //only ispell supports
- if ( ksconfig->client() == KS_CLIENT_ISPELL )
+ //only ispell and hunspell support
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
*proc << "-n";
break;
case Text:
@@ -239,7 +245,60 @@
// option, so kspell tries again without it. That's why as 'ps -ax'
// shows "ispell -a -S ..." withou the "-Tlatin2" option.
- if ( trystart<1 ) {
+ if ( ksconfig->client() == KS_CLIENT_HUNSPELL && trystart<1 ) {
+ // Note: This sets I/O encoding. Hunspell correctly handles dictionary encoding != I/O encoding.
+ // It will be faster if the I/O encoding matches the dictionary encoding, but using UTF-8 is always safe.
+ switch ( ksconfig->encoding() )
+ {
+ case KS_E_LATIN1:
+ *proc << "-i" << "ISO-8859-1";
+ break;
+ case KS_E_LATIN2:
+ *proc << "-i" << "ISO-8859-2";
+ break;
+ case KS_E_LATIN3:
+ *proc << "-i" << "ISO-8859-3";
+ break;
+ case KS_E_LATIN4:
+ *proc << "-i" << "ISO-8859-4";
+ break;
+ case KS_E_LATIN5:
+ *proc << "-i" << "ISO-8859-5";
+ break;
+ case KS_E_LATIN7:
+ *proc << "-i" << "ISO-8859-7";
+ break;
+ case KS_E_LATIN8:
+ *proc << "-i" << "ISO-8859-8";
+ break;
+ case KS_E_LATIN9:
+ *proc << "-i" << "ISO-8859-9";
+ break;
+ case KS_E_LATIN13:
+ *proc << "-i" << "ISO-8859-13";
+ break;
+ case KS_E_LATIN15:
+ *proc << "-i" << "ISO-8859-15";
+ break;
+ case KS_E_UTF8:
+ *proc << "-i" << "UTF-8";
+ break;
+ case KS_E_KOI8R:
+ *proc << "-i" << "KOI8-R";
+ break;
+ case KS_E_KOI8U:
+ *proc << "-i" << "KOI8-U";
+ break;
+ case KS_E_CP1251:
+ *proc << "-i" << "CP1251";
+ break;
+ case KS_E_CP1255:
+ *proc << "-i" << "CP1255";
+ break;
+ default:
+ break;
+ }
+ } else if ( trystart<1 ) {
switch ( ksconfig->encoding() )
{
case KS_E_LATIN1: