diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/ftplugin/ocaml.vim | 17 | ||||
| -rw-r--r-- | runtime/spell/check_locales.vim | 21 | ||||
| -rw-r--r-- | runtime/spell/de/main.aap | 2 | ||||
| -rw-r--r-- | runtime/spell/fr/main.aap | 2 | ||||
| -rw-r--r-- | runtime/spell/gd/main.aap | 2 | ||||
| -rw-r--r-- | runtime/spell/la/main.aap | 5 | ||||
| -rw-r--r-- | runtime/spell/nb/main.aap | 4 | ||||
| -rw-r--r-- | runtime/spell/nn/main.aap | 4 | ||||
| -rw-r--r-- | runtime/spell/pt/main.aap | 2 | ||||
| -rw-r--r-- | runtime/spell/sv/main.aap | 27 | ||||
| -rw-r--r-- | runtime/spell/sv/sv_SE.diff | 152 |
11 files changed, 72 insertions, 166 deletions
diff --git a/runtime/ftplugin/ocaml.vim b/runtime/ftplugin/ocaml.vim index 7acf49328..a59141182 100644 --- a/runtime/ftplugin/ocaml.vim +++ b/runtime/ftplugin/ocaml.vim @@ -5,7 +5,8 @@ " Stefano Zacchiroli <zack@bononia.it> " Vincent Aravantinos <firstname.name@imag.fr> " URL: http://www.ocaml.info/vim/ftplugin/ocaml.vim -" Last Change: 2008 Jul 17 - Bugfix related to fnameescape (VA) +" Last Change: 2010 Jul 10 - Bugfix, thanks to Pat Rondon +" 2008 Jul 17 - Bugfix related to fnameescape (VA) " 2007 Sep 09 - Added .annot support for ocamlbuild, python not " needed anymore (VA) " 2006 May 01 - Added .annot support for file.whateverext (SZ) @@ -292,10 +293,6 @@ endfunction " - b:_build_path: " path to the build directory even if this one is " not named '_build' - " - b:source_file_relative_path : - " relative path of the source file *in* the build - " directory ; this is how it is reffered to in the - " .annot file function! s:Locate_annotation() if !b:annotation_file_located @@ -308,7 +305,6 @@ endfunction if b:annot_file_path != '' let b:annot_file_path = getcwd().'/'.b:annot_file_path let b:_build_path = '' - let b:source_file_relative_path = s:Fnameescape(expand('%')) else " 2nd case : the buffer and the _build directory are in the same directory " .. @@ -323,7 +319,6 @@ endfunction if b:annot_file_path != '' let b:annot_file_path = getcwd().'/'.b:annot_file_path endif - let b:source_file_relative_path = s:Fnameescape(expand('%')) else " 3rd case : the _build directory is in a directory higher in the file hierarchy " (it can't be deeper by ocamlbuild requirements) @@ -340,7 +335,6 @@ endfunction let project_path = substitute(b:_build_path,'/_build$','','') let path_relative_to_project = s:Fnameescape(substitute(expand('%:p:h'),project_path.'/','','')) let b:annot_file_path = findfile(annot_file_name,project_path.'/_build/'.path_relative_to_project) - let b:source_file_relative_path = s:Fnameescape(substitute(expand('%:p'),project_path.'/','','')) else let b:annot_file_path = findfile(annot_file_name,'**') "4th case : what if the user decided to change the name of the _build directory ? @@ -352,7 +346,6 @@ endfunction let b:annot_file_path = getcwd().'/'.b:annot_file_path let b:_build_path = getcwd().'/'.b:_build_path endif - let b:source_file_relative_path = s:Fnameescape(expand('%')) else " 4b. anarchy : the renamed _build directory may be higher in the hierarchy " this will work if the file for which we are looking annotations has a unique name in the whole project @@ -360,7 +353,6 @@ endfunction let b:annot_file_path = findfile(annot_file_name,'**;') let project_path = s:Find_common_path(b:annot_file_path,expand('%:p:h')) let b:_build_path = matchstr(b:annot_file_path,project_path.'/[^/]*') - let b:source_file_relative_path = substitute(expand('%:p'),project_path.'/','','') endif endif endif @@ -438,11 +430,12 @@ endfunction let start_num1 = a:lin1 let start_num2 = line2byte(a:lin1) - 1 let start_num3 = start_num2 + a:col1 - let start_pos = '"'.b:source_file_relative_path.'" '.start_num1.' '.start_num2.' '.start_num3 + let path = '"\(\\"\|[^"]\)\+"' + let start_pos = path.' '.start_num1.' '.start_num2.' '.start_num3 let end_num1 = a:lin2 let end_num2 = line2byte(a:lin2) - 1 let end_num3 = end_num2 + a:col2 - let end_pos = '"'.b:source_file_relative_path.'" '.end_num1.' '.end_num2.' '.end_num3 + let end_pos = path.' '.end_num1.' '.end_num2.' '.end_num3 return '^'.start_pos.' '.end_pos."$" " rq: the '^' here is not totally correct regarding the annot file "grammar" " but currently the annotation file respects this, and it's a little bit faster with the '^'; diff --git a/runtime/spell/check_locales.vim b/runtime/spell/check_locales.vim new file mode 100644 index 000000000..fe7be93b5 --- /dev/null +++ b/runtime/spell/check_locales.vim @@ -0,0 +1,21 @@ +" Script to check if all the locales used in spell files are available. + +grep /sys env LANG/ */main.aap +let not_supported = [] +for item in getqflist() + let lang = substitute(item.text, '.*LANG=\(\S\+\).*', '\1', '') + try + exe 'lang ' . lang + catch /E197/ + call add(not_supported, lang) + endtry +endfor + +if len(not_supported) > 0 + echo "Unsupported languages:" + for l in not_supported + echo l + endfor +else + echo "Everything appears to be OK" +endif diff --git a/runtime/spell/de/main.aap b/runtime/spell/de/main.aap index 015b95767..78dfaabd4 100644 --- a/runtime/spell/de/main.aap +++ b/runtime/spell/de/main.aap @@ -33,7 +33,7 @@ READMES = README_de_$*(REGIONS).txt all: $SPELLDIR/de.latin1.spl $SPELLDIR/de.utf-8.spl ../README_de.txt $SPELLDIR/de.latin1.spl : $FILES - :sys env LANG=de_DE.ISO8859-1 + :sys env LANG=de_DE.ISO-8859-1 $VIM -u NONE -e -c "mkspell! $SPELLDIR/de $DE_REGIONS" -c q $SPELLDIR/de.utf-8.spl : $FILES diff --git a/runtime/spell/fr/main.aap b/runtime/spell/fr/main.aap index b207b6e66..a0cf37449 100644 --- a/runtime/spell/fr/main.aap +++ b/runtime/spell/fr/main.aap @@ -25,7 +25,7 @@ all: $SPELLDIR/fr.latin1.spl $SPELLDIR/fr.utf-8.spl ../README_fr.txt $SPELLDIR/fr.latin1.spl : $FILES :copy {force} fr_FR_latin1.aff fr_FR.aff :copy {force} fr_FR_latin1.dic fr_FR.dic - :sys env LANG=fr_FR.ISO8859-15 + :sys env LANG=fr_FR.ISO-8859-15@euro $VIM -u NONE -e -c "mkspell! $SPELLDIR/fr fr_FR" -c q $SPELLDIR/fr.utf-8.spl : $FILES diff --git a/runtime/spell/gd/main.aap b/runtime/spell/gd/main.aap index 658cbfc05..55443aeb0 100644 --- a/runtime/spell/gd/main.aap +++ b/runtime/spell/gd/main.aap @@ -12,7 +12,7 @@ FILES = gd_GB.aff gd_GB.dic all: $SPELLDIR/gd.latin1.spl $SPELLDIR/gd.utf-8.spl ../README_gd.txt $SPELLDIR/gd.latin1.spl : $FILES - :sys env LANG=gd_GB.ISO8859-1 + :sys env LANG=gd_GB.ISO8859-15 $VIM -u NONE -e -c "mkspell! $SPELLDIR/gd gd_GB" -c q $SPELLDIR/gd.utf-8.spl : $FILES diff --git a/runtime/spell/la/main.aap b/runtime/spell/la/main.aap index 0cf1d8ab3..d9815850b 100644 --- a/runtime/spell/la/main.aap +++ b/runtime/spell/la/main.aap @@ -11,8 +11,11 @@ FILES = la.aff la.dic all: $SPELLDIR/la.latin1.spl $SPELLDIR/la.utf-8.spl ../README_la.txt +# NOTE: the la_LN.ISO-8859-1 locale is not available on Ubuntu. +# Use the English one instead. + $SPELLDIR/la.latin1.spl : $FILES - :sys env LANG=la_LN.ISO8859-1 + :sys env LANG=en_US.ISO-8859-1 $VIM -u NONE -e -c "mkspell! $SPELLDIR/la la" -c q $SPELLDIR/la.utf-8.spl : $FILES diff --git a/runtime/spell/nb/main.aap b/runtime/spell/nb/main.aap index f7805ea1c..4d445c020 100644 --- a/runtime/spell/nb/main.aap +++ b/runtime/spell/nb/main.aap @@ -12,11 +12,11 @@ FILES = nb_NO.aff nb_NO.dic all: $SPELLDIR/nb.latin1.spl $SPELLDIR/nb.utf-8.spl ../README_nb.txt $SPELLDIR/nb.latin1.spl : $FILES - :sys env LANG=no_NO.ISO8859-1 + :sys env LANG=nb_NO.ISO-8859-1 $VIM -u NONE -e -c "mkspell! $SPELLDIR/nb nb_NO" -c q $SPELLDIR/nb.utf-8.spl : $FILES - :sys env LANG=no_NO.UTF-8 + :sys env LANG=nb_NO.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/nb nb_NO" -c q ../README_nb.txt : README_nb_NO.txt diff --git a/runtime/spell/nn/main.aap b/runtime/spell/nn/main.aap index da71b209a..efb0812a4 100644 --- a/runtime/spell/nn/main.aap +++ b/runtime/spell/nn/main.aap @@ -12,11 +12,11 @@ FILES = nn_NO.aff nn_NO.dic all: $SPELLDIR/nn.latin1.spl $SPELLDIR/nn.utf-8.spl ../README_nn.txt $SPELLDIR/nn.latin1.spl : $FILES - :sys env LANG=no_NO.ISO8859-1 + :sys env LANG=nb_NO.ISO-8859-1 $VIM -u NONE -e -c "mkspell! $SPELLDIR/nn nn_NO" -c q $SPELLDIR/nn.utf-8.spl : $FILES - :sys env LANG=no_NO.UTF-8 + :sys env LANG=nb_NO.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/nn nn_NO" -c q ../README_nn.txt : README_nn_NO.txt diff --git a/runtime/spell/pt/main.aap b/runtime/spell/pt/main.aap index 3d08faf6d..751fb9527 100644 --- a/runtime/spell/pt/main.aap +++ b/runtime/spell/pt/main.aap @@ -29,7 +29,7 @@ all: $SPELLDIR/pt.latin1.spl $SPELLDIR/pt.utf-8.spl \ ../README_pt.txt $SPELLDIR/pt.latin1.spl : $FILES - :sys env LANG=pt_PT.ISO8859-1 LC_ALL=pt_PT.ISO8859-1 + :sys env LANG=pt_PT.ISO-8859-1 LC_ALL=pt_PT.ISO-8859-1 $VIM -u NONE -e -c "mkspell! $SPELLDIR/pt pt_PT pt_BR" -c q $SPELLDIR/pt.utf-8.spl : $FILES diff --git a/runtime/spell/sv/main.aap b/runtime/spell/sv/main.aap index 5634711af..de8696ee3 100644 --- a/runtime/spell/sv/main.aap +++ b/runtime/spell/sv/main.aap @@ -1,6 +1,6 @@ # Aap recipe for Swedish Vim spell files. # -# Maintainer: Stefan Karlsson <stefan.74@comhem.se> +# Maintainer: Mattias Winther <vim@mattias.winthernet.se> # Use a freshly compiled Vim if it exists. @if os.path.exists('../../../src/vim'): @@ -14,30 +14,33 @@ FILES = sv_SE.aff sv_SE.dic all: $SPELLDIR/sv.latin1.spl $SPELLDIR/sv.utf-8.spl ../README_sv.txt $SPELLDIR/sv.latin1.spl : $FILES - :sys env LANG=sv_SE.ISO8859-1 + :sys env LANG=sv_SE.ISO-8859-1 $VIM -u NONE -e -c "mkspell! $SPELLDIR/sv sv_SE" -c q $SPELLDIR/sv.utf-8.spl : $FILES :sys env LANG=sv_SE.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/sv sv_SE" -c q -../README_sv.txt : README_sv_SE.txt +../README_sv.txt : LICENSE_sv_SE.txt :copy $source $target # # Fetching the files from OpenOffice.org. # -OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries -:attr {fetch = $OODIR/%file%} sv_SE.zip +OODIR = http://extensions.services.openoffice.org/e-files/1080/6 +:attr {fetch = $OODIR/%file%} ooo_swedish_dict_1.42.oxt # The files don't depend on the .zip file so that we can delete it. # Only download the zip file if the targets don't exist. sv_SE.aff sv_SE.dic: {buildcheck=} :assertpkg unzip patch - :fetch sv_SE.zip - :sys $UNZIP sv_SE.zip - :delete sv_SE.zip - :delete hyph_sv_SE.dic + :fetch ooo_swedish_dict_1.42.oxt + :sys $UNZIP ooo_swedish_dict_1.42.oxt + :delete ooo_swedish_dict_1.42.oxt + :delete {r} META-INF + :copy dictionaries/sv_SE.aff sv_SE.aff + :copy dictionaries/sv_SE.dic sv_SE.dic + :delete {r} dictionaries dictionaries.xcu description.xml @if not os.path.exists('sv_SE.orig.aff'): :copy sv_SE.aff sv_SE.orig.aff @if not os.path.exists('sv_SE.orig.dic'): @@ -60,12 +63,12 @@ diff: check: :assertpkg unzip diff - :fetch sv_SE.zip + :fetch ooo_swedish_dict_1.42.oxt :mkdir tmp :cd tmp @try: @import stat - :sys $UNZIP ../sv_SE.zip + :sys $UNZIP ../ooo_swedish_dict_1.42.oxt :sys {force} diff ../sv_SE.orig.aff sv_SE.aff >d @if os.stat('d')[stat.ST_SIZE] > 0: :copy sv_SE.aff ../sv_SE.new.aff @@ -75,7 +78,7 @@ check: @finally: :cd .. :delete {r}{f}{q} tmp - :delete sv_SE.zip + :delete ooo_swedish_dict_1.42.oxt # vim: set sts=4 sw=4 : diff --git a/runtime/spell/sv/sv_SE.diff b/runtime/spell/sv/sv_SE.diff index 73ed14b3c..6c83d4982 100644 --- a/runtime/spell/sv/sv_SE.diff +++ b/runtime/spell/sv/sv_SE.diff @@ -1,9 +1,9 @@ -*** sv_SE.orig.aff Thu Feb 23 20:02:32 2006 ---- sv_SE.aff Thu Feb 23 20:02:32 2006 +*** sv_SE.orig.aff 2010-05-20 21:31:54.000000000 +0200 +--- sv_SE.aff 2010-05-20 21:38:36.000000000 +0200 *************** *** 6,7 **** ---- 6,22 ---- - +--- 6,21 ---- + NOSUGGEST ! + FOL ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ + LOW ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ + UPP ßÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞÿ @@ -18,142 +18,27 @@ + MAP cç + MAP yÿý + MAP sß -+ - SFX A Y 1 -*************** -*** 15,17 **** -! SFX C Y 16 - SFX C 0 t [aeiouyåäöé] ---- 30,32 ---- - -! SFX C Y 15 - SFX C 0 t [aeiouyåäöé] -*************** -*** 30,32 **** - SFX C en nets en -- SFX C 0 net nets [^e]n - SFX C 0 nets [^e]n ---- 45,46 ---- *************** -*** 427 **** ---- 441,541 ---- - SFX T el la el -+ -+ # soundslike mapping from Aspell -+ # swedish_phonet.dat - Swedish phonetic transformation rules for aspell -+ # Copyright (C) 2000 Martin Norbäck <d95mback@dtek.chalmers.se> -+ # distributed under GNU GPL -+ # version 0.2 +*** 649 **** +--- 663,664 ---- + SFX t el la/WXZ el + -+ SAL & & -+ SAL @ @ -+ SAL ANG(EIYÄÖ)-^ ANI # förledet an- ska inte bli @-ljud -+ SAL AGNO6 AKNO # agnostiker osv. -+ SAL AG(IE)-6 AK # vokal+g(ie) ger ej j-ljud -+ SAL A A -+ SAL BB-< _ -+ SAL B P -+ SAL CCO- K # broccoli, piccolo -+ SAL CC KS # successiv, access, succé -+ SAL CH & # choklad osv. -+ SAL CK K # ck -> k som vanligt -+ SAL C(EIYÄÖ)-< S # c + mjuk vokal -> s -+ SAL C K # c + annat -> k -+ SAL DJ(UÄÖ)- I # djungel, djävel, adjö -+ SAL DD- _ -+ SAL D T -+ SAL EG(IE)-6 EK # vokal+g(ie) ger ej j-ljud -+ SAL E E -+ SAL É E -+ SAL FF F -+ SAL F F -+ SAL G(EIYÄÖ)-3 I # g+mjuk vokal ger j-ljud -+ SAL GG6 K -+ SAL GN @N # ugn, lugn... -+ SAL G K -+ SAL H(AOUÅEIYÄÖ)-^ H # h i början av ord hörs -+ SAL H(AUOÅEIYÄÖ)- _ # annars stumt framför vokal -+ SAL HJ I # hj->j (hjärta osv.) -+ SAL H H -+ SAL IG(IE)-6 IK # vokal+g(ie) ger ej j-ljud -+ SAL I I -+ SAL J I -+ SAL K(EIYÄÖ)-^ & # k+mjuk vokal ger sje-ljud -+ SAL KJ & # kjol -+ SAL K K -+ SAL LJU- I # ljuga, ljus -+ SAL LL- _ -+ SAL L L -+ SAL MM- _ -+ SAL M M -+ SAL NG6 @ -+ SAL NN- _ -+ SAL N N -+ SAL ORIGI8 ORKI # specialfall -+ SAL OG(IE)-6 OK # vokal+g(ie) ger ej j-ljud -+ SAL O O -+ SAL PROJEKT PRO&EKT # specialfall -+ SAL PSALT< SALT # specialfall -+ SAL PSALM< SALM # specialfall -+ SAL PP- _ -+ SAL P P -+ SAL Q K -+ SAL RGI$6 RGI # inget j i slutet -+ SAL RGA$6 RIA # här är det däremot j (arga,färga) -+ SAL RGE$6 RIE # här också (Norge, överge) -+ SAL RGS$ RIS # rgs i slutet -+ SAL RG$ RI # rg i slutet -+ SAL RD T # "blött" d -+ SAL RN N # "blött" n -+ SAL RT T # "blött" t -+ SAL RLD T # värld -+ SAL RL L # "blött" l -+ SAL RS & # sje-ljud (fars, gärsgård) -+ SAL RR- _ -+ SAL R R -+ SAL SS- _ -+ SAL SCHIZ6 SKITS # specialfall -+ SAL SCH6 & -+ SAL SKJ & # skjorta, skjuta -+ SAL SJ & # sje-ljud -+ SAL S S -+ SAL TION9^ TION # tionde -+ SAL TION6 &ON # station osv. -+ SAL TT- _ -+ SAL T T -+ SAL UG(IE)-6 UK # vokal+g(ie) ger ej j-ljud -+ SAL U U -+ SAL V F -+ SAL W F -+ SAL X9 KS -+ SAL YG(IE)-6 YK # vokal+g(ie) ger ej j-ljud -+ SAL Y I -+ SAL ZZ TS -+ SAL Z S -+ SAL ÅTTIO9 OTIO # specialfall (ej sje-ljud) -+ SAL ÅRTION9 ORTION # specialfall (r hörs) -+ SAL ÅG(IE)-6 OK # vokal+g(ie) ger ej j-ljud -+ SAL Å O -+ SAL ÄG(IE)-6 EK # vokal+g(ie) ger ej j-ljud -+ SAL Ä E -+ SAL ÖG(IE)-6 ÖK # vokal+g(ie) ger ej j-ljud -+ SAL Ö Ö -*** sv_SE.orig.dic Thu Feb 23 20:02:32 2006 ---- sv_SE.dic Thu Feb 23 20:02:32 2006 +*** sv_SE.orig.dic 2010-05-20 21:31:54.000000000 +0200 +--- sv_SE.dic 2010-05-20 21:31:54.000000000 +0200 *************** -*** 4317,4319 **** - dvaldes/S +*** 11786,11788 **** + DVD ! dvs - dväljas/S ---- 4317,4319 ---- - dvaldes/S + dväljas +--- 11786,11788 ---- + DVD ! #dvs Removed by Stefan. - dväljas/S + dväljas *************** -*** 24490 **** ---- 24490,24554 ---- - åvila/MS +*** 31959,31960 **** +--- 31959,32024 ---- + korsning/ADGvY + + # Additions by Stefan: + SEK @@ -218,3 +103,4 @@ + vard. + vd + vol. + korsningsfri/OY |