diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-07-03 21:39:27 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-07-03 21:39:27 +0000 |
commit | 7d1f5dbc0a254d7524b3f985f2440bf89e037355 (patch) | |
tree | 7e4c83253b68e454fca710b215f928c1e012ba74 /src | |
parent | 51ac12f68322b411ae5b038834a649a0e9ccb462 (diff) |
updated for version 7.0101v7.0101
Diffstat (limited to 'src')
-rw-r--r-- | src/Make_mvc.mak | 14 | ||||
-rw-r--r-- | src/eval.c | 82 | ||||
-rw-r--r-- | src/farsi.c | 8 | ||||
-rw-r--r-- | src/if_ole.cpp | 2 | ||||
-rw-r--r-- | src/spell.c | 72 | ||||
-rw-r--r-- | src/spell/Makefile | 117 | ||||
-rw-r--r-- | src/spell/de_DE.diff | 24 | ||||
-rw-r--r-- | src/spell/en_AU.diff | 2632 | ||||
-rw-r--r-- | src/spell/en_CA.diff | 442 | ||||
-rw-r--r-- | src/spell/en_GB.diff | 2619 | ||||
-rw-r--r-- | src/spell/en_NZ.diff | 2678 | ||||
-rw-r--r-- | src/spell/en_US.diff | 547 | ||||
-rw-r--r-- | src/spell/fr_FR.diff | 29 | ||||
-rw-r--r-- | src/spell/he_IL.diff | 76 | ||||
-rw-r--r-- | src/spell/nl_NL.diff | 409 | ||||
-rw-r--r-- | src/spell/pl_PL.diff | 31 | ||||
-rw-r--r-- | src/version.h | 4 |
17 files changed, 109 insertions, 9677 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 757aa73800..e74019fcea 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -679,16 +679,16 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \ $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) $(TCL_LIB) \ $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB) -all: $(VIM) vimrun.exe install.exe uninstal.exe xxd/xxd.exe GvimExt/gvimext.dll +all: $(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe GvimExt/gvimext.dll -$(VIM): $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(RUBY_OBJ) $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(XPM_OBJ) version.c version.h +$(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(RUBY_OBJ) $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(XPM_OBJ) version.c version.h $(CC) $(CFLAGS) version.c /Fo$(OUTDIR)/version.obj $(PDB) - $(link) $(LINKARGS1) -out:$*.exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \ + $(link) $(LINKARGS1) -out:$* $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \ $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(RUBY_OBJ) $(TCL_OBJ) $(SNIFF_OBJ) \ $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(XPM_OBJ) \ $(OUTDIR)\version.obj $(LINKARGS2) -$(VIM).exe: $(VIM) +$(VIM): $(VIM).exe $(OUTDIR): if not exist $(OUTDIR)/nul mkdir $(OUTDIR) @@ -907,11 +907,11 @@ $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c $(OUTDIR)/vim.res: $(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico $(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc -iid_ole.c if_ole.h vim.tlb: if_ole.idl $(INTDIR) $(OUTDIR) - midl /nologo /proxy nul /iid iid_ole.c /tlb vim.tlb /header if_ole.h if_ole.idl +iid_ole.c if_ole.h vim.tlb: if_ole.idl + midl /nologo /error none /proxy nul /iid iid_ole.c /tlb vim.tlb /header if_ole.h if_ole.idl dimm.h dimm_i.c: dimm.idl - midl /nologo /proxy nul dimm.idl + midl /nologo /error none /proxy nul dimm.idl $(OUTDIR)/dimm_i.obj: $(OUTDIR) dimm_i.c $(INCL) diff --git a/src/eval.c b/src/eval.c index af2c73d7f5..c1762265ff 100644 --- a/src/eval.c +++ b/src/eval.c @@ -375,7 +375,6 @@ static long list_len __ARGS((list_T *l)); static int list_equal __ARGS((list_T *l1, list_T *l2, int ic)); static int dict_equal __ARGS((dict_T *d1, dict_T *d2, int ic)); static int tv_equal __ARGS((typval_T *tv1, typval_T *tv2, int ic)); -static int string_isa_number __ARGS((char_u *s)); static listitem_T *list_find __ARGS((list_T *l, long n)); static long list_idx_of_item __ARGS((list_T *l, listitem_T *item)); static void list_append __ARGS((list_T *l, listitem_T *item)); @@ -5179,7 +5178,8 @@ dict_equal(d1, d2, ic) /* * Return TRUE if "tv1" and "tv2" have the same value. - * Compares the items just like "==" would compare them. + * Compares the items just like "==" would compare them, but strings and + * numbers are different. */ static int tv_equal(tv1, tv2, ic) @@ -5190,61 +5190,35 @@ tv_equal(tv1, tv2, ic) char_u buf1[NUMBUFLEN], buf2[NUMBUFLEN]; char_u *s1, *s2; - if (tv1->v_type == VAR_LIST || tv2->v_type == VAR_LIST) - { - /* recursive! */ - if (tv1->v_type != tv2->v_type - || !list_equal(tv1->vval.v_list, tv2->vval.v_list, ic)) - return FALSE; - } - else if (tv1->v_type == VAR_DICT || tv2->v_type == VAR_DICT) - { - /* recursive! */ - if (tv1->v_type != tv2->v_type - || !dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic)) - return FALSE; - } - else if (tv1->v_type == VAR_FUNC || tv2->v_type == VAR_FUNC) - { - if (tv1->v_type != tv2->v_type - || tv1->vval.v_string == NULL - || tv2->vval.v_string == NULL - || STRCMP(tv1->vval.v_string, tv2->vval.v_string) != 0) - return FALSE; - } - else if (tv1->v_type == VAR_NUMBER || tv2->v_type == VAR_NUMBER) - { - /* "4" is equal to 4. But don't consider 'a' and zero to be equal. - * Don't consider "4x" to be equal to 4. */ - if ((tv1->v_type == VAR_STRING - && !string_isa_number(tv1->vval.v_string)) - || (tv2->v_type == VAR_STRING - && !string_isa_number(tv2->vval.v_string))) - return FALSE; - if (get_tv_number(tv1) != get_tv_number(tv2)) - return FALSE; - } - else + if (tv1->v_type != tv2->v_type) + return FALSE; + + switch (tv1->v_type) { - s1 = get_tv_string_buf(tv1, buf1); - s2 = get_tv_string_buf(tv2, buf2); - if ((ic ? MB_STRICMP(s1, s2) : STRCMP(s1, s2)) != 0) - return FALSE; - } - return TRUE; -} + case VAR_LIST: + /* recursive! */ + return list_equal(tv1->vval.v_list, tv2->vval.v_list, ic); -/* - * Return TRUE if "tv" is a number without other non-white characters. - */ - static int -string_isa_number(s) - char_u *s; -{ - int len; + case VAR_DICT: + /* recursive! */ + return dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic); + + case VAR_FUNC: + return (tv1->vval.v_string != NULL + && tv2->vval.v_string != NULL + && STRCMP(tv1->vval.v_string, tv2->vval.v_string) == 0); + + case VAR_NUMBER: + return tv1->vval.v_number == tv2->vval.v_number; - vim_str2nr(s, NULL, &len, TRUE, TRUE, NULL, NULL); - return len > 0 && *skipwhite(s + len) == NUL; + case VAR_STRING: + s1 = get_tv_string_buf(tv1, buf1); + s2 = get_tv_string_buf(tv2, buf2); + return ((ic ? MB_STRICMP(s1, s2) : STRCMP(s1, s2)) == 0); + } + + EMSG2(_(e_intern2), "tv_equal()"); + return TRUE; } /* diff --git a/src/farsi.c b/src/farsi.c index f74447f76e..f325b32e05 100644 --- a/src/farsi.c +++ b/src/farsi.c @@ -1939,7 +1939,7 @@ lrFswap(cmdbuf, len) } /* - * Reverse the characters in the seach path and substitude section accordingly + * Reverse the characters in the search path and substitute section accordingly */ char_u * lrF_sub(ibuf) @@ -1950,8 +1950,8 @@ lrF_sub(ibuf) p = ibuf; - /* Find the boundry of the search path */ - while (((p = vim_strchr(++p, '/')) != NULL) && p[-1] == '\\') + /* Find the boundary of the search path */ + while (++p, ((p = vim_strchr(p, '/')) != NULL) && p[-1] == '\\') ; if (p == NULL) @@ -1960,7 +1960,7 @@ lrF_sub(ibuf) /* Reverse the Farsi characters in the search path. */ lrFswap(ibuf, (int)(p-ibuf)); - /* Now find the boundry of the substitute section */ + /* Now find the boundary of the substitute section */ if ((ep = (char_u *)strrchr((char *)++p, '/')) != NULL) cnt = (int)(ep - p); else diff --git a/src/if_ole.cpp b/src/if_ole.cpp index de6faad07b..544ea16fb1 100644 --- a/src/if_ole.cpp +++ b/src/if_ole.cpp @@ -651,7 +651,7 @@ static void RecursiveDeleteKey(HKEY hKeyParent, const char *child) } // Create a key and set its value -static void SetKeyAndValue(const char *key, const char subkey, const char *value) +static void SetKeyAndValue(const char *key, const char *subkey, const char *value) { HKEY hKey; char buffer[1024]; diff --git a/src/spell.c b/src/spell.c index f8b8460339..015a7108b9 100644 --- a/src/spell.c +++ b/src/spell.c @@ -607,7 +607,7 @@ static int set_spell_charflags __ARGS((char_u *flags, char_u *upp)); static int set_spell_chartab __ARGS((char_u *fol, char_u *low, char_u *upp)); static void write_spell_chartab __ARGS((FILE *fd)); static int spell_casefold __ARGS((char_u *p, int len, char_u *buf, int buflen)); -static void spell_find_suggest __ARGS((char_u *badptr, suginfo_T *su, int maxcount, int banbadword)); +static void spell_find_suggest __ARGS((char_u *badptr, suginfo_T *su, int maxcount, int banbadword, int need_cap)); #ifdef FEAT_EVAL static void spell_suggest_expr __ARGS((suginfo_T *su, char_u *expr)); #endif @@ -5952,6 +5952,10 @@ spell_suggest() suginfo_T sug; suggest_T *stp; int mouse_used; + int need_cap; + regmatch_T regmatch; + int endcol; + char_u *line_copy = NULL; /* Find the start of the badly spelled word. */ if (spell_move_to(FORWARD, TRUE, TRUE) == FAIL @@ -5983,8 +5987,62 @@ spell_suggest() /* Get the word and its length. */ line = ml_get_curline(); + /* Figure out if the word should be capitalised. */ + need_cap = FALSE; + if (curbuf->b_cap_prog != NULL) + { + endcol = 0; + if (skipwhite(line) - line == curwin->w_cursor.col) + { + /* At start of line, check if previous line is empty or sentence + * ends there. */ + if (curwin->w_cursor.lnum == 1) + need_cap = TRUE; + else + { + line = ml_get(curwin->w_cursor.lnum - 1); + if (*skipwhite(line) == NUL) + need_cap = TRUE; + else + { + /* Append a space in place of the line break. */ + line_copy = concat_str(line, (char_u *)" "); + line = line_copy; + endcol = STRLEN(line); + } + } + } + else + endcol = curwin->w_cursor.col; + + if (endcol > 0) + { + /* Check if sentence ends before the bad word. */ + regmatch.regprog = curbuf->b_cap_prog; + regmatch.rm_ic = FALSE; + p = line + endcol; + for (;;) + { + mb_ptr_back(line, p); + if (p == line || SPELL_ISWORDP(p)) + break; + if (vim_regexec(®match, p, 0) + && regmatch.endp[0] == line + endcol) + { + need_cap = TRUE; + break; + } + } + } + + /* get the line again, we may have been using the previous one */ + line = ml_get_curline(); + vim_free(line_copy); + } + /* Get the list of suggestions */ - spell_find_suggest(line + curwin->w_cursor.col, &sug, (int)Rows - 2, TRUE); + spell_find_suggest(line + curwin->w_cursor.col, &sug, (int)Rows - 2, + TRUE, need_cap); if (sug.su_ga.ga_len == 0) MSG(_("Sorry, no suggestions")); @@ -6159,7 +6217,7 @@ spell_suggest_list(gap, word, maxcount) suggest_T *stp; char_u *wcopy; - spell_find_suggest(word, &sug, maxcount, FALSE); + spell_find_suggest(word, &sug, maxcount, FALSE, FALSE); /* Make room in "gap". */ ga_init2(gap, sizeof(char_u *), sug.su_ga.ga_len + 1); @@ -6192,11 +6250,12 @@ spell_suggest_list(gap, word, maxcount) * This is based on the mechanisms of Aspell, but completely reimplemented. */ static void -spell_find_suggest(badptr, su, maxcount, banbadword) +spell_find_suggest(badptr, su, maxcount, banbadword, need_cap) char_u *badptr; suginfo_T *su; int maxcount; int banbadword; /* don't include badword in suggestions */ + int need_cap; /* word should start with capital */ { int attr = 0; char_u buf[MAXPATHL]; @@ -6230,6 +6289,8 @@ spell_find_suggest(badptr, su, maxcount, banbadword) su->su_fbadword, MAXWLEN); /* get caps flags for bad word */ su->su_badflags = captype(su->su_badptr, su->su_badptr + su->su_badlen); + if (need_cap) + su->su_badflags |= WF_ONECAP; /* If the word is not capitalised and spell_check() doesn't consider the * word to be bad then it might need to be capitalised. Add a suggestion @@ -6237,7 +6298,7 @@ spell_find_suggest(badptr, su, maxcount, banbadword) #ifdef FEAT_MBYTE c = mb_ptr2char(su->su_badptr); #else - c = *p; + c = *su->su_badptr; #endif if (!SPELL_ISUPPER(c) && attr == 0) { @@ -7972,6 +8033,7 @@ suggest_try_soundalike(su) char_u *p; int score; + flags |= su->su_badflags; if (round == 1 && (flags & WF_CAPMASK) != 0) { /* Need to fix case according to diff --git a/src/spell/Makefile b/src/spell/Makefile deleted file mode 100644 index 838e603abd..0000000000 --- a/src/spell/Makefile +++ /dev/null @@ -1,117 +0,0 @@ -# Makefile for Vim spell files. - -SPELLDIR = ../../runtime/spell -VIM = ../vim - -all: en pl nl de fr - -en: $(SPELLDIR)/en.latin1.spl \ - $(SPELLDIR)/en.utf-8.spl \ - $(SPELLDIR)/en.ascii.spl - -pl: $(SPELLDIR)/pl.iso-8859-2.spl \ - $(SPELLDIR)/pl.utf-8.spl - -nl: $(SPELLDIR)/nl.latin1.spl \ - $(SPELLDIR)/nl.utf-8.spl - -de: $(SPELLDIR)/de.latin1.spl \ - $(SPELLDIR)/de.utf-8.spl - -fr: $(SPELLDIR)/fr.latin1.spl \ - $(SPELLDIR)/fr.utf-8.spl - -he: $(SPELLDIR)/he.utf-8.spl - -diff: - -diff -a -C 1 en_US.orig.aff en_US.aff >en_US.diff - -diff -a -C 1 en_US.orig.dic en_US.dic >>en_US.diff - -diff -a -C 1 en_AU.orig.aff en_AU.aff >en_AU.diff - -diff -a -C 1 en_AU.orig.dic en_AU.dic >>en_AU.diff - -diff -a -C 1 en_CA.orig.aff en_CA.aff >en_CA.diff - -diff -a -C 1 en_CA.orig.dic en_CA.dic >>en_CA.diff - -diff -a -C 1 en_GB.orig.aff en_GB.aff >en_GB.diff - -diff -a -C 1 en_GB.orig.dic en_GB.dic >>en_GB.diff - -diff -a -C 1 en_NZ.orig.aff en_NZ.aff >en_NZ.diff - -diff -a -C 1 en_NZ.orig.dic en_NZ.dic >>en_NZ.diff - - -diff -a -C 1 nl_NL.orig.aff nl_NL.aff >nl_NL.diff - -diff -a -C 1 nl_NL.orig.dic nl_NL.dic >>nl_NL.diff - - -diff -a -C 1 pl_PL.orig.aff pl_PL.aff >pl_PL.diff - -diff -a -C 1 pl_PL.orig.dic pl_PL.dic >>pl_PL.diff - - -diff -a -C 1 de_DE.orig.aff de_DE.aff >de_DE.diff - -diff -a -C 1 de_DE.orig.dic de_DE.dic >>de_DE.diff - - -diff -a -C 1 fr_FR.orig.aff fr_FR.aff >fr_FR.diff - -diff -a -C 1 fr_FR.orig.dic fr_FR.dic >>fr_FR.diff - - -diff -a -C 1 he_IL.orig.aff he_IL.aff >he_IL.diff - -diff -a -C 1 he_IL.orig.dic he_IL.dic >>he_IL.diff - -$(SPELLDIR)/en.latin1.spl : $(VIM) \ - en_US.aff en_US.dic \ - en_AU.aff en_AU.dic \ - en_CA.aff en_CA.dic \ - en_GB.aff en_GB.dic \ - en_NZ.aff en_NZ.dic - env LANG=en_US.ISO8859-1 \ - $(VIM) -e -c "mkspell! $(SPELLDIR)/en en_US en_AU en_CA en_GB \ - en_NZ" -c q - -$(SPELLDIR)/en.utf-8.spl : $(VIM) \ - en_US.aff en_US.dic \ - en_AU.aff en_AU.dic \ - en_CA.aff en_CA.dic \ - en_GB.aff en_GB.dic \ - en_NZ.aff en_NZ.dic - env LANG=en_US.UTF-8 \ - $(VIM) -e -c "mkspell! $(SPELLDIR)/en en_US en_AU en_CA en_GB \ - en_NZ" -c q - -$(SPELLDIR)/en.ascii.spl : $(VIM) \ - en_US.aff en_US.dic \ - en_AU.aff en_AU.dic \ - en_CA.aff en_CA.dic \ - en_GB.aff en_GB.dic \ - en_NZ.aff en_NZ.dic - $(VIM) -e -c "mkspell! -ascii $(SPELLDIR)/en en_US en_AU en_CA en_GB \ - en_NZ" -c q - -$(SPELLDIR)/pl.iso-8859-2.spl : $(VIM) \ - pl_PL.aff pl_PL.dic - env LANG=pl_PL.ISO8859-2 $(VIM) -e -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q - -$(SPELLDIR)/pl.utf-8.spl : $(VIM) \ - pl_PL.aff pl_PL.dic - env LANG=pl_PL.UTF-8 $(VIM) -e -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q - -$(SPELLDIR)/nl.latin1.spl : $(VIM) \ - nl_NL.aff nl_NL.dic - env LANG=nl_NL.ISO8859-1 $(VIM) -e -c "mkspell! $(SPELLDIR)/nl nl_NL" -c q - -$(SPELLDIR)/nl.utf-8.spl : $(VIM) \ - nl_NL.aff nl_NL.dic - env LANG=nl_NL.UTF-8 $(VIM) -e -c "mkspell! $(SPELLDIR)/nl nl_NL" -c q - -$(SPELLDIR)/de.latin1.spl : $(VIM) \ - de_DE.aff de_DE.dic - env LANG=de_DE.ISO8859-1 $(VIM) -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q - -$(SPELLDIR)/de.utf-8.spl : $(VIM) \ - de_DE.aff de_DE.dic - env LANG=de_DE.UTF-8 $(VIM) -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q - -$(SPELLDIR)/fr.latin1.spl : $(VIM) \ - fr_FR.aff fr_FR.dic - env LANG=fr_FR.ISO8859-1 $(VIM) -e -c "mkspell! $(SPELLDIR)/fr fr_FR" -c q - -$(SPELLDIR)/fr.utf-8.spl : $(VIM) \ - fr_FR.aff fr_FR.dic - env LANG=fr_FR.UTF-8 $(VIM) -e -c "mkspell! $(SPELLDIR)/fr fr_FR" -c q - - -$(SPELLDIR)/he.utf-8.spl : $(VIM) \ - he_IL.aff he_IL.dic - env LANG=he_IL.UTF-8 $(VIM) -e -c "mkspell! $(SPELLDIR)/he he_IL" -c q diff --git a/src/spell/de_DE.diff b/src/spell/de_DE.diff deleted file mode 100644 index a7b056a242..0000000000 --- a/src/spell/de_DE.diff +++ /dev/null @@ -1,24 +0,0 @@ -*** de_DE.orig.aff Fri Jun 17 10:01:18 2005 ---- de_DE.aff Mon Jun 27 19:42:20 2005 -*************** -*** 3,4 **** ---- 3,10 ---- - -+ FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ -+ LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ -+ UPP ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ -+ -+ MIDWORD ' -+ - # (c) copyright by Bjoern Jacke <bjoern@j3e.de> -*** de_DE.orig.dic Fri Jun 17 10:01:27 2005 ---- de_DE.dic Sat Jun 18 19:57:07 2005 -*************** -*** 76258,76259 **** - zynismusfördernd/A -! zzgl -\ No newline at end of file ---- 76258,76260 ---- - zynismusfördernd/A -! zzgl -! diff --git a/src/spell/en_AU.diff b/src/spell/en_AU.diff deleted file mode 100644 index ff3c56e03b..0000000000 --- a/src/spell/en_AU.diff +++ /dev/null @@ -1,2632 +0,0 @@ -*** en_AU.orig.aff Fri Apr 15 13:20:36 2005 ---- en_AU.aff Mon Jun 27 19:42:32 2005 -*************** -*** 7,9 **** - SET ISO8859-1 -! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ - REP 24 ---- 7,19 ---- - SET ISO8859-1 -! TRY esiaénrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKWöâôZQJXÅçèîêàïüäñ -! -! FOL àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ -! LOW àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ -! UPP ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ -! -! MIDWORD ' -! -! RAR ? -! BAD ! -! - REP 24 -*************** -*** 34,53 **** - PFX A Y 2 -! PFX A 0 re [^e] -! PFX A 0 re- e - PFX a Y 1 -! PFX a 0 mis . - PFX I Y 4 -! PFX I 0 il l -! PFX I 0 ir r -! PFX I 0 im [bmp] -! PFX I 0 in [^blmpr] - PFX c Y 1 -! PFX c 0 over . - PFX U Y 1 -! PFX U 0 un . - PFX C Y 2 -! PFX C 0 de [^e] -! PFX C 0 de- e - PFX E Y 1 -! PFX E 0 dis . - PFX F Y 5 ---- 44,63 ---- - PFX A Y 2 -! PFX A 0 re [^e] -! PFX A 0 re- e - PFX a Y 1 -! PFX a 0 mis . - PFX I Y 4 -! PFX I 0 il l -! PFX I 0 ir r -! PFX I 0 im [bmp] -! PFX I 0 in [^blmpr] - PFX c Y 1 -! PFX c 0 over . - PFX U Y 1 -! PFX U 0 un . - PFX C Y 2 -! PFX C 0 de [^e] -! PFX C 0 de- e - PFX E Y 1 -! PFX E 0 dis . - PFX F Y 5 -*************** -*** 57,451 **** - PFX F 0 col l -! PFX F 0 con [^abehilmopru]. - PFX K Y 1 -! PFX K 0 pre . - PFX e Y 1 -! PFX e 0 out . - PFX f Y 2 -! PFX f 0 under [^r] -! PFX f 0 under- r - PFX O Y 1 -! PFX O 0 non- . - PFX 4 Y 1 -! PFX 4 0 trans . - SFX V Y 15 -! SFX V 0 tive [aio] -! SFX V b ptive b -! SFX V d sive d -! SFX V be ptive be -! SFX V e tive ce -! SFX V de sive de -! SFX V ke cative ke -! SFX V e ptive me -! SFX V e ive [st]e -! SFX V e ative [^bcdkmst]e -! SFX V 0 lative [aeiou]l -! SFX V 0 ative [^aeiou]l -! SFX V 0 ive [st] -! SFX V y icative y -! SFX V 0 ative [^abdeilosty] - SFX v Y 15 -! SFX v 0 tively [aio] -! SFX v b ptively b -! SFX v d sively d -! SFX v be ptively be -! SFX v e tively ce -! SFX v de sively de -! SFX v ke catively ke -! SFX v e ptively me -! SFX v e ively [st]e -! SFX v e atively [^bcdkmst]e -! SFX v 0 latively [aeiou]l -! SFX v 0 atively [^aeiou]l -! SFX v 0 ively [st] -! SFX v y icatively y -! SFX v 0 atively [^abdeilosty] - SFX u Y 15 -! SFX u 0 tiveness [aio] -! SFX u b ptiveness b -! SFX u d siveness d -! SFX u be ptiveness be -! SFX u e tiveness ce -! SFX u de siveness de -! SFX u ke cativeness ke -! SFX u e ptiveness me -! SFX u e iveness [st]e -! SFX u e ativeness [^bcdkmst]e -! SFX u 0 lativeness [aeiou]l -! SFX u 0 ativeness [^aeiou]l -! SFX u 0 iveness [st] -! SFX u y icativeness y -! SFX u 0 ativeness [^abdeilosty] - SFX N Y 26 -! SFX N b ption b -! SFX N d sion d -! SFX N be ption be -! SFX N e tion ce -! SFX N de sion de -! SFX N ke cation ke -! SFX N e ption ume -! SFX N e mation [^u]me -! SFX N e ion [^o]se -! SFX N e ition ose -! SFX N e ation [iou]te -! SFX N e ion [^iou]te -! SFX N e ation [^bcdkmst]e -! SFX N el ulsion el -! SFX N 0 lation [aiou]l -! SFX N 0 ation [^aeiou]l -! SFX N 0 mation [aeiou]m -! SFX N 0 ation [^aeiou]m -! SFX N er ration er -! SFX N 0 ation [^e]r -! SFX N 0 ion [sx] -! SFX N t ssion mit -! SFX N 0 ion [^m]it -! SFX N 0 ation [^i]t -! SFX N y ication y -! SFX N 0 ation [^bdelmrstxy] - SFX n Y 28 -! SFX n 0 tion a -! SFX n e tion ce -! SFX n ke cation ke -! SFX n e ation [iou]te -! SFX n e ion [^iou]te -! SFX n e ation [^ckt]e -! SFX n el ulsion el -! SFX n 0 lation [aiou]l -! SFX n 0 ation [^aeiou]l -! SFX n er ration er -! SFX n 0 ation [^e]r -! SFX n y ation py -! SFX n y ication [^p]y -! SFX n 0 ation [^aelry] -! SFX n 0 tions a -! SFX n e tions ce -! SFX n ke cations ke -! SFX n e ations [iou]te -! SFX n e ions [^iou]te -! SFX n e ations [^ckt]e -! SFX n el ulsions el -! SFX n 0 lations [aiou]l -! SFX n 0 ations [^aeiou]l -! SFX n er rations er -! SFX n 0 ations [^e]r -! SFX n y ations py -! SFX n y ications [^p]y -! SFX n 0 ations [^aelry] - SFX X Y 26 -! SFX X b ptions b -! SFX X d sions d -! SFX X be ptions be -! SFX X e tions ce -! SFX X ke cations ke -! SFX X de sions de -! SFX X e ptions ume -! SFX X e mations [^u]me -! SFX X e ions [^o]se -! SFX X e itions ose -! SFX X e ations [iou]te -! SFX X e ions [^iou]te -! SFX X e ations [^bcdkmst]e -! SFX X el ulsions el -! SFX X 0 lations [aiou]l -! SFX X 0 ations [^aeiou]l -! SFX X 0 mations [aeiou]m -! SFX X 0 ations [^aeiou]m -! SFX X er rations er -! SFX X 0 ations [^e]r -! SFX X 0 ions [sx] -! SFX X t ssions mit -! SFX X 0 ions [^m]it -! SFX X 0 ations [^i]t -! SFX X y ications y -! SFX X 0 ations [^bdelmrstxy] - SFX x Y 40 -! SFX x b ptional b -! SFX x d sional d -! SFX x be ptional be -! SFX x e tional ce -! SFX x ke cational ke -! SFX x de sional de -! SFX x e ional [^o]se -! SFX x e itional ose -! SFX x e ional te -! SFX x e ational [^bcdkst]e -! SFX x el ulsional el -! SFX x 0 lational [aiou]l -! SFX x 0 ational [^aeiou]l -! SFX x er rational er -! SFX x 0 ational [^e]r -! SFX x 0 ional [sx] -! SFX x 0 ional [^n]t -! SFX x 0 ational nt -! SFX x y icational y -! SFX x 0 ational [^bdelrstxy] -! SFX x b ptionally b -! SFX x d sionally d -! SFX x be ptionally be -! SFX x e tionally ce -! SFX x ke cationally ke -! SFX x de sionally de -! SFX x e ionally [^o]se -! SFX x e itionally ose -! SFX x e ionally te -! SFX x e ationally [^bcdkst]e -! SFX x el ulsionally el -! SFX x 0 lationally [aiou]l -! SFX x 0 ationally [^aeiou]l -! SFX x er rationally er -! SFX x 0 ationally [^e]r -! SFX x 0 ionally [sx] -! SFX x 0 ionally [^n]t -! SFX x 0 ationally nt -! SFX x y icationally y -! SFX x 0 ationally [^bdelrstxy] - SFX H N 13 -! SFX H y ieth y -! SFX H ree ird ree -! SFX H ve fth ve -! SFX H e th [^ev]e -! SFX H 0 h t -! SFX H 0 th [^ety] -! SFX H y ieths y -! SFX H ree irds ree -! SFX H ve fths ve -! SFX H e ths [^ev]e -! SFX H 0 hs t -! SFX H 0 ths [^ety] -! SFX H 0 fold . - SFX Y Y 9 -! SFX Y 0 ally ic -! SFX Y 0 ly [^i]c -! SFX Y e y [^aeiou]le -! SFX Y 0 ly [aeiou]le -! SFX Y 0 ly [^l]e -! SFX Y 0 y [^aeiou]l -! SFX Y y ily [^aeiou]y -! SFX Y 0 ly [aeiou][ly] -! SFX Y 0 ly [^cely] - SFX G Y 24 -! SFX G e ing [^eioy]e -! SFX G 0 ing [eoy]e -! SFX G ie ying ie -! SFX G 0 bing [^aeio][aeiou]b -! SFX G 0 king [^aeio][aeiou]c -! SFX G 0 ding [^aeio][aeiou]d -! SFX G 0 fing [^aeio][aeiou]f -! SFX G 0 ging [^aeio][aeiou]g -! SFX G 0 king [^aeio][aeiou]k -! SFX G 0 ling [^aeio][eiou]l -! SFX G 0 ing [aeio][eiou]l -! SFX G 0 ling [^aeo]al -! SFX G 0 ing [aeo]al -! SFX G 0 ming [^aeio][aeiou]m -! SFX G 0 ning [^aeio][aeiou]n -! SFX G 0 ping [^aeio][aeiou]p -! SFX G 0 ring [^aeio][aeiou]r -! SFX G 0 sing [^aeio][aeiou]s -! SFX G 0 ting [^aeio][aeiou]t -! SFX G 0 ving [^aeio][aeiou]v -! SFX G 0 zing [^aeio][aeiou]z -! SFX G 0 ing [aeio][aeiou][bcdfgkmnprstvz] -! SFX G 0 ing [^aeiou][bcdfgklmnprstvz] -! SFX G 0 ing [^ebcdfgklmnprstvz] - SFX J Y 25 -! SFX J e ings [^eioy]e -! SFX J 0 ings [eoy]e -! SFX J ie yings ie -! SFX J 0 bings [^aeio][aeiou]b -! SFX J 0 king [^aeio][aeiou]c -! SFX J 0 dings [^aeio][aeiou]d -! SFX J 0 fings [^aeio][aeiou]f -! SFX J 0 gings [^aeio][aeiou]g -! SFX J 0 kings [^aeio][aeiou]k -! SFX J 0 lings [^aeio][eiou]l -! SFX J 0 ings [aeio][eiou]l -! SFX J 0 lings [^aeo]al -! SFX J 0 ings [aeo]al -! SFX J 0 mings [^aeio][aeiou]m -! SFX J 0 nings [^aeio][aiou]n -! SFX J 0 pings [^aeio][aeiou]p -! SFX J 0 rings [^aeio][aiou]r -! SFX J 0 sings [^aeio][aeiou]s -! SFX J 0 tings [^aeio][aiou]t -! SFX J 0 vings [^aeio][aeiou]v -! SFX J 0 zings [^aeio][aeiou]z -! SFX J 0 ings [^aeio]e[nrt] -! SFX J 0 ings [aeio][aeiou][bcdfgkmnprstvz] -! SFX J 0 ings [^aeiou][bcdfgklmnprstvz] -! SFX J 0 ings [^ebcdfgklmnprstvz] - SFX k Y 8 -! SFX k e ingly [^eioy]e -! SFX k 0 ingly [eoy]e -! SFX k ie yingly ie -! SFX k 0 kingly [^aeio][aeiou]c -! SFX k 0 lingly [^aeio][aeiou]l -! SFX k 0 ingly [aeio][aeiou][cl] -! SFX k 0 ingly [^aeiou][cl] -! SFX k 0 ingly [^ecl] - SFX D Y 25 -! SFX D 0 d [^e]e -! SFX D e d ee -! SFX D 0 bed [^aeio][aeiou]b -! SFX D 0 ked [^aeio][aeiou]c -! SFX D 0 ded [^aeio][aeiou]d -! SFX D 0 fed [^aeio][aeiou]f -! SFX D 0 ged [^aeio][aeiou]g -! SFX D 0 ked [^aeio][aeiou]k -! SFX D 0 led [^aeio][eiou]l -! SFX D 0 ed [aeio][eiou]l -! SFX D 0 led [^aeo]al -! SFX D 0 ed [aeo]al -! SFX D 0 med [^aeio][aeiou]m -! SFX D 0 ned [^aeio][aeiou]n -! SFX D 0 ped [^aeio][aeiou]p -! SFX D 0 red [^aeio][aeiou]r -! SFX D 0 sed [^aeio][aeiou]s -! SFX D 0 ted [^aeio][aeiou]t -! SFX D 0 ved [^aeio][aeiou]v -! SFX D 0 zed [^aeio][aeiou]z -! SFX D y ied [^aeiou]y -! SFX D 0 ed [aeiou]y -! SFX D 0 ed [aeio][aeiou][bcdfgkmnprstvz] -! SFX D 0 ed [^aeiou][bcdfgklmnprstvz] -! SFX D 0 ed [^ebcdfgklmnprstvyz] - SFX d Y 16 -! SFX d 0 d e -! SFX d 0 ked [^aeio][aeiou]c -! SFX d 0 led [^aeio][aeiou]l -! SFX d y ied [^aeiou]y -! SFX d 0 ed [aeiou]y -! SFX d 0 ed [aeio][aeiou][cl] -! SFX d 0 ed [^aeiou][cl] -! SFX d 0 ed [^ecly] -! SFX d e ing [^eioy]e -! SFX d 0 ing [eoy]e -! SFX d ie ying ie -! SFX d 0 king [^aeio][aeiou]c -! SFX d 0 ling [^aeio][aeiou]l -! SFX d 0 ing [aeio][aeiou][cl] -! SFX d 0 ing [^aeiou][cl] -! SFX d 0 ing [^ecl] - SFX h Y 22 -! SFX h 0 dly e -! SFX h 0 bedly [^aeio][aeiou]b -! SFX h 0 kedly [^aeio][aeiou]c -! SFX h 0 dedly [^aeio][aeiou]d -! SFX h 0 fedly [^aeio][aeiou]f -! SFX h 0 gedly [^aeio][aeiou]g -! SFX h 0 kedly [^aeio][aeiou]k -! SFX h 0 ledly [^aeio][aeiou]l -! SFX h 0 medly [^aeio][aeiou]m -! SFX h 0 nedly [^aeio][aiou]n -! SFX h 0 pedly [^aeio][aeiou]p -! SFX h 0 redly [^aeio][aiou]r -! SFX h 0 sedly [^aeio][aeiou]s -! SFX h 0 tedly [^aeio][aiou]t -! SFX h 0 vedly [^aeio][aeiou]v -! SFX h 0 zedly [^aeio][aeiou]z -! SFX h 0 edly [^aeio]e[nrt] -! SFX h y iedly [^aeiou]y -! SFX h 0 edly [aeiou]y -! SFX h 0 edly [aeio][aeiou][bcdfgklmnprstvz] -! SFX h 0 edly [^aeiou][bcdfgklmnprstvz] -! SFX h 0 edly [^ebcdfgklmnprstvyz] - SFX i Y 22 -! SFX i 0 dness e -! SFX i 0 bedness [^aeio][aeiou]b -! SFX i 0 kedness [^aeio][aeiou]c -! SFX i 0 dedness [^aeio][aeiou]d -! SFX i 0 fedness [^aeio][aeiou]f -! SFX i 0 gedness [^aeio][aeiou]g -! SFX i 0 kedness [^aeio][aeiou]k -! SFX i 0 ledness [^aeio][aeiou]l -! SFX i 0 medness [^aeio][aeiou]m -! SFX i 0 nedness [^aeio][aiou]n -! SFX i 0 pedness [^aeio][aeiou]p -! SFX i 0 redness [^aeio][aiou]r -! SFX i 0 sedness [^aeio][aeiou]s -! SFX i 0 tedness [^aeio][aiou]t -! SFX i 0 vedness [^aeio][aeiou]v -! SFX i 0 zedness [^aeio][aeiou]z -! SFX i 0 edness [^aeio]e[nrt] -! SFX i y iedness [^aeiou]y -! SFX i 0 edness [aeiou]y -! SFX i 0 edness [aeio][aeiou][bcdfgklmnprstvz] -! SFX i 0 edness [^aeiou][bcdfgklmnprstvz] -! SFX i 0 edness [^ebcdfgklmnprstvyz] - SFX T Y 42 -! SFX T 0 r e - SFX T 0 st e -! SFX T 0 ber [^aeio][aeiou]b - SFX T 0 best [^aeio][aeiou]b -! SFX T 0 ker [^aeio][aeiou]c - SFX T 0 kest [^aeio][aeiou]c -! SFX T 0 der [^aeio][aeiou]d - SFX T 0 dest [^aeio][aeiou]d -! SFX T 0 fer [^aeio][aeiou]f - SFX T 0 fest [^aeio][aeiou]f -! SFX T 0 ger [^aeio][aeiou]g - SFX T 0 gest [^aeio][aeiou]g -! SFX T 0 ker [^aeio][aeiou]k - SFX T 0 kest [^aeio][aeiou]k -! SFX T 0 ler [^aeio][aeiou]l - SFX T 0 lest [^aeio][aeiou]l -! SFX T 0 mer [^aeio][aeiou]m - SFX T 0 mest [^aeio][aeiou]m -! SFX T 0 ner [^aeio][aeiou]n - SFX T 0 nest [^aeio][aeiou]n -! SFX T 0 per [^aeio][aeiou]p - SFX T 0 pest [^aeio][aeiou]p -! SFX T 0 rer [^aeio][aeiou]r - SFX T 0 rest [^aeio][aeiou]r -! SFX T 0 ser [^aeio][aeiou]s - SFX T 0 sest [^aeio][aeiou]s -! SFX T 0 ter [^aeio][aeiou]t - SFX T 0 test [^aeio][aeiou]t -! SFX T 0 ver [^aeio][aeiou]v - SFX T 0 vest [^aeio][aeiou]v -! SFX T 0 zer [^aeio][aeiou]z - SFX T 0 zest [^aeio][aeiou]z -! SFX T y ier [^aeiou]y - SFX T y iest [^aeiou]y -! SFX T 0 er [aeiou]y - SFX T 0 est [aeiou]y ---- 67,461 ---- - PFX F 0 col l -! PFX F 0 con [^abehilmopru]. - PFX K Y 1 -! PFX K 0 pre . - PFX e Y 1 -! PFX e 0 out . - PFX f Y 2 -! PFX f 0 under [^r] -! PFX f 0 under- r - PFX O Y 1 -! PFX O 0 non- . - PFX 4 Y 1 -! PFX 4 0 trans . - SFX V Y 15 -! SFX V 0 tive [aio] -! SFX V b ptive b -! SFX V d sive d -! SFX V be ptive be -! SFX V e tive ce -! SFX V de sive de -! SFX V ke cative ke -! SFX V e ptive me -! SFX V e ive [st]e -! SFX V e ative [^bcdkmst]e -! SFX V 0 lative [aeiou]l -! SFX V 0 ative [^aeiou]l -! SFX V 0 ive [st] -! SFX V y icative y -! SFX V 0 ative [^abdeilosty] - SFX v Y 15 -! SFX v 0 tively [aio] -! SFX v b ptively b -! SFX v d sively d -! SFX v be ptively be -! SFX v e tively ce -! SFX v de sively de -! SFX v ke catively ke -! SFX v e ptively me -! SFX v e ively [st]e -! SFX v e atively [^bcdkmst]e -! SFX v 0 latively [aeiou]l -! SFX v 0 atively [^aeiou]l -! SFX v 0 ively [st] -! SFX v y icatively y -! SFX v 0 atively [^abdeilosty] - SFX u Y 15 -! SFX u 0 tiveness [aio] -! SFX u b ptiveness b -! SFX u d siveness d -! SFX u be ptiveness be -! SFX u e tiveness ce -! SFX u de siveness de -! SFX u ke cativeness ke -! SFX u e ptiveness me -! SFX u e |