updated for version 7.0152

This commit is contained in:
Bram Moolenaar
2005-09-30 21:23:56 +00:00
parent c54b8a78fa
commit 69e0ff94dc
9 changed files with 740 additions and 356 deletions

View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 7.0aa. Last change: 2005 Sep 29
*todo.txt* For Vim version 7.0aa. Last change: 2005 Sep 30
VIM REFERENCE MANUAL by Bram Moolenaar
@ -30,30 +30,17 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs*
-------------------- Known bugs and current work -----------------------
Spelling:
- CTRL-X s doesn't consider 'spellcapcheck'.
- spellsuggest() needs a way to require a capital. A flag or context?
- Use more phonet.dat files from Aspell. en and de are done.
ftp.gnu.org/gnu/aspell/dict
Win32: Composing char appears on next position. (Tony Mechelynck)
Include check in set_num_option() for 'columns' and 'lines' in Vim 6.3?
Support subdirectories in plugin directory? (Nikolai Weibull)
When scrolling starts, remember what script/line caused this, so that we know
what caused the hit-enter prompt? (Charles Campbell)
Change 'include' so that it can match the file name when \zs and \ze are
included. (docs already done tentatively).
When 'foldcolumn' is 1 show more + to be able to open all folds? (Donohue)
ccomplete:
- How to use a popup menu?
- When a typedef or struct is local to a file only use it in that file?
When 'foldcolumn' is 1 show more + to be able to open all folds? (Donohue)
Mac unicode patch (Da Woon Jung):
- selecting proportional font breaks display
- UTF-8 text causes display problems. Font replacement causes this.
@ -1350,6 +1337,7 @@ Spell checking:
- Do we need a flag for the rule that when compounding is done the following
word doesn't have a capital after a word character, even for Onecap words?
- New hunspell home page: http://hunspell.sourceforge.net/
- Version 1.1.0 is out now, look into that.
- Lots of code depends on LANG, that isn't right. Enable each mechanism
in the affix file separately.
- Example with compounding dash is bad, gets in the way of setting

View File

@ -1,4 +1,4 @@
*version7.txt* For Vim version 7.0aa. Last change: 2005 Sep 29
*version7.txt* For Vim version 7.0aa. Last change: 2005 Sep 30
VIM REFERENCE MANUAL by Bram Moolenaar
@ -823,6 +823,9 @@ completion supported for the input. (Yegappan Lakshmanan)
"dp" works with more than two buffers in diff mode if there is only one where
'modifiable' is set.
When the 'include' option contains \zs the file name found is what is being
matched from \zs to the end or \ze. Useful to pass more to 'includeexpr'.
==============================================================================
COMPILE TIME CHANGES *compile-changes-7*

View File

@ -1,156 +0,0 @@
" netrw.vim: Handles file transfer and remote directory listing across a network
" PLUGIN PORTION
" Last Change: Aug 29, 2005
" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
" Version: 66
" License: Vim License (see vim's :help license)
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
" Permission is hereby granted to use and distribute this code,
" with or without modifications, provided that this copyright
" notice is copied with it. Like anything else that's free,
" netrw.vim is provided *as is* and comes with no warranty
" of any kind, either expressed or implied. By using this
" plugin, you agree that in no event will the copyright
" holder be liable for any damages resulting from the use
" of this software.
"
" But be doers of the Word, and not only hearers, deluding your own selves {{{1
" (James 1:22 RSV)
" =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
" ---------------------------------------------------------------------
" Load Once: {{{1
if exists("g:loaded_netrw") || &cp
finish
endif
if v:version < 600
echoerr "***netrw*** doesn't support Vim version ".v:version
finish
endif
let g:loaded_netrw = "v66"
if v:version < 700
let loaded_explorer = 1
endif
let s:keepcpo= &cpo
set cpo&vim
" ---------------------------------------------------------------------
" Public Interface: {{{1
" Local Browsing: {{{2
augroup FileExplorer
au!
au BufEnter * call s:LocalBrowse(expand("<amatch>"))
augroup END
" Network Browsing Reading Writing: {{{2
augroup Network
au!
if has("win32") || has("win95") || has("win64") || has("win16")
au BufReadCmd file://* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e '.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
else
au BufReadCmd file:///* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
endif
au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread 0r ".expand("<amatch>")|exe "silent doau BufReadPost ".expand("<amatch>")
au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread " .expand("<amatch>")|exe "silent doau FileReadPost ".expand("<amatch>")
au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe "Nwrite " .expand("<amatch>")|exe "silent doau BufWritePost ".expand("<amatch>")
au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe "'[,']Nwrite " .expand("<amatch>")|exe "silent doau FileWritePost ".expand("<amatch>")
augroup END
" Commands: :Nread, :Nwrite, :NetUserPass {{{2
com! -nargs=* Nread call netrw#NetSavePosn()<bar>call netrw#NetRead(<f-args>)<bar>call netrw#NetRestorePosn()
com! -range=% -nargs=* Nwrite call netrw#NetSavePosn()<bar><line1>,<line2>call netrw#NetWrite(<f-args>)<bar>call netrw#NetRestorePosn()
com! -nargs=* NetUserPass call NetUserPass(<f-args>)
" Commands: :Explore, :Sexplore, Hexplore, Vexplore {{{2
com! -nargs=? -bar -bang -count=0 Explore call netrw#Explore(<count>,0,0+<bang>0,<q-args>)
com! -nargs=? -bar -bang -count=0 Sexplore call netrw#Explore(<count>,1,0+<bang>0,<q-args>)
com! -nargs=? -bar -bang -count=0 Hexplore call netrw#Explore(<count>,1,2+<bang>0,<q-args>)
com! -nargs=? -bar -bang -count=0 Vexplore call netrw#Explore(<count>,1,4+<bang>0,<q-args>)
com! -nargs=? -bar -bang Nexplore call netrw#Explore(-1,0,0,<q-args>)
com! -nargs=? -bar -bang Pexplore call netrw#Explore(-2,0,0,<q-args>)
" Commands: NetrwSettings {{{2
com! -nargs=0 NetrwSettings :call NetrwSettings#NetrwSettings()
" ---------------------------------------------------------------------
" LocalBrowse: {{{2
fun! s:LocalBrowse(dirname)
" unfortunate interaction -- debugging calls can't be used here;
" the BufEnter event causes triggering when attempts to write to
" the DBG buffer are made.
if isdirectory(a:dirname)
call netrw#DirBrowse(a:dirname)
endif
" not a directory, ignore it
endfun
" ---------------------------------------------------------------------
" NetrwStatusLine: {{{1
fun! NetrwStatusLine()
" let g:stlmsg= "Xbufnr=".w:netrw_explore_bufnr." bufnr=".bufnr(".")." Xline#".w:netrw_explore_line." line#".line(".")
if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr(".") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
let &stl= s:netrw_explore_stl
if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
if exists("w:netrw_explore_line")|unlet w:netrw_explore_line|endif
return ""
else
return "Match ".w:netrw_explore_mtchcnt." of ".w:netrw_explore_listlen
endif
endfun
" ------------------------------------------------------------------------
" NetUserPass: set username and password for subsequent ftp transfer {{{1
" Usage: :call NetUserPass() -- will prompt for userid and password
" :call NetUserPass("uid") -- will prompt for password
" :call NetUserPass("uid","password") -- sets global userid and password
fun! NetUserPass(...)
" get/set userid
if a:0 == 0
" call Dfunc("NetUserPass(a:0<".a:0.">)")
if !exists("g:netrw_uid") || g:netrw_uid == ""
" via prompt
let g:netrw_uid= input('Enter username: ')
endif
else " from command line
" call Dfunc("NetUserPass(a:1<".a:1.">) {")
let g:netrw_uid= a:1
endif
" get password
if a:0 <= 1 " via prompt
" call Decho("a:0=".a:0." case <=1:")
let g:netrw_passwd= inputsecret("Enter Password: ")
else " from command line
" call Decho("a:0=".a:0." case >1: a:2<".a:2.">")
let g:netrw_passwd=a:2
endif
" call Dret("NetUserPass")
endfun
" ------------------------------------------------------------------------
" NetReadFixup: this sort of function is typically written by the user {{{1
" to handle extra junk that their system's ftp dumps
" into the transfer. This function is provided as an
" example and as a fix for a Windows 95 problem: in my
" experience, win95's ftp always dumped four blank lines
" at the end of the transfer.
if has("win95") && g:netrw_win95ftp
fun! NetReadFixup(method, line1, line2)
" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")")
if method == 3 " ftp (no <.netrc>)
let fourblanklines= line2 - 3
silent fourblanklines.",".line2."g/^\s*/d"
endif
" call Dret("NetReadFixup")
endfun
endif
let &cpo= s:keepcpo
unlet s:keepcpo
" ------------------------------------------------------------------------
" Modelines: {{{1
" vim:ts=8 fdm=marker

