summaryrefslogtreecommitdiffstats
path: root/runtime/spell/en
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-08-01 07:19:10 +0000
committerBram Moolenaar <Bram@vim.org>2005-08-01 07:19:10 +0000
commit78984f503c0404ea36674a74076b091b27a9e528 (patch)
tree89fafa57f1dfefd4a483e20b8ffbb778ea50c498 /runtime/spell/en
parent53805d1eaa179509f39048516e344158eedfbbe4 (diff)
updated for version 7.0121v7.0121
Diffstat (limited to 'runtime/spell/en')
-rw-r--r--runtime/spell/en/en_AU.diff252
-rw-r--r--runtime/spell/en/en_CA.diff72
-rw-r--r--runtime/spell/en/en_GB.diff252
-rw-r--r--runtime/spell/en/en_NZ.diff252
-rw-r--r--runtime/spell/en/en_US.diff86
-rw-r--r--runtime/spell/en/main.aap27
6 files changed, 469 insertions, 472 deletions
diff --git a/runtime/spell/en/en_AU.diff b/runtime/spell/en/en_AU.diff
index 1b45c8f30d..c0ee62d6bb 100644
--- a/runtime/spell/en/en_AU.diff
+++ b/runtime/spell/en/en_AU.diff
@@ -1,11 +1,11 @@
*** en_AU.orig.aff Fri Apr 15 13:20:36 2005
---- en_AU.aff Sun Jul 3 17:11:07 2005
+--- en_AU.aff Sun Jul 31 22:16:19 2005
***************
*** 7,9 ****
SET ISO8859-1
! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ
REP 24
---- 7,19 ----
+--- 7,140 ----
SET ISO8859-1
! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ
!
@@ -18,6 +18,127 @@
! RAR ?
! BAD !
!
+! MAP 9
+! MAP aàáâãäå
+! MAP eèéêë
+! MAP iìíîï
+! MAP oòóôõö
+! MAP uùúûü
+! MAP nñ
+! MAP cç
+! MAP yÿý
+! MAP sß
+!
+! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
+!
+! SAL AH(AEIOUY)-^ *H
+! SAL AR(AEIOUY)-^ *R
+! SAL A(HR)^ *
+! SAL A^ *
+! SAL AH(AEIOUY)- H
+! SAL AR(AEIOUY)- R
+! SAL A(HR) _
+! SAL À^ *
+! SAL Å^ *
+! SAL BB- _
+! SAL B B
+! SAL CQ- _
+! SAL CIA X
+! SAL CH X
+! SAL C(EIY)- S
+! SAL CK K
+! SAL COUGH^ KF
+! SAL CC< C
+! SAL C K
+! SAL DG(EIY) K
+! SAL DD- _
+! SAL D T
+! SAL É< E
+! SAL EH(AEIOUY)-^ *H
+! SAL ER(AEIOUY)-^ *R
+! SAL E(HR)^ *
+! SAL ENOUGH^$ *NF
+! SAL E^ *
+! SAL EH(AEIOUY)- H
+! SAL ER(AEIOUY)- R
+! SAL E(HR) _
+! SAL FF- _
+! SAL F F
+! SAL GN^ N
+! SAL GN$ N
+! SAL GNS$ NS
+! SAL GNED$ N
+! SAL GH(AEIOUY)- K
+! SAL GH _
+! SAL GG9 K
+! SAL G K
+! SAL H H
+! SAL IH(AEIOUY)-^ *H
+! SAL IR(AEIOUY)-^ *R
+! SAL I(HR)^ *
+! SAL I^ *
+! SAL ING6 N
+! SAL IH(AEIOUY)- H
+! SAL IR(AEIOUY)- R
+! SAL I(HR) _
+! SAL J K
+! SAL KN^ N
+! SAL KK- _
+! SAL K K
+! SAL LAUGH^ LF
+! SAL LL- _
+! SAL L L
+! SAL MB$ M
+! SAL MM M
+! SAL M M
+! SAL NN- _
+! SAL N N
+! SAL OH(AEIOUY)-^ *H
+! SAL OR(AEIOUY)-^ *R
+! SAL O(HR)^ *
+! SAL O^ *
+! SAL OH(AEIOUY)- H
+! SAL OR(AEIOUY)- R
+! SAL O(HR) _
+! SAL PH F
+! SAL PN^ N
+! SAL PP- _
+! SAL P P
+! SAL Q K
+! SAL RH^ R
+! SAL ROUGH^ RF
+! SAL RR- _
+! SAL R R
+! SAL SCH(EOU)- SK
+! SAL SC(IEY)- S
+! SAL SH X
+! SAL SI(AO)- X
+! SAL SS- _
+! SAL S S
+! SAL TI(AO)- X
+! SAL TH @
+! SAL TCH-- _
+! SAL TOUGH^ TF
+! SAL TT- _
+! SAL T T
+! SAL UH(AEIOUY)-^ *H
+! SAL UR(AEIOUY)-^ *R
+! SAL U(HR)^ *
+! SAL U^ *
+! SAL UH(AEIOUY)- H
+! SAL UR(AEIOUY)- R
+! SAL U(HR) _
+! SAL V^ W
+! SAL V F
+! SAL WR^ R
+! SAL WH^ W
+! SAL W(AEIOU)- W
+! SAL X^ S
+! SAL X KS
+! SAL Y(AEIOU)- Y
+! SAL ZZ- _
+! SAL Z S
+!
REP 24
***************
*** 34,53 ****
@@ -41,7 +162,7 @@
PFX E Y 1
! PFX E 0 dis .
PFX F Y 5
---- 44,63 ----
+--- 165,184 ----
PFX A Y 2
! PFX A 0 re [^e]
! PFX A 0 re- e
@@ -459,7 +580,7 @@
SFX T y iest [^aeiou]y
! SFX T 0 er [aeiou]y
SFX T 0 est [aeiou]y
---- 67,461 ----
+--- 188,582 ----
PFX F 0 col l
! PFX F 0 con [^abehilmopru].
PFX K Y 1
@@ -1543,7 +1664,7 @@
! SFX 3 0 ist's [aeioubp]y
! SFX 3 o ist's o
! SFX 3 0 ist's [^eoy]
---- 468,1274 ----
+--- 589,1274 ----
SFX R Y 72
! SFX R 0 r e
! SFX R 0 rs e
@@ -2230,127 +2351,6 @@
! SFX 3 0 ist's [aeioubp]y
! SFX 3 o ist's o
! SFX 3 0 ist's [^eoy]
-!
-! MAP 5
-! MAP aàáâãäå
-! MAP eèéêë
-! MAP iìíîï
-! MAP oòóôõö
-! MAP uùúûü
-! MAP nñ
-! MAP cç
-! MAP yÿý
-! MAP sß
-!
-! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
-!
-! SAL AH(AEIOUY)-^ *H
-! SAL AR(AEIOUY)-^ *R
-! SAL A(HR)^ *
-! SAL A^ *
-! SAL AH(AEIOUY)- H
-! SAL AR(AEIOUY)- R
-! SAL A(HR) _
-! SAL À^ *
-! SAL Å^ *
-! SAL BB- _
-! SAL B B
-! SAL CQ- _
-! SAL CIA X
-! SAL CH X
-! SAL C(EIY)- S
-! SAL CK K
-! SAL COUGH^ KF
-! SAL CC< C
-! SAL C K
-! SAL DG(EIY) K
-! SAL DD- _
-! SAL D T
-! SAL É< E
-! SAL EH(AEIOUY)-^ *H
-! SAL ER(AEIOUY)-^ *R
-! SAL E(HR)^ *
-! SAL ENOUGH^$ *NF
-! SAL E^ *
-! SAL EH(AEIOUY)- H
-! SAL ER(AEIOUY)- R
-! SAL E(HR) _
-! SAL FF- _
-! SAL F F
-! SAL GN^ N
-! SAL GN$ N
-! SAL GNS$ NS
-! SAL GNED$ N
-! SAL GH(AEIOUY)- K
-! SAL GH _
-! SAL GG9 K
-! SAL G K
-! SAL H H
-! SAL IH(AEIOUY)-^ *H
-! SAL IR(AEIOUY)-^ *R
-! SAL I(HR)^ *
-! SAL I^ *
-! SAL ING6 N
-! SAL IH(AEIOUY)- H
-! SAL IR(AEIOUY)- R
-! SAL I(HR) _
-! SAL J K
-! SAL KN^ N
-! SAL KK- _
-! SAL K K
-! SAL LAUGH^ LF
-! SAL LL- _
-! SAL L L
-! SAL MB$ M
-! SAL MM M
-! SAL M M
-! SAL NN- _
-! SAL N N
-! SAL OH(AEIOUY)-^ *H
-! SAL OR(AEIOUY)-^ *R
-! SAL O(HR)^ *
-! SAL O^ *
-! SAL OH(AEIOUY)- H
-! SAL OR(AEIOUY)- R
-! SAL O(HR) _
-! SAL PH F
-! SAL PN^ N
-! SAL PP- _
-! SAL P P
-! SAL Q K
-! SAL RH^ R
-! SAL ROUGH^ RF
-! SAL RR- _
-! SAL R R
-! SAL SCH(EOU)- SK
-! SAL SC(IEY)- S
-! SAL SH X
-! SAL SI(AO)- X
-! SAL SS- _
-! SAL S S
-! SAL TI(AO)- X
-! SAL TH @
-! SAL TCH-- _
-! SAL TOUGH^ TF
-! SAL TT- _
-! SAL T T
-! SAL UH(AEIOUY)-^ *H
-! SAL UR(AEIOUY)-^ *R
-! SAL U(HR)^ *
-! SAL U^ *
-! SAL UH(AEIOUY)- H
-! SAL UR(AEIOUY)- R
-! SAL U(HR) _
-! SAL V^ W
-! SAL V F
-! SAL WR^ R
-! SAL WH^ W
-! SAL W(AEIOU)- W
-! SAL X^ S
-! SAL X KS
-! SAL Y(AEIOU)- Y
-! SAL ZZ- _
-! SAL Z S
*** en_AU.orig.dic Fri Apr 15 13:20:36 2005
--- en_AU.dic Sun Jul 3 17:11:07 2005
***************
diff --git a/runtime/spell/en/en_CA.diff b/runtime/spell/en/en_CA.diff
index 0ae8ff808f..904e0c6203 100644
--- a/runtime/spell/en/en_CA.diff
+++ b/runtime/spell/en/en_CA.diff
@@ -1,8 +1,8 @@
*** en_CA.orig.aff Fri Apr 15 13:20:36 2005
---- en_CA.aff Sun Jul 3 17:09:40 2005
+--- en_CA.aff Sun Jul 31 22:16:56 2005
***************
*** 3,4 ****
---- 3,13 ----
+--- 3,134 ----
+ FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
+ LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -13,42 +13,7 @@
+ RAR ?
+ BAD !
+
- PFX A Y 1
-***************
-*** 30,33 ****
- SFX N e ion e
-! SFX N y ication y
-! SFX N 0 en [^ey]
-
---- 39,42 ----
- SFX N e ion e
-! SFX N y ication y
-! SFX N 0 en [^ey]
-
-***************
-*** 40,42 ****
- SFX H y ieth y
-! SFX H 0 th [^y]
-
---- 49,51 ----
- SFX H y ieth y
-! SFX H 0 th [^y]
-
-***************
-*** 47,49 ****
- SFX G e ing e
-! SFX G 0 ing [^e]
-
---- 56,58 ----
- SFX G e ing e
-! SFX G 0 ing [^e]
-
-***************
-*** 98 ****
---- 107,228 ----
- SFX L 0 ment .
-+
-+ MAP 5
++ MAP 9
+ MAP aàáâãäå
+ MAP eèéêë
+ MAP iìíîï
@@ -168,6 +133,37 @@
+ SAL Y(AEIOU)- Y
+ SAL ZZ- _
+ SAL Z S
++
+ PFX A Y 1
+***************
+*** 30,33 ****
+ SFX N e ion e
+! SFX N y ication y
+! SFX N 0 en [^ey]
+
+--- 160,163 ----
+ SFX N e ion e
+! SFX N y ication y
+! SFX N 0 en [^ey]
+
+***************
+*** 40,42 ****
+ SFX H y ieth y
+! SFX H 0 th [^y]
+
+--- 170,172 ----
+ SFX H y ieth y
+! SFX H 0 th [^y]
+
+***************
+*** 47,49 ****
+ SFX G e ing e
+! SFX G 0 ing [^e]
+
+--- 177,179 ----
+ SFX G e ing e
+! SFX G 0 ing [^e]
+
*** en_CA.orig.dic Sat Apr 16 14:40:06 2005
--- en_CA.dic Sun Jul 3 17:09:40 2005
***************
diff --git a/runtime/spell/en/en_GB.diff b/runtime/spell/en/en_GB.diff
index ab6e8dac21..6032c25588 100644
--- a/runtime/spell/en/en_GB.diff
+++ b/runtime/spell/en/en_GB.diff
@@ -1,8 +1,8 @@
*** en_GB.orig.aff Sun Jul 3 17:53:13 2005
---- en_GB.aff Sun Jul 3 17:59:15 2005
+--- en_GB.aff Sun Jul 31 22:17:09 2005
***************
*** 8,9 ****
---- 8,19 ----
+--- 8,140 ----
TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXÅçèîêàïüäñ
+
+ FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -14,6 +14,127 @@
+ RAR ?
+ BAD !
+
++ MAP 9
++ MAP aàáâãäå
++ MAP eèéêë
++ MAP iìíîï
++ MAP oòóôõö
++ MAP uùúûü
++ MAP nñ
++ MAP cç
++ MAP yÿý
++ MAP sß
++
++ # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
++
++ SAL AH(AEIOUY)-^ *H
++ SAL AR(AEIOUY)-^ *R
++ SAL A(HR)^ *
++ SAL A^ *
++ SAL AH(AEIOUY)- H
++ SAL AR(AEIOUY)- R
++ SAL A(HR) _
++ SAL À^ *
++ SAL Å^ *
++ SAL BB- _
++ SAL B B
++ SAL CQ- _
++ SAL CIA X
++ SAL CH X
++ SAL C(EIY)- S
++ SAL CK K
++ SAL COUGH^ KF
++ SAL CC< C
++ SAL C K
++ SAL DG(EIY) K
++ SAL DD- _
++ SAL D T
++ SAL É< E
++ SAL EH(AEIOUY)-^ *H
++ SAL ER(AEIOUY)-^ *R
++ SAL E(HR)^ *
++ SAL ENOUGH^$ *NF
++ SAL E^ *
++ SAL EH(AEIOUY)- H
++ SAL ER(AEIOUY)- R
++ SAL E(HR) _
++ SAL FF- _
++ SAL F F
++ SAL GN^ N
++ SAL GN$ N
++ SAL GNS$ NS
++ SAL GNED$ N
++ SAL GH(AEIOUY)- K
++ SAL GH _
++ SAL GG9 K
++ SAL G K
++ SAL H H
++ SAL IH(AEIOUY)-^ *H
++ SAL IR(AEIOUY)-^ *R
++ SAL I(HR)^ *
++ SAL I^ *
++ SAL ING6 N
++ SAL IH(AEIOUY)- H
++ SAL IR(AEIOUY)- R
++ SAL I(HR) _
++ SAL J K
++ SAL KN^ N
++ SAL KK- _
++ SAL K K
++ SAL LAUGH^ LF
++ SAL LL- _
++ SAL L L
++ SAL MB$ M
++ SAL MM M
++ SAL M M
++ SAL NN- _
++ SAL N N
++ SAL OH(AEIOUY)-^ *H
++ SAL OR(AEIOUY)-^ *R
++ SAL O(HR)^ *
++ SAL O^ *
++ SAL OH(AEIOUY)- H
++ SAL OR(AEIOUY)- R
++ SAL O(HR) _
++ SAL PH F
++ SAL PN^ N
++ SAL PP- _
++ SAL P P
++ SAL Q K
++ SAL RH^ R
++ SAL ROUGH^ RF
++ SAL RR- _
++ SAL R R
++ SAL SCH(EOU)- SK
++ SAL SC(IEY)- S
++ SAL SH X
++ SAL SI(AO)- X
++ SAL SS- _
++ SAL S S
++ SAL TI(AO)- X
++ SAL TH @
++ SAL TCH-- _
++ SAL TOUGH^ TF
++ SAL TT- _
++ SAL T T
++ SAL UH(AEIOUY)-^ *H
++ SAL UR(AEIOUY)-^ *R
++ SAL U(HR)^ *
++ SAL U^ *
++ SAL UH(AEIOUY)- H
++ SAL UR(AEIOUY)- R
++ SAL U(HR) _
++ SAL V^ W
++ SAL V F
++ SAL WR^ R
++ SAL WH^ W
++ SAL W(AEIOU)- W
++ SAL X^ S
++ SAL X KS
++ SAL Y(AEIOU)- Y
++ SAL ZZ- _
++ SAL Z S
++
REP 27
***************
*** 37,56 ****
@@ -37,7 +158,7 @@
PFX E Y 1
! PFX E 0 dis .
PFX F Y 5
---- 47,66 ----
+--- 168,187 ----
PFX A Y 2
! PFX A 0 re [^e]
! PFX A 0 re- e
@@ -455,7 +576,7 @@
SFX T y iest [^aeiou]y
! SFX T 0 er [aeiou]y
SFX T 0 est [aeiou]y
---- 70,464 ----
+--- 191,585 ----
PFX F 0 col l
! PFX F 0 con [^abehilmopru].
PFX K Y 1
@@ -1543,7 +1664,7 @@
! SFX 3 0 ist's [aeioubp]y
! SFX 3 o ist's o
! SFX 3 0 ist's [^eoy]
---- 471,1281 ----
+--- 592,1281 ----
SFX R Y 72
! SFX R 0 r e
! SFX R 0 rs e
@@ -2234,127 +2355,6 @@
! SFX 3 0 ist's [aeioubp]y
! SFX 3 o ist's o
! SFX 3 0 ist's [^eoy]
-!
-! MAP 5
-! MAP aàáâãäå
-! MAP eèéêë
-! MAP iìíîï
-! MAP oòóôõö
-! MAP uùúûü
-! MAP nñ
-! MAP cç
-! MAP yÿý
-! MAP sß
-!
-! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
-!
-! SAL AH(AEIOUY)-^ *H
-! SAL AR(AEIOUY)-^ *R
-! SAL A(HR)^ *
-! SAL A^ *
-! SAL AH(AEIOUY)- H
-! SAL AR(AEIOUY)- R
-! SAL A(HR) _
-! SAL À^ *
-! SAL Å^ *
-! SAL BB- _
-! SAL B B
-! SAL CQ- _
-! SAL CIA X
-! SAL CH X
-! SAL C(EIY)- S
-! SAL CK K
-! SAL COUGH^ KF
-! SAL CC< C
-! SAL C K
-! SAL DG(EIY) K
-! SAL DD- _
-! SAL D T
-! SAL É< E
-! SAL EH(AEIOUY)-^ *H
-! SAL ER(AEIOUY)-^ *R
-! SAL E(HR)^ *
-! SAL ENOUGH^$ *NF
-! SAL E^ *
-! SAL EH(AEIOUY)- H
-! SAL ER(AEIOUY)- R
-! SAL E(HR) _
-! SAL FF- _
-! SAL F F
-! SAL GN^ N
-! SAL GN$ N
-! SAL GNS$ NS
-! SAL GNED$ N
-! SAL GH(AEIOUY)- K
-! SAL GH _
-! SAL GG9 K
-! SAL G K
-! SAL H H
-! SAL IH(AEIOUY)-^ *H
-! SAL IR(AEIOUY)-^ *R
-! SAL I(HR)^ *
-! SAL I^ *
-! SAL ING6 N
-! SAL IH(AEIOUY)- H
-! SAL IR(AEIOUY)- R
-! SAL I(HR) _
-! SAL J K
-! SAL KN^ N
-! SAL KK- _
-! SAL K K
-! SAL LAUGH^ LF
-! SAL LL- _
-! SAL L L
-! SAL MB$ M
-! SAL MM M
-! SAL M M
-! SAL NN- _
-! SAL N N
-! SAL OH(AEIOUY)-^ *H
-! SAL OR(AEIOUY)-^ *R
-! SAL O(HR)^ *
-! SAL O^ *
-! SAL OH(AEIOUY)- H
-! SAL OR(AEIOUY)- R
-! SAL O(HR) _
-! SAL PH F
-! SAL PN^ N
-! SAL PP- _
-! SAL P P
-! SAL Q K
-! SAL RH^ R
-! SAL ROUGH^ RF
-! SAL RR- _
-! SAL R R
-! SAL SCH(EOU)- SK
-! SAL SC(IEY)- S
-! SAL SH X
-! SAL SI(AO)- X
-! SAL SS- _
-! SAL S S
-! SAL TI(AO)- X
-! SAL TH @
-! SAL TCH-- _
-! SAL TOUGH^ TF
-! SAL TT- _
-! SAL T T
-! SAL UH(AEIOUY)-^ *H
-! SAL UR(AEIOUY)-^ *R
-! SAL U(HR)^ *
-! SAL U^ *
-! SAL UH(AEIOUY)- H
-! SAL UR(AEIOUY)- R
-! SAL U(HR) _
-! SAL V^ W
-! SAL V F
-! SAL WR^ R
-! SAL WH^ W
-! SAL W(AEIOU)- W
-! SAL X^ S
-! SAL X KS
-! SAL Y(AEIOU)- Y
-! SAL ZZ- _
-! SAL Z S
*** en_GB.orig.dic Sun Jul 3 18:05:07 2005
--- en_GB.dic Sun Jul 3 18:19:25 2005
***************
diff --git a/runtime/spell/en/en_NZ.diff b/runtime/spell/en/en_NZ.diff
index 5c95622282..4e28fff4ed 100644
--- a/runtime/spell/en/en_NZ.diff
+++ b/runtime/spell/en/en_NZ.diff
@@ -1,11 +1,11 @@
*** en_NZ.orig.aff Fri Apr 15 13:20:36 2005
---- en_NZ.aff Sun Jul 3 17:11:34 2005
+--- en_NZ.aff Sun Jul 31 22:17:27 2005
***************
*** 7,9 ****
SET ISO8859-1
! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ
REP 66
---- 7,19 ----
+--- 7,140 ----
SET ISO8859-1
! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ
!
@@ -18,6 +18,127 @@
! RAR ?
! BAD !
!
+! MAP 9
+! MAP aàáâãäå
+! MAP eèéêë
+! MAP iìíîï
+! MAP oòóôõö
+! MAP uùúûü
+! MAP nñ
+! MAP cç
+! MAP yÿý
+! MAP sß
+!
+! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
+!
+! SAL AH(AEIOUY)-^ *H
+! SAL AR(AEIOUY)-^ *R
+! SAL A(HR)^ *
+! SAL A^ *
+! SAL AH(AEIOUY)- H
+! SAL AR(AEIOUY)- R
+! SAL A(HR) _
+! SAL À^ *
+! SAL Å^ *
+! SAL BB- _
+! SAL B B
+! SAL CQ- _
+! SAL CIA X
+! SAL CH X
+! SAL C(EIY)- S
+! SAL CK K
+! SAL COUGH^ KF
+! SAL CC< C
+! SAL C K
+! SAL DG(EIY) K
+! SAL DD- _
+! SAL D T
+! SAL É< E
+! SAL EH(AEIOUY)-^ *H
+! SAL ER(AEIOUY)-^ *R
+! SAL E(HR)^ *
+! SAL ENOUGH^$ *NF
+! SAL E^ *
+! SAL EH(AEIOUY)- H
+! SAL ER(AEIOUY)- R
+! SAL E(HR) _
+! SAL FF- _
+! SAL F F
+! SAL GN^ N
+! SAL GN$ N
+! SAL GNS$ NS
+! SAL GNED$ N
+! SAL GH(AEIOUY)- K
+! SAL GH _
+! SAL GG9 K
+! SAL G K
+! SAL H H
+! SAL IH(AEIOUY)-^ *H
+! SAL IR(AEIOUY)-^ *R
+! SAL I(HR)^ *
+! SAL I^ *
+! SAL ING6 N
+! SAL IH(AEIOUY)- H
+! SAL IR(AEIOUY)- R
+! SAL I(HR) _
+! SAL J K
+! SAL KN^ N
+! SAL KK- _
+! SAL K K
+! SAL LAUGH^ LF
+! SAL LL- _
+! SAL L L
+! SAL MB$ M
+! SAL MM M
+! SAL M M
+! SAL NN- _
+! SAL N N
+! SAL OH(AEIOUY)-^ *H
+! SAL OR(AEIOUY)-^ *R
+! SAL O(HR)^ *
+! SAL O^ *
+! SAL OH(AEIOUY)- H
+! SAL OR(AEIOUY)- R
+! SAL O(HR) _
+! SAL PH F
+! SAL PN^ N
+! SAL PP- _
+! SAL P P
+! SAL Q K
+! SAL RH^ R
+! SAL ROUGH^ RF
+! SAL RR- _
+! SAL R R
+! SAL SCH(EOU)- SK
+! SAL SC(IEY)- S
+! SAL SH X
+! SAL SI(AO)- X
+! SAL SS- _
+! SAL S S
+! SAL TI(AO)- X
+! SAL TH @
+! SAL TCH-- _
+! SAL TOUGH^ TF
+! SAL TT- _
+! SAL T T
+! SAL UH(AEIOUY)-^ *H
+! SAL UR(AEIOUY)-^ *R
+! SAL U(HR)^ *
+! SAL U^ *
+! SAL UH(AEIOUY)- H
+! SAL UR(AEIOUY)- R
+! SAL U(HR) _
+! SAL V^ W
+! SAL V F
+! SAL WR^ R
+! SAL WH^ W
+! SAL W(AEIOU)- W
+! SAL X^ S
+! SAL X KS
+! SAL Y(AEIOU)- Y
+! SAL ZZ- _
+! SAL Z S
+!
REP 66
***************
*** 76,95 ****
@@ -41,7 +162,7 @@
PFX E Y 1
! PFX E 0 dis .
PFX F Y 5
---- 86,105 ----
+--- 207,226 ----
PFX A Y 2
! PFX A 0 re [^e]
! PFX A 0 re- e
@@ -459,7 +580,7 @@
SFX T y iest [^aeiou]y
! SFX T 0 er [aeiou]y
SFX T 0 est [aeiou]y
---- 109,503 ----
+--- 230,624 ----
PFX F 0 col l
! PFX F 0 con [^abehilmopru].
PFX K Y 1
@@ -1544,7 +1665,7 @@
! SFX 3 o ist's o
! SFX 3 0 ist's [^eoy]
\ No newline at end of file
---- 510,1316 ----
+--- 631,1316 ----
SFX R Y 72
! SFX R 0 r e
! SFX R 0 rs e
@@ -2231,127 +2352,6 @@
! SFX 3 0 ist's [aeioubp]y
! SFX 3 o ist's o
! SFX 3 0 ist's [^eoy]
-!
-! MAP 5
-! MAP aàáâãäå
-! MAP eèéêë
-! MAP iìíîï
-! MAP oòóôõö
-! MAP uùúûü
-! MAP nñ
-! MAP cç
-! MAP yÿý
-! MAP sß
-!
-! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
-!
-! SAL AH(AEIOUY)-^ *H
-! SAL AR(AEIOUY)-^ *R
-! SAL A(HR)^ *
-! SAL A^ *
-! SAL AH(AEIOUY)- H
-! SAL AR(AEIOUY)- R
-! SAL A(HR) _
-! SAL À^ *
-! SAL Å^ *
-! SAL BB- _
-! SAL B B
-! SAL CQ- _
-! SAL CIA X
-! SAL CH X
-! SAL C(EIY)- S
-! SAL CK K
-! SAL COUGH^ KF
-! SAL CC< C
-! SAL C K
-! SAL DG(EIY) K
-! SAL DD- _
-! SAL D T
-! SAL É< E
-! SAL EH(AEIOUY)-^ *H
-! SAL ER(AEIOUY)-^ *R
-! SAL E(HR)^ *
-! SAL ENOUGH^$ *NF
-! SAL E^ *
-! SAL EH(AEIOUY)- H
-! SAL ER(AEIOUY)- R
-! SAL E(HR) _
-! SAL FF- _
-! SAL F F
-! SAL GN^ N
-! SAL GN$ N
-! SAL GNS$ NS
-! SAL GNED$ N
-! SAL GH(AEIOUY)- K
-! SAL GH _
-! SAL GG9 K
-! SAL G K
-! SAL H H
-! SAL IH(AEIOUY)-^ *H
-! SAL IR(AEIOUY)-^ *R
-! SAL I(HR)^ *
-! SAL I^ *
-! SAL ING6 N
-! SAL IH(AEIOUY)- H
-! SAL IR(AEIOUY)- R
-! SAL I(HR) _
-! SAL J K
-! SAL KN^ N
-! SAL KK- _
-! SAL K K
-! SAL LAUGH^ LF
-! SAL LL- _
-! SAL L L
-! SAL MB$ M
-! SAL MM M
-! SAL M M
-! SAL NN- _
-! SAL N N
-! SAL OH(AEIOUY)-^ *H
-! SAL OR(AEIOUY)-^ *R
-! SAL O(HR)^ *
-! SAL O^ *
-! SAL OH(AEIOUY)- H
-! SAL OR(AEIOUY)- R
-! SAL O(HR) _
-! SAL PH F
-! SAL PN^ N
-! SAL PP- _
-! SAL P P
-! SAL Q K
-! SAL RH^ R
-! SAL ROUGH^ RF
-! SAL RR- _
-! SAL R R
-! SAL SCH(EOU)- SK
-! SAL SC(IEY)- S
-! SAL SH X
-! SAL SI(AO)- X
-! SAL SS- _
-! SAL S S
-! SAL TI(AO)- X
-! SAL TH @
-! SAL TCH-- _
-! SAL TOUGH^ TF
-! SAL TT- _
-! SAL T T
-! SAL UH(AEIOUY)-^ *H
-! SAL UR(AEIOUY)-^ *R
-! SAL U(HR)^ *
-! SAL U^ *
-! SAL UH(AEIOUY)- H
-! SAL UR(AEIOUY)- R
-! SAL U(HR) _
-! SAL V^ W
-! SAL V F
-! SAL WR^ R
-! SAL WH^ W
-! SAL W(AEIOU)- W
-! SAL X^ S
-! SAL X KS
-! SAL Y(AEIOU)- Y
-! SAL ZZ- _
-! SAL Z S
*** en_NZ.orig.dic Fri Apr 15 13:20:36 2005
--- en_NZ.dic Sun Jul 3 17:11:34 2005
***************
diff --git a/runtime/spell/en/en_US.diff b/runtime/spell/en/en_US.diff
index e2321a0e49..99ddf0a18b 100644
--- a/runtime/spell/en/en_US.diff
+++ b/runtime/spell/en/en_US.diff
@@ -1,8 +1,8 @@
*** en_US.orig.aff Fri Apr 15 13:20:36 2005
---- en_US.aff Sun Jul 3 16:59:28 2005
+--- en_US.aff Sun Jul 31 22:17:40 2005
***************
*** 3,4 ****
---- 3,13 ----
+--- 3,134 ----
+ FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
+ LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -13,49 +13,7 @@
+ RAR ?
+ BAD !
+
- PFX A Y 1
-***************
-*** 30,33 ****
- SFX N e ion e
-! SFX N y ication y
-! SFX N 0 en [^ey]
-
---- 39,42 ----
- SFX N e ion e
-! SFX N y ication y
-! SFX N 0 en [^ey]
-
-***************
-*** 40,42 ****
- SFX H y ieth y
-! SFX H 0 th [^y]
-
---- 49,51 ----
- SFX H y ieth y
-! SFX H 0 th [^y]
-
-***************
-*** 47,49 ****
- SFX G e ing e
-! SFX G 0 ing [^e]
-
---- 56,58 ----
- SFX G e ing e
-! SFX G 0 ing [^e]
-
-***************
-*** 137,138 ****
---- 146,149 ----
- REP uy i
-+ REP y ie
-+ REP ie y
- REP i ee
-***************
-*** 188 ****
---- 199,320 ----
- REP shun cion
-+
-+ MAP 5
++ MAP 9
+ MAP aàáâãäå
+ MAP eèéêë
+ MAP iìíîï
@@ -175,6 +133,44 @@
+ SAL Y(AEIOU)- Y
+ SAL ZZ- _
+ SAL Z S
++
+ PFX A Y 1
+***************
+*** 30,33 ****
+ SFX N e ion e
+! SFX N y ication y
+! SFX N 0 en [^ey]
+
+--- 160,163 ----
+ SFX N e ion e
+! SFX N y ication y
+! SFX N 0 en [^ey]
+
+***************
+*** 40,42 ****
+ SFX H y ieth y
+! SFX H 0 th [^y]
+
+--- 170,172 ----
+ SFX H y ieth y
+! SFX H 0 th [^y]
+
+***************
+*** 47,49 ****
+ SFX G e ing e
+! SFX G 0 ing [^e]
+
+--- 177,179 ----
+ SFX G e ing e
+! SFX G 0 ing [^e]
+
+***************
+*** 137,138 ****
+--- 267,270 ----
+ REP uy i
++ REP y ie
++ REP ie y
+ REP i ee
*** en_US.orig.dic Fri Apr 15 13:20:36 2005
--- en_US.dic Sun Jul 3 16:59:28 2005
***************
diff --git a/runtime/spell/en/main.aap b/runtime/spell/en/main.aap
index b3bbb24394..d466830816 100644
--- a/runtime/spell/en/main.aap
+++ b/runtime/spell/en/main.aap
@@ -4,7 +4,7 @@
@if os.path.exists('../../../src/vim'):
VIM = ../../../src/vim
@else:
- VIM = vim
+ :progsearch VIM vim
SPELLDIR = ..
FILES = en_US.aff en_US.dic
@@ -63,8 +63,9 @@ en_US.aff en_US.dic: {buildcheck=}
@if not os.path.exists('en_US.orig.aff'):
:copy en_US.aff en_US.orig.aff
@if not os.path.exists('en_US.orig.dic'):
- :copy en_US.aff en_US.orig.dic
- :sys patch <en_US.diff
+ :copy en_US.dic en_US.orig.dic
+ @if os.path.exists('en_US.diff'):
+ :sys patch <en_US.diff
en_AU.aff en_AU.dic: {buildcheck=}
:assertpkg unzip patch
@@ -74,8 +75,9 @@ en_AU.aff en_AU.dic: {buildcheck=}
@if not os.path.exists('en_AU.orig.aff'):
:copy en_AU.aff en_AU.orig.aff
@if not os.path.exists('en_AU.orig.dic'):
- :copy en_AU.aff en_AU.orig.dic
- :sys patch <en_AU.diff
+ :copy en_AU.dic en_AU.orig.dic
+ @if os.path.exists('en_AU.diff'):
+ :sys patch <en_AU.diff
en_CA.aff en_CA.dic: {buildcheck=}
:assertpkg unzip patch
@@ -85,8 +87,9 @@ en_CA.aff en_CA.dic: {buildcheck=}
@if not os.path.exists('en_CA.orig.aff'):
:copy en_CA.aff en_CA.orig.aff
@if not os.path.exists('en_CA.orig.dic'):
- :copy en_CA.aff en_CA.orig.dic
- :sys patch <en_CA.diff
+ :copy en_CA.dic en_CA.orig.dic
+ @if os.path.exists('en_CA.diff'):
+ :sys patch <