diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/spell.txt | 28 | ||||
| -rw-r--r-- | runtime/doc/tags | 1 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 31 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 5 | ||||
| -rw-r--r-- | runtime/lang/menu_de_de.latin1.vim | 11 | ||||
| -rw-r--r-- | runtime/spell/en.ascii.spl | bin | 0 -> 1193528 bytes | |||
| -rw-r--r-- | runtime/spell/en.latin1.spl | bin | 1196250 -> 1196252 bytes | |||
| -rw-r--r-- | runtime/syntax/make.vim | 6 |
8 files changed, 47 insertions, 35 deletions
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 04e1cfd0be..b33dec2201 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0aa. Last change: 2005 Apr 15 +*spell.txt* For Vim version 7.0aa. Last change: 2005 Apr 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -75,23 +75,24 @@ Vim searches for spell files in the "spell" subdirectory of the directories in -XXX optional addition EEE the value of 'encoding' -Exception: Vim uses "latin1" when 'encoding' is "iso-8859-15". The euro sign -doesn't matter for spelling. +Exceptions: +- Vim uses "latin1" when 'encoding' is "iso-8859-15". The euro sign doesn't + matter for spelling. +- When no spell file for 'encoding' is found "ascii" is tried. This only + works for languages where nearly all words are ASCII, such as English. It + helps when 'encoding' is not "latin1", such as iso-8859-2, and English text + is being edited. Spelling for EBCDIC is currently not supported. A spell file might not be available in the current 'encoding'. See |spell-mkspell| about how to create a spell file. Converting a spell file -with "iconv" will NOT work. - -If a spell file only uses ASCII characters the encoding can be omitted. This -is useful for English: "en.spl" The file with encoding is checked first, thus -you could have one with encoding that includes words with non-ASCII characters -and use the ASCII file as a fall-back. +with "iconv" will NOT work! *E758* *E759* When loading a spell file Vim checks that it is properly formatted. If you -get an error the file may be truncated, modified or for another Vim version. +get an error the file may be truncated, modified or intended for another Vim +version. WORDS @@ -126,9 +127,14 @@ uses. Myspell is used by OpenOffice.org and Mozilla. You should be able to find them here: http://lingucomponent.openoffice.org/spell_dic.html -:mksp[ell] {outname} {inname} ... *:mksp* *:mkspell* +:mksp[ell] [-ascii] {outname} {inname} ... *:mksp* *:mkspell* Generate spell file {outname}.spl from Myspell files {inname}.aff and {inname}.dic. + When the [-ascii] argument is present, words with + non-ascii characters are skipped. The resulting file + ends in "ascii.spl". Otherwise the resulting file + ends in "ENC.spl", where ENC is the value of + 'encoding'. Multiple {inname} arguments can be given to combine regions into one Vim spell file. Example: > :mkspell ~/.vim/spell/en /tmp/en_US /tmp/en_CA /tmp/en_AU diff --git a/runtime/doc/tags b/runtime/doc/tags index c89e2b3688..bcbe4ba486 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5111,7 +5111,6 @@ hebrew hebrew.txt /*hebrew* hebrew.txt hebrew.txt /*hebrew.txt* help various.txt /*help* help-context help.txt /*help-context* -help-tags tags 1 help-translated various.txt /*help-translated* help-xterm-window various.txt /*help-xterm-window* help.txt help.txt /*help.txt* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 33c1f8f5d1..411e001792 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Apr 15 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Apr 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -98,7 +98,14 @@ PLANNED FOR VERSION 7.0: - Add SPELLCHECKER, with support for many languages. - Use "engspchk" from Charles Campbell for ideas. - Spell checking code todo's: - - BWF_ADDS and BWF_ADDSM for more than 256, only one byte for count. + - For French, prefixes with single quotes result in many additions. + How to do this more efficiently? Both storing and checking. + Put addition up to end of word also in hashtab, so that "s'aaa" + is found by "'aaa", s-bbb by "-bbb", etc. Put rest in table (search + longest match). + - use BWF_ADDS and BWF_ADDSM for more than 256, only one byte for count. + - Implement user and project word lists. Commands to add words and to + mark words as wrong. - Case folding only works when locale is set properly. E.g., when C locale is active then 'enc' is "latin1" but Ångström isn't seen as a ONECAP. @@ -107,29 +114,21 @@ PLANNED FOR VERSION 7.0: Put the character tables in the .aff file? - Implement = flag in .dic: KEEPCASE for lower case word. 's morgens/= does not match 'S morgens - - Merge en_US, en_CA, en_AU, etc. - Implement compound words? - - Make matching additions faster somehow? - - More efficient way to store additions? - remove fw_prefix and fw_suffix, use fw_len (word length) and put prefixes and suffixes right after it. - Make "en-rare" spell file. Convention: use en_US (language_region) and en-rare (language-field) - - Need to check for affixes of zero length? - - specify word characters in .aff file? + Add hl groups to 'spelllang'? + :set spelllang=en_us,en-rare/SpellRare,en-math/SpellMath - Polish: Anio and Hanio are wrong words, even though Myspell allows them. Problem with not ignoring case in conditions. - - Put addition up to end of word also in hashtab, so that "s'aaa" - is found by "'aaa", s-bbb by "-bbb", etc. Put rest in table (search - longest match). - - Rare words: use another dictionary. Add hl groups to 'spelllang'? - :set spelllang=en_us,en.rare/SpellRare,en.math/SpellMath - References MySpell library (in OpenOffice.org). http://spellchecker.mozdev.org/source.html http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/ author: Kevin Hendricks <kevin.hendricks@sympatico.ca> - Alternative: use aspell library. - ispell is replaced by aspell, thus forget about it. + ispell is replaced by aspell, thus forget about ispell. - More complicated: Regions with different languages? E.g. comments in English, strings in German (po file). - Commands required: @@ -139,11 +138,13 @@ PLANNED FOR VERSION 7.0: [s move to previous spell error [S also rare word ]s move to next spell error ]S also rare word (only "]s" is currently implemented) + Make this work like displaying, check @Spell in syntax. + Support a count. - Update option window for 'spell' and 'spelllang'. - Use an external program like aspell for suggestions to correct the - spelling? Or include the myspell/spell code in Vim? + spelling? Or include the myspell suggestion code in Vim? - Distribution: Need wordlists for many languages; "language pack" - - Work together with OpenOffic.org to update the wordlists. (Adri + - Work together with OpenOffice.org to update the wordlists. (Adri Verhoef, Aad Nales) - Support for approximate-regexps will help with finding similar words (agrep http://www.tgries.de/agrep/). diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index ff3bfd667e..e60b54496f 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2005 Apr 05 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Apr 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1042,4 +1042,7 @@ an error message when the argument isn't recognized. In gui_mch_draw_string() in gui_w32.c "unibuflen" wasn't static, resulting in reallocating the buffer every time. (Alexei Alexandrov) +When using a Python "atexit" function it was not invoked when Vim exits. Now +call Py_Finalize() for that. (Ugo Di Girolamo) + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/lang/menu_de_de.latin1.vim b/runtime/lang/menu_de_de.latin1.vim index f0ed55f049..12488930ae 100644 --- a/runtime/lang/menu_de_de.latin1.vim +++ b/runtime/lang/menu_de_de.latin1.vim @@ -1,7 +1,8 @@ " Menu Translations: German / Deutsch -" Maintainer: Johannes Zellner <johannes@zellner.org> -" Originally By: Marcin Dalecki <martin@dalecki.de> -" Last Change: Sat, 20 Apr 2002 19:02:42 CEST +" Maintainer: Georg Dahn <gorgyd@yahoo.co.uk> +" Originally By: Marcin Dalecki <dalecki@cs.net.pl> +" Johannes Zellner <johannes@zellner.org> +" Last Change: Sun, 17 Apr 2005 18:28:58 CEST " vim:set foldmethod=marker tabstop=8: " Quit when menu translations have already been done. @@ -44,7 +45,8 @@ menutrans &Copy<Tab>"+y &Kopieren<Tab>"+y menutrans &Paste<Tab>"+gP Ein&fügen<Tab>"+gP menutrans Put\ &Before<Tab>[p Da&vor\ Einfügen<Tab>[p menutrans Put\ &After<Tab>]p Da&nach\ Einfügen<Tab>]p -menutrans &Select\ all<Tab>ggVG Alles\ &Markieren<Tab>ggVG +menutrans &Delete<Tab>x &Löschen<Tab>x +menutrans &Select\ All<Tab>ggVG Alles\ &Markieren<Tab>ggVG menutrans &Find\.\.\. &Suchen\.\.\. menutrans Find\ and\ Rep&lace\.\.\. Suchen\ und\ &Ersetzen\.\.\. @@ -156,6 +158,7 @@ menutrans Conve&rt\ back<Tab>:%!xxd\ -r Zurück\ konvertieren<Tab>:%!xxd\ -r " {{{ SYNTAX / SYNTAX menutrans &Syntax &Syntax +menutrans &Show\ filetypes\ in\ menu Dateitypen\ an&zeigen menutrans Set\ '&syntax'\ only Nur\ '&syntax'\ Setzen menutrans Set\ '&filetype'\ too Auch\ '&filetype'\ Setzen menutrans &Off &Aus diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl Binary files differnew file mode 100644 index 0000000000..e489e1f151 --- /dev/null +++ b/runtime/spell/en.ascii.spl diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl Binary files differindex 25c67de67d..c65db0e3f1 100644 --- a/runtime/spell/en.latin1.spl +++ b/runtime/spell/en.latin1.spl diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim index 85da9800e8..aba073ee5d 100644 --- a/runtime/syntax/make.vim +++ b/runtime/syntax/make.vim @@ -2,7 +2,7 @@ " Language: Makefile " Maintainer: Claudio Fleiner <claudio@fleiner.com> " URL: http://www.fleiner.com/vim/syntax/make.vim -" Last Change: 2004 Apr 30 +" Last Change: 2005 Apr 17 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -67,9 +67,9 @@ syn match makeStatement contained "(\(subst\|addprefix\|addsuffix\|basename\|cal " Comment if exists("make_microsoft") - syn match makeComment "#.*" contains=makeTodo + syn match makeComment "#.*" contains=makeTodo,@Spell else - syn region makeComment start="#" end="^$" end="[^\\]$" keepend contains=makeTodo + syn region makeComment start="#" end="^$" end="[^\\]$" keepend contains=makeTodo,@Spell syn match makeComment "#$" endif syn keyword makeTodo TODO FIXME XXX contained |