View File

@ -1,157 +0,0 @@
" NetrwSettings.vim: makes netrw settings simpler
" Last Change: Aug 16, 2005
" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
" Version: 3
" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
" Permission is hereby granted to use and distribute this code,
" with or without modifications, provided that this copyright
" notice is copied with it. Like anything else that's free,
" NetrwSettings.vim is provided *as is* and comes with no
" warranty of any kind, either expressed or implied. By using
" this plugin, you agree that in no event will the copyright
" holder be liable for any damages resulting from the use
" of this software.
"
" Mat 4:23 (WEB) Jesus went about in all Galilee, teaching in their {{{1
" synagogues, preaching the gospel of the kingdom, and healing
" every disease and every sickness among the people.
" Load Once: {{{1
if exists("g:loaded_NetrwSettings") || &cp
finish
endif
let g:loaded_NetrwSettings = "v3"
" ---------------------------------------------------------------------
" NetrwSettings: {{{1
fun! NetrwSettings#NetrwSettings()
" this call is here largely just to insure that netrw has been loaded
call netrw#NetSavePosn()
above wincmd s
enew
setlocal noswapfile bh=wipe
set ft=vim
file Netrw\ Settings
" these variables have the following default effects when they don't
" exist (ie. have not been set by the user in his/her .vimrc)
if !exists("g:netrw_longlist")
let g:netrw_longlist= 0
let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
endif
if !exists("g:netrw_silent")
let g:netrw_silent= 0
endif
if !exists("g:netrw_use_nt_rcp")
let g:netrw_use_nt_rcp= 0
endif
if !exists("g:netrw_ftp")
let g:netrw_ftp= 0
endif
if !exists("g:netrw_ignorenetrc")
let g:netrw_ignorenetrc= 0
endif
put ='+ ---------------------------------------------'
put ='+ NetrwSettings: (by Charles E. Campbell, Jr.)'
put ='+ Press ? with cursor atop any line for help '
put ='+ ---------------------------------------------'
let s:netrw_settings_stop= line(".")
put =''
put ='+ Netrw Protocol Commands'
put = 'let g:netrw_dav_cmd = '.g:netrw_dav_cmd
put = 'let g:netrw_fetch_cmd = '.g:netrw_fetch_cmd
put = 'let g:netrw_ftp_cmd = '.g:netrw_ftp_cmd
put = 'let g:netrw_http_cmd = '.g:netrw_http_cmd
put = 'let g:netrw_rcp_cmd = '.g:netrw_rcp_cmd
put = 'let g:netrw_rsync_cmd = '.g:netrw_rsync_cmd
put = 'let g:netrw_scp_cmd = '.g:netrw_scp_cmd
put = 'let g:netrw_sftp_cmd = '.g:netrw_sftp_cmd
let s:netrw_protocol_stop= line(".")
put = ''
put ='+Netrw Transfer Control'
put = 'let g:netrw_cygwin = '.g:netrw_cygwin
put = 'let g:netrw_ftp = '.g:netrw_ftp
put = 'let g:netrw_ftpmode = '.g:netrw_ftpmode
put = 'let g:netrw_ignorenetrc = '.g:netrw_ignorenetrc
put = 'let g:netrw_use_nt_rcp = '.g:netrw_use_nt_rcp
put = 'let g:netrw_win95ftp = '.g:netrw_win95ftp
let s:netrw_xfer_stop= line(".")
put = ''
put ='+ Netrw Browser Control'
put = 'let g:netrw_alto = '.g:netrw_alto
put = 'let g:netrw_altv = '.g:netrw_altv
put = 'let g:netrw_dirhistmax = '.g:netrw_dirhistmax
put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
put = 'let g:netrw_ftp_list_cmd = '.g:netrw_ftp_list_cmd
put = 'let g:netrw_hide = '.g:netrw_hide
put = 'let g:netrw_keepdir = '.g:netrw_keepdir
put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd
put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd
put = 'let g:netrw_list_hide = '.g:netrw_list_hide
put = 'let g:netrw_local_mkdir = '.g:netrw_local_mkdir
put = 'let g:netrw_local_rmdir = '.g:netrw_local_rmdir
put = 'let g:netrw_longlist = '.g:netrw_longlist
put = 'let g:netrw_maxfilenamelen = '.g:netrw_maxfilenamelen
put = 'let g:netrw_mkdir_cmd = '.g:netrw_mkdir_cmd
put = 'let g:netrw_rename_cmd = '.g:netrw_rename_cmd
put = 'let g:netrw_rm_cmd = '.g:netrw_rm_cmd
put = 'let g:netrw_rmdir_cmd = '.g:netrw_rmdir_cmd
put = 'let g:netrw_rmf_cmd = '.g:netrw_rmf_cmd
put = 'let g:netrw_silent = '.g:netrw_silent
put = 'let g:netrw_sort_by = '.g:netrw_sort_by
put = 'let g:netrw_sort_direction = '.g:netrw_sort_direction
put = 'let g:netrw_sort_sequence = '.g:netrw_sort_sequence
put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
put = 'let g:netrw_timefmt = '.g:netrw_timefmt
put = 'let g:netrw_winsize = '.g:netrw_winsize
put =''
put ='+ For help, place cursor on line and press ?'
1d
silent %s/^+/"/e
res 99
silent %s/= \([^0-9].*\)$/= '\1'/e
silent %s/= $/= ''/e
1
set nomod
map <buffer> <silent> ? :call NetrwSettingHelp()<cr>
let tmpfile= tempname()
exe 'au BufWriteCmd Netrw\ Settings silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod'
endfun
" ---------------------------------------------------------------------
" NetrwSettingHelp: {{{2
fun! NetrwSettingHelp()
" call Dfunc("NetrwSettingHelp()")
let curline = getline(".")
if curline =~ '='
let varhelp = substitute(curline,'^\s*let ','','e')
let varhelp = substitute(varhelp,'\s*=.*$','','e')
" call Decho("trying help ".varhelp)
try
exe "he ".varhelp
catch /^Vim\%((\a\+)\)\=:E149/
echo "***sorry*** no help available for <".varhelp.">"
endtry
elseif line(".") < s:netrw_settings_stop
he netrw-settings
elseif line(".") < s:netrw_protocol_stop
he netrw-externapp
elseif line(".") < s:netrw_xfer_stop
he netrw-variables
else
he netrw-browse-var
endif
" call Dret("NetrwSettingHelp")
endfun
" ---------------------------------------------------------------------
" Modelines: {{{1
" vim:ts=8 fdm=marker

