diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/spell.txt | 33 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 31 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 5 | ||||
| -rw-r--r-- | runtime/spell/en.ascii.spl | bin | 1101014 -> 559851 bytes | |||
| -rw-r--r-- | runtime/spell/en.latin1.spl | bin | 1103766 -> 561886 bytes | |||
| -rw-r--r-- | runtime/syntax/mail.vim | 30 |
7 files changed, 66 insertions, 37 deletions
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 6721820ba..79419b24e 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 24 +*spell.txt* For Vim version 7.0aa. Last change: 2005 Jun 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -140,13 +140,19 @@ find them here: http://lingucomponent.openoffice.org/spell_dic.html :mksp[ell] [-ascii] {outname} {inname} ... *:mksp* *:mkspell* - Generate spell file {outname}.spl from Myspell files - {inname}.aff and {inname}.dic. + Generate spell file {outname}.spl. + 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'. + + The input can be the Myspell format files {inname}.aff + and {inname}.dic. If {inname}.aff does not exist then + {inname} is used as the file name of a plain word + list. + 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 @@ -187,6 +193,27 @@ Names will not appear in a dictionary, but do appear in a word list. And some old words are rarely used and are common misspellings. These do appear in a dictionary but not in a word list. +There are two formats: one with affix compression and one without. The files +with affix compression are used by Myspell (Mozilla and OpenOffice.org). This +requires two files, one with .aff and one with .dic extension. The second +format is a list of words. + + +FORMAT OF WORD LIST + +The words must appear one per line. That is all that is required. Optional +items are: +- Empty and blank lines are ignored. +- Lines starting with a # are ignored (comment lines). +- A line starting with "=encoding=" before any word. After the second '=' + comes an encoding name. This tells Vim to setup conversion from the + specified encoding to 'encoding'. +- Other lines starting with '=' are special. The ones that are not recognized + are ignored (but you do get a warning message). + + +FORMAT WITH AFFIX COMPRESSION + There are two files: the basic word list and an affix file. The affixes are used to modify the basic words to get the full word list. This significantly reduces the number of words, especially for a language like Polish. This is diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 27a9f3a86..2660432d9 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.0aa. Last change: 2005 May 18 +*syntax.txt* For Vim version 7.0aa. Last change: 2005 Jun 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3636,6 +3636,8 @@ the same syntax file on all terminals, and use the optimal highlighting. 1. highlight arguments for normal terminals + *bold* *underline* *undercurl* + *inverse* *italic* *standout* term={attr-list} *attr-list* *highlight-term* *E418* attr-list is a comma separated list (without spaces) of the following items (in any order): diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 1f10a8695..e547e2acd 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 Jun 01 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Jun 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,6 +30,12 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +Patch in if_cscope.c also in 6.3? (Froloff) + Sergey says it's OK. + +Now that search HL combines with existing color, ctermfg=white doesn't work. +(Gautam Iyer) + Add extra list of file locations. Can be used with: :ltag list of matching tags, like :tselect @@ -39,21 +45,20 @@ Add extra list of file locations. Can be used with: :lNfile :lpfile location in previous file :lrewind :lfirst first location :llast last location - :lq [N] go to location N (current one if N omitted) + :ll [N] go to location N (current one if N omitted) :lwindow open window with locations (separate from quickfix window) :lopen open window with locations :lclose close window with locations :llist list locations :lfile read locations from file using 'errorformat' :lgetfile idem, don't jump to first one + :lbuffer idem, from current buffer. Win32: Balloon text can't contain line break. Hints for multiline tooltips from Alexei Alexandrov (2005 Mar 26) Patch from Sergey Khorev, 2005 Apr 11 Add has("balloon_multiline") -Patch in if_cscope.c also in 6.3? (Froloff) - Mac unicode patch (Da Woon Jung): - selecting proportional font breaks display - UTF-8 text causes display problems. Font replacement causes this. @@ -92,9 +97,10 @@ Still seems to fail 15% of the time. PLANNED FOR VERSION 7.0: - Add SPELLCHECKER, with support for many languages. - - Use "engspchk" from Charles Campbell for ideas. - - Is it worth trying the trie structure (see code from Olaf Seibert, 2005 - May 9) + - Use "engspchk" from Charles Campbell for ideas (commands, rare words). + - Should quickly return if there is no word with the character. + Use array with flags, indicating if there is a word starting with this + byte. Quickly skip bytes where no word can start. - Spell checking code todo's: - Implement user and project word lists. Commands to add words and to mark words as wrong. @@ -107,14 +113,10 @@ PLANNED FOR VERSION 7.0: :set spelllang=en_us,en-rare/SpellRare,en-math/SpellMath - How about making suggestions? Use an external program like aspell? Or include the myspell suggestion code in Vim? - - Some word lists are inefficient. Remove affixes from a word when it - results in another basic word. - - References MySpell library (in OpenOffice.org). + - 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 ispell. - More complicated: Regions with different languages? E.g. comments in English, strings in German (po file). - Commands required: @@ -136,11 +138,6 @@ PLANNED FOR VERSION 7.0: items. - Install spell files with src/main.aap. Alternatives using ispell or aspell: - 8 Add spell checking. Use "ispell -a" somehow. - ~/vim/patches/wm_vim-5_4d.zip can be used as an example (includes - ispell inside Vim). Gautam Iyer has an example with "aspell". - Patch from Marcin Dalecki, uses pipe to aspell. - - REFACTORING: The main() function is very long. Move parts to separate functions, especially loops. Ideas from Walter Briscoe (2003 Apr 3, 2004 diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index fc8988aae..c34dd5ea0 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 May 31 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Jun 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -149,7 +149,8 @@ The "guisp" color can be used to give it a color different from foreground and background. The number of possible different highlight attributes was raised from about 220 to over 30000. This allows for the attributes of spelling to be combined -with syntax highlighting attributes. +with syntax highlighting attributes. This is also used for syntax +highlighting. Much more info here: |spell|. diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl Binary files differindex 0db7eca5f..5b111cfbe 100644 --- a/runtime/spell/en.ascii.spl +++ b/runtime/spell/en.ascii.spl diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl Binary files differindex 78de0c617..d10869585 100644 --- a/runtime/spell/en.latin1.spl +++ b/runtime/spell/en.latin1.spl diff --git a/runtime/syntax/mail.vim b/runtime/syntax/mail.vim index a45eb61ce..291daa25c 100644 --- a/runtime/syntax/mail.vim +++ b/runtime/syntax/mail.vim @@ -2,7 +2,7 @@ " Language: Mail file " Previous Maintainer: Felix von Leitner <leitner@math.fu-berlin.de> " Maintainer: Gautam Iyer <gautam@math.uchicago.edu> -" Last Change: 2005 Mar 23 +" Last Change: Wed 01 Jun 2005 02:11:07 PM CDT " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -22,7 +22,7 @@ syn cluster mailQuoteExps contains=mailQuoteExp1,mailQuoteExp2,mailQuoteExp3,mai syn case match " For "From " matching case is required. The "From " is not matched in quoted " emails -syn region mailHeader contains=@mailHeaderFields start="^From " skip="^\s" end="\v^[-A-Za-z0-9]*([^-A-Za-z0-9:]|$)"me=s-1 +syn region mailHeader contains=@mailHeaderFields,@NoSpell start="^From " skip="^\s" end="\v^[-A-Za-z0-9]*([^-A-Za-z0-9:]|$)"me=s-1 syn match mailHeaderKey contained contains=mailEmail,@NoSpell "^From\s.*$" syn case ignore @@ -32,18 +32,20 @@ syn region mailHeader keepend contains=@mailHeaderFields,@mailQuoteExps,@NoSpell syn region mailHeaderKey contained contains=mailHeaderEmail,mailEmail,@mailQuoteExps,@NoSpell start="\v(^(\> ?)*)@<=(to|b?cc):" skip=",$" end="$" syn match mailHeaderKey contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|reply-to):.*$" -syn match mailHeaderKey contained "\v(^(\> ?)*)@<=date:" -syn match mailSubject contained "\v(^(\> ?)*)@<=subject:.*$" +syn match mailHeaderKey contained contains=@NoSpell "\v(^(\> ?)*)@<=date:" +syn match mailSubject contained "\v^subject:.*$" +syn match mailSubject contained contains=@NoSpell "\v(^(\> ?)+)@<=subject:.*$" " Anything in the header between < and > is an email address -syn match mailHeaderEmail contained "<.\{-}>" contains=@NoSpell +syn match mailHeaderEmail contained contains=@NoSpell "<.\{-}>" " Mail Signatures. (Begin with "-- ", end with change in quote level) -syn region mailSignature keepend contains=@mailLinks,@mailQuoteExps start="^\z(\(> \?\)*\)-- $" end="^\z1$" end="^\z1\@!"me=s-1 end="^\z1\(> \?\)\+"me=s-1 +syn region mailSignature keepend contains=@mailLinks,@mailQuoteExps start="^--\s$" end="^$" end="^\(> \?\)\+"me=s-1 +syn region mailSignature keepend contains=@mailLinks,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)\+\)--\s$" end="^\z1$" end="^\z1\@!"me=s-1 end="^\z1\(> \?\)\+"me=s-1 " URLs start with a known protocol or www,web,w3. -syn match mailURL `\v<(((https?|ftp|gopher)://|(mailto|file|news):)[^' <>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' <>"]+)[a-z0-9/]` contains=@NoSpell -syn match mailEmail "\v[_=a-z\./+0-9-]+\@[a-z0-9._-]+\a{2}" contains=@NoSpell +syn match mailURL contains=@NoSpell `\v<(((https?|ftp|gopher)://|(mailto|file|news):)[^' <>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' <>"]+)[a-z0-9/]` +syn match mailEmail contains=@NoSpell "\v[_=a-z\./+0-9-]+\@[a-z0-9._-]+\a{2}" " Make sure quote markers in regions (header / signature) have correct color syn match mailQuoteExp1 contained "\v^(\> ?)" @@ -54,12 +56,12 @@ syn match mailQuoteExp5 contained "\v^(\> ?){5}" syn match mailQuoteExp6 contained "\v^(\> ?){6}" " Even and odd quoted lines. order is imporant here! -syn match mailQuoted1 contains=mailHeader,@mailLinks,mailSignature "^\([a-z]\+>\|[]|}>]\).*$" -syn match mailQuoted2 contains=mailHeader,@mailLinks,mailSignature "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{2}.*$" -syn match mailQuoted3 contains=mailHeader,@mailLinks,mailSignature "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{3}.*$" -syn match mailQuoted4 contains=mailHeader,@mailLinks,mailSignature "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{4}.*$" -syn match mailQuoted5 contains=mailHeader,@mailLinks,mailSignature "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{5}.*$" -syn match mailQuoted6 contains=mailHeader,@mailLinks,mailSignature "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{6}.*$" +syn match mailQuoted1 contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\([a-z]\+>\|[]|}>]\).*$" +syn match mailQuoted2 contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{2}.*$" +syn match mailQuoted3 contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{3}.*$" +syn match mailQuoted4 contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{4}.*$" +syn match mailQuoted5 contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{5}.*$" +syn match mailQuoted6 contains=mailHeader,@mailLinks,mailSignature,@NoSpell "^\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{6}.*$" " Need to sync on the header. Assume we can do that within 100 lines if exists("mail_minlines") |