Imported Upstream version 8.0.586

[platform/upstream/vim.git] / runtime / syntax / tex.vim

diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index dd66902..ab19da3 100644 (file)
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:    TeX
 " Maintainer:  Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change: Sep 20, 2016
-" Version:     101
+" Last Change: Jan 31, 2017
+" Version:     103
 " URL:         http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -494,13 +494,11 @@ if !exists("g:tex_no_math")
      \ ['\\backslash'  , '\'] ,
      \ ['\\downarrow'  , '↓'] ,
      \ ['\\Downarrow'  , '⇓'] ,
-     \ ['\\langle'     , '<'] ,
      \ ['\\lbrace'     , '['] ,
      \ ['\\lceil'      , '⌈'] ,
      \ ['\\lfloor'     , '⌊'] ,
      \ ['\\lgroup'     , '⌊'] ,
      \ ['\\lmoustache' , '⎛'] ,
-     \ ['\\rangle'     , '>'] ,
      \ ['\\rbrace'     , ']'] ,
      \ ['\\rceil'      , '⌉'] ,
      \ ['\\rfloor'     , '⌋'] ,
@@ -510,6 +508,15 @@ if !exists("g:tex_no_math")
      \ ['\\Uparrow'    , '↑'] ,
      \ ['\\updownarrow', '↕'] ,
      \ ['\\Updownarrow', '⇕']]
+  if &ambw == "double" || exists("g:tex_usedblwidth")
+    let s:texMathDelimList= s:texMathDelimList + [
+     \ ['\\langle'     , '〈'] ,
+     \ ['\\rangle'     , '〉']]
+  else
+    let s:texMathDelimList= s:texMathDelimList + [
+     \ ['\\langle'     , '<'] ,
+     \ ['\\rangle'     , '>']]
+  endif
   syn match texMathDelim       '\\[bB]igg\=[lr]' contained nextgroup=texMathDelimBad
   for texmath in s:texMathDelimList
    exe "syn match texMathDelim '\\\\[bB]igg\\=[lr]\\=".texmath[0]."'   contained conceal cchar=".texmath[1]
@@ -587,8 +594,6 @@ endif
 if s:tex_fast =~# 'v'
   if exists("g:tex_verbspell") && g:tex_verbspell
    syn region texZone          start="\\begin{[vV]erbatim}"            end="\\end{[vV]erbatim}\|%stopzone\>"   contains=@Spell
-   " listings package:
-   syn region texZone          start="\\begin{lstlisting}"             end="\\end{lstlisting}\|%stopzone\>"    contains=@Spell
    if b:tex_stylish
     syn region texZone         start="\\verb\*\=\z([^\ta-zA-Z@]\)"     end="\z1\|%stopzone\>"                  contains=@Spell
    else
@@ -680,6 +685,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['backslash'     , '∖'],
     \ ['barwedge'      , '⊼'],
     \ ['because'       , '∵'],
+    \ ['beth'           , 'ܒ'],
     \ ['between'       , '≬'],
     \ ['bigcap'                , '∩'],
     \ ['bigcirc'       , '○'],
@@ -699,6 +705,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['boxminus'      , '⊟'],
     \ ['boxplus'       , '⊞'],
     \ ['boxtimes'      , '⊠'],
+    \ ['Box'            , '☐'],
     \ ['bullet'                , '•'],
     \ ['bumpeq'                , '≏'],
     \ ['Bumpeq'                , '≎'],
@@ -748,6 +755,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['eqslantgtr'    , '⪖'],
     \ ['eqslantless'   , '⪕'],
     \ ['equiv'         , '≡'],
+    \ ['eth'            , 'ð'],
     \ ['exists'                , '∃'],
     \ ['fallingdotseq' , '≒'],
     \ ['flat'          , '♭'],
@@ -757,6 +765,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['geq'           , '≥'],
     \ ['geqq'          , '≧'],
     \ ['gets'          , '←'],
+    \ ['gimel'          , 'ℷ'],
     \ ['gg'            , '⟫'],
     \ ['gneqq'         , '≩'],
     \ ['gtrdot'                , '⋗'],
@@ -767,13 +776,17 @@ if has("conceal") && &enc == 'utf-8'
     \ ['heartsuit'     , '♡'],
     \ ['hookleftarrow' , '↩'],
     \ ['hookrightarrow'        , '↪'],
+    \ ['iff'            , '⇔'],
     \ ['iiint'         , '∭'],
     \ ['iint'          , '∬'],
     \ ['Im'            , 'ℑ'],
     \ ['imath'         , 'ɩ'],
+    \ ['implies'       , '⇒'],
     \ ['in'            , '∈'],
     \ ['infty'         , '∞'],
     \ ['int'           , '∫'],
+    \ ['jmath'         , '𝚥'],
+    \ ['land'          , '∧'],
     \ ['lceil'         , '⌈'],
     \ ['ldots'         , '…'],
     \ ['le'            , '≤'],
@@ -800,6 +813,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['ll'            , '≪'],
     \ ['lmoustache'     , '╭'],
     \ ['lneqq'         , '≨'],
+    \ ['lor'           , '∨'],
     \ ['ltimes'                , '⋉'],
     \ ['mapsto'                , '↦'],
     \ ['measuredangle' , '∡'],
@@ -826,6 +840,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['nless'         , '≮'],
     \ ['nmid'          , '∤'],
     \ ['notin'         , '∉'],
+    \ ['nparallel'      , '∦'],
     \ ['nprec'         , '⊀'],
     \ ['nrightarrow'   , '↛'],
     \ ['nRightarrow'   , '⇏'],
@@ -927,10 +942,12 @@ if has("conceal") && &enc == 'utf-8'
     \ ['trianglerighteq', '⊵'],
     \ ['twoheadleftarrow', '↞'],
     \ ['twoheadrightarrow', '↠'],
+    \ ['ulcorner'       , '⌜'],
     \ ['uparrow'       , '↑'],
     \ ['Uparrow'       , '⇑'],
     \ ['updownarrow'   , '↕'],
     \ ['Updownarrow'   , '⇕'],
+    \ ['urcorner'       , '⌝'],
     \ ['varnothing'    , '∅'],
     \ ['vartriangle'   , '∆'],
     \ ['vdash'         , '⊢'],
@@ -946,6 +963,15 @@ if has("conceal") && &enc == 'utf-8'
 "    \ ['jmath'                , 'X']
 "    \ ['uminus'       , 'X']
 "    \ ['uplus'                , 'X']
+  if &ambw == "double" || exists("g:tex_usedblwidth")
+    let s:texMathList= s:texMathList + [
+    \ ['right\\rangle' , '〉'],
+    \ ['left\\langle'  , '〈']]
+  else
+    let s:texMathList= s:texMathList + [
+    \ ['right\\rangle' , '>'],
+    \ ['left\\langle'  , '<']]
+  endif
   for texmath in s:texMathList
    if texmath[0] =~# '\w$'
     exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]