View File

@ -1,16 +1,140 @@
*** da_DK.orig.aff Sun Aug 14 20:04:31 2005
--- da_DK.aff Mon Aug 15 14:03:06 2005
--- da_DK.aff Thu Sep 29 22:20:15 2005
***************
*** 6,7 ****
--- 6,16 ----
--- 6,13 ----
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
+ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
+
+ MIDWORD '-
+
# Foranstilling af u-
***************
*** 606,618 ****
--- 612,735 ----
+ # sound folding from Aspell
+ # Doesn't contain a copyright notice.
+ # version 0.1-2002.12.15-3
+
+ SAL AA< <20>
+ SAL ACTION AKSJON
+ SAL AF< AV
+ SAL ASIE< ASJE
+ SAL A A
+
+ SAL BEDST< BEST
+ SAL BORD< BOR
+ SAL BRYST< BR<42>ST
+ SAL BUREAU BYRO
+ SAL B B
+
+ SAL CC< KS
+ SAL CK< K
+ SAL CH< TJ
+ SAL CI< SI
+ SAL CO< KO
+ SAL CY< SY
+ SAL C< S
+ SAL #C C
+
+ SAL DIG^$ DAJ
+ SAL DIG< DI
+ SAL D$ _
+ SAL D D
+
+ SAL EAUX< O
+ SAL EAU< O
+ SAL EJ$< AJ
+ SAL EU< <20>V
+ SAL E E
+
+ SAL <20> E
+
+ SAL <20> E
+
+ SAL FEDT< FET
+ SAL F F
+
+ SAL G G
+
+ SAL HJ^< J
+ SAL H<>RD< H<>R
+ SAL H<>ND< H<>N
+ SAL H H
+
+ SAL ION< JON
+ SAL IND^< IN
+ SAL I I
+
+ SAL J J
+
+ SAL K K
+
+ # Stumt G
+ SAL LIG< LI
+ SAL L L
+
+ SAL MAND< MAN
+ SAL MIG^$ MAJ
+ SAL M M
+
+ SAL N N
+
+ SAL OST <20>ST
+ SAL O O
+
+ SAL <20> O
+
+ SAL PH< F
+ SAL P P
+
+ SAL Q< KU
+
+ SAL REGN< REJN
+ SAL RUG< RU
+ SAL RYG R<>G
+ SAL R R
+
+ SAL SH< SJ
+ SAL SIG^$ SAJ
+ SAL SKIND< SKIN
+ SAL S'S<$ S
+ SAL S S
+
+ SAL TION SJON
+ SAL TZ< TS
+ SAL T T
+ SAL U U
+ SAL <20>< Y
+ SAL V V
+ SAL W< V
+ SAL X'S< KS
+ SAL X< KS
+ SAL YKK< <20>KK
+ SAL YND< <20>ND
+ SAL Y Y
+ SAL Z'S< S
+ SAL Z< S
+ SAL #Z Z
+ SAL <20> <20>
+ SAL <20>< <20>
+ # eks. Han l<>v en tur (l<>b)
+ SAL <20>B< <20>V
+ SAL <20> <20>
+ SAL <20>< <20>
+ SAL <20> <20>

View File

