Mercurial > vim
comparison runtime/spell/en/en_CA.diff @ 7525:319980d694f4
commit https://github.com/vim/vim/commit/4d1c0a44419afb3c15a861dcb88f46bfed8cd952
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 9 13:23:54 2016 +0100
Update to newer English spell files,
but without the COMPOUND rules that make suggestions very slow.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 09 Jan 2016 13:30:06 +0100 |
parents | 3eda97270667 |
children |
comparison
equal
deleted
inserted
replaced
7524:02d60f6a6874 | 7525:319980d694f4 |
---|---|
1 *** en_CA.orig.aff 2010-05-15 13:03:47.000000000 +0200 | 1 *** en_CA.orig.aff 2015-12-30 18:18:20.076952127 +0100 |
2 --- en_CA.aff 2010-05-15 13:03:47.000000000 +0200 | 2 --- en_CA.aff 2016-01-09 13:15:51.306488848 +0100 |
3 *************** | 3 *************** |
4 *** 3,4 **** | 4 *** 2,18 **** |
5 --- 3,141 ---- | 5 TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ' |
6 | 6 ! ICONV 1 |
7 + FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ | 7 ! ICONV ’ ' |
8 + LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ | 8 NOSUGGEST ! |
9 + UPP ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ | 9 |
10 + | 10 ! # ordinal numbers |
11 + MIDWORD ' | 11 ! COMPOUNDMIN 1 |
12 + | 12 ! # only in compounds: 1th, 2th, 3th |
13 + RARE ? | 13 ! ONLYINCOMPOUND c |
14 + BAD ! | 14 ! # compound rules: |
15 + | 15 ! # 1. [0-9]*1[0-9]th (10th, 11th, 12th, 56714th, etc.) |
16 + MAP 9 | 16 ! # 2. [0-9]*[02-9](1st|2nd|3rd|[4-9]th) (21st, 22nd, 123rd, 1234th, etc.) |
17 + MAP aàáâãäå | 17 ! COMPOUNDRULE 2 |
18 + MAP eèéêë | 18 ! COMPOUNDRULE n*1t |
19 + MAP iìíîï | 19 ! COMPOUNDRULE n*mp |
20 + MAP oòóôõö | 20 ! WORDCHARS 0123456789 |
21 + MAP uùúûü | 21 |
22 + MAP nñ | 22 --- 2,161 ---- |
23 + MAP cç | 23 TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ' |
24 + MAP yÿý | 24 ! |
25 + MAP sß | 25 ! # ICONV 1 |
26 + | 26 ! # ICONV ’ ' |
27 + # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07 | 27 ! |
28 + | 28 NOSUGGEST ! |
29 + SAL AH(AEIOUY)-^ *H | 29 |
30 + SAL AR(AEIOUY)-^ *R | 30 ! FOL à áâãäåæçèéêëìÃîïðñòóôõöøùúûüýþßÿ |
31 + SAL A(HR)^ * | 31 ! LOW à áâãäåæçèéêëìÃîïðñòóôõöøùúûüýþßÿ |
32 + SAL A^ * | 32 ! UPP ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖØÙÚÛÜÃÞßÿ |
33 + SAL AH(AEIOUY)- H | 33 ! |
34 + SAL AR(AEIOUY)- R | 34 ! MIDWORD ' |
35 + SAL A(HR) _ | 35 ! |
36 + SAL À^ * | 36 ! RARE ? |
37 + SAL Å^ * | 37 ! BAD % |
38 + SAL BB- _ | 38 ! |
39 + SAL B B | 39 ! MAP 9 |
40 + SAL CQ- _ | 40 ! MAP aà áâãäå |
41 + SAL CIA X | 41 ! MAP eèéêë |
42 + SAL CH X | 42 ! MAP iìÃîï |
43 + SAL C(EIY)- S | 43 ! MAP oòóôõö |
44 + SAL CK K | 44 ! MAP uùúûü |
45 + SAL COUGH^ KF | 45 ! MAP nñ |
46 + SAL CC< C | 46 ! MAP cç |
47 + SAL C K | 47 ! MAP yÿý |
48 + SAL DG(EIY) K | 48 ! MAP sß |
49 + SAL DD- _ | 49 ! |
50 + SAL D T | 50 ! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07 |
51 + SAL É< E | 51 ! |
52 + SAL EH(AEIOUY)-^ *H | 52 ! SAL AH(AEIOUY)-^ *H |
53 + SAL ER(AEIOUY)-^ *R | 53 ! SAL AR(AEIOUY)-^ *R |
54 + SAL E(HR)^ * | 54 ! SAL A(HR)^ * |
55 + SAL ENOUGH^$ *NF | 55 ! SAL A^ * |
56 + SAL E^ * | 56 ! SAL AH(AEIOUY)- H |
57 + SAL EH(AEIOUY)- H | 57 ! SAL AR(AEIOUY)- R |
58 + SAL ER(AEIOUY)- R | 58 ! SAL A(HR) _ |
59 + SAL E(HR) _ | 59 ! SAL À^ * |
60 + SAL FF- _ | 60 ! SAL Ã…^ * |
61 + SAL F F | 61 ! SAL BB- _ |
62 + SAL GN^ N | 62 ! SAL B B |
63 + SAL GN$ N | 63 ! SAL CQ- _ |
64 + SAL GNS$ NS | 64 ! SAL CIA X |
65 + SAL GNED$ N | 65 ! SAL CH X |
66 + SAL GH(AEIOUY)- K | 66 ! SAL C(EIY)- S |
67 + SAL GH _ | 67 ! SAL CK K |
68 + SAL GG9 K | 68 ! SAL COUGH^ KF |
69 + SAL G K | 69 ! SAL CC< C |
70 + SAL H H | 70 ! SAL C K |
71 + SAL IH(AEIOUY)-^ *H | 71 ! SAL DG(EIY) K |
72 + SAL IR(AEIOUY)-^ *R | 72 ! SAL DD- _ |
73 + SAL I(HR)^ * | 73 ! SAL D T |
74 + SAL I^ * | 74 ! SAL É< E |
75 + SAL ING6 N | 75 ! SAL EH(AEIOUY)-^ *H |
76 + SAL IH(AEIOUY)- H | 76 ! SAL ER(AEIOUY)-^ *R |
77 + SAL IR(AEIOUY)- R | 77 ! SAL E(HR)^ * |
78 + SAL I(HR) _ | 78 ! SAL ENOUGH^$ *NF |
79 + SAL J K | 79 ! SAL E^ * |
80 + SAL KN^ N | 80 ! SAL EH(AEIOUY)- H |
81 + SAL KK- _ | 81 ! SAL ER(AEIOUY)- R |
82 + SAL K K | 82 ! SAL E(HR) _ |
83 + SAL LAUGH^ LF | 83 ! SAL FF- _ |
84 + SAL LL- _ | 84 ! SAL F F |
85 + SAL L L | 85 ! SAL GN^ N |
86 + SAL MB$ M | 86 ! SAL GN$ N |
87 + SAL MM M | 87 ! SAL GNS$ NS |
88 + SAL M M | 88 ! SAL GNED$ N |
89 + SAL NN- _ | 89 ! SAL GH(AEIOUY)- K |
90 + SAL N N | 90 ! SAL GH _ |
91 + SAL OH(AEIOUY)-^ *H | 91 ! SAL GG9 K |
92 + SAL OR(AEIOUY)-^ *R | 92 ! SAL G K |
93 + SAL O(HR)^ * | 93 ! SAL H H |
94 + SAL O^ * | 94 ! SAL IH(AEIOUY)-^ *H |
95 + SAL OH(AEIOUY)- H | 95 ! SAL IR(AEIOUY)-^ *R |
96 + SAL OR(AEIOUY)- R | 96 ! SAL I(HR)^ * |
97 + SAL O(HR) _ | 97 ! SAL I^ * |
98 + SAL PH F | 98 ! SAL ING6 N |
99 + SAL PN^ N | 99 ! SAL IH(AEIOUY)- H |
100 + SAL PP- _ | 100 ! SAL IR(AEIOUY)- R |
101 + SAL P P | 101 ! SAL I(HR) _ |
102 + SAL Q K | 102 ! SAL J K |
103 + SAL RH^ R | 103 ! SAL KN^ N |
104 + SAL ROUGH^ RF | 104 ! SAL KK- _ |
105 + SAL RR- _ | 105 ! SAL K K |
106 + SAL R R | 106 ! SAL LAUGH^ LF |
107 + SAL SCH(EOU)- SK | 107 ! SAL LL- _ |
108 + SAL SC(IEY)- S | 108 ! SAL L L |
109 + SAL SH X | 109 ! SAL MB$ M |
110 + SAL SI(AO)- X | 110 ! SAL MM M |
111 + SAL SS- _ | 111 ! SAL M M |
112 + SAL S S | 112 ! SAL NN- _ |
113 + SAL TI(AO)- X | 113 ! SAL N N |
114 + SAL TH @ | 114 ! SAL OH(AEIOUY)-^ *H |
115 + SAL TCH-- _ | 115 ! SAL OR(AEIOUY)-^ *R |
116 + SAL TOUGH^ TF | 116 ! SAL O(HR)^ * |
117 + SAL TT- _ | 117 ! SAL O^ * |
118 + SAL T T | 118 ! SAL OH(AEIOUY)- H |
119 + SAL UH(AEIOUY)-^ *H | 119 ! SAL OR(AEIOUY)- R |
120 + SAL UR(AEIOUY)-^ *R | 120 ! SAL O(HR) _ |
121 + SAL U(HR)^ * | 121 ! SAL PH F |
122 + SAL U^ * | 122 ! SAL PN^ N |
123 + SAL UH(AEIOUY)- H | 123 ! SAL PP- _ |
124 + SAL UR(AEIOUY)- R | 124 ! SAL P P |
125 + SAL U(HR) _ | 125 ! SAL Q K |
126 + SAL V^ W | 126 ! SAL RH^ R |
127 + SAL V F | 127 ! SAL ROUGH^ RF |
128 + SAL WR^ R | 128 ! SAL RR- _ |
129 + SAL WH^ W | 129 ! SAL R R |
130 + SAL W(AEIOU)- W | 130 ! SAL SCH(EOU)- SK |
131 + SAL X^ S | 131 ! SAL SC(IEY)- S |
132 + SAL X KS | 132 ! SAL SH X |
133 + SAL Y(AEIOU)- Y | 133 ! SAL SI(AO)- X |
134 + SAL ZZ- _ | 134 ! SAL SS- _ |
135 + SAL Z S | 135 ! SAL S S |
136 + | 136 ! SAL TI(AO)- X |
137 + # When soundfolding "th" is turned into "@". When this is mistyped as "ht" it | 137 ! SAL TH @ |
138 + # soundfolds to "ht". This difference is too big, thus use REP items to lower | 138 ! SAL TCH-- _ |
139 + # the score. | 139 ! SAL TOUGH^ TF |
140 + REPSAL 2 | 140 ! SAL TT- _ |
141 + REPSAL ht @ | 141 ! SAL T T |
142 + REPSAL @ ht | 142 ! SAL UH(AEIOUY)-^ *H |
143 + | 143 ! SAL UR(AEIOUY)-^ *R |
144 PFX A Y 1 | 144 ! SAL U(HR)^ * |
145 ! SAL U^ * | |
146 ! SAL UH(AEIOUY)- H | |
147 ! SAL UR(AEIOUY)- R | |
148 ! SAL U(HR) _ | |
149 ! SAL V^ W | |
150 ! SAL V F | |
151 ! SAL WR^ R | |
152 ! SAL WH^ W | |
153 ! SAL W(AEIOU)- W | |
154 ! SAL X^ S | |
155 ! SAL X KS | |
156 ! SAL Y(AEIOU)- Y | |
157 ! SAL ZZ- _ | |
158 ! SAL Z S | |
159 ! | |
160 ! # When soundfolding "th" is turned into "@". When this is mistyped as "ht" it | |
161 ! # soundfolds to "ht". This difference is too big, thus use REP items to lower | |
162 ! # the score. | |
163 ! REPSAL 2 | |
164 ! REPSAL ht @ | |
165 ! REPSAL @ ht | |
166 ! | |
167 ! # This is disabled, because if Vim does not support NOCOMPOUNDSUGS giving | |
168 ! # suggestions is extremely slow. | |
169 ! ## ordinal numbers | |
170 ! #COMPOUNDMIN 1 | |
171 ! ## only in compounds: 1th, 2th, 3th | |
172 ! #ONLYINCOMPOUND c | |
173 ! ## compound rules: | |
174 ! ## 1. [0-9]*1[0-9]th (10th, 11th, 12th, 56714th, etc.) | |
175 ! ## 2. [0-9]*[02-9](1st|2nd|3rd|[4-9]th) (21st, 22nd, 123rd, 1234th, etc.) | |
176 ! #COMPOUNDRULE 2 | |
177 ! #COMPOUNDRULE n*1t | |
178 ! #COMPOUNDRULE n*mp | |
179 ! #NOCOMPOUNDSUGS | |
180 ! | |
181 ! # WORDCHARS 0123456789 | |
182 | |
183 *** en_CA.orig.dic 2015-12-30 18:20:47.803358258 +0100 | |
184 --- en_CA.dic 2016-01-08 23:03:52.562085247 +0100 | |
145 *************** | 185 *************** |
146 *** 30,33 **** | 186 *** 1,25 **** |
147 SFX N e ion e | 187 48929 |
148 ! SFX N y ication y | 188 ! 0/nm |
149 ! SFX N 0 en [^ey] | 189 ! 0th/pt |
150 | 190 ! 1/n1 |
151 --- 167,170 ---- | 191 ! 1st/p |
152 SFX N e ion e | 192 ! 1th/tc |
153 ! SFX N y ication y | 193 ! 2/nm |
154 ! SFX N 0 en [^ey] | 194 ! 2nd/p |
155 | 195 ! 2th/tc |
196 ! 3/nm | |
197 ! 3rd/p | |
198 ! 3th/tc | |
199 ! 4/nm | |
200 ! 4th/pt | |
201 ! 5/nm | |
202 ! 5th/pt | |
203 ! 6/nm | |
204 ! 6th/pt | |
205 ! 7/nm | |
206 ! 7th/pt | |
207 ! 8/nm | |
208 ! 8th/pt | |
209 ! 9/nm | |
210 ! 9th/pt | |
211 A/SM | |
212 --- 1,12 ---- | |
213 48929 | |
214 ! 0th | |
215 ! 1st | |
216 ! 2nd | |
217 ! 3rd | |
218 ! 4th | |
219 ! 5th | |
220 ! 6th | |
221 ! 7th | |
222 ! 8th | |
223 ! 9th | |
224 A/SM | |
156 *************** | 225 *************** |
157 *** 40,42 **** | 226 *** 48930 **** |
158 SFX H y ieth y | 227 --- 48917,48927 ---- |
159 ! SFX H 0 th [^y] | 228 zymurgy/M |
160 | 229 + a a/% |
161 --- 177,179 ---- | 230 + a an/% |
162 SFX H y ieth y | 231 + a the/% |
163 ! SFX H 0 th [^y] | 232 + an a/% |
164 | 233 + an an/% |
165 *************** | 234 + an the/% |
166 *** 47,49 **** | 235 + and and/% |
167 SFX G e ing e | 236 + the a/% |
168 ! SFX G 0 ing [^e] | 237 + the an/% |
169 | 238 + the the/% |
170 --- 184,186 ---- | |
171 SFX G e ing e | |
172 ! SFX G 0 ing [^e] | |
173 | |
174 *** en_CA.orig.dic 2010-05-15 13:03:47.000000000 +0200 | |
175 --- en_CA.dic 2010-05-15 13:03:48.000000000 +0200 | |
176 *************** | |
177 *** 46,48 **** | |
178 R/G | |
179 - S | |
180 easternmost | |
181 --- 46,47 ---- | |
182 *************** | |
183 *** 59,66 **** | |
184 a | |
185 ! b/KGDT | |
186 Emmey/M | |
187 baggagemen | |
188 ! c/EAS | |
189 antimalarial/S | |
190 - d/AMV | |
191 enveloper/M | |
192 --- 58,65 ---- | |
193 a | |
194 ! probing | |
195 ! probed | |
196 Emmey/M | |
197 baggagemen | |
198 ! recs | |
199 antimalarial/S | |
200 enveloper/M | |
201 *************** | |
202 *** 68,98 **** | |
203 Balearic/M | |
204 ! e/FDSM | |
205 ! f/BVXT | |
206 Karamazov/M | |
207 ! g/VXB | |
208 ! h/VEMS | |
209 ! i | |
210 Braille/DSGM | |
211 - j/FTV | |
212 transceiver/MS | |
213 ! k/FGISE | |
214 promising/YU | |
215 ! l/XTJGV | |
216 Emmet/M | |
217 ! m/XG | |
218 ! n/FKT | |
219 ! o | |
220 xviii | |
221 fitting/PSY | |
222 ! p/KRT | |
223 ! q | |
224 ! r/GVTJ | |
225 ! s/FK | |
226 fatting | |
227 ! t/BGXTJ | |
228 Franciska/M | |
229 oedipal | |
230 ! u | |
231 ! v/VTK | |
232 ! w/JXTGV | |
233 youths | |
234 --- 67,94 ---- | |
235 Balearic/M | |
236 ! fens | |
237 Karamazov/M | |
238 ! gens | |
239 Braille/DSGM | |
240 transceiver/MS | |
241 ! inking | |
242 ! disking | |
243 ! conking | |
244 ! inks | |
245 ! disks | |
246 ! conks | |
247 promising/YU | |
248 ! lings | |
249 Emmet/M | |
250 ! ming | |
251 ! pron | |
252 xviii | |
253 fitting/PSY | |
254 ! cons | |
255 fatting | |
256 ! tings | |
257 Franciska/M | |
258 oedipal | |
259 ! vive | |
260 ! wens | |
261 ! wings | |
262 youths | |
263 *************** | |
264 *** 100,103 **** | |
265 x | |
266 ! y/F | |
267 ! z/JGT | |
268 crumby/RT | |
269 --- 96,98 ---- | |
270 x | |
271 ! zings | |
272 crumby/RT | |
273 *************** | |
274 *** 714,715 **** | |
275 --- 709,711 ---- | |
276 silty/RT | |
277 + conj. | |
278 conjectural/Y | |
279 *************** | |
280 *** 3145,3146 **** | |
281 --- 3141,3143 ---- | |
282 semester/MS | |
283 + etc. | |
284 etch/GZSRDJ | |
285 *************** | |
286 *** 6190,6191 **** | |
287 --- 6187,6190 ---- | |
288 Paula/M | |
289 + coned | |
290 + cone/MS | |
291 coneflower/M | |
292 *************** | |
293 *** 7022,7024 **** | |
294 DA | |
295 - DB | |
296 DC | |
297 --- 7021,7022 ---- | |
298 *************** | |
299 *** 7395,7397 **** | |
300 rec | |
301 ! red/YPS | |
302 Eamon/M | |
303 --- 7393,7395 ---- | |
304 rec | |
305 ! red/YPSM | |
306 Eamon/M | |
307 *************** | |
308 *** 8388,8390 **** | |
309 slotting | |
310 - ON | |
311 OR | |
312 --- 8386,8387 ---- | |
313 *************** | |
314 *** 9125,9127 **** | |
315 perchance | |
316 - rte | |
317 hastiness/MS | |
318 --- 9122,9123 ---- | |
319 *************** | |
320 *** 10603,10604 **** | |
321 --- 10599,10603 ---- | |
322 dB/M | |
323 + dBi | |
324 + dBm | |
325 + dBd | |
326 Hewet/M | |
327 *************** | |
328 *** 10615,10617 **** | |
329 Garold/M | |
330 - db | |
331 tollhouse/M | |
332 --- 10614,10615 ---- | |
333 *************** | |
334 *** 11017,11019 **** | |
335 hr | |
336 - ht | |
337 MCI/M | |
338 --- 11015,11016 ---- | |
339 *************** | |
340 *** 11609,11611 **** | |
341 demureness/SM | |
342 ! nd/A | |
343 MIA | |
344 --- 11606,11608 ---- | |
345 demureness/SM | |
346 ! nd | |
347 MIA | |
348 *************** | |
349 *** 13669,13671 **** | |
350 engross/LDRSG | |
351 ! hobbit | |
352 certainty/MUS | |
353 --- 13666,13668 ---- | |
354 engross/LDRSG | |
355 ! hobbit/MS | |
356 certainty/MUS | |
357 *************** | |
358 *** 14434,14435 **** | |
359 --- 14431,14433 ---- | |
360 pompom/MS | |
361 + pompon/M | |
362 Devland/M | |
363 *************** | |
364 *** 19265,19267 **** | |
365 bloodstone/M | |
366 ! cetera/S | |
367 storm/SGZRDM | |
368 --- 19263,19265 ---- | |
369 bloodstone/M | |
370 ! et cetera/S | |
371 storm/SGZRDM | |
372 *************** | |
373 *** 20162,20164 **** | |
374 Hansel/M | |
375 ! ring/GZJDRM | |
376 Hansen/M | |
377 --- 20160,20162 ---- | |
378 Hansel/M | |
379 ! ring/GZJDRMS | |
380 Hansen/M | |
381 *************** | |
382 *** 26960,26965 **** | |
383 Wisenheimer/M | |
384 ! disc/GDM | |
385 horticulturist/SM | |
386 isotropically | |
387 ! dish/DG | |
388 disburser/M | |
389 --- 26958,26963 ---- | |
390 Wisenheimer/M | |
391 ! disc/GDMS | |
392 horticulturist/SM | |
393 isotropically | |
394 ! dish/DGMS | |
395 disburser/M | |
396 *************** | |
397 *** 28157,28158 **** | |
398 --- 28155,28157 ---- | |
399 pneumonia/MS | |
400 + pneumonic | |
401 Socratic/S | |
402 *************** | |
403 *** 34999,35001 **** | |
404 claque/MS | |
405 - etc | |
406 Chad/M | |
407 --- 34998,34999 ---- | |
408 *************** | |
409 *** 36707,36708 **** | |
410 --- 36705,36707 ---- | |
411 Moody/M | |
412 + Moolenaar/M | |
413 Bresenham/M | |
414 *************** | |
415 *** 40455,40457 **** | |
416 proneness/MS | |
417 ! transl | |
418 Conchita/M | |
419 --- 40454,40456 ---- | |
420 proneness/MS | |
421 ! transl. | |
422 Conchita/M | |
423 *************** | |
424 *** 50272,50273 **** | |
425 --- 50271,50273 ---- | |
426 Dutch/M | |
427 + Farsi | |
428 Sharon/M | |
429 *************** | |
430 *** 52565,52567 **** | |
431 hatchery/MS | |
432 ! vim/SM | |
433 compatriot/MS | |
434 --- 52565,52568 ---- | |
435 hatchery/MS | |
436 ! Vim/SM | |
437 ! vim/? | |
438 compatriot/MS | |
439 *************** | |
440 *** 53490,53491 **** | |
441 --- 53491,53493 ---- | |
442 unsearchable | |
443 + searchable | |
444 felicitous/IY | |
445 *************** | |
446 *** 62341 **** | |
447 --- 62343,62354 ---- | |
448 data/M | |
449 + et al. | |
450 + the the/! | |
451 + and and/! | |
452 + a a/! | |
453 + a an/! | |
454 + an a/! | |
455 + an an/! | |
456 + PayPal | |
457 + Google | |
458 + e.g. | |
459 + TCP\/IP |