# HG changeset patch # User Bram Moolenaar # Date 1383509671 -3600 # Node ID 9521463d4fc1652fd7081d0f855b4c7b090b0d2d # Parent ed761b26334f176b4f6c54d951bf0c2698502fdd Update runtime files. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2013 Aug 24 +*eval.txt* For Vim version 7.4. Last change: 2013 Nov 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2013 Oct 05 +*todo.txt* For Vim version 7.4. Last change: 2013 Nov 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,17 +34,17 @@ not be repeated below, unless there is e *known-bugs* -------------------- Known bugs and current work ----------------------- -Problem positioning the cursor after auto-formatting without a comment. (Tor -Perkins, 2013 Sep 1) +Revert patch 7.4.056? Do it differently? Using \1 in pattern goes one line too far. (Bohr Shaw, 2013 Sep 5) Column is OK. "/\v(^.+\n)\1/e" (John Little, Sep 5) Also, matches start of 2nd line, not the whole line. +NFA regexp doesn't handle backreference correctly. (Ryuichi Hayashida, 2013 +Oct 10) + Error for incomplete help argument. (John Beckett, 2013 Sep 12) -Popup menu: first item is not selected when typing more than one character? - Should win_redr_custom() not be allowed to use recursively? (Yasuhiro Matsumoto, 2013 Aug 15) @@ -58,6 +58,16 @@ Problem using ":try" inside ":execute". Issue 164: freeze on regexp search. +Patch to Fix Python: DictionaryContains return -1 on error. (ZyX, 2013 Nov 1) + +Patch to fix that inserting CR when replacing a Visual block doesn't cause a +line break. (Christian Brabandt, 2013 Oct 19) +Check: does CTRL-V CR insert a literal CR? New patch Oct 21 +With test Oct 22. + +When recording the character typed at the hit-enter prompt is recorded twice. +(Urtica Dioica) Patch by Christian Brabandt, 2013 Oct 8. + Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in ftplugins. @@ -66,9 +76,29 @@ Python: ":py raw_input('prompt')" doesn' Patch to avoid problem with colon in file name. (Yasuhiro Matsumoto, 2013 Sep 5) Only copy file name when needed: Sep 9. +After inserting comment leader, CTRL-\ CTRL-O does move the cursor. +(Wiktor Ruben, 2013 Oct 7) +Patch by Christian Brabandt. + +Patch to support slices in Python vim.List. (ZyX, 2013 Oct 20) + +Patch to support iterator on Python vim.options. (ZyX, 2013 Nov 2) + +Patch to avoid "-no-cpp-precomp" on Mac. (Misty De Meo, demeo, 2013 Oct 19) + +Patch to make Dictionary.update() work without arguments. +(ZyX, 2013 Oct 19) + Patch to make #N in 'cino' stop not indenting #lines. (Christian Brabandt, 2013 Sep 25) +Patch for Cobol ftplugin. (ZyX, 2013 Oct 20) +Await response from maintainer. + +Can 'undolevels' be a buffer-local option? Helps for making big changes in +one file only, set 'ul' to -1 only for that buffer. +Patch by Christian Brabandt, 2010 Dec 17. Needs test. + Include systemverilog file? Two votes yes. Wrapping around end of file does not work for "." after "cgn". (Dimitar @@ -79,6 +109,11 @@ Clang error for integer overflow. (Domin Patch to add v:hlsearch. (ZyX, 2013 Sep 22) +Patch to fix E315 error. (Lech Lorens, 2013 Oct 26) + +Patch to add :keeppatterns, don't put used search patterns in history. +(Christian Brabandt, 2013 Oct 18) + Problem with 'spellsuggest' file, only works for some words. (Cesar Romani, 2013 Aug 20) Depends on file name? (Aug 24) Additional remark by glts: the suggested words are marked bad? @@ -87,6 +122,11 @@ Syntax highlighting slow (hangs) in SASS Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19) +Issue 174: Detect Mason files. + +Patch for Python: Fix interrupt not being properly discarded in VimTryEnd. +With tests. (ZyX, 2013 Oct 19) Reported by Yggdroot Chen. + Patch to make has() check for Vim version and patch at the same time. (Marc Weber, 2013 Jun 7) @@ -96,9 +136,28 @@ Sep 28) With test Sept 29. VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow instead. (Samuel Ferencik, 2013 Sep 28) +Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3) + +Perl: support for Activestate perl 5.18: Issue 170. + +Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep +29) +Patch to fix expr7() when skipping. (2013 Oct 15) Oct 23 with test. + Several syntax file match "^\s*" which may get underlined if that's in the highlight group. Add a "\zs" after it? +- Have an option for spell checking to not mark any Chinese, Japanese or + other double-width characters (or CJK characters) as error. + Helps a lot for mixed Asian and latin text. + More general: Have some way not to give spelling errors for a range of + characters. +Patch to add "cjk" to 'spelllang'. (Ken Takata, 2013 Oct 8, second one) + +Patch to add mch_copy_sec() to vim_rename(). +bug report on redhat. (Peter Backes, 2013 oct 8) +Patch to vim-dev, 2013 Oct 9. + Win32: When a directory name contains an exclamation mark, completion doesn't complete the contents of the directory. No escaping for the "!"? (Jan Stocker, 2012 Jan 5; 2013 Aug 20) @@ -106,8 +165,9 @@ Patch 2013 Sept 10, test: Sept 11. Go through more coverity reports. -Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep -29) +Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24) + +Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16) Patch to make ColorScheme autocommand match with the colorscheme name instead of the buffer name. (Christian Brabandt, 2013 Sep 25) @@ -123,6 +183,12 @@ Patch by Christian Brabandt (2013 Aug 12 Several Win32 functions are not using Unicode. Patches to fix this. (Ken Takata, 2013 Aug 9) +Patch to add item in 'listchars' to repeat first character. (Nathaniel Braun, +pragm, 2013 Oct 13) + +Undo message is not always properly displayed. Patch by Ken Takata, 2013 oct +3. Doesn't work properly according to Yukihiro Nakadaira. + /[b-a] gives error E16, should probably be E769. :help gives example for z?, but it does not work. m? and t? do work. @@ -210,10 +276,6 @@ Second one. Update May 22. Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec) -TCL: With MSVC 2010 doesn't find Tcl_FindExecutable. (tux) -Patch to define it. (Ken Takata, 2013 Aug 12) Is this right? -Probably not: http://code.google.com/p/vim/issues/detail?id=167 - MS-Windows: Patch to make tests copy files to avoid changing the fileformat of the files under version control. (Taro Muraoka, 2013 Jul 5) @@ -345,10 +407,6 @@ But use "gi" instead of "a". Or use CTR Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012 Aug 16) -Have an option for spell checking to not mark any Chinese, Japanese or other -double-width characters as error. Or perhaps all characters above 256. -(Bill Sun) Helps a lot for mixed Asian and latin text. - When there are no command line arguments ":next" and ":argu" give E163, which is confusing. Should say "the argument list is empty". @@ -729,10 +787,6 @@ Requires a map mode for Insert mode star Writing nested List and Dict in viminfo gives error message and can't be read back. (Yukihiro Nakadaira, 2010 Nov 13) -Can 'undolevels' be a buffer-local option? Helps for making big changes in -one file only, set 'ul' to -1 only for that buffer. -Patch by Christian Brabandt, 2010 Dec 17. Needs test. - Problem with cursor in the wrong column. (SungHyun Nam, 2010 Mar 11) Additional info by Dominique Pelle. (also on 2010 Apr 10) @@ -1027,7 +1081,7 @@ probably causes this. 2009 Jan 16) Patch to support strikethrough next to bold and italic. (Christian Brabandt, -2013 Jul 30) +2013 Jul 30) Update from Ken Takata, 2013 Oct 12. Document that default font in Athena can be set with resources: XtDefaultFont: "9x15" @@ -2830,10 +2884,6 @@ 7 Add local directory for tab pages? Spell checking: -- have some way not to give spelling errors for a range of characters. - E.g. for Chinese and other languages with specific characters for which we - don't have a spell file. Useful when there is also text in other - languages in the file. - Support more regions? Caolan McNamara argues it's needed for es_XX. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219777 - Unicode defines another quote character: 0x2019. Use it as an equivalent @@ -4947,6 +4997,7 @@ 8 Add "g^E" and "g^Y", to scroll a scr 6 Add ":timer" command, to set a command to be executed at a certain interval, or once after some time has elapsed. (Aaron) Perhaps an autocommand event like CursorHold is better? + Patch to add async functionality. (Geoff Greer, 2013 Sep 1 and later) 8 Add ":confirm" handling in open_exfile(), for when file already exists. 8 When quitting with changed files, make the dialog list the changed file and allow "write all", "discard all", "write some". The last one would diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 7.4. Last change: 2012 Aug 15 +*visual.txt* For Vim version 7.4. Last change: 2013 Nov 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -75,7 +75,11 @@ 2. Starting and stopping Visual mode * *V* *linewise-visual* [count]V Start Visual mode linewise. - With [count] select that many lines. + With [count] select the same number of lines as used + for the last Visual operation, but at the current + cursor position, multiplied by [count]. When there + was no previous Visual operation [count] lines are + selected. *CTRL-V* *blockwise-visual* [count]CTRL-V Start Visual mode blockwise. Note: Under Windows diff --git a/runtime/filetype.vim b/runtime/filetype.vim --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar -" Last Change: 2013 Sep 22 +" Last Change: 2013 Oct 06 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -2061,14 +2061,15 @@ au BufNewFile,BufRead */etc/sudoers,sudo " SVG (Scalable Vector Graphics) au BufNewFile,BufRead *.svg setf svg -" If the file has an extension of 't' and is in a directory 't' then it is -" almost certainly a Perl test file. +" If the file has an extension of 't' and is in a directory 't' or 'xt' then +" it is almost certainly a Perl test file. " If the first line starts with '#' and contains 'perl' it's probably a Perl " file. " (Slow test) If a file contains a 'use' statement then it is almost certainly " a Perl file. func! s:FTperl() - if expand("%:e") == 't' && expand("%:p:h:t") == 't' + let dirname = expand("%:p:h:t") + if expand("%:e") == 't' && (dirname == 't' || dirname == 'xt') setf perl return 1 endif diff --git a/runtime/ftplugin/j.vim b/runtime/ftplugin/j.vim --- a/runtime/ftplugin/j.vim +++ b/runtime/ftplugin/j.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: J " Maintainer: David Bürgin <676c7473@gmail.com> -" Last Change: 2013-09-21 +" Last Change: 2013-10-06 if exists("b:did_ftplugin") finish @@ -11,7 +11,8 @@ let b:did_ftplugin = 1 setlocal iskeyword=48-57,65-90,_,97-122 setlocal comments=:NB. setlocal commentstring=NB.\ %s -setlocal formatoptions-=t formatoptions+=croql +setlocal formatoptions-=t setlocal shiftwidth=2 softtabstop=2 expandtab +setlocal matchpairs=(:) -let b:undo_ftplugin = "setl et< sts< sw< fo< cms< com< isk<" +let b:undo_ftplugin = "setl mps< et< sts< sw< fo< cms< com< isk<" diff --git a/runtime/ftplugin/lisp.vim b/runtime/ftplugin/lisp.vim --- a/runtime/ftplugin/lisp.vim +++ b/runtime/ftplugin/lisp.vim @@ -4,7 +4,7 @@ " URL: http://sites.google.com/site/khorser/opensource/vim " Original author: Dorai Sitaram " Original URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html -" Last Change: Feb 12, 2013 +" Last Change: Oct 23, 2013 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -21,9 +21,6 @@ setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!, setl lisp setl commentstring=;%s -" make comments behaviour like in c.vim -" e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|# -setl formatoptions+=croql let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<" diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim --- a/runtime/ftplugin/scheme.vim +++ b/runtime/ftplugin/scheme.vim @@ -4,7 +4,7 @@ " URL: http://sites.google.com/site/khorser/opensource/vim " Original author: Dorai Sitaram " Original URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html -" Last Change: Feb 12, 2013 +" Last Change: Oct 23, 2013 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -22,10 +22,7 @@ setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!, setl lisp setl commentstring=;%s -" make comments behaviour like in c.vim -" e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|# -setl formatoptions+=croql " Scheme-specific settings if exists("b:is_mzscheme") || exists("is_mzscheme") diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim --- a/runtime/syntax/clean.vim +++ b/runtime/syntax/clean.vim @@ -2,7 +2,7 @@ " Language: Clean " Author: Pieter van Engelen " Co-Author: Arthur van Leeuwen -" Last Change: 2013 Jun 19 by Jurriën Stutterheim +" Last Change: 2013 Oct 15 by Jurriën Stutterheim " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -31,11 +31,10 @@ syn keyword cleanIncludeKeyword containe " To do some Denotation Highlighting syn keyword cleanBoolDenot True False -syn region cleanStringDenot start=+"+ end=+"+ -syn match cleanCharDenot "'.'" -syn match cleanCharsDenot "'[^'\\]*\(\\.[^'\\]\)*'" contained -syn match cleanIntegerDenot "[+-~]\=\<\(\d\+\|0[0-7]\+\|0x[0-9A-Fa-f]\+\)\>" -syn match cleanRealDenot "[+-~]\=\<\d\+\.\d+\(E[+-~]\=\d+\)\=" +syn region cleanStringDenot start=+"+ skip=+\(\(\\\\\)\+\|\\"\)+ end=+"+ display +syn match cleanCharDenot "'\(\\\\\|\\'\|[^'\\]\)\+'" display +syn match cleanIntegerDenot "[\~+-]\?\<\(\d\+\|0[0-7]\+\|0x[0-9A-Fa-f]\+\)\>" display +syn match cleanRealDenot "[\~+-]\?\d\+\.\d\+\(E[\~+-]\?\d\+\)\?" display " To highlight the use of lists, tuples and arrays syn region cleanList start="\[" end="\]" contains=ALL @@ -44,11 +43,13 @@ syn region cleanArray start="{:" end=":} syn match cleanTuple "([^=]*,[^=]*)" contains=ALL " To do some Comment Highlighting -syn region cleanComment start="/\*" end="\*/" contains=cleanComment -syn match cleanComment "//.*" +syn region cleanComment start="/\*" end="\*/" contains=cleanComment,cleanTodo fold +syn region cleanComment start="//.*" end="$" display contains=cleanTodo +syn keyword cleanTodo TODO FIXME XXX contained -" Now for some useful typedefinitionrecognition -syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)[ \t]*\(infix[lr]\=\)\=[ \t]*\d\=[ \t]*::.*->.*" contains=cleanSpecial +" Now for some useful type definition recognition +syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(infix[lr]\=\)\=\s*\d\=\s*::.*->.*" contains=cleanSpecial,cleanBasicType,cleanSpecialType,cleanKeyword + " Define the default highlighting. " For version 5.7 and earlier: only when not done already @@ -64,7 +65,6 @@ if version >= 508 || !exists("did_clean_ " Comments HiLink cleanComment Comment " Constants and denotations - HiLink cleanCharsDenot String HiLink cleanStringDenot String HiLink cleanCharDenot Character HiLink cleanIntegerDenot Number @@ -91,6 +91,7 @@ if version >= 508 || !exists("did_clean_ HiLink cleanTuple Special " Error " Todo + HiLink cleanTodo Todo delcommand HiLink endif diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim --- a/runtime/syntax/diff.vim +++ b/runtime/syntax/diff.vim @@ -2,7 +2,7 @@ " Language: Diff (context or unified) " Maintainer: Bram Moolenaar " Translations by Jakson Alves de Aquino. -" Last Change: 2013 Jul 24 +" Last Change: 2013 Oct 06 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -336,7 +336,7 @@ syn match diffLine "^---$" "Some versions of diff have lines like "#c#" and "#d#" (where # is a number) syn match diffLine "^\d\+\(,\d\+\)\=[cda]\d\+\>.*" -syn match diffFile "^diff.*" +syn match diffFile "^diff\>.*" syn match diffFile "^+++ .*" syn match diffFile "^Index: .*" syn match diffFile "^==== .*" diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim --- a/runtime/syntax/dnsmasq.vim +++ b/runtime/syntax/dnsmasq.vim @@ -1,26 +1,19 @@ " Vim syntax file " Maintainer: Thilo Six -" Contact: -" http://www.vim.org/maillist.php#vim-dev -" +" Contact: vim-foo@xk2c-foo.de +" :3s+-foo++g " Description: highlight dnsmasq configuration files " File: runtime/syntax/dnsmasq.vim -" Version: 2.61-1 -" Last Change: 2012 May 19 +" Version: 2.67 +" Last Change: 2013 Nov 03 " Modeline: vim: ts=8:sw=2:sts=2: " -" Credits: Igor N. Prischepoff -" Doug Kearns -" David Ne\v{c}as -" Christian Brabandt -" " License: VIM License " Vim is Charityware, see ":help Uganda" " " Options: You might want to add this to your vimrc: " " if &background == "dark" -" " dnsmasq.vim " let dnsmasq_backrgound_light = 0 " else " let dnsmasq_backrgound_light = 1 @@ -28,8 +21,7 @@ " " For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 +if v:version < 600 syntax clear elseif exists("b:current_syntax") || &compatible finish @@ -39,11 +31,11 @@ let s:cpo_save = &cpo set cpo&vim if !exists("b:dnsmasq_backrgound_light") - if exists("dnsmasq_backrgound_light") - let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light - else - let b:dnsmasq_backrgound_light = 0 - endif + if exists("dnsmasq_backrgound_light") + let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light + else + let b:dnsmasq_backrgound_light = 0 + endif endif @@ -89,10 +81,13 @@ syn match DnsmasqKeywordSpecial ",\:"me=e-1 syn match DnsmasqKeyword "^\s*add-mac\>" +syn match DnsmasqKeyword "^\s*add-subnet\>" syn match DnsmasqKeyword "^\s*addn-hosts\>" syn match DnsmasqKeyword "^\s*address\>" syn match DnsmasqKeyword "^\s*alias\>" syn match DnsmasqKeyword "^\s*all-servers\>" +syn match DnsmasqKeyword "^\s*auth-zone\>" +syn match DnsmasqKeyword "^\s*bind-dynamic\>" syn match DnsmasqKeyword "^\s*bind-interfaces\>" syn match DnsmasqKeyword "^\s*bogus-nxdomain\>" syn match DnsmasqKeyword "^\s*bogus-priv\>" @@ -128,6 +123,7 @@ syn match DnsmasqKeyword "^\s*dhcp-op syn match DnsmasqKeyword "^\s*dhcp-optsfile\>" syn match DnsmasqKeyword "^\s*dhcp-proxy\>" syn match DnsmasqKeyword "^\s*dhcp-range\>" +syn match DnsmasqKeyword "^\s*dhcp-relay\>" syn match DnsmasqKeyword "^\s*dhcp-remoteid\>" syn match DnsmasqKeyword "^\s*dhcp-script\>" syn match DnsmasqKeyword "^\s*dhcp-scriptuser\>" @@ -135,6 +131,7 @@ syn match DnsmasqKeyword "^\s*dhcp-se syn match DnsmasqKeyword "^\s*dhcp-subscrid\>" syn match DnsmasqKeyword "^\s*dhcp-userclass\>" syn match DnsmasqKeyword "^\s*dhcp-vendorclass\>" +syn match DnsmasqKeyword "^\s*dns-rr\>" syn match DnsmasqKeyword "^\s*dns-forward-max\>" syn match DnsmasqKeyword "^\s*domain\>" syn match DnsmasqKeyword "^\s*domain-needed\>" @@ -149,6 +146,7 @@ syn match DnsmasqKeyword "^\s*group\> syn match DnsmasqKeyword "^\s*host-record\>" syn match DnsmasqKeyword "^\s*interface\>" syn match DnsmasqKeyword "^\s*interface-name\>" +syn match DnsmasqKeyword "^\s*ipset\>" syn match DnsmasqKeyword "^\s*keep-in-foreground\>" syn match DnsmasqKeyword "^\s*leasefile-ro\>" syn match DnsmasqKeyword "^\s*listen-address\>" @@ -161,6 +159,7 @@ syn match DnsmasqKeyword "^\s*log-dhc syn match DnsmasqKeyword "^\s*log-facility\>" syn match DnsmasqKeyword "^\s*log-queries\>" syn match DnsmasqKeyword "^\s*max-ttl\>" +syn match DnsmasqKeyword "^\s*max-cache-ttl\>" syn match DnsmasqKeyword "^\s*min-port\>" syn match DnsmasqKeyword "^\s*mx-host\>" syn match DnsmasqKeyword "^\s*mx-target\>" @@ -180,6 +179,10 @@ syn match DnsmasqKeyword "^\s*ptr-rec syn match DnsmasqKeyword "^\s*pxe-prompt\>" syn match DnsmasqKeyword "^\s*pxe-service\>" syn match DnsmasqKeyword "^\s*query-port\>" +syn match DnsmasqKeyword "^\s*quiet-ra\>" +syn match DnsmasqKeyword "^\s*quiet-dhcp\>" +syn match DnsmasqKeyword "^\s*quiet-dhcp6\>" +syn match DnsmasqKeyword "^\s*ra-param\>" syn match DnsmasqKeyword "^\s*read-ethers\>" syn match DnsmasqKeyword "^\s*rebind-domain-ok\>" syn match DnsmasqKeyword "^\s*rebind-localhost-ok\>" @@ -189,6 +192,7 @@ syn match DnsmasqKeyword "^\s*server\ syn match DnsmasqKeyword "^\s*srv-host\>" syn match DnsmasqKeyword "^\s*stop-dns-rebind\>" syn match DnsmasqKeyword "^\s*strict-order\>" +syn match DnsmasqKeyword "^\s*synth-domain\>" syn match DnsmasqKeyword "^\s*tag-if\>" syn match DnsmasqKeyword "^\s*test\>" syn match DnsmasqKeyword "^\s*tftp-max\>" diff --git a/runtime/syntax/dts.vim b/runtime/syntax/dts.vim --- a/runtime/syntax/dts.vim +++ b/runtime/syntax/dts.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: dts/dtsi (device tree files) " Maintainer: Daniel Mack -" Last Change: 2013 Apr 05 +" Last Change: 2013 Oct 20 if exists("b:current_syntax") finish @@ -11,11 +11,12 @@ syntax region dtsComment start="/ syntax match dtsReference "&[[:alpha:][:digit:]_]\+" syntax region dtsBinaryProperty start="\[" end="\]" syntax match dtsStringProperty "\".*\"" -syntax match dtsKeyword "/.*/" +syntax match dtsKeyword "/.\{-1,\}/" syntax match dtsLabel "^[[:space:]]*[[:alpha:][:digit:]_]\+:" syntax match dtsNode /[[:alpha:][:digit:]-_]\+\(@[0-9a-fA-F]\+\|\)[[:space:]]*{/he=e-1 syntax region dtsCellProperty start="<" end=">" contains=dtsReference,dtsBinaryProperty,dtsStringProperty,dtsComment syntax region dtsCommentInner start="/\*" end="\*/" +syntax match dtsCommentLine "//.*$" hi def link dtsCellProperty Number hi def link dtsBinaryProperty Number @@ -26,3 +27,4 @@ hi def link dtsNode Structur hi def link dtsReference Macro hi def link dtsComment Comment hi def link dtsCommentInner Comment +hi def link dtsCommentLine Comment diff --git a/runtime/syntax/j.vim b/runtime/syntax/j.vim --- a/runtime/syntax/j.vim +++ b/runtime/syntax/j.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: J " Maintainer: David Bürgin <676c7473@gmail.com> -" Last Change: 2013-09-21 +" Last Change: 2013-10-06 if exists("b:current_syntax") finish @@ -33,11 +33,13 @@ syn match jNumber /\<_\=\d\+\%([eE]\d\+\ syn match jNumber /\<__\=\>/ syn match jNumber /\<_\=\d\+x\>/ -syn match jComment /NB\..*$/ +syn match jComment /NB\..*$/ contains=jTodo,@Spell +syn keyword jTodo TODO FIXME XXX contained hi def link jControl Statement hi def link jString String hi def link jNumber Number hi def link jComment Comment +hi def link jTodo Todo let b:current_syntax = "j" diff --git a/runtime/syntax/upstreamlog.vim b/runtime/syntax/upstreamlog.vim --- a/runtime/syntax/upstreamlog.vim +++ b/runtime/syntax/upstreamlog.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Innovation Data Processing upstream.log file " Maintainer: Rob Owens -" Latest Revision: 2013-07-26 +" Latest Revision: 2013-09-19 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -31,13 +31,14 @@ syn match upstreamlog_Profile / Profile: syn match upstreamlog_Profile / Profile: \zs\S\{1,8}\ze, / syn match upstreamlog_Profile /, profile: \zs\S\{1,8}\ze,/ syn match upstreamlog_Profile /found Profile: \zs\S\{1,8}\ze,/ -syn match upstreamlog_Profile /Backup Profile: \zs\ze Version date/ +syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/ +syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze Version date/ syn match upstreamlog_Profile /Full of \zs\S\{1,8}\ze$/ syn match upstreamlog_Profile /Incr. of \zs\S\{1,8}\ze$/ syn match upstreamlog_Profile /Profile=\zs\S\{1,8}\ze,/ " Target: syn region upstreamlog_Target start="Computer: \zs" end="\ze[\]\)]" -syn region upstreamlog_Target start="Computer name \zs" end="\ze," +syn region upstreamlog_Target start="Computer name \zs\"" end="\"\ze" syn region upstreamlog_Target start="request to registered name \zs" end=" " diff --git a/runtime/syntax/usserverlog.vim b/runtime/syntax/usserverlog.vim --- a/runtime/syntax/usserverlog.vim +++ b/runtime/syntax/usserverlog.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Innovation Data Processing usserver.log file " Maintainer: Rob Owens -" Latest Revision: 2013-07-26 +" Latest Revision: 2013-09-19 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -36,13 +36,14 @@ syn match usserverlog_Profile /, profile syn match usserverlog_Profile /Expecting Profile: \zs\S\{1,8}\ze,/ syn match usserverlog_Profile /found Profile: \zs\S\{1,8}\ze,/ syn match usserverlog_Profile /Profile \zs\S\{1,8} \zeis a member of group: / -syn match usserverlog_Profile /Backup Profile: \zs\ze Version date/ +syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/ +syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze Version date/ syn match usserverlog_Profile /Full of \zs\S\{1,8}\ze$/ syn match usserverlog_Profile /Incr. of \zs\S\{1,8}\ze$/ syn match usserverlog_Profile /Profile=\zs\S\{1,8}\ze,/ " Target: syn region usserverlog_Target start="Computer: \zs" end="\ze[\]\)]" -syn region usserverlog_Target start="Computer name \zs" end="\ze," +syn region usserverlog_Target start="Computer name \zs\"" end="\"\ze" syn region usserverlog_Target start="Registration add request successful \zs" end="$" syn region usserverlog_Target start="request to registered name \zs" end=" " syn region usserverlog_Target start=", sending to \zs" end="$" diff --git a/runtime/syntax/usw2kagtlog.vim b/runtime/syntax/usw2kagtlog.vim --- a/runtime/syntax/usw2kagtlog.vim +++ b/runtime/syntax/usw2kagtlog.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Innovation Data Processing USW2KAgt.log file " Maintainer: Rob Owens -" Latest Revision: 2013-07-26 +" Latest Revision: 2013-09-19 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -26,13 +26,14 @@ syn match usw2kagtlog_IPaddr / \d\{1,3}\ syn match usw2kagtlog_Profile /Profile name \zs\"\S\{1,8}\"/ syn match usw2kagtlog_Profile / Profile: \zs\S\{1,8}/ syn match usw2kagtlog_Profile / Profile: \zs\S\{1,8}\ze, / -syn match usw2kagtlog_Profile /Backup Profile: \zs\ze Version date/ +syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/ +syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze Version date/ syn match usw2kagtlog_Profile /Full of \zs\S\{1,8}\ze$/ syn match usw2kagtlog_Profile /Incr. of \zs\S\{1,8}\ze$/ syn match usw2kagtlog_Profile /profile name "\zs\S\{1,8}\ze"/ " Target: syn region usw2kagtlog_Target start="Computer: \zs" end="\ze[\]\)]" -syn region usw2kagtlog_Target start="Computer name \zs" end="\ze," +syn region usw2kagtlog_Target start="Computer name \zs\"" end="\"\ze" " Agent Keywords: syn keyword usw2kagtlog_Agentword opened closed diff --git a/runtime/vimlogo.eps b/runtime/vimlogo.eps --- a/runtime/vimlogo.eps +++ b/runtime/vimlogo.eps @@ -1,791 +1,803 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%BoundingBox: 147 74 429 356 -%%LanguageLevel: 1 -%%Creator: CorelDRAW 11 -%%Title: vimlogo.eps -%%CreationDate: Mon Feb 02 14:35:16 2004 -%%DocumentProcessColors: Cyan Yellow Black -%%DocumentSuppliedResources: (atend) -%%EndComments -%%BeginProlog -/AutoFlatness false def -/AutoSteps 0 def -/CMYKMarks true def -/UseLevel 1 def -%Build: CorelDRAW 11 Version 11.633 -%Color profile: Generic offset separations profile -/CorelIsEPS true def -%%BeginResource: procset wCorel11Dict 11.0 0 -/wCorel11Dict 300 dict def wCorel11Dict begin -% Copyright (c)1992-2002 Corel Corporation -% All rights reserved. v11.0 r0.0 -/bd{bind def}bind def/ld{load def}bd/xd{exch def}bd/_ null def/rp{{pop}repeat} -bd/@cp/closepath ld/@gs/gsave ld/@gr/grestore ld/@np/newpath ld/Tl/translate ld -/$sv 0 def/@sv{/$sv save def}bd/@rs{$sv restore}bd/spg/showpage ld/showpage{} -bd currentscreen/@dsp xd/$dsp/@dsp def/$dsa xd/$dsf xd/$sdf false def/$SDF -false def/$Scra 0 def/SetScr/setscreen ld/@ss{2 index 0 eq{$dsf 3 1 roll 4 -1 -roll pop}if exch $Scra add exch load SetScr}bd/SepMode_5 where{pop}{/SepMode_5 -0 def}ifelse/CorelIsSeps where{pop}{/CorelIsSeps false def}ifelse -/CorelIsInRIPSeps where{pop}{/CorelIsInRIPSeps false def}ifelse/CorelIsEPS -where{pop}{/CorelIsEPS false def}ifelse/CurrentInkName_5 where{pop} -{/CurrentInkName_5(Composite)def}ifelse/$ink_5 where{pop}{/$ink_5 -1 def} -ifelse/$c 0 def/$m 0 def/$y 0 def/$k 0 def/$t 1 def/$n _ def/$o 0 def/$fil 0 -def/$C 0 def/$M 0 def/$Y 0 def/$K 0 def/$T 1 def/$N _ def/$O 0 def/$PF false -def/s1c 0 def/s1m 0 def/s1y 0 def/s1k 0 def/s1t 0 def/s1n _ def/$bkg false def -/SK 0 def/SM 0 def/SY 0 def/SC 0 def/$op false def matrix currentmatrix/$ctm xd -/$ptm matrix def/$ttm matrix def/$stm matrix def/$ffpnt true def -/CorelDrawReencodeVect[16#0/grave 16#5/breve 16#6/dotaccent 16#8/ring -16#A/hungarumlaut 16#B/ogonek 16#C/caron 16#D/dotlessi 16#27/quotesingle -16#60/grave 16#7C/bar -16#82/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl -16#88/circumflex/perthousand/Scaron/guilsinglleft/OE -16#91/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash -16#98/tilde/trademark/scaron/guilsinglright/oe 16#9F/Ydieresis -16#A1/exclamdown/cent/sterling/currency/yen/brokenbar/section -16#a8/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/minus/registered/macron -16#b0/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered -16#b8/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown -16#c0/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla -16#c8/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis -16#d0/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply -16#d8/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls -16#e0/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla -16#e8/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis -16#f0/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide -16#f8/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]def -/L2?/languagelevel where{pop languagelevel 2 ge}{false}ifelse def/Comp?{ -/LumSepsDict where{pop false}{/AldusSepsDict where{pop false}{1 0 0 0 @gs -setcmykcolor currentcmykcolor @gr add add add 0 ne 0 1 0 0 @gs setcmykcolor -currentcmykcolor @gr add add add 0 ne 0 0 1 0 @gs setcmykcolor currentcmykcolor -@gr add add add 0 ne 0 0 0 1 @gs setcmykcolor currentcmykcolor @gr add add add -0 ne and and and}ifelse}ifelse}bd/@PL{/LV where{pop LV 2 ge L2? not and{@np -/Courier findfont 12 scalefont setfont 72 144 m -(The PostScript level set in the Corel application is higher than)show 72 132 m -(the PostScript level of this device. Change the PS Level in the Corel)show 72 -120 m(application to Level 1 by selecting the PostScript tab in the print)show -72 108 m(dialog, and selecting Level 1 from the Compatibility drop down list.) -show flush spg quit}if}if}bd/@BeginSysCorelDict{systemdict/Corel30Dict known -{systemdict/Corel30Dict get exec}if systemdict/CorelLexDict known{1 systemdict -/CorelLexDict get exec}if}bd/@EndSysCorelDict{systemdict/Corel30Dict known -{end}if/EndCorelLexDict where{pop EndCorelLexDict}if}bd AutoFlatness{/@ifl{dup -currentflat exch sub 10 gt{ -([Error: PathTooComplex; OffendingCommand: AnyPaintingOperator]\n)print flush -@np exit}{currentflat 2 add setflat}ifelse}bd/@fill/fill ld/fill{currentflat{ -{@fill}stopped{@ifl}{exit}ifelse}bind loop setflat}bd/@eofill/eofill ld/eofill -{currentflat{{@eofill}stopped{@ifl}{exit}ifelse}bind loop setflat}bd/@clip -/clip ld/clip{currentflat{{@clip}stopped{@ifl}{exit}ifelse}bind loop setflat} -bd/@eoclip/eoclip ld/eoclip{currentflat{{@eoclip}stopped{@ifl}{exit}ifelse} -bind loop setflat}bd/@stroke/stroke ld/stroke{currentflat{{@stroke}stopped -{@ifl}{exit}ifelse}bind loop setflat}bd}if L2?{/@ssa{true setstrokeadjust}bd}{ -/@ssa{}bd}ifelse/d/setdash ld/j/setlinejoin ld/J/setlinecap ld/M/setmiterlimit -ld/w/setlinewidth ld/O{/$o xd}bd/R{/$O xd}bd/W/eoclip ld/c/curveto ld/C/c ld/l -/lineto ld/L/l ld/rl/rlineto ld/m/moveto ld/n/newpath ld/N/newpath ld/P{11 rp} -bd/u{}bd/U{}bd/A{pop}bd/q/@gs ld/Q/@gr ld/&{}bd/@j{@sv @np}bd/@J{@rs}bd/g{1 -exch sub/$k xd/$c 0 def/$m 0 def/$y 0 def/$t 1 def/$n _ def/$fil 0 def}bd/G{1 -sub neg/$K xd _ 1 0 0 0/$C xd/$M xd/$Y xd/$T xd/$N xd}bd/k{1 index type -/stringtype eq{/$t xd/$n xd}{/$t 0 def/$n _ def}ifelse/$k xd/$y xd/$m xd/$c xd -/$fil 0 def}bd/K{1 index type/stringtype eq{/$T xd/$N xd}{/$T 0 def/$N _ def} -ifelse/$K xd/$Y xd/$M xd/$C xd}bd/x/k ld/X/K ld/sf{1 index type/stringtype eq{ -/s1t xd/s1n xd}{/s1t 0 def/s1n _ def}ifelse/s1k xd/s1y xd/s1m xd/s1c xd}bd/i{ -dup 0 ne{setflat}{pop}ifelse}bd/v{4 -2 roll 2 copy 6 -2 roll c}bd/V/v ld/y{2 -copy c}bd/Y/y ld/@w{matrix rotate/$ptm xd matrix scale $ptm dup concatmatrix -/$ptm xd 1 eq{$ptm exch dup concatmatrix/$ptm xd}if 1 w}bd/@g{1 eq dup/$sdf xd -{/$scp xd/$sca xd/$scf xd}if}bd/@G{1 eq dup/$SDF xd{/$SCP xd/$SCA xd/$SCF xd} -if}bd/@D{2 index 0 eq{$dsf 3 1 roll 4 -1 roll pop}if 3 copy exch $Scra add exch -load SetScr/$dsp xd/$dsa xd/$dsf xd}bd/$ngx{$SDF{$SCF SepMode_5 0 eq{$SCA} -{$dsa}ifelse $SCP @ss}if}bd/@MN{2 copy le{pop}{exch pop}ifelse}bd/@MX{2 copy ge -{pop}{exch pop}ifelse}bd/InRange{3 -1 roll @MN @MX}bd/@sqr{dup 0 rl dup 0 exch -rl neg 0 rl @cp}bd/currentscale{1 0 dtransform matrix defaultmatrix idtransform -dup mul exch dup mul add sqrt 0 1 dtransform matrix defaultmatrix idtransform -dup mul exch dup mul add sqrt}bd/@unscale{}bd/wDstChck{2 1 roll dup 3 -1 roll -eq{1 add}if}bd/@dot{dup mul exch dup mul add 1 exch sub}bd/@lin{exch pop abs 1 -exch sub}bd/cmyk2rgb{3{dup 5 -1 roll add 1 exch sub dup 0 lt{pop 0}if exch} -repeat pop}bd/rgb2cmyk{3{1 exch sub 3 1 roll}repeat 3 copy @MN @MN 3{dup 5 -1 -roll sub neg exch}repeat}bd/rgb2g{2 index .299 mul 2 index .587 mul add 1 index -.114 mul add 4 1 roll pop pop pop}bd/WaldoColor_5 where{pop}{/SetRgb -/setrgbcolor ld/GetRgb/currentrgbcolor ld/SetGry/setgray ld/GetGry/currentgray -ld/SetRgb2 systemdict/setrgbcolor get def/GetRgb2 systemdict/currentrgbcolor -get def/SetHsb systemdict/sethsbcolor get def/GetHsb systemdict -/currenthsbcolor get def/rgb2hsb{SetRgb2 GetHsb}bd/hsb2rgb{3 -1 roll dup floor -sub 3 1 roll SetHsb GetRgb2}bd/setcmykcolor where{pop/LumSepsDict where{pop -/SetCmyk_5{LumSepsDict/setcmykcolor get exec}def}{/AldusSepsDict where{pop -/SetCmyk_5{AldusSepsDict/setcmykcolor get exec}def}{/SetCmyk_5/setcmykcolor ld -}ifelse}ifelse}{/SetCmyk_5{cmyk2rgb SetRgb}bd}ifelse/currentcmykcolor where{ -pop/GetCmyk/currentcmykcolor ld}{/GetCmyk{GetRgb rgb2cmyk}bd}ifelse -/setoverprint where{pop}{/setoverprint{/$op xd}bd}ifelse/currentoverprint where -{pop}{/currentoverprint{$op}bd}ifelse/@tc_5{5 -1 roll dup 1 ge{pop}{4{dup 6 -1 -roll mul exch}repeat pop}ifelse}bd/@trp{exch pop 5 1 roll @tc_5}bd -/setprocesscolor_5{SepMode_5 0 eq{SetCmyk_5}{0 4 $ink_5 sub index exch pop 5 1 -roll pop pop pop pop SepsColor true eq{$ink_5 3 gt{1 sub neg SetGry}{0 0 0 4 -$ink_5 roll SetCmyk_5}ifelse}{1 sub neg SetGry}ifelse}ifelse}bd -/findcmykcustomcolor where{pop}{/findcmykcustomcolor{5 array astore}bd}ifelse -/Corelsetcustomcolor_exists false def/setcustomcolor where{pop -/Corelsetcustomcolor_exists true def}if CorelIsSeps true eq CorelIsInRIPSeps -false eq and{/Corelsetcustomcolor_exists false def}if -Corelsetcustomcolor_exists false eq{/setcustomcolor{exch aload pop SepMode_5 0 -eq{pop @tc_5 setprocesscolor_5}{CurrentInkName_5 eq{4 index}{0}ifelse 6 1 roll -5 rp 1 sub neg SetGry}ifelse}bd}if/@scc_5{dup type/booleantype eq{dup -currentoverprint ne{setoverprint}{pop}ifelse}{1 eq setoverprint}ifelse dup _ eq -{pop setprocesscolor_5 pop}{findcmykcustomcolor exch setcustomcolor}ifelse -SepMode_5 0 eq{true}{GetGry 1 eq currentoverprint and not}ifelse}bd/colorimage -where{pop/ColorImage{colorimage}def}{/ColorImage{/ncolors xd/$multi xd $multi -true eq{ncolors 3 eq{/daqB xd/daqG xd/daqR xd pop pop exch pop abs{daqR pop -daqG pop daqB pop}repeat}{/daqK xd/daqY xd/daqM xd/daqC xd pop pop exch pop abs -{daqC pop daqM pop daqY pop daqK pop}repeat}ifelse}{/dataaq xd{dataaq ncolors -dup 3 eq{/$dat xd 0 1 $dat length 3 div 1 sub{dup 3 mul $dat 1 index get 255 -div $dat 2 index 1 add get 255 div $dat 3 index 2 add get 255 div rgb2g 255 mul -cvi exch pop $dat 3 1 roll put}for $dat 0 $dat length 3 idiv getinterval pop}{ -4 eq{/$dat xd 0 1 $dat length 4 div 1 sub{dup 4 mul $dat 1 index get 255 div -$dat 2 index 1 add get 255 div $dat 3 index 2 add get 255 div $dat 4 index 3 -add get 255 div cmyk2rgb rgb2g 255 mul cvi exch pop $dat 3 1 roll put}for $dat -0 $dat length ncolors idiv getinterval}if}ifelse}image}ifelse}bd}ifelse -/setcmykcolor{1 5 1 roll _ currentoverprint @scc_5/$ffpnt xd}bd -/currentcmykcolor{GetCmyk}bd/setrgbcolor{rgb2cmyk setcmykcolor}bd -/currentrgbcolor{currentcmykcolor cmyk2rgb}bd/sethsbcolor{hsb2rgb setrgbcolor} -bd/currenthsbcolor{currentrgbcolor rgb2hsb}bd/setgray{dup dup setrgbcolor}bd -/currentgray{currentrgbcolor rgb2g}bd/InsideDCS false def/IMAGE/image ld/image -{InsideDCS{IMAGE}{/EPSDict where{pop SepMode_5 0 eq{IMAGE}{dup type/dicttype eq -{dup/ImageType get 1 ne{IMAGE}{dup dup/BitsPerComponent get 8 eq exch -/BitsPerComponent get 1 eq or currentcolorspace 0 get/DeviceGray eq and{ -CurrentInkName_5(Black)eq{IMAGE}{dup/DataSource get/TCC xd/Height get abs{TCC -pop}repeat}ifelse}{IMAGE}ifelse}ifelse}{2 index 1 ne{CurrentInkName_5(Black)eq -{IMAGE}{/TCC xd pop pop exch pop abs{TCC pop}repeat}ifelse}{IMAGE}ifelse} -ifelse}ifelse}{IMAGE}ifelse}ifelse}bd}ifelse/WaldoColor_5 true def/$fm 0 def -/wfill{1 $fm eq{fill}{eofill}ifelse}bd/@Pf{@sv SepMode_5 0 eq $Psc 0 ne or -$ink_5 3 eq or{0 J 0 j[]0 d $t $c $m $y $k $n $o @scc_5 pop $ctm setmatrix 72 -1000 div dup matrix scale dup concat dup Bburx exch Bbury exch itransform -ceiling cvi/Bbury xd ceiling cvi/Bburx xd Bbllx exch Bblly exch itransform -floor cvi/Bblly xd floor cvi/Bbllx xd $Prm aload pop $Psn load exec}{1 SetGry -wfill}ifelse @rs @np}bd/F{matrix currentmatrix $sdf{$scf $sca $scp @ss}if $fil -1 eq{CorelPtrnDoFill}{$fil 2 eq{@ff}{$fil 3 eq{@Pf}{$fil 4 eq -{CorelShfillDoFill}{$t $c $m $y $k $n $o @scc_5{wfill}{@np}ifelse}ifelse} -ifelse}ifelse}ifelse $sdf{$dsf $dsa $dsp @ss}if setmatrix}bd/f{@cp F}bd/S{ -matrix currentmatrix $ctm setmatrix $SDF{$SCF $SCA $SCP @ss}if $T $C $M $Y $K -$N $O @scc_5{matrix currentmatrix $ptm concat stroke setmatrix}{@np}ifelse $SDF -{$dsf $dsa $dsp @ss}if setmatrix}bd/s{@cp S}bd/B{@gs F @gr S}bd/b{@cp B}bd/_E{ -5 array astore exch cvlit xd}bd/@cc{currentfile $dat readhexstring pop}bd/@sm{ -/$ctm $ctm currentmatrix def}bd/@E{/Bbury xd/Bburx xd/Bblly xd/Bbllx xd}bd/@c{ -@cp}bd/@P{/$fil 3 def/$Psn xd/$Psc xd array astore/$Prm xd}bd/tcc{@cc}def/@B{ -@gs S @gr F}bd/@b{@cp @B}bd/@sep{CurrentInkName_5(Composite)eq{/$ink_5 -1 def} -{CurrentInkName_5(Cyan)eq{/$ink_5 0 def}{CurrentInkName_5(Magenta)eq{/$ink_5 1 -def}{CurrentInkName_5(Yellow)eq{/$ink_5 2 def}{CurrentInkName_5(Black)eq -{/$ink_5 3 def}{/$ink_5 4 def}ifelse}ifelse}ifelse}ifelse}ifelse}bd/@whi{@gs --72000 dup m -72000 72000 l 72000 dup l 72000 -72000 l @cp 1 SetGry fill @gr} -bd/@neg{[{1 exch sub}/exec cvx currenttransfer/exec cvx]cvx settransfer @whi} -bd/deflevel 0 def/@sax{/deflevel deflevel 1 add def}bd/@eax{/deflevel deflevel -dup 0 gt{1 sub}if def deflevel 0 gt{/eax load}{eax}ifelse}bd/eax{{exec}forall} -bd/@rax{deflevel 0 eq{@rs @sv}if}bd systemdict/pdfmark known not{/pdfmark -/cleartomark ld}if/wclip{1 $fm eq{clip}{eoclip}ifelse}bd -% Copyright (c)1992-2002 Corel Corporation -% All rights reserved. v11.0 r0.0 -/@ii{concat 3 index 3 index m 3 index 1 index l 2 copy l 1 index 3 index l 3 -index 3 index l clip pop pop pop pop}bd/@i{@sm @gs @ii 6 index 1 ne{/$frg true -def pop pop}{1 eq{s1t s1c s1m s1y s1k s1n $O @scc_5/$frg xd}{/$frg false def} -ifelse 1 eq{@gs $ctm setmatrix F @gr}if}ifelse @np/$ury xd/$urx xd/$lly xd -/$llx xd/$bts xd/$hei xd/$wid xd/$dat $wid $bts mul 8 div ceiling cvi string -def $bkg $frg or{$SDF{$SCF $SCA $SCP @ss}if $llx $lly Tl $urx $llx sub $ury -$lly sub scale $bkg{$t $c $m $y $k $n $o @scc_5 pop}if $wid $hei abs $bts 1 eq -{$bkg}{$bts}ifelse[$wid 0 0 $hei neg 0 $hei 0 gt{$hei}{0}ifelse]/tcc load $bts -1 eq{imagemask}{image}ifelse $SDF{$dsf $dsa $dsp @ss}if}{$hei abs{tcc pop} -repeat}ifelse @gr $ctm setmatrix}bd/@I{@sm @gs @ii @np/$ury xd/$urx xd/$lly xd -/$llx xd/$ncl xd/$bts xd/$hei xd/$wid xd $ngx $llx $lly Tl $urx $llx sub $ury -$lly sub scale $wid $hei abs $bts[$wid 0 0 $hei neg 0 $hei 0 gt{$hei}{0}ifelse -]$msimage false eq $ncl 1 eq or{/$dat $wid $bts mul $ncl mul 8 div ceiling cvi -string def/@cc load false $ncl ColorImage}{$wid $bts mul 8 div ceiling cvi $ncl -3 eq{dup dup/$dat1 exch string def/$dat2 exch string def/$dat3 exch string def -/@cc1 load/@cc2 load/@cc3 load}{dup dup dup/$dat1 exch string def/$dat2 exch -string def/$dat3 exch string def/$dat4 exch string def/@cc1 load/@cc2 load -/@cc3 load/@cc4 load}ifelse true $ncl ColorImage}ifelse $SDF{$dsf $dsa $dsp -@ss}if @gr $ctm setmatrix}bd/@cc1{currentfile $dat1 readhexstring pop}bd/@cc2{ -currentfile $dat2 readhexstring pop}bd/@cc3{currentfile $dat3 readhexstring pop -}bd/@cc4{currentfile $dat4 readhexstring pop}bd/$msimage false def/COMP 0 def -/MaskedImage false def L2?{/@I_2{@sm @gs @ii @np/$ury xd/$urx xd/$lly xd/$llx -xd/$ncl xd/$bts xd/$hei xd/$wid xd/$dat $wid $bts mul $ncl mul 8 div ceiling -cvi string def $ngx $ncl 1 eq{/DeviceGray}{$ncl 3 eq{/DeviceRGB}{/DeviceCMYK} -ifelse}ifelse setcolorspace $llx $lly Tl $urx $llx sub $ury $lly sub scale 8 -dict begin/ImageType 1 def/Width $wid def/Height $hei abs def/BitsPerComponent -$bts def/Decode $ncl 1 eq{[0 1]}{$ncl 3 eq{[0 1 0 1 0 1]}{[0 1 0 1 0 1 0 1]} -ifelse}ifelse def/ImageMatrix[$wid 0 0 $hei neg 0 $hei 0 gt{$hei}{0}ifelse]def -/DataSource currentfile/ASCII85Decode filter COMP 1 eq{/DCTDecode filter}{COMP -2 eq{/RunLengthDecode filter}if}ifelse def currentdict end image $SDF{$dsf $dsa -$dsp @ss}if @gr $ctm setmatrix}bd}{/@I_2{}bd}ifelse/@I_3{@sm @gs @ii @np/$ury -xd/$urx xd/$lly xd/$llx xd/$ncl xd/$bts xd/$hei xd/$wid xd/$dat $wid $bts mul -$ncl mul 8 div ceiling cvi string def $ngx $ncl 1 eq{/DeviceGray}{$ncl 3 eq -{/DeviceRGB}{/DeviceCMYK}ifelse}ifelse setcolorspace $llx $lly Tl $urx $llx sub -$ury $lly sub scale/ImageDataDict 8 dict def ImageDataDict begin/ImageType 1 -def/Width $wid def/Height $hei abs def/BitsPerComponent $bts def/Decode $ncl 1 -eq{[0 1]}{$ncl 3 eq{[0 1 0 1 0 1]}{[0 1 0 1 0 1 0 1]}ifelse}ifelse def -/ImageMatrix[$wid 0 0 $hei neg 0 $hei 0 gt{$hei}{0}ifelse]def/DataSource -currentfile/ASCII85Decode filter COMP 1 eq{/DCTDecode filter}{COMP 2 eq{ -/RunLengthDecode filter}if}ifelse def end/MaskedImageDict 7 dict def -MaskedImageDict begin/ImageType 3 def/InterleaveType 3 def/MaskDict -ImageMaskDict def/DataDict ImageDataDict def end MaskedImageDict image $SDF -{$dsf $dsa $dsp @ss}if @gr $ctm setmatrix}bd/@SetMask{/$mbts xd/$mhei xd/$mwid -xd/ImageMaskDict 8 dict def ImageMaskDict begin/ImageType 1 def/Width $mwid def -/Height $mhei abs def/BitsPerComponent $mbts def/DataSource maskstream def -/ImageMatrix[$mwid 0 0 $mhei neg 0 $mhei 0 gt{$mhei}{0}ifelse]def/Decode[1 0] -def end}bd/@daq{dup type/arraytype eq{{}forall}if}bd/@BMP{/@cc xd UseLevel 3 eq -MaskedImage true eq and{7 -2 roll pop pop @I_3}{12 index 1 gt UseLevel 2 eq -UseLevel 3 eq or and{7 -2 roll pop pop @I_2}{11 index 1 eq{12 -1 roll pop @i}{ -7 -2 roll pop pop @I}ifelse}ifelse}ifelse}bd -% Copyright (c)1992-2002 Corel Corporation -% All rights reserved. v11.0 r0.0 -/@p{/$fil 1 def 1 eq dup/$vectpat xd{/$pfrg true def}{@gs $t $c $m $y $k $n $o -@scc_5/$pfrg xd @gr}ifelse/$pm xd/$psy xd/$psx xd/$pyf xd/$pxf xd/$pn xd}bd -/CorelPtrnDoFill{@gs $ctm setmatrix $pm concat CorelPtrnSetBBox wclip @sv Bburx -Bbury $pm itransform/$tury xd/$turx xd Bbllx Bblly $pm itransform/$tlly xd -/$tllx xd newpath $tllx $tlly m $tllx $tury l $turx $tury l $turx $tlly l $tllx -$tlly m @cp pathbbox @rs/$tury xd/$turx xd/$tlly xd/$tllx xd/$wid $turx $tllx -sub def/$hei $tury $tlly sub def @gs $vectpat{1 0 0 0 0 _ $o @scc_5{wfill}if}{ -$t $c $m $y $k $n $o @scc_5{SepMode_5 0 eq $pfrg or{$tllx $tlly Tl $wid $hei -scale <00> 8 1 false[8 0 0 1 0 0]{}imagemask}{/$bkg true def}ifelse}if}ifelse -@gr $wid 0 gt $hei 0 gt and{$pn cvlit load aload pop/$pd xd 3 -1 roll sub -/$phei xd exch sub/$pwid xd $wid $pwid div ceiling 1 add/$tlx xd $hei $phei div -ceiling 1 add/$tly xd currentdict/CorelPtrnL2Pattern known $psy 0 eq and $psx 0 -eq and{CorelPtrnL2Pattern}{$psx 0 eq{CorelPtrnTileVeritcal}{CorelPtrnTileHoriz -}ifelse}ifelse}if @gr @np/$bkg false def}bd/CorelPtrnSetBBox{pathbbox/$ury xd -/$urx xd/$lly xd/$llx xd}bd/CorelPtrnSetFirstTile{$tllx $pxf add dup $tllx gt -{$pwid sub}if/$tx xd $tury $pyf sub dup $tury lt{$phei add}if/$ty xd}bd/p{/$pm -xd 7 rp/$pyf xd/$pxf xd/$pn xd/$fil 1 def}bd/CorelPtrnDraw{@ep}bd -/CorelPtrnPutTile{@sv/$in true def 2 copy dup $lly le{/$in false def}if $phei -sub $ury ge{/$in false def}if dup $urx ge{/$in false def}if $pwid add $llx le{ -/$in false def}if $in{@np 2 copy m $pwid 0 rl 0 $phei neg rl $pwid neg 0 rl 0 -$phei rl clip @np $pn cvlit load aload pop 7 -1 roll 5 index sub 7 -1 roll 3 -index sub Tl matrix currentmatrix/$ctm xd CorelPtrnDraw pop pop pop pop}{pop -pop}ifelse @rs}bd/CorelPtrnTileHoriz{CorelPtrnSetFirstTile 0 1 $tly 1 sub{dup -$psx mul $tx add{dup $llx gt{$pwid sub}{exit}ifelse}loop exch $phei mul $ty -exch sub 0 1 $tlx 1 sub{$pwid mul 3 copy 3 -1 roll add exch CorelPtrnPutTile -pop}for pop pop}for}bd/CorelPtrnTileVeritcal{CorelPtrnSetFirstTile 0 1 $tlx 1 -sub{dup $pwid mul $tx add exch $psy mul $ty exch sub{dup $ury lt{$phei add} -{exit}ifelse}loop 0 1 $tly 1 sub{$phei mul 3 copy sub CorelPtrnPutTile pop}for -pop pop}for}bd L2? UseLevel 2 ge and{/CorelPtrnL2Pattern{@sv[$pn cvlit load -aload pop pop]$pwid $phei $pn cvlit load aload pop pop pop pop pathbbox pop pop -2 index sub exch 3 index sub 4 -2 roll pop pop exch matrix identmatrix -translate/PatternMatrix xd/PatternYStep xd/PatternXStep xd/PatternBBox xd -currentdict/PatternMainDict xd <> -PatternMatrix makepattern setpattern fill @rs}def}if +%!PS-Adobe-3.0 EPSF-3.0 +%%For: +%%Title: +%%Creator: Scribus1.4.2 +%%Pages: 1 +%%BoundingBox: 0 0 282 282 +%%HiResBoundingBox: 0 0 282 282 +%%LanguageLevel: 3 +%%EndComments +%%BeginProlog +/Scribusdict 100 dict def +Scribusdict begin +/sp {showpage} bind def +/oldsetgray /setgray load def +/cmyk {setcmykcolor} def +/m {moveto} bind def +/l {lineto} bind def +/li {lineto} bind def +/cu {curveto} bind def +/cl {closepath} bind def +/gs {gsave} bind def +/gr {grestore} bind def +/tr {translate} bind def +/ro {rotate} bind def +/sh {show} bind def +/shg {setcmykcolor moveto glyphshow} def +/shgsp {moveto glyphshow} def +/sc {scale} bind def +/se {selectfont} bind def +/sf {setfont} bind def +/sw {setlinewidth} bind def +/f {findfont} bind def +/fi {fill} bind def +/st {stroke} bind def +/shgf {gs dup scale begin cvx exec fill end gr} bind def +/shgs {gs dup 1 exch div currentlinewidth mul sw dup scale + begin cvx exec st end gr} bind def +/bEPS { + /b4_Inc_state save def + /dict_count countdictstack def + /op_count count 1 sub def + userdict begin + /showpage { } def + 0 setgray 0 setlinecap + 1 setlinewidth 0 setlinejoin + 10 setmiterlimit [ ] 0 setdash newpath + /languagelevel where + {pop languagelevel + 1 ne + {false setstrokeadjust false setoverprint + } if } if } bind def +/eEPS { count op_count sub {pop} repeat + countdictstack dict_count sub {end} repeat + b4_Inc_state restore } bind def + end +%%EndProlog +%%BeginSetup +%%EndSetup +%%Page: 1 1 +%%PageOrientation: Portrait +Scribusdict begin +save +/DeviceCMYK setcolorspace +0 0 tr +0 0 m +282 0 li +282 282 li +0 282 li cl clip newpath +gs +0.708406 281.428 m +281.58 281.428 li +281.58 0.556 li +0.708406 0.556 li +0.708406 281.428 li +cl +eoclip newpath +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +0.816406 281.32 tr +280.656 -138.888 m +138.888 0 li +0 -141.696 li +138.888 -280.656 li +280.656 -138.888 li +cl +0 0 0 1 cmyk eofill +280.656 -138.888 m +138.888 0 li +0 -141.696 li +138.888 -280.656 li +280.656 -138.888 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +139.704 142.432 tr +127.584 0 m +136.08 0 li +0 -136.08 li +0 -127.584 li +127.584 0 li +cl +0.6 0 0.4 0.580392 cmyk eofill +127.584 0 m +136.08 0 li +0 -136.08 li +0 -127.584 li +127.584 0 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +6.50391 139.624 tr +0 0 m +8.49609 0 li +133.2 -124.776 li +133.2 -133.272 li +0 0 li +cl +0.6 0 0.4 0.509804 cmyk eofill +0 0 m +8.49609 0 li +133.2 -124.776 li +133.2 -133.272 li +0 0 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +6.50391 275.632 tr +133.2 -8.42384 m +133.2 0 li +0 -136.008 li +8.49609 -136.008 li +133.2 -8.42384 li +cl +0.6 0 0.4 0 cmyk eofill +133.2 -8.42384 m +133.2 0 li +0 -136.008 li +8.49609 -136.008 li +133.2 -8.42384 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +139.704 275.632 tr +0 0 m +0 -8.42384 li +127.584 -133.2 li +136.08 -133.2 li +0 0 li +cl +0.729412 0 0.988235 0 cmyk eofill +0 0 m +0 -8.42384 li +127.584 -133.2 li +136.08 -133.2 li +0 0 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +15 267.208 tr +124.704 -252.36 m +252.288 -124.776 li +124.704 0 li +0 -127.584 li +124.704 -252.36 li +cl +0.6 0 0.4 0.4 cmyk eofill +124.704 -252.36 m +252.288 -124.776 li +124.704 0 li +0 -127.584 li +124.704 -252.36 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +18.8164 270.016 tr +147.384 -31.1758 m +155.88 -39.7431 li +97.2716 -99.2156 li +97.2716 -39.7431 li +102.96 -39.7431 li +111.456 -31.1758 li +111.456 -8.5674 li +102.96 0 li +8.4951 0 li +0 -8.5674 li +0 -31.1758 li +8.4951 -39.7431 li +15.1191 -39.7431 li +15.1191 -232.488 li +25.4873 -240.984 li +54.792 -240.984 li +257.904 -31.1758 li +257.904 -8.5674 li +249.408 0 li +156.816 0 li +147.384 -8.5674 li +147.384 -31.1758 li +cl +0 0 0 1 cmyk eofill +147.384 -31.1758 m +155.88 -39.7431 li +97.2716 -99.2156 li +97.2716 -39.7431 li +102.96 -39.7431 li +111.456 -31.1758 li +111.456 -8.5674 li +102.96 0 li +8.4951 0 li +0 -8.5674 li +0 -31.1758 li +8.4951 -39.7431 li +15.1191 -39.7431 li +15.1191 -232.488 li +25.4873 -240.984 li +54.792 -240.984 li +257.904 -31.1758 li +257.904 -8.5674 li +249.408 0 li +156.816 0 li +147.384 -8.5674 li +147.384 -31.1758 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +24.4316 264.4 tr +5.6885 -28.4404 m +0 -22.752 li +0 -5.7608 li +5.6885 -0.0723 li +94.5364 0 li +100.152 -5.7608 li +94.5364 -8.4961 li +91.6564 -5.7608 li +5.6885 -19.8721 li +5.6885 -28.4404 li +cl +0 0 0 0 cmyk eofill +5.6885 -28.4404 m +0 -22.752 li +0 -5.7608 li +5.6885 -0.0723 li +94.5364 0 li +100.152 -5.7608 li +94.5364 -8.4961 li +91.6564 -5.7608 li +5.6885 -19.8721 li +5.6885 -28.4404 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +40.4883 241.648 tr +6.624 -206.928 m +0 -201.24 li +0 -5.6162 li +6.624 0 li +6.624 -206.928 li +cl +0 0 0 0 cmyk eofill +6.624 -206.928 m +0 -201.24 li +0 -5.6162 li +6.624 0 li +6.624 -206.928 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +100.032 241.648 tr +88.848 -5.6884 m +94.536 0 li +94.536 -11.3759 li +0 -107.712 li +10.44 -85.0324 li +88.848 -5.6884 li +cl +0 0 0 0 cmyk eofill +88.848 -5.6884 m +94.536 0 li +94.536 -11.3759 li +0 -107.712 li +10.44 -85.0324 li +88.848 -5.6884 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +30.1201 247.336 tr +18.9356 -2.8798 m +16.9922 -5.6875 li +10.3682 -11.3759 li +0 -11.3759 li +0 0 li +18.9356 -2.8798 li +cl +0 0 0 0.501961 cmyk eofill +18.9356 -2.8798 m +16.9922 -5.6875 li +10.3682 -11.3759 li +0 -11.3759 li +0 0 li +18.9356 -2.8798 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +100.032 258.64 tr +10.44 -22.6796 m +10.44 -102.024 li +0 -124.632 li +0 -16.9199 li +16.056 -16.9199 li +18.936 -14.1113 li +16.056 0 li +24.552 0 li +24.552 -16.9912 li +18.936 -22.6796 li +10.44 -22.6796 li +cl +0 0 0 0.501961 cmyk eofill +10.44 -22.6796 m +10.44 -102.024 li +0 -124.632 li +0 -16.9199 li +16.056 -16.9199 li +18.936 -14.1113 li +16.056 0 li +24.552 0 li +24.552 -16.9912 li +18.936 -22.6796 li +10.44 -22.6796 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +171.888 264.328 tr +5.616 -28.3681 m +0 -22.6797 li +0 -5.6885 li +6.552 0 li +92.592 0 li +99.216 -5.6885 li +89.712 -14.1845 li +5.616 -19.7998 li +5.616 -28.3681 li +cl +0 0 0 0 cmyk eofill +5.616 -28.3681 m +0 -22.6797 li +0 -5.6885 li +6.552 0 li +92.592 0 li +99.216 -5.6885 li +89.712 -14.1845 li +5.616 -19.7998 li +5.616 -28.3681 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +47.1123 258.64 tr +223.992 -16.9912 m +24.5518 -223.92 li +0 -223.92 li +0 -215.424 li +18 -215.424 li +217.368 -11.3037 li +214.488 0 li +223.992 0 li +223.992 -16.9912 li +cl +0 0 0 0.501961 cmyk eofill +223.992 -16.9912 m +24.5518 -223.92 li +0 -223.92 li +0 -215.424 li +18 -215.424 li +217.368 -11.3037 li +214.488 0 li +223.992 0 li +223.992 -16.9912 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +177.504 247.336 tr +18.936 -2.8798 m +16.992 -5.6875 li +11.376 -11.3759 li +0 -11.3759 li +0 0 li +18.936 -2.8798 li +cl +0 0 0 0.501961 cmyk eofill +18.936 -2.8798 m +16.992 -5.6875 li +11.376 -11.3759 li +0 -11.3759 li +0 0 li +18.936 -2.8798 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +30.1201 258.712 tr +69.9119 -124.704 m +69.9119 -16.9922 li +85.9679 -16.9922 li +88.8479 -14.1836 li +88.8479 -2.8076 li +85.9679 0 li +2.8076 0 li +0 -2.8076 li +0 -14.1836 li +2.8076 -16.9922 li +16.9922 -16.9922 li +16.9922 -215.496 li +20.6641 -218.304 li +36.8643 -218.304 li +235.296 -11.376 li +235.296 -3.2402 li +232.416 0 li +150.264 0 li +147.384 -2.8076 li +147.384 -14.2558 li +150.264 -17.0635 li +164.448 -17.0635 li +164.448 -28.4394 li +69.9119 -124.704 li +cl +0 0 0 0.2 cmyk eofill +69.9119 -124.704 m +69.9119 -16.9922 li +85.9679 -16.9922 li +88.8479 -14.1836 li +88.8479 -2.8076 li +85.9679 0 li +2.8076 0 li +0 -2.8076 li +0 -14.1836 li +2.8076 -16.9922 li +16.9922 -16.9922 li +16.9922 -215.496 li +20.6641 -218.304 li +36.8643 -218.304 li +235.296 -11.376 li +235.296 -3.2402 li +232.416 0 li +150.264 0 li +147.384 -2.8076 li +147.384 -14.2558 li +150.264 -17.0635 li +164.448 -17.0635 li +164.448 -28.4394 li +69.9119 -124.704 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +145.896 139.552 tr +5.688 -5.688 m +12.312 0 li +29.304 0 li +34.056 -5.688 li +28.368 -22.68 li +21.816 -28.368 li +4.824 -28.368 li +0 -22.68 li +5.688 -5.688 li +cl +0 0 0 1 cmyk eofill +5.688 -5.688 m +12.312 0 li +29.304 0 li +34.056 -5.688 li +28.368 -22.68 li +21.816 -28.368 li +4.824 -28.368 li +0 -22.68 li +5.688 -5.688 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +157.272 108.376 tr +0 -68.04 m +17.064 -17.064 li +11.376 -17.064 li +17.064 0 li +42.48 0 li +48.168 -5.688 li +51.984 -5.688 li +57.6 0 li +76.536 0 li +82.224 -5.688 li +85.968 -5.688 li +91.656 0 li +112.392 0 li +119.952 -11.376 li +107.568 -51.696 li +113.184 -51.696 li +107.712 -68.04 li +73.656 -68.04 li +86.976 -28.368 li +78.48 -28.368 li +70.632 -51.552 li +76.248 -51.552 li +70.92 -68.04 li +36.864 -68.04 li +50.112 -28.368 li +41.616 -28.368 li +33.696 -51.696 li +39.384 -51.696 li +34.056 -68.04 li +0 -68.04 li +cl +0 0 0 1 cmyk eofill +0 -68.04 m +17.064 -17.064 li +11.376 -17.064 li +17.064 0 li +42.48 0 li +48.168 -5.688 li +51.984 -5.688 li +57.6 0 li +76.536 0 li +82.224 -5.688 li +85.968 -5.688 li +91.656 0 li +112.392 0 li +119.952 -11.376 li +107.568 -51.696 li +113.184 -51.696 li +107.712 -68.04 li +73.656 -68.04 li +86.976 -28.368 li +78.48 -28.368 li +70.632 -51.552 li +76.248 -51.552 li +70.92 -68.04 li +36.864 -68.04 li +50.112 -28.368 li +41.616 -28.368 li +33.696 -51.696 li +39.384 -51.696 li +34.056 -68.04 li +0 -68.04 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +164.832 102.688 tr +102.24 0 m +106.632 -6.264 li +92.664 -51.048 li +98.28 -51.048 li +96.408 -56.664 li +73.728 -56.664 li +86.976 -16.992 li +67.104 -16.992 li +55.8 -51.048 li +61.416 -51.048 li +59.544 -56.664 li +36.864 -56.664 li +50.112 -16.992 li +30.24 -16.992 li +18.936 -51.048 li +24.624 -51.048 li +22.68 -56.664 li +0 -56.664 li +17.064 -5.688 li +11.376 -5.688 li +13.248 0 li +34.056 0 li +39.744 -5.688 li +45.36 -5.688 li +51.048 0 li +68.04 0 li +73.728 -5.688 li +79.416 -5.688 li +85.104 0 li +102.24 0 li +cl +0 0 0 0.2 cmyk eofill +102.24 0 m +106.632 -6.264 li +92.664 -51.048 li +98.28 -51.048 li +96.408 -56.664 li +73.728 -56.664 li +86.976 -16.992 li +67.104 -16.992 li +55.8 -51.048 li +61.416 -51.048 li +59.544 -56.664 li +36.864 -56.664 li +50.112 -16.992 li +30.24 -16.992 li +18.936 -51.048 li +24.624 -51.048 li +22.68 -56.664 li +0 -56.664 li +17.064 -5.688 li +11.376 -5.688 li +13.248 0 li +34.056 0 li +39.744 -5.688 li +45.36 -5.688 li +51.048 0 li +68.04 0 li +73.728 -5.688 li +79.416 -5.688 li +85.104 0 li +102.24 0 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +120.408 108.376 tr +51.048 0 m +33.696 -51.624 li +39.6 -51.624 li +33.984 -68.04 li +0 -68.04 li +16.992 -17.064 li +11.304 -17.064 li +51.048 0 li +cl +11.304 -17.064 m +16.992 0 li +51.048 0 li +11.304 -17.064 li +cl +0 0 0 1 cmyk eofill +51.048 0 m +33.696 -51.624 li +39.6 -51.624 li +33.984 -68.04 li +0 -68.04 li +16.992 -17.064 li +11.304 -17.064 li +51.048 0 li +cl +11.304 -17.064 m +16.992 0 li +51.048 0 li +11.304 -17.064 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +127.968 102.688 tr +22.68 -56.664 m +24.552 -51.048 li +18.864 -51.048 li +35.928 0 li +12.312 0 li +10.368 -5.688 li +16.992 -5.688 li +0 -56.664 li +22.68 -56.664 li +cl +0 0 0 0.2 cmyk eofill +22.68 -56.664 m +24.552 -51.048 li +18.864 -51.048 li +35.928 0 li +12.312 0 li +10.368 -5.688 li +16.992 -5.688 li +0 -56.664 li +22.68 -56.664 li +cl +0 0 0 1 cmyk st +gr +gs +0.216 sw +0 setlinecap +0 setlinejoin +[] 0 setdash +152.52 133.864 tr +16.992 -14.184 m +20.808 -2.808 li +18.936 0 li +7.56 0 li +3.816 -2.808 li +0 -14.184 li +1.944 -16.992 li +13.32 -16.992 li +16.992 -14.184 li +cl +0 0 0 0.2 cmyk eofill +16.992 -14.184 m +20.808 -2.808 li +18.936 0 li +7.56 0 li +3.816 -2.808 li +0 -14.184 li +1.944 -16.992 li +13.32 -16.992 li +16.992 -14.184 li +cl +0 0 0 1 cmyk st +gr +gr +%%PageTrailer +restore +gs +gr +sp end -%%EndResource -%%EndProlog -%%BeginSetup -wCorel11Dict begin -@BeginSysCorelDict -2.6131 setmiterlimit -1.00 setflat -/$fst 128 def -%%EndSetup - -%%Page: 1 1 -%LogicalPage: 1 -%%BeginPageSetup -@sv -@sm -@sv -%%EndPageSetup -@rax %Note: Object -147.81600 74.66400 428.47200 355.32000 @E - 0 O 0 @g -0.00 0.00 0.00 1.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -428.47200 216.43200 m -286.70400 355.32000 L -147.81600 213.62400 L -286.70400 74.66400 L -428.47200 216.43200 L -@c -B - -@rax %Note: Object -286.70400 80.35200 422.78400 216.43200 @E - 0 O 0 @g -0.60 0.00 0.40 0.58 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -414.28800 216.43200 m -422.78400 216.43200 L -286.70400 80.35200 L -286.70400 88.84800 L -414.28800 216.43200 L -@c -B - -@rax %Note: Object -153.50400 80.35200 286.70400 213.62400 @E - 0 O 0 @g -0.60 0.00 0.40 0.51 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -153.50400 213.62400 m -162.00000 213.62400 L -286.70400 88.84800 L -286.70400 80.35200 L -153.50400 213.62400 L -@c -B - -@rax %Note: Object -153.50400 213.62400 286.70400 349.63200 @E - 0 O 0 @g -0.60 0.00 0.40 0.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -286.70400 341.20800 m -286.70400 349.63200 L -153.50400 213.62400 L -162.00000 213.62400 L -286.70400 341.20800 L -@c -B - -@rax %Note: Object -286.70400 216.43200 422.78400 349.63200 @E - 0 O 0 @g -0.73 0.00 0.99 0.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -286.70400 349.63200 m -286.70400 341.20800 L -414.28800 216.43200 L -422.78400 216.43200 L -286.70400 349.63200 L -@c -B - -@rax %Note: Object -162.00000 88.84800 414.28800 341.20800 @E - 0 O 0 @g -0.60 0.00 0.40 0.40 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -286.70400 88.84800 m -414.28800 216.43200 L -286.70400 341.20800 L -162.00000 213.62400 L -286.70400 88.84800 L -@c -B - -@rax %Note: Object -165.81600 103.03200 423.72000 344.01600 @E - 0 O 0 @g -0.00 0.00 0.00 1.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -313.20000 312.84000 m -321.69600 304.27200 L -321.69600 304.27200 L -263.08800 244.80000 L -263.08800 304.27200 L -268.77600 304.27200 L -277.27200 312.84000 L -277.27200 335.44800 L -268.77600 344.01600 L -174.31200 344.01600 L -165.81600 335.44800 L -165.81600 312.84000 L -174.31200 304.27200 L -180.93600 304.27200 L -180.93600 111.52800 L -191.30400 103.03200 L -220.60800 103.03200 L -423.72000 312.84000 L -423.72000 335.44800 L -415.22400 344.01600 L -322.63200 344.01600 L -313.20000 335.44800 L -313.20000 312.84000 L -@c -B - -@rax %Note: Object -171.43200 309.96000 271.58400 338.40000 @E - 0 O 0 @g -0.00 0.00 0.00 0.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -177.12000 309.96000 m -171.43200 315.64800 L -171.43200 332.64000 L -177.12000 338.32800 L -265.96800 338.40000 L -271.58400 332.64000 L -265.96800 329.90400 L -263.08800 332.64000 L -177.12000 318.52800 L -177.12000 309.96000 L -@c -B - -@rax %Note: Object -187.48800 108.72000 194.11200 315.64800 @E - 0 O 0 @g -0.00 0.00 0.00 0.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -194.11200 108.72000 m -187.48800 114.40800 L -187.48800 310.03200 L -194.11200 315.64800 L -194.11200 108.72000 L -@c -B - -@rax %Note: Object -247.03200 207.93600 341.56800 315.64800 @E - 0 O 0 @g -0.00 0.00 0.00 0.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -335.88000 309.96000 m -341.56800 315.64800 L -341.56800 304.27200 L -247.03200 207.93600 L -257.47200 230.61600 L -335.88000 309.96000 L -@c -B - -@rax %Note: Object -177.12000 309.96000 196.05600 321.33600 @E - 0 O 0 @g -0.00 0.00 0.00 0.50 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -196.05600 318.45600 m -194.11200 315.64800 L -187.48800 309.96000 L -177.12000 309.96000 L -177.12000 321.33600 L -196.05600 318.45600 L -@c -B - -@rax %Note: Object -247.03200 208.00800 271.58400 332.64000 @E - 0 O 0 @g -0.00 0.00 0.00 0.50 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -257.47200 309.96000 m -257.47200 230.61600 L -247.03200 208.00800 L -247.03200 315.72000 L -263.08800 315.72000 L -265.96800 318.52800 L -263.08800 332.64000 L -271.58400 332.64000 L -271.58400 315.64800 L -265.96800 309.96000 L -257.47200 309.96000 L -@c -B - -@rax %Note: Object -318.88800 309.96000 418.10400 338.32800 @E - 0 O 0 @g -0.00 0.00 0.00 0.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -324.50400 309.96000 m -318.88800 315.64800 L -318.88800 332.64000 L -325.44000 338.32800 L -411.48000 338.32800 L -418.10400 332.64000 L -408.60000 324.14400 L -324.50400 318.52800 L -324.50400 309.96000 L -@c -B - -@rax %Note: Object -194.11200 108.72000 418.10400 332.64000 @E - 0 O 0 @g -0.00 0.00 0.00 0.50 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -418.10400 315.64800 m -218.66400 108.72000 L -194.11200 108.72000 L -194.11200 117.21600 L -212.11200 117.21600 L -411.48000 321.33600 L -408.60000 332.64000 L -418.10400 332.64000 L -418.10400 315.64800 L -@c -B - -@rax %Note: Object -324.50400 309.96000 343.44000 321.33600 @E - 0 O 0 @g -0.00 0.00 0.00 0.50 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -343.44000 318.45600 m -341.49600 315.64800 L -335.88000 309.96000 L -324.50400 309.96000 L -324.50400 321.33600 L -343.44000 318.45600 L -@c -B - -@rax %Note: Object -177.12000 114.40800 412.41600 332.71200 @E - 0 O 0 @g -0.00 0.00 0.00 0.20 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -247.03200 208.00800 m -247.03200 315.72000 L -263.08800 315.72000 L -265.96800 318.52800 L -265.96800 329.90400 L -263.08800 332.71200 L -179.92800 332.71200 L -177.12000 329.90400 L -177.12000 318.52800 L -179.92800 315.72000 L -194.11200 315.72000 L -194.11200 117.21600 L -197.78400 114.40800 L -213.98400 114.40800 L -412.41600 321.33600 L -412.41600 329.47200 L -409.53600 332.71200 L -327.38400 332.71200 L -324.50400 329.90400 L -324.50400 318.45600 L -327.38400 315.64800 L -341.56800 315.64800 L -341.56800 304.27200 L -247.03200 208.00800 L -@c -B - -@rax %Note: Object -292.89600 185.18400 326.95200 213.55200 @E - 0 O 0 @g -0.00 0.00 0.00 1.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -298.58400 207.86400 m -305.20800 213.55200 L -322.20000 213.55200 L -326.95200 207.86400 L -321.26400 190.87200 L -314.71200 185.18400 L -297.72000 185.18400 L -292.89600 190.87200 L -298.58400 207.86400 L -@c -B - -@rax %Note: Object -304.27200 114.33600 424.22400 182.37600 @E - 0 O 0 @g -0.00 0.00 0.00 1.00 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -304.27200 114.33600 m -321.33600 165.31200 L -315.64800 165.31200 L -321.33600 182.37600 L -346.75200 182.37600 L -352.44000 176.68800 L -356.25600 176.68800 L -361.87200 182.37600 L -380.80800 182.37600 L -386.49600 176.68800 L -390.24000 176.68800 L -395.92800 182.37600 L -416.66400 182.37600 L -424.22400 171.00000 L -411.84000 130.68000 L -417.45600 130.68000 L -411.98400 114.33600 L -377.92800 114.33600 L -391.24800 154.00800 L -382.75200 154.00800 L -374.90400 130.82400 L -380.52000 130.82400 L -375.19200 114.33600 L -341.13600 114.33600 L -354.38400 154.00800 L -345.88800 154.00800 L -337.96800 130.68000 L -343.65600 130.68000 L -338.32800 114.33600 L -304.27200 114.33600 L -@c -B - -@rax %Note: Object -311.83200 120.02400 418.46400 176.68800 @E - 0 O 0 @g -0.00 0.00 0.00 0.20 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -414.07200 176.68800 m -418.46400 170.42400 L -404.49600 125.64000 L -410.11200 125.64000 L -408.24000 120.02400 L -385.56000 120.02400 L -398.80800 159.69600 L -378.93600 159.69600 L -367.63200 125.64000 L -373.24800 125.64000 L -371.37600 120.02400 L -348.69600 120.02400 L -361.94400 159.69600 L -342.07200 159.69600 L -330.76800 125.64000 L -336.45600 125.64000 L -334.51200 120.02400 L -311.83200 120.02400 L -328.89600 171.00000 L -323.20800 171.00000 L -325.08000 176.68800 L -345.88800 176.68800 L -351.57600 171.00000 L -357.19200 171.00000 L -362.88000 176.68800 L -379.87200 176.68800 L -385.56000 171.00000 L -391.24800 171.00000 L -396.93600 176.68800 L -414.07200 176.68800 L -@c -B - -@rax %Note: Object -267.40800 114.33600 318.45600 182.37600 @E - 0 O 0 @g -0.00 0.00 0.00 1.00 k -/$fm 0 def -318.45600 182.37600 m -301.10400 130.75200 L -307.00800 130.75200 L -301.39200 114.33600 L -267.40800 114.33600 L -284.40000 165.31200 L -278.71200 165.31200 L -318.45600 182.37600 L -@c -278.71200 165.31200 m -284.40000 182.37600 L -318.45600 182.37600 L -@c -F - -@rax %Note: Object -267.40800 114.33600 318.45600 182.37600 @E -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -318.45600 182.37600 m -301.10400 130.75200 L -307.00800 130.75200 L -301.39200 114.33600 L -267.40800 114.33600 L -284.40000 165.31200 L -278.71200 165.31200 L -@c -278.71200 165.31200 m -284.40000 182.37600 L -318.45600 182.37600 L -@c -S - -@rax %Note: Object -274.96800 120.02400 310.89600 176.68800 @E - 0 O 0 @g -0.00 0.00 0.00 0.20 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -297.64800 120.02400 m -299.52000 125.64000 L -293.83200 125.64000 L -310.89600 176.68800 L -287.28000 176.68800 L -285.33600 171.00000 L -291.96000 171.00000 L -274.96800 120.02400 L -297.64800 120.02400 L -@c -B - -@rax %Note: Object -299.52000 190.87200 320.32800 207.86400 @E - 0 O 0 @g -0.00 0.00 0.00 0.20 k -0 J 0 j [] 0 d 0 R 0 @G -0.00 0.00 0.00 1.00 K -0 0.21600 0.21600 0.00000 @w -/$fm 0 def -316.51200 193.68000 m -320.32800 205.05600 L -318.45600 207.86400 L -307.08000 207.86400 L -303.33600 205.05600 L -299.52000 193.68000 L -301.46400 190.87200 L -312.84000 190.87200 L -316.51200 193.68000 L -@c -B - -%%PageTrailer -@rs -@rs -%%Trailer -@EndSysCorelDict -end -%%DocumentSuppliedResources: procset wCorel11Dict 11.0 0 -%%EOF +%%Trailer +%%EOF diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po --- a/src/po/uk.cp1251.po +++ b/src/po/uk.cp1251.po @@ -2,14 +2,12 @@ # Ukrainian Vim translation [uk] # # Copyright (C) 2001 Bohdan Vlasyuk +# Bohdan donated this work to be distributed with Vim under the Vim license. # # Thanks to: # Dmytro Kovalov for useful suggestions # Dmytro O. Redchuk for viminfo bug # -# Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any -# complains, and even if you won't complain, read it anyway. -# msgid "" msgstr "" "Project-Id-Version: vim 7.4\n" diff --git a/src/po/uk.po b/src/po/uk.po --- a/src/po/uk.po +++ b/src/po/uk.po @@ -2,14 +2,12 @@ # Ukrainian Vim translation [uk] # # Copyright (C) 2001 Bohdan Vlasyuk +# Bohdan donated this work to be distributed with Vim under the Vim license. # # Thanks to: # Dmytro Kovalov for useful suggestions # Dmytro O. Redchuk for viminfo bug # -# Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any -# complains, and even if you won't complain, read it anyway. -# msgid "" msgstr "" "Project-Id-Version: vim 7.4\n"