@ -0,0 +1,204 @@
*** el_GR.orig.aff Tue Aug 16 18:02:27 2005
--- el_GR.aff Thu Sep 29 22:28:12 2005
***************
*** 572,574 ****
SFX J <20> <20><><EFBFBD><EFBFBD><EFBFBD> . # <20><><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
!
SFX K Y 4
--- 572,574 ----
SFX J <20> <20><><EFBFBD><EFBFBD><EFBFBD> . # <20><><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
!
SFX K Y 4
***************
*** 619,621 ****
!
SFX R Y 4
--- 619,621 ----
!
SFX R Y 4
***************
*** 626,628 ****
!
SFX S Y 4
--- 626,628 ----
!
SFX S Y 4
***************
*** 646,648 ****
!
SFX V Y 5
--- 646,648 ----
!
SFX V Y 5
***************
*** 686,688 ****
!
SFX b Y 4
--- 686,688 ----
!
SFX b Y 4
***************
*** 758 ****
--- 758,911 ----
SFX n <20><> <20> . # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD>
+
+ # sound folding from Aspell
+ # version 0.0 03/14/2002
+ # 03/14/2002 Evripidis Papakostas <evris@source.gr>
+
+ # all the following double letters are pronounced as one
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><> <20><>
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20><> <20>
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20><> <20>
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+ SAL <20><>- _
+ SAL <20> <20>
+
+ # alpha + (ypsilon or ypsilon tonos) becomes alpha + beta
+ SAL <20><>< <20><>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><>
+ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)- <20><>
+ SAL <20><><EFBFBD> <20><>
+ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD><D5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)- <20><>
+
+ # alpha + (ypsilon or ypsilon tonos) becomes alpha + phi
+ SAL <20><><EFBFBD> <20><>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><>
+ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)- <20><>
+ SAL <20><><EFBFBD>- <20><>
+ SAL <20><><EFBFBD>- <20><>
+
+ # alpha + (iota or iota tonos) becomes epsilon
+ SAL <20>(ɺ) <20>
+
+ # alpha is alpha
+ SAL <20> <20>
+
+ # epsilon + (ypsilon or ypsilon tonos) becomes epsilon + vita
+ SAL ž< <20>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><>
+ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)- <20><>
+ SAL <20><><EFBFBD> <20><>
+ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD><D5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)- <20><>
+
+ # epsilon + (ypsilon or ypsilon tonos) becomes epsilon + phi
+ SAL <20><><EFBFBD> <20><>
+ SAL <20><><EFBFBD><EFBFBD>-- <20><> # GUESSED!
+ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)- <20><>
+ SAL <20><><EFBFBD>- <20><>
+ SAL <20><><EFBFBD>- <20><>
+
+ # epsilon + (iota or iota tonos) becomes iota
+ SAL <20>(ɺ) <20>
+
+ # epsilon is epsilon
+ SAL <20> <20>
+
+
+ # omikron + (iota or iota tonos) becomes iota
+ SAL <20>(ɺ) <20>
+
+ # omikron + (ypsilon or ypsilon tonos) becomes u
+ SAL <20>(վ) <20><>
+
+ # omikron is omikron
+ SAL <20> <20>
+
+ # wmega becomes omikron
+ SAL <20> <20>
+
+ # ita becomes iota
+ SAL <20> <20>
+
+ # ypsilon + iota becomes iota
+ SAL <20><> <20>
+
+ # ypsilon becomes iota
+ SAL <20> <20>
+
+ # iota is iota
+ SAL <20> <20>
+
+ # double ksi becomes ksi
+ SAL <20><>- _
+
+ # ksi + sigma becomes ksi
+ SAL <20><> <20>
+
+ # ksi is ksi
+ SAL <20> <20>
+
+ # psi + psi becomes psi
+ SAL <20><>- _
+
+ # psi + sigma becomes psi
+ SAL <20><> <20>
+
+ # psi is psi
+ SAL <20> <20>
+
+
+ # iota dialitika becomes iota
+ SAL <20> <20>
+
+ # ypsilon dialitika becomes I
+ SAL <20> <20>
+
+ # alpha tonos becomes alpha
+ SAL <20> <20>
+
+ # omikron tonos becomes omikron
+ SAL <20> <20>
+
+ # iota tonos becomes iota
+ SAL <20> <20>
+
+ # epsilon tonos becomes epsilon
+ SAL <20> <20>
+
+ # ypsilon tonos becomes ypsilon
+ SAL <20> <20>
+
+ # wmega tonos becomes omikron
+ SAL <20> <20>
+
+ # ita tonos becomes iota
+ SAL <20> <20>

View File

@ -1,16 +1,13 @@
*** fr_FR.orig.aff Sun Jul 3 19:34:20 2005
--- fr_FR.aff Sun Jul 31 22:17:53 2005
--- fr_FR.aff Fri Sep 30 12:58:29 2005
***************
*** 3,4 ****
--- 3,24 ----
--- 3,21 ----
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
+ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
+
+ MIDWORD '
+
+ MAP 9
@ -26,10 +23,100 @@
+
PFX A Y 10
***************
*** 690,694 ****
SFX q ssait raient ssait
-
-
-
-
--- 710 ----
*** 692,694 ****
!
!
--- 709,800 ----
! # sound folding from Aspell
! # Copyright (C) 2000 R<>mi Vanicat, distributed under LGPL
! # version francais 0.000000001
!
! #EMME ~ AME
! SAL AIX$ E
! SAL AI E
! SAL AN(AEUIO)- AM
! SAL AN A
! SAL AMM AM
! SAL AM(AEUIO)- AM
! SAL AM A
! SAL AUD$ O
! SAL AUX$ O
! SAL AU O
! SAL A A
! SAL <20> A
! SAL <20> A
! SAL BB P
! SAL B P
! SAL <20> S
! SAL C(EI)- S
! SAL CU(EI)- K
! SAL CC(EI)- X
! SAL CC K
! SAL CH CH
! SAL C K
! SAL DD T
! SAL D T
! SAL EMMENTAL EMATAL
! SAL EMMENTHAL EMATAL
! SAL EM(AEIOU)- EM
! SAL EM A
! SAL ET$ E
! SAL EUX$ E
! SAL EU E
! SAL EN(AEUIO)- EM
! SAL EN A
! SAL ER$ E
! SAL EO O
! SAL EAUX$ O
! SAL EAU O
! SAL E E
! SAL <20> E
! SAL <20> E
! SAL <20> E
! SAL F F
! SAL G(EIY)- J
! SAL GU(EIY)- G
! SAL G G
! SAL H _
! SAL I I
! SAL <20> I
! SAL J J
! SAL KS X
! SAL K K
! SAL LL L
! SAL L L
! SAL MM M
! SAL M M
! SAL NN M
! SAL N M
! SAL OEU E
! SAL OUX$ U
! SAL OU U
! SAL O<> U
! SAL O O
! SAL <20> O
! SAL PP P
! SAL PH F
! SAL P P
! SAL QU K
! SAL Q K
! SAL RIX$ RI
! SAL RR R
! SAL R R
! SAL S$ _
! SAL SS S
! SAL S S
! SAL TT T
! SAL T T
! SAL U U
! SAL <20> U
! SAL <20> U
! SAL V V
! SAL W W
! SAL X X
! SAL Y(AEOU)- IL
! SAL Y I
! SAL ZZ S
! SAL Z S

View File

@ -1,16 +1,13 @@
*** ga_IE.orig.aff Wed Aug 31 16:48:49 2005
--- ga_IE.aff Wed Aug 31 16:49:43 2005
--- ga_IE.aff Fri Sep 30 13:01:38 2005
***************
*** 37,38 ****
--- 37,58 ----
--- 37,55 ----
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
+ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
+
+ MIDWORD '-
+
+ MAP 9
@ -25,3 +22,287 @@
+ MAP s<>
+
PFX S Y 18
***************
*** 556 ****
--- 573,853 ----
+ # soundslike mapping from Aspell
+ # Aspell phonetics for Irish, by Kevin Scannell <scannell@slu.edu>
+ # Copyright 2002, 2003 Kevin P. Scannell, distributed under GNU GPL
+ # version 2.0
+
+ SAL followup 0 # else breaks QU^, e.g.
+ SAL collapse_result 1 # no double letters in resulting strings
+
+ SAL ANBHANN----- *N* # epenthetic vowel, anbhanna? only, see NBH--
+ SAL ANBHAIN----- *N* # epenthetic vowel, anbhainne? only, see NBH--
+ SAL AERGA-- *R # epenthetic exception, see RG, aerga only
+ SAL AORG- *R # epenthetic exception, see RG, [ms]aorg*, etc.
+ SAL AEILG- *L # epenthetic exception, Gaeilge* only, see LG
+ SAL AILBH-- *L* # epenthetic vowel, [bcs]ailbh* only, see LBH--
+ SAL ALBH<42>D---- *L # galbh<62>d only, next few are exceptions to ALBH
+ SAL ALBH<42>ID----- *L # galbh<62>id only (coinnealbh<62>id<69>s, etc. b4)
+ SAL ALBHR--- *L # pobalbhreith, galbhruith, etc. except. to next
+ SAL ALBH-- *L* # epenthetic vowel
+ SAL ARBH<42>D---- *R # m<>tarbh<62>d only, exception to ARBH epenth.
+ SAL ARBH<42>ID----- *R # m<>tarbh<62>id only, " " " "
+ SAL ARBHUIL----- *R # epenth. exception, garbhuille only, cuarbh* b4
+ SAL ARBHUA---- *R # epenth. exception, eadarbhuas* only
+ SAL ARBHIN---- *R* # exception to next, marbhintinn* only
+ SAL ARBH(EI)--- *R # epenthetic exception to next, *tarbhealach, etc.
+ SAL ARBH-- *R* # epenthetic, garbh, dearbh, etc. - [IU]ARBH b4
+ SAL ATHFH(<28><><EFBFBD>AEIOU)--- *H # athfhill,uathfheidhmeach,etc.-exception to next
+ SAL ATH(BCDFGLMNPRST)- * # athlas, mionathr<68>, etc. - exception to TH->H
+ SAL ADH * # bladhm, feadhain, tadhall, adhmad, -adh$, etc.
+ SAL AGHI--- * # exception to AGH, corraghiob only
+ SAL AGHLOIN------ * # " " ", pleicseaghl- only (not aghloit)
+ SAL AGH * # slaghd<68>n, treaghd, saghas, etc.
+ SAL AOMH(FLNST)--- * # faomh[ft]-,caomhn*,naomh* only, OMH exception
+ SAL A *
+ SAL <20>IRG- *R # epenthetic exception, see RG, t<>irg*, etc.
+ SAL <20>DHU--- * # p<>dhuille only, exception to next
+ SAL <20>DH * # <20>dh<64>il, -<2D>dh$ only
+ SAL <20>THFH-- *H # t<>thfh<66>ithleann, gn<67>thfh- only exception to next
+ SAL <20>TH(BCDFGLMNPRST)- * # f<>thsc<73>al, gn<67>th*, bl<62>thfhleasc, etc.
+ SAL <20> *
+ SAL BANBH^$ B*N*V # epenthetic vowel, see NBH--, banbh, not -ar<61>n
+ SAL BHANBH^$ V*N*V # epenthetic vowel, see NBH--
+ SAL BAINBH^$ B*N*V # epenthetic vowel, see NBH--, bainbh only
+ SAL BHAINBH^$ V*N*V # epenthetic vowel, see NBH--
+ SAL BH V # includes bh$, eclipsis of F via collapsing
+ SAL B B # note eclipsis of P via collapsing
+ SAL CH<43>ADFA<46>--$ K*TV # exception to FA<46>$, (br<62>ag|do|m<>)
+ SAL CHEARCH-- K*R* # epenthetic vowel, chearchaill only
+ SAL CEARCH-- K*R* # epenthetic vowel, g?cearchaill only
+ SAL CHONF K*N*V # epenthetic vowel,no dash=>handles FAI?DH$excepts
+ SAL CONF K*N*V # " " " " " " "
+ SAL CANBH-- K*N* # epenthetic vowel, see NBH--, g?canbh<62>s* only
+ SAL CHANBH-- K*N* # epenthetic vowel, see NBH--, chanbh<62>s* only
+ SAL COLBHA--- K*L* # epenthetic vowel, see LBH--, g?colbha<68>? only
+ SAL CHOLBHA--- K*L* # epenthetic vowel, see LBH--, cholbha<68>? only
+ SAL CURF K*RV # exception to F<>$, g?curf<72>(nna) only
+ SAL CHURF K*RV # exception to F<>$, churf<72>(nna) only
+ SAL CH K # OK
+ SAL C K
+ SAL DHORCH-- K*R* # epenthetic vowel, dorcha root only
+ SAL DORCH-- T*R* # epenthetic vowel, dorcha root only
+ SAL DHEARF Y*R* # epenthetic vowel,init only, no dash=>FA<46> except
+ SAL DEARF T*R* # epenthetic vowel,initial only (nd- done b4)
+ SAL DHEIRF- Y*R* # epenthetic vowel, initial only
+ SAL DEIRF- T*R* # epenthetic vowel, (leas)?deirf* only
+ SAL DHOIL(BF)- K*L* # epenthetic,see LBH--,initial only,dhoil(fe|bh)*
+ SAL DOIL(BF)- T*L* # epenthetic, see LBH--, " " (nd- done b4)
+ SAL DHIFEAR Y*V*R # exception to FEAR$, ^dhifear$ only
+ SAL DIFEAR T*V*R # exception to FEAR$, ^difear$ only (nd- b4)
+ SAL DH$ _ # [a<>u]dh+most [io]dh done b4,[e<><65><EFBFBD><EFBFBD>]dh done here
+ SAL DH(A<>O<EFBFBD>U<EFBFBD>)- K # athdh<64>chas, bu<62>dhonn, comhdh<64>il, etc.
+ SAL DH(E<>I<EFBFBD>)- Y # athdh<64>an, caordhearg, cinedheighilt, etc.
+ SAL DHL(AU<41>)-- K # comhdhl<68>thaigh, ^dhl- only
+ SAL DHL(EI<45>)-- Y # (m<>|neamh)dhl(istean|eath|<7C>thi<68>), ^dhl only
+ SAL DHR(A<>O<EFBFBD>U<EFBFBD>)-- K # *dhroim,marbhdhra*,*dhr[<5B>u]ma, ^dhr only
+ SAL DHR(<28>EI<45>)-- Y # *dhreach,feirdhris,*dhr<68>acht,*dhreasacht,^dhr
+ SAL D T # note eclipsis of T via collapsing
+ SAL EAFAR--$ *V # geafar, meafar only, FAR$ exception
+ SAL EOFAR--$ * # silent verb ending, exception to OFAR$ except!
+ SAL EILBH-- *L* # epenthetic vowel, see LBH-- exception below
+ SAL EIDH(EI)- * # augments IDH rule,eidheann,teidheach,meidhir,etc
+ SAL EOMH(FT)--- * # leomh[ft]- only, exception to -omh rule
+ SAL E *
+ SAL <20>ARBH-- *R # epenthetic exception, g<>arbh- only
+ SAL <20>ARM- *R # epenthetic exception, <20>armh+ t<>arma root only
+ SAL <20>ARG- *R # epenthetic exception, <20>argh+(l<>n)?l<>argas only
+ SAL <20>IRG- *R # epenthetic exception, <20>irgh+ aill<6C>irge only
+ SAL <20>IRBH-- *R # epenthetic except. l<>irbhreith*, sp<73>irbhean only
+ SAL <20>ALBH-- *L # b<>albhach only, exception to ALBH
+ SAL <20>AF<41> *V* # <20>af<61> only, exception to F<>$
+ SAL <20> *
+ SAL FHAIRCH-- *R* # epenthetic vowel, fhairch* only
+ SAL FAIRCH-- V*R* # epenthetic vowel, (bh)?fairch* only
+ SAL FHOIRF- *R* # epenthetic vowel, foirfe root only
+ SAL FOIRF- V*R* # epenthetic vowel, initial (bh)?foirf* only
+ SAL FHONNMH-- *N* # epenthetic vowel, see NMH--, fhonnmhai?r* only
+ SAL FONNMH-- V*N* # " " " ", (bh)?fonnmhai?r* only
+ SAL FHOILMH-- *L* # epenthetic vowel, see LMH--, fhoilmhe only
+ SAL FOILMH-- V*L* # epenthetic vowel, see LMH--, (bh)?foilmhe only
+ SAL FHOLMH-- *L* # epenthetic vowel, see LMH--, fholmh* only
+ SAL FOLMH-- V*L* # epenthetic vowel, see LMH--, (bh)?folmh* only
+ SAL FEADH^$ V* # exception to verb ending below, eclipsis by luck
+ SAL FEAR^$ V*R # " " " " " " " "
+ SAL FINN^$ V*N # " " " " " " " "
+ SAL FE<46>^$ V* # " " " " " " " "
+ SAL FA<46>^$ V* # " " " " " " " "
+ SAL F<>^$ V* # " " " " " " " "
+ SAL FAIDH----$ _ # silent 'f' in verb ending
+ SAL FADH---$ _ # " " " " "
+ SAL FIDH---$ _ # " " " " "
+ SAL FEADH----$ _ # " " " " "
+ SAL FEAR---$ _ # " " " " "
+ SAL FAR--$ _ # " " " " "
+ SAL FINN---$ _ # " " " " "
+ SAL FAINN----$ _ # " " " " "
+ SAL F<>-$ _ # " " " " "
+ SAL FE<46>--$ _ # " " " " "
+ SAL FA<46>--$ _ # " " " " "
+ SAL F<>-$ _ # " " " " "
+ SAL FAIMI(DS)-----$ _ # " " " " " (no exceptions)
+ SAL FIMI(DS)----$ _ # " " " " " (no exceptions)
+ SAL FAID<49>S-----$ _ # " " " " " (no exceptions)
+ SAL FID<49>S----$ _ # " " " " " (no exceptions)
+ SAL FH _ # always silent
+ SAL F V
+ SAL GHAINMH-- K*N* # epenthetic vowel,see NMH--,^ghainmh* only
+ SAL GAINMH-- K*N* # epenthetic vowel,see NMH--,^gainmh* only, ng- b4
+ SAL GHEALLMH-- Y*L* # epenthetic vowel,see LMH--,gheallmhar only
+ SAL GEALLMH-- K*L* # epenthetic vowel,see LMH--,geallmhar only
+ SAL GLAFADH KL*V* # exception to FADH$, not glafarnach
+ SAL GHLAFADH KL*V* # exception to FADH$
+ SAL GLAFAIDH KL*V* # exception to FAIDH$, not glafaire
+ SAL GHLAFAIDH KL*V* # exception to FAIDH$
+ SAL GH$ _ # [ai<61>u]gh,most ogh done b4,[e<><65><EFBFBD><EFBFBD>]gh all terminal
+ SAL GH(A<>O<EFBFBD>U<EFBFBD>)- K # bobghaiste, deoirgh<67>s, soghonta, etc.
+ SAL GH(E<>I<EFBFBD>)- Y # athghin, luasgh<67>araigh, etc.
+ SAL GHL(A<>O<EFBFBD>U<EFBFBD>)-- K # ardghl<68>rach, fol<6F>sghlant<6E>ir, etc.
+ SAL GHL(E<>I)-- Y # comhghl<68>as, comhghleaca<63>, scoiltghleann, etc.
+ SAL GHR(A<>O<EFBFBD>U<EFBFBD>)-- K # t<>rghr<68>, grianghraf, aoisghr<68>pa, etc.
+ SAL GHR(E<>I<EFBFBD>)-- Y # idirghr<68>as<61>n, breithghreamannach, etc.
+ SAL GHN(A<>O<EFBFBD>U<EFBFBD>)-- K # deasghn<68>th, neamhghn<68>ch, etc.
+ SAL GHN(E<>I<EFBFBD>)-- Y # leorgn<67>omh, aonghn<68>itheach, etc.
+ SAL G K # note eclipsis of C via collapsing
+ SAL H H # between vowels+Faranha<68>t,forhalla,etc.
+ SAL IARG- *R # epenthetic exception, iarg<72>il, tiarg<72>il, etc.
+ SAL IARBH-- *R # iarbh<62>is, giarbhosca, etc. epenth. exception
+ SAL IDIRBH-- *T*R # idirbheart, idirbhliain, etc., exception to IRBH
+ SAL IRBHR<48>---- *R # muirbhr<68>cht* only, exception to IRBH--
+ SAL IRBHU--- *R # eochairbhuille,litirbhuama only, except. to next
+ SAL IRBH-- *R* # *seirbh<62>s, tairbh*, toirbh*, etc. epenthetic
+ SAL IF<49>-$ *V # exception to F<>$, <20>IF<49>$ done before
+ SAL INMHE(A<>)---- *N # exception to next,ainmheasartha,inmheabhr<68>, etc.
+ SAL INMHE--- *N* # epenthetic vowel, inmhe$ only by previous
+ SAL INNMH-- *N* # epenthetic vowel, fuinnmh-, coinnmhe only
+ SAL IONMHAG---- *N # exception to next, mionmhagadh only
+ SAL IONMHA--- *N* # epenthetic vowel, cionmhar only, see NMH--
+ SAL ITHFH(AEIOU<4F><55><EFBFBD><EFBFBD><EFBFBD>)--- *H # cithfholc*,crithfhuacht,frith* only- see next
+ SAL ITH(BCDFGLMNPRST)- * # aithris, frith*, etc. exception to TH->H
+ SAL IDH(BCDFGLMNPRST)- * # feidhm, traidhfil, oidhre, etc.
+ SAL IGH(CDEFILNRST)- * # foighne,caighde<64>n,oighrigh,oighear,feighil,etc.
+ SAL I *
+ SAL <20>ORM- *R # epenthetic exception, d<>orma, f<>or- only
+ SAL <20>OMH(BCDFGLMNPRST)--- * # (pr|r|l|sn|gn)<29>omh- only, exceptions to omh-
+ SAL <20>THS- * # cl<63>thseach only (no excp. for d<>threabh, etc.)
+ SAL <20> *
+ SAL J T # initial j, diosc-jaca<63> only; bit like slender d
+ SAL K K # karat<61> only
+ SAL LEANBH-- L*N* # epenthetic vowel, (ucht)?leanbh(aois)?,see NBH--
+ SAL LINBH-- L*N* # epenthetic vowel, (ucht)?linbh only, see NBH--
+ SAL LMH-- L # feallmhar<61>, etc., epenth. exception
+ SAL LBH-- L # uaillbhreas, etc., epenth. exception
+ SAL LGH-- L # timpeallghearr, etc., epenth. exception
+ SAL L(BGM)- L* # epenthetic vowel, see also ULCH--
+ SAL L L
+ SAL MORFA<46>--$ M*RV # exception to silent FA<46>$
+ SAL MBANBH^$ M*N*V # epenthetic vowel, see NBH--, not -ar<61>n
+ SAL MBAINBH^$ M*N*V # epenthetic vowel, see NBH--
+ SAL MB^ M # eclipsis
+ SAL MHARF- V*R* # epenthetic vowel
+ SAL MARF- M*R* # epenthetic vowel, initial only
+ SAL MHODH V* # ODH exception, usually initial
+ SAL MODH M* # " " , " "
+ SAL MH V # includes mh$,/w/,/v/ + see UMH
+ SAL M M
+ SAL NAFA<46>-- N*V # exception to FA<46>$, snafa<66> only
+ SAL NNARB- N*R # exception to RB epenthetic, ionnarb* only
+ SAL NNEALBH-- N*L # exception to ALBH epenthetic, coinnealbh<62> only
+ SAL NDORCH-- N*R* # epenthetic vowel, see DORCH--
+ SAL NDEARF- N*R* # epenthetic vowel, see DEARF-
+ SAL NDEIRF- N*R* # epenthetic vowel, see DEIRF-
+ SAL NDOIL(BF)- N*L* # epenthetic vowel, see DOIL(BF)-
+ SAL NDIFEAR N*V*R # exception to FEAR$, ^ndifear$ only
+ SAL NGAINMH-- N*N* # epenthetic vowel, see GAINMH--
+ SAL NGEALLMH-- N*L* # epenthetic vowel, see GEALLMH-
+ SAL NGLAFADH NL*V* # exception to FADH$, ^nglafadh$ only
+ SAL NGLAFAIDH NL*V* # exception to FAIDH$, ^nglafaidh$ only
+ SAL NCHA(<28>S)---- N* # epenthetic vowel, *sh?eancha(<28>s)*,ionchas only
+ SAL NCHAIRD------ N # exception to next, daonchaird* only
+ SAL NCHAI(RS)----- N* # epenth. tionchair*, ionchais, *sh?eanchai*, etc.
+ SAL NCHAITHE------- N* # " " , sh?eanchaithe, not seanchaite
+ SAL N(DG)^ N # eclipsis
+ SAL NMH-- N # exception to N(BM)-, pianmhar, onnmhaire, etc.
+ SAL NBH-- N # " " ", aonbheannach, bunbhrat, etc.
+ SAL N(BM)- N* # epenthetic vowel, binb, ainm, etc.
+ SAL N N
+ SAL OFAR--$ *V # exception to FAR$, EOFAR done b4
+ SAL OIRCH-- *R* # epenthetic vowel, t?oirch* only
+ SAL OCALBH-- *K*L # exception to ALBH - focalbh<62>* only
+ SAL ORBH<42>--- *R* # epenthetic vowel, forbh<62>s only
+ SAL ONNCHA--- *N* # epenthetic vowel fionncha, Donncha only
+ SAL OMHARB- *R # exception to epenth. R(BFGM)-, comharba* only
+ SAL OMH(BCDFGLMNPRST)- * # comh-, Domhnach, etc. (several excpts b4 this)
+ SAL OTH(BCDGLMNPRS)- * # cothrom, baothchaint, gaothsc<73>th, etc.
+ SAL ODHAO---- * # fodhao* only, exception to next
+ SAL ODH(ACLNR)- * # bodhr<68>n,modhnaigh,todhcha<68>,fodhla,bodhar etc.
+ SAL OGHR<48>P----- * # foghr<68>pa, this and next few are OGH->* excepts.
+ SAL OGHLUA----- * # so/doghluaiste* only
+ SAL OGHAF---- * # doghafa only
+ SAL OGH(A<>BCDFGLMNPRST)- * # ogham, foghlaim, boghd<68>ir, toghch<63>n, etc.
+ SAL O *
+ SAL <20>R(GM)- *R # epenthetic exception, (for)?th?<3F>rmach, <20>rga,etc.
+ SAL <20>GH * # <20>gha?$ only
+ SAL <20> *
+ SAL PH V # OK
+ SAL P B
+ SAL QU KV # ^quin<69>n$, ^quarto$ only
+ SAL RANFA<46>-- R*NV # exception to silent FA<46>$, -chuaranfa<66> only
+ SAL RAFA<46>-- R*V # exception to silent FA<46>$, all *graf-
+ SAL RRBHA--- R* # epenthetic vowel, cearrbh* only, no carrbhuama
+ SAL REALMH-- R*L* # epenthetic vowel, see LMH--, trealmh* only
+ SAL R<>FEAR^$ R*V*R # exception to FEAR$, not athr<68>fear!
+ SAL ROMH(FT)--- R* # promh[ft]- only, exception to -omh rule
+ SAL RFEAN---- R* # epenthetic vowel, (be|se|ga)irfean only
+ SAL RFIN---$ R* # epenthetic vowel, same words as previous
+ SAL RBH-- R # c<>orbhu<68>, aerbhrat, etc., epenth. exception
+ SAL RMH-- R # iarmhar, l<>irmheas, etc., epenth. exception
+ SAL RGH-- R # daorghalar, etc., epenth. exception
+ SAL RBO-- R # cosarbolg only, epenth. exception
+ SAL R(BGM)- R* # epenthetic vowel
+ SAL R R
+ SAL SHORCH-- H*R* # epenthetic vowel, sorcha root only
+ SAL SORCH-- S*R* # epenthetic vowel, sorcha root only
+ SAL SHOILBH-- H*L* # epenthetic, see LBH--
+ SAL SOILBH-- S*L* # epenthetic, see LBH--
+ SAL SH H # OK
+ SAL S S
+ SAL TALMH-- T*L* # epenthetic vowel, see LMH--, talmhaigh only
+ SAL THALMH-- H*L* # epenthetic vowel, see LMH--, " "
+ SAL TINF(EI)- T*NV # exception to F(EA|I)DH$, d?tinf(ea|i)dh only
+ SAL THINF(EI)- H*NV # exception to F(EA|I)DH$, thinf(ea|i)dh only
+ SAL TAFA- T*V # exception to FAINN$, d?tafainn only
+ SAL THAFA- H*V # exception to FAINN$, thafainn only
+ SAL TSORCH-- T*R* # epenthetic vowel, see SORCH--
+ SAL TSOILBH-- T*L* # epenthetic vowel, see SOILBH--
+ SAL TS^ T # prefix-t
+ SAL TH$ _ # no exceptions
+ SAL TH H
+ SAL T T
+ SAL UFA(<28>R)--$ *V # exception to FAR$, brufar/[cr]ufa<66> only
+ SAL UARG- *R # epenthetic exception, fuarga*, tuargain only
+ SAL UAIRG- *R # epenthetic exception, tuairgn* only
+ SAL UARBH-- *R # epenthetic exception, fuarbh*, cuarbh* only
+ SAL UALGA-- *L # epenthetic exception, dualgas only
+ SAL ULLMH-- *L* # epenthetic vowel, see LMH--
+ SAL UMH * # cumhacht, umhla<6C>ocht, ciumhais, except. to MH->V
+ SAL UTH(BCDGLMNPR)- * # sruth*, guthphost only, TH->H exception
+ SAL ULCH-- *L* # epenth. vowel,ulcha,[tm]ulch<63>n,amhulchach only
+ SAL URCH(A<>)--- *R* # epenthetic vowel, urchar, urchall, urch<63>id, etc.
+ SAL UDH * # mudh* only (literary)
+ SAL UGH * # brugh* only (literary)
+ SAL U *
+ SAL <20>IRG- *R # epenthetic exception, liot<6F>irg* only, see RG
+ SAL <20>TH(BCDFLPR)- * # l<>thchleasa, d<>thracht, etc. - TH->H exception
+ SAL <20> *
+ SAL V V
+ SAL W V # wigwam only
+ SAL X(AE<41>I<EFBFBD>)-^ S # xileaf<61>n, etc.
+ SAL X^ *KS # x-gha* only
+ SAL X KS # Marxach only
+ SAL Y Y # y<>y<EFBFBD> only
+ SAL Z S # z<>, puzal, etc.

View File

@ -6887,7 +6887,7 @@ static struct fst
{"sort", 1, 2, f_sort},
{"soundfold", 1, 1, f_soundfold},
{"spellbadword", 0, 1, f_spellbadword},
{"spellsuggest", 1, 2, f_spellsuggest},
{"spellsuggest", 1, 3, f_spellsuggest},
{"split", 1, 3, f_split},
#ifdef HAVE_STRFTIME
{"strftime", 1, 2, f_strftime},
@ -13961,12 +13961,16 @@ f_spellsuggest(argvars, rettv)
typval_T *argvars;
typval_T *rettv;
{
list_T *l;
#ifdef FEAT_SYN_HL
char_u *str;
int typeerr = FALSE;
int maxcount;
garray_T ga;
list_T *l;
listitem_T *li;
int i;
listitem_T *li;
int need_capital = FALSE;
#endif
l = list_alloc();
if (l == NULL)
@ -13981,14 +13985,20 @@ f_spellsuggest(argvars, rettv)
str = get_tv_string(&argvars[0]);
if (argvars[1].v_type != VAR_UNKNOWN)
{
maxcount = get_tv_number(&argvars[1]);
maxcount = get_tv_number_chk(&argvars[1], &typeerr);
if (maxcount <= 0)
return;
if (argvars[2].v_type != VAR_UNKNOWN)
{
need_capital = get_tv_number_chk(&argvars[2], &typeerr);
if (typeerr)
return;
}
}
else
maxcount = 25;
spell_suggest_list(&ga, str, maxcount, FALSE);
spell_suggest_list(&ga, str, maxcount, need_capital);
for (i = 0; i < ga.ga_len; ++i)
{