From 7c33b14a84fd506904a010239adb92eefb41e0e4 Mon Sep 17 00:00:00 2001
From: ache <ache@ache.one>
Date: Mon, 13 Nov 2017 14:33:55 +0100
Subject: New SVG/HTML syntax support

---
 ftplugin/svg.vim | 105 +++++++++++++
 indent/html.vim  | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 plugin/svg.vim   | 105 -------------
 syntax/html.vim  | 185 ++++++++++++++++++++++
 4 files changed, 752 insertions(+), 105 deletions(-)
 create mode 100644 ftplugin/svg.vim
 create mode 100644 indent/html.vim
 delete mode 100644 plugin/svg.vim
 create mode 100644 syntax/html.vim

diff --git a/ftplugin/svg.vim b/ftplugin/svg.vim
new file mode 100644
index 0000000..b1597a9
--- /dev/null
+++ b/ftplugin/svg.vim
@@ -0,0 +1,105 @@
+" Vim indent file
+"
+" Language: svg
+" Maintainer: Jason Shell <jason.shell.mail@gmail.com>
+" Last Change:	2015 Sep 23
+" Notes: 1) will be confused by unbalanced tags in comments
+
+" Only load this indent file when no other was loaded.
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+let s:keepcpo= &cpo
+set cpo&vim
+
+" [-- local settings (must come before aborting the script) --]
+setlocal indentexpr=SvgIndentGet(v:lnum,1)
+setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,}
+
+if !exists('b:svg_indent_open')
+  let b:svg_indent_open = '.\{-}<\a'
+  " pre tag, e.g. <address>
+  " let b:svg_indent_open = '.\{-}<[/]\@!\(address\)\@!'
+endif
+
+if !exists('b:svg_indent_close')
+  let b:svg_indent_close = '.\{-}</'
+  " end pre tag, e.g. </address>
+  " let b:svg_indent_close = '.\{-}</\(address\)\@!'
+endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" [-- finish, if the function already exists --]
+if exists('*SvgIndentGet')
+  finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+fun! <SID>SvgIndentWithPattern(line, pat)
+  let s = substitute('x'.a:line, a:pat, "\1", 'g')
+  return strlen(substitute(s, "[^\1].*$", '', ''))
+endfun
+
+" [-- check if it's svg --]
+fun! <SID>SvgIndentSynCheck(lnum)
+  if '' != &syntax
+    let syn1 = synIDattr(synID(a:lnum, 1, 1), 'name')
+    let syn2 = synIDattr(synID(a:lnum, strlen(getline(a:lnum)) - 1, 1), 'name')
+    if '' != syn1 && syn1 !~ 'svg' && '' != syn2 && syn2 !~ 'svg'
+      " don't indent pure non-xml code
+      return 0
+
+    " elseif syn1 =~ '^xmlComment' && syn2 =~ '^xmlComment'
+    elseif syn1 =~ '^svgComment' && syn2 =~ '^svgComment'
+      " indent comments specially
+      return -1
+    endif
+  endif
+  return 1
+endfun
+
+" [-- return the sum of indents of a:lnum --]
+fun! <SID>SvgIndentSum(lnum, style, add)
+  let line = getline(a:lnum)
+  if a:style == match(line, '^\s*</')
+    return (&sw *
+    \  (<SID>SvgIndentWithPattern(line, b:svg_indent_open)
+    \ - <SID>SvgIndentWithPattern(line, b:svg_indent_close)
+    \ - <SID>SvgIndentWithPattern(line, '.\{-}/>'))) + a:add
+  else
+    return a:add
+  endif
+endfun
+
+fun! SvgIndentGet(lnum, use_syntax_check)
+  " Find a non-empty line above the current line.
+  let lnum = prevnonblank(a:lnum - 1)
+
+  " Hit the start of the file, use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  if a:use_syntax_check
+    let check_lnum = <SID>SvgIndentSynCheck(lnum)
+    let check_alnum = <SID>SvgIndentSynCheck(a:lnum)
+    if 0 == check_lnum || 0 == check_alnum
+      return indent(a:lnum)
+    elseif -1 == check_lnum || -1 == check_alnum
+      return -1
+    endif
+  endif
+
+  let ind = <SID>SvgIndentSum(lnum, -1, indent(lnum))
+  let ind = <SID>SvgIndentSum(a:lnum, 0, ind)
+
+  return ind
+endfun
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/indent/html.vim b/indent/html.vim
new file mode 100644
index 0000000..2e8216d
--- /dev/null
+++ b/indent/html.vim
@@ -0,0 +1,462 @@
+" Description:      HTML5 and inline SVG indenter
+" Changed By: HT de Beer <H.T.de.Beer@gmail.com>
+" Last Change: 20121013
+"   Added the SVG elements to the list of indenting element. SVG elements
+"   taken from http://www.w3.org/TR/SVG/eltindex.html
+"   
+" Description:        html5 (and html4) indenter
+" Changed By:        Brian Gershon <brian.five@gmail.com>
+" Last Change:        30 Jan 2011
+" 
+"   1. Started with vim72 html indent file authored by Johannes Zellner (below)
+"   2. Added html5 list as described here:
+"      http://stackoverflow.com/questions/3232518/how-to-update-vim-to-color-code-new-html-elements
+"   3. Added this to a fork of https://github.com/othree/html5.vim
+"      which already provides nice html5 syntax highlighting.
+"
+" Description:        html indenter
+" Author:        Johannes Zellner <johannes@zellner.org>
+" Last Change:        Mo, 05 Jun 2006 22:32:41 CEST
+"                 Restoring 'cpo' and 'ic' added by Bram 2006 May 5
+" Globals:
+" let g:html_indent_tags = 'html\|p\|time'
+" let g:html_exclude_tags = ['html', 'style', 'script', 'body']
+
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+runtime! indent/javascript.vim
+let s:jsindent = &indentexpr
+unlet b:did_indent
+runtime! indent/css.vim
+let s:cssindent = &indentexpr
+let b:did_indent = 1
+
+" [-- local settings (must come before aborting the script) --]
+setlocal indentexpr=HtmlIndentGet(v:lnum)
+setlocal indentkeys=o,O,*<Return>,<>>,{,},!^F
+
+
+let s:tags = []
+let s:no_tags = []
+
+" [-- <ELEMENT ? - - ...> --]
+call add(s:tags, 'a')
+call add(s:tags, 'abbr')
+call add(s:tags, 'acronym')
+call add(s:tags, 'address')
+call add(s:tags, 'b')
+call add(s:tags, 'bdo')
+call add(s:tags, 'big')
+call add(s:tags, 'blockquote')
+call add(s:tags, 'button')
+call add(s:tags, 'caption')
+call add(s:tags, 'center')
+call add(s:tags, 'cite')
+call add(s:tags, 'code')
+call add(s:tags, 'colgroup')
+call add(s:tags, 'del')
+call add(s:tags, 'dfn')
+call add(s:tags, 'dir')
+call add(s:tags, 'div')
+call add(s:tags, 'dl')
+call add(s:tags, 'dt')
+call add(s:tags, 'dd')
+call add(s:tags, 'em')
+call add(s:tags, 'fieldset')
+call add(s:tags, 'font')
+call add(s:tags, 'form')
+call add(s:tags, 'frameset')
+call add(s:tags, 'h1')
+call add(s:tags, 'h2')
+call add(s:tags, 'h3')
+call add(s:tags, 'h4')
+call add(s:tags, 'h5')
+call add(s:tags, 'h6')
+call add(s:tags, 'i')
+call add(s:tags, 'iframe')
+call add(s:tags, 'ins')
+call add(s:tags, 'kbd')
+call add(s:tags, 'label')
+call add(s:tags, 'legend')
+call add(s:tags, 'li')
+call add(s:tags, 'map')
+call add(s:tags, 'menu')
+call add(s:tags, 'noframes')
+call add(s:tags, 'noscript')
+call add(s:tags, 'object')
+call add(s:tags, 'ol')
+call add(s:tags, 'optgroup')
+call add(s:tags, 'p')
+" call add(s:tags, 'pre')
+call add(s:tags, 'q')
+call add(s:tags, 's')
+call add(s:tags, 'samp')
+call add(s:tags, 'script')
+call add(s:tags, 'select')
+call add(s:tags, 'small')
+call add(s:tags, 'span')
+call add(s:tags, 'strong')
+call add(s:tags, 'style')
+call add(s:tags, 'sub')
+call add(s:tags, 'sup')
+call add(s:tags, 'table')
+call add(s:tags, 'textarea')
+call add(s:tags, 'title')
+call add(s:tags, 'tt')
+call add(s:tags, 'u')
+call add(s:tags, 'ul')
+call add(s:tags, 'var')
+
+" New HTML 5 elements
+call add(s:tags, 'article')
+call add(s:tags, 'aside')
+call add(s:tags, 'audio')
+call add(s:tags, 'canvas')
+call add(s:tags, 'datalist')
+call add(s:tags, 'details')
+call add(s:tags, 'figcaption')
+call add(s:tags, 'figure')
+call add(s:tags, 'footer')
+call add(s:tags, 'header')
+call add(s:tags, 'hgroup')
+call add(s:tags, 'main')
+call add(s:tags, 'mark')
+call add(s:tags, 'meter')
+call add(s:tags, 'nav')
+call add(s:tags, 'output')
+call add(s:tags, 'progress')
+call add(s:tags, 'picture')
+call add(s:tags, 'rb')
+call add(s:tags, 'rp')
+call add(s:tags, 'rt')
+call add(s:tags, 'rtc')
+call add(s:tags, 'ruby')
+call add(s:tags, 'section')
+call add(s:tags, 'source')
+call add(s:tags, 'summary')
+call add(s:tags, 'time')
+call add(s:tags, 'video')
+call add(s:tags, 'bdi')
+call add(s:tags, 'data')
+
+" Web Component
+call add(s:tags, 'template')
+
+" Common inline used SVG elements
+call add(s:tags, 'clipPath')
+call add(s:tags, 'defs')
+call add(s:tags, 'desc')
+call add(s:tags, 'filter')
+call add(s:tags, 'foreignObject')
+call add(s:tags, 'g')
+call add(s:tags, 'linearGradient')
+call add(s:tags, 'marker')
+call add(s:tags, 'mask')
+call add(s:tags, 'pattern')
+call add(s:tags, 'radialGradient')
+call add(s:tags, 'svg')
+call add(s:tags, 'switch')
+call add(s:tags, 'symbol')
+call add(s:tags, 'text')
+call add(s:tags, 'textPath')
+call add(s:tags, 'tref')
+call add(s:tags, 'tspan')
+" Common self closing SVG elements
+call add(s:no_tags, 'animate')
+call add(s:no_tags, 'animateTransform')
+call add(s:no_tags, 'circle')
+call add(s:no_tags, 'ellipse')
+call add(s:no_tags, 'feBlend')
+call add(s:no_tags, 'feColorMatrix')
+call add(s:no_tags, 'feComposite')
+call add(s:no_tags, 'feConvolveMatrix')
+call add(s:no_tags, 'feDisplacementMap')
+call add(s:no_tags, 'feFlood')
+call add(s:no_tags, 'feFuncR')
+call add(s:no_tags, 'feFuncG')
+call add(s:no_tags, 'feFuncB')
+call add(s:no_tags, 'feFuncA')
+call add(s:no_tags, 'feGaussianBlur')
+call add(s:no_tags, 'feImage')
+call add(s:no_tags, 'feMergeNode')
+call add(s:no_tags, 'feMorphology')
+call add(s:no_tags, 'feOffset')
+call add(s:no_tags, 'fePointLight')
+call add(s:no_tags, 'feSpotLight')
+call add(s:no_tags, 'feTile')
+call add(s:no_tags, 'feTurbulence')
+call add(s:no_tags, 'hatchpath')
+call add(s:no_tags, 'hkern')
+call add(s:no_tags, 'image')
+call add(s:no_tags, 'line')
+call add(s:no_tags, 'mpath')
+call add(s:no_tags, 'polygon')
+call add(s:no_tags, 'polyline')
+call add(s:no_tags, 'path')
+call add(s:no_tags, 'rect')
+call add(s:no_tags, 'solidColor')
+call add(s:no_tags, 'stop')
+call add(s:no_tags, 'use')
+call add(s:no_tags, 'view')
+call add(s:no_tags, 'vkern')
+
+call add(s:tags, 'html')
+call add(s:tags, 'head')
+call add(s:tags, 'body')
+
+call add(s:tags, 'thead')
+call add(s:tags, 'tbody')
+call add(s:tags, 'tfoot')
+call add(s:tags, 'tr')
+call add(s:tags, 'th')
+call add(s:tags, 'td')
+
+call add(s:no_tags, 'base')
+call add(s:no_tags, 'link')
+call add(s:no_tags, 'meta')
+call add(s:no_tags, 'hr')
+call add(s:no_tags, 'br')
+call add(s:no_tags, 'wbr')
+call add(s:no_tags, 'img')
+call add(s:no_tags, 'embed')
+call add(s:no_tags, 'param')
+call add(s:no_tags, 'source')
+call add(s:no_tags, 'track')
+call add(s:no_tags, 'area')
+call add(s:no_tags, 'col')
+call add(s:no_tags, 'input')
+call add(s:no_tags, 'keygen')
+call add(s:no_tags, 'menuitem')
+
+let s:omittable = [ 
+  \  ['address', 'article', 'aside', 'blockquote', 'dir', 'div', 'dl', 'fieldset', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'menu', 'nav', 'ol', 'p', 'pre', 'section', 'table', 'ul'],
+  \  ['dt', 'dd'],
+  \  ['li'],
+  \  ['thead', 'tbody', 'tfoot'],
+  \  ['th', 'td'],
+  \]
+
+
+let s:html_noindent_tags = join(s:no_tags, '\|')
+
+if exists('g:html_exclude_tags')
+    for tag in g:html_exclude_tags
+        call remove(s:tags, index(s:tags, tag))
+    endfor
+    let s:html_noindent_tags = s:html_noindent_tags.'\|'.join(g:html_exclude_tags, '\|')
+endif
+
+" let s:html_indent_tags = join(s:tags, '\|')
+let s:html_indent_tags = '[a-z_][a-z0-9_.-]*'
+" if exists('g:html_indent_tags')
+    " let s:html_indent_tags = s:html_indent_tags.'\|'.g:html_indent_tags
+" endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+func! <SID>HtmlIndentPatternCount(content, pattern)
+    let s = substitute('x'.a:content, a:pattern, "\1", 'g')
+    let s = substitute(s, "[^\1].*$", '', '')
+    return strlen(s)
+endfun
+
+" [-- count indent-increasing tags of line a:lnum --]
+fun! <SID>HtmlIndentOpen(lnum, pattern)
+    return <SID>HtmlIndentPatternCount(getline(a:lnum),
+    \ '.\{-}\(\(<\)\('.a:pattern.'\)\>\)')
+endfun
+
+" [-- count indent-decreasing tags of line a:lnum --]
+fun! <SID>HtmlIndentClose(lnum, pattern)
+    return <SID>HtmlIndentPatternCount(getline(a:lnum),
+    \ '.\{-}\(\(<\)/\('.a:pattern.'\)\>>\)')
+endfun
+
+" [-- count self close tags of line a:lnum --]
+fun! <SID>HtmlIndentSelfClose(lnum, pattern)
+    return <SID>HtmlIndentPatternCount(getline(a:lnum),
+    \ '.\{-}\(\(<\('.a:pattern.'\).*\)\@<!\/>\)')
+endfun
+
+" [-- count indent-increasing '{' of (java|css) line a:lnum --]
+fun! <SID>HtmlIndentOpenAlt(lnum)
+    return strlen(substitute(getline(a:lnum), '[^{]\+', '', 'g'))
+endfun
+
+" [-- count indent-decreasing '}' of (java|css) line a:lnum --]
+fun! <SID>HtmlIndentCloseAlt(lnum)
+    return strlen(substitute(getline(a:lnum), '[^}]\+', '', 'g'))
+endfun
+
+" [-- return the sum of indents respecting the syntax of a:lnum --]
+fun! <SID>HtmlIndentSum(lnum, style)
+    if a:style == match(getline(a:lnum), '^\s*</')
+        if a:style == match(getline(a:lnum), '^\s*</\<\('.s:html_indent_tags.'\)\>')
+            let open = <SID>HtmlIndentOpen(a:lnum, s:html_indent_tags) - <SID>HtmlIndentOpen(a:lnum, s:html_noindent_tags)
+            let close = <SID>HtmlIndentClose(a:lnum, s:html_indent_tags) - <SID>HtmlIndentClose(a:lnum, s:html_noindent_tags)
+            let self_close = <SID>HtmlIndentSelfClose(a:lnum, s:html_noindent_tags)
+            if 0 != open || 0 != close || 0 != self_close
+                return open - close - self_close
+            endif
+        endif
+    endif
+
+    if '' != &syntax &&
+        \ synIDattr(synID(a:lnum, 1, 1), 'name') =~ '\(css\|java\).*' &&
+        \ synIDattr(synID(a:lnum, strlen(getline(a:lnum)), 1), 'name')
+        \ =~ '\(css\|java\).*'
+        if a:style == match(getline(a:lnum), '^\s*}')
+            return <SID>HtmlIndentOpenAlt(a:lnum) - <SID>HtmlIndentCloseAlt(a:lnum)
+        endif
+    endif
+    return 0
+endfun
+
+fun! HtmlIndentGet(lnum)
+    " Get shiftwidth value.
+    if exists('*shiftwidth')
+        let sw = shiftwidth()
+    else
+        let sw = &sw
+    endif
+
+    " Find a non-empty line above the current line.
+    let lnum = prevnonblank(a:lnum - 1)
+
+    " Hit the start of the file, use zero indent.
+    if lnum == 0
+        return 0
+    endif
+
+    let restore_ic = &ic
+    setlocal ic " ignore case
+
+    " [-- special handling for <pre>: no indenting --]
+    if getline(a:lnum) =~ '\c</pre>'
+                \ || 0 < searchpair('\c<pre>', '', '\c</pre>', 'nWb')
+                \ || 0 < searchpair('\c<pre>', '', '\c</pre>', 'nW')
+        " we're in a line with </pre> or inside <pre> ... </pre>
+        if restore_ic == 0
+          setlocal noic
+        endif
+        return -1
+    endif
+
+    " [-- special handling for <javascript>: use cindent --]
+    let js = '<script'
+    let jse = '</script>'
+
+    """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+    " by Tye Zdrojewski <zdro@yahoo.com>, 05 Jun 2006
+    " ZDR: This needs to be an AND (we are 'after the start of the pair' AND
+    "      we are 'before the end of the pair').  Otherwise, indentation
+    "      before the start of the script block will be affected; the end of
+    "      the pair will still match if we are before the beginning of the
+    "      pair.
+    "
+    if   0 < searchpair(js, '', jse, 'nWb')
+    \ && 0 < searchpair(js, '', jse, 'nW')
+        " we're inside javascript
+        if getline(searchpair(js, '', '</script>', 'nWb')) !~ '<script [^>]*type=["'']\?text\/\(html\|\(ng-\)\?template\)'
+        \ && getline(lnum) !~ js && getline(a:lnum) !~ jse
+            if restore_ic == 0
+              setlocal noic
+            endif
+            if s:jsindent == ''
+              return cindent(a:lnum)
+            else
+              execute 'let ind = ' . s:jsindent
+              return ind
+            endif
+        endif
+        if getline(a:lnum) =~ jse
+          return indent(searchpair(js, '', jse, 'nWb'))
+        endif
+    endif
+
+    let css = '<style'
+    let csse = '</style>'
+    if   0 < searchpair(css, '', csse, 'nWb')
+    \ && 0 < searchpair(css, '', csse, 'nW')
+        " we're inside style
+        if getline(lnum) !~ css && getline(a:lnum) !~ csse
+            if restore_ic == 0
+              setlocal noic
+            endif
+            if s:cssindent == ''
+              return cindent(a:lnum)
+            else
+              execute 'let ind = ' . s:cssindent
+              return ind
+            endif
+        endif
+        if getline(a:lnum) =~ csse
+          return indent(searchpair(css, '', csse, 'nWb'))
+        endif
+    endif
+
+    if getline(lnum) =~ '\c</pre>'
+        " line before the current line a:lnum contains
+        " a closing </pre>. --> search for line before
+        " starting <pre> to restore the indent.
+        let preline = prevnonblank(search('\c<pre>', 'bW') - 1)
+        if preline > 0
+            if restore_ic == 0
+              setlocal noic
+            endif
+
+            if 0 == match(getline(a:lnum), '^\s*</')
+                return indent(preline) - (1*sw)
+            else
+                return indent(preline)
+            endif
+        endif
+    endif
+
+    let ind = <SID>HtmlIndentSum(lnum, -1)
+    let ind = ind + <SID>HtmlIndentSum(a:lnum, 0)
+
+    " Fix for conditional comment
+    if getline(a:lnum) =~ '\c<!--.*<\(html\|body\).*-->'
+        let ind = ind - 1
+    endif
+
+    let lind = indent(lnum)
+
+    " for tags in s:omittable
+      " let tags_exp = '<\(' . join(tags, '\|') . '\)>'
+      " let close_tags_exp = '</\(' . join(tags, '\|') . '\)>'
+      " if getline(a:lnum) =~ tags_exp
+        " let block_start = search('^'.repeat(' ', lind + (sw * ind - 1)).'\S'  , 'bnW')
+        " let prev_tag = search(tags_exp, 'bW', block_start)
+        " let prev_closetag = search(close_tags_exp, 'W', a:lnum)
+        " if prev_tag && !prev_closetag
+          " let ind = ind - 1
+        " endif
+      " endif
+
+      " if getline(a:lnum) =~ '</\w\+>'
+        " let block_start = search('^'.repeat(' ', lind + (sw * ind - 1)).'\S'  , 'bnW')
+        " let prev_tag = search(tags_exp, 'bW', block_start)
+        " let prev_closetag = search(close_tags_exp, 'W', a:lnum)
+        " if prev_tag && !prev_closetag
+          " let ind = ind - 1
+        " endif
+      " endif
+    " endfor
+
+    if restore_ic == 0
+        setlocal noic
+    endif
+
+    return lind + (sw * ind)
+endfun
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" [-- EOF <runtime>/indent/html.vim --]
diff --git a/plugin/svg.vim b/plugin/svg.vim
deleted file mode 100644
index b1597a9..0000000
--- a/plugin/svg.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" Vim indent file
-"
-" Language: svg
-" Maintainer: Jason Shell <jason.shell.mail@gmail.com>
-" Last Change:	2015 Sep 23
-" Notes: 1) will be confused by unbalanced tags in comments
-
-" Only load this indent file when no other was loaded.
-if exists('b:did_indent')
-  finish
-endif
-let b:did_indent = 1
-let s:keepcpo= &cpo
-set cpo&vim
-
-" [-- local settings (must come before aborting the script) --]
-setlocal indentexpr=SvgIndentGet(v:lnum,1)
-setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,}
-
-if !exists('b:svg_indent_open')
-  let b:svg_indent_open = '.\{-}<\a'
-  " pre tag, e.g. <address>
-  " let b:svg_indent_open = '.\{-}<[/]\@!\(address\)\@!'
-endif
-
-if !exists('b:svg_indent_close')
-  let b:svg_indent_close = '.\{-}</'
-  " end pre tag, e.g. </address>
-  " let b:svg_indent_close = '.\{-}</\(address\)\@!'
-endif
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" [-- finish, if the function already exists --]
-if exists('*SvgIndentGet')
-  finish
-endif
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-fun! <SID>SvgIndentWithPattern(line, pat)
-  let s = substitute('x'.a:line, a:pat, "\1", 'g')
-  return strlen(substitute(s, "[^\1].*$", '', ''))
-endfun
-
-" [-- check if it's svg --]
-fun! <SID>SvgIndentSynCheck(lnum)
-  if '' != &syntax
-    let syn1 = synIDattr(synID(a:lnum, 1, 1), 'name')
-    let syn2 = synIDattr(synID(a:lnum, strlen(getline(a:lnum)) - 1, 1), 'name')
-    if '' != syn1 && syn1 !~ 'svg' && '' != syn2 && syn2 !~ 'svg'
-      " don't indent pure non-xml code
-      return 0
-
-    " elseif syn1 =~ '^xmlComment' && syn2 =~ '^xmlComment'
-    elseif syn1 =~ '^svgComment' && syn2 =~ '^svgComment'
-      " indent comments specially
-      return -1
-    endif
-  endif
-  return 1
-endfun
-
-" [-- return the sum of indents of a:lnum --]
-fun! <SID>SvgIndentSum(lnum, style, add)
-  let line = getline(a:lnum)
-  if a:style == match(line, '^\s*</')
-    return (&sw *
-    \  (<SID>SvgIndentWithPattern(line, b:svg_indent_open)
-    \ - <SID>SvgIndentWithPattern(line, b:svg_indent_close)
-    \ - <SID>SvgIndentWithPattern(line, '.\{-}/>'))) + a:add
-  else
-    return a:add
-  endif
-endfun
-
-fun! SvgIndentGet(lnum, use_syntax_check)
-  " Find a non-empty line above the current line.
-  let lnum = prevnonblank(a:lnum - 1)
-
-  " Hit the start of the file, use zero indent.
-  if lnum == 0
-    return 0
-  endif
-
-  if a:use_syntax_check
-    let check_lnum = <SID>SvgIndentSynCheck(lnum)
-    let check_alnum = <SID>SvgIndentSynCheck(a:lnum)
-    if 0 == check_lnum || 0 == check_alnum
-      return indent(a:lnum)
-    elseif -1 == check_lnum || -1 == check_alnum
-      return -1
-    endif
-  endif
-
-  let ind = <SID>SvgIndentSum(lnum, -1, indent(lnum))
-  let ind = <SID>SvgIndentSum(a:lnum, 0, ind)
-
-  return ind
-endfun
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
diff --git a/syntax/html.vim b/syntax/html.vim
new file mode 100644
index 0000000..e97be5d
--- /dev/null
+++ b/syntax/html.vim
@@ -0,0 +1,185 @@
+" Vim syntax file
+" Language:     HTML (version 5.1)
+"               SVG (SVG 1.1 Second Edition)
+"               MathML (MathML 3.0 Second Edition)
+" Last Change:  2017 Mar 07
+" License:      Public domain
+"               (but let me know if you like :) )
+"
+" Note: This file just add new tags from HTML 5
+"       and don't replace default html.vim syntax file
+"
+" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Changes:      update to Draft 2016 Jan 13
+"               add microdata Attributes
+" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
+" URL:          http://rm.blog.br/vim/syntax/html.vim
+" Modified:     htdebeer <H.T.de.Beer@gmail.com>
+" Changes:      add common SVG elements and attributes for inline SVG
+
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,-
+  else
+    syn iskeyword @,48-57,_,192-255,-
+  endif
+endif
+
+" HTML 5 tags
+syn keyword htmlTagName contained article aside audio canvas command
+syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
+syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
+syn keyword htmlTagName contained template content shadow
+syn keyword htmlTagName contained wbr bdi
+syn keyword htmlTagName contained picture
+
+" SVG tags
+" http://www.w3.org/TR/SVG/
+" as found in http://www.w3.org/TR/SVG/eltindex.html
+syn keyword htmlTagName contained svg 
+syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
+syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
+syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
+syn keyword htmlTagName contained clipPath color-profile cursor 
+syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
+syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
+syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
+syn keyword htmlTagName contained glyph glyphRef hkern 
+syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
+syn keyword htmlTagName contained missing-glyph mpath 
+syn keyword htmlTagName contained text textPath tref tspan vkern
+syn keyword htmlTagName contained metadata title
+
+" MathML tags
+" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
+syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
+syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
+syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
+syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
+syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
+syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
+syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
+syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
+syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
+syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
+syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
+syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
+syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
+syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
+syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
+syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
+syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
+syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
+syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
+syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
+
+" Custom Element
+syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
+
+" HTML 5 arguments
+" Core Attributes
+syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
+syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
+" Event-handler Attributes
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
+syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
+syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
+syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
+syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
+syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
+syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
+syn keyword htmlArg contained onvolumechange onwaiting
+" XML Attributes
+syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
+" new features
+" <body>
+syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
+syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
+" <video>, <audio>, <source>, <track>
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
+" <form>, <input>, <button>
+syn keyword htmlArg contained form autocomplete autofocus list min max step
+syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+syn keyword htmlArg contained required placeholder pattern
+" <command>, <details>, <time>
+syn keyword htmlArg contained label icon open datetime-local pubdate
+" <script>
+syn keyword htmlArg contained async
+" <content>
+syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest 
+" <picture>
+syn keyword htmlArg contained srcset sizes
+" <a>
+syn keyword htmlArg contained download media
+" <script>, <style>
+syn keyword htmlArg contained nonce
+" <area>, <a>, <img>, <iframe>, <link>
+syn keyword htmlArg contained referrerpolicy
+" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
+syn keyword htmlArg contained integrity crossorigin
+" <link>
+syn keyword htmlArg contained prefetch 
+" syn keyword htmlArg contained preload
+
+" Custom Data Attributes
+" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
+syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Vendor Extension Attributes
+" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
+syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Microdata
+" http://dev.w3.org/html5/md/
+syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
+
+" SVG
+" http://www.w3.org/TR/SVG/
+" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
+syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
+syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
+syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
+syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
+syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
+syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
+syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
+syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
+syn keyword htmlArg contained id ideographic in in2 intercept 
+syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
+syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
+syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
+syn keyword htmlArg contained numOctaves 
+syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
+syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
+syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
+syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
+syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
+syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
+syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
+syn keyword htmlArg contained width widths 
+syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
+syn keyword htmlArg contained y y1 y2 yChannelSelector 
+syn keyword htmlArg contained z zoomAndPan 
+syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
+
+" MathML attributes
+" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
+syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
+syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
+syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
+syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
+syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
+syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
+syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
+syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
+syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
+syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
+syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
+syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
+syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
+syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
+
-- 
cgit v1.2.3


From 85492b6f67c281f5156ca7c493543ec8aa403812 Mon Sep 17 00:00:00 2001
From: ache <ache@ache.one>
Date: Mon, 15 Jan 2018 09:18:33 +0100
Subject: auto fold !

---
 plugin/perso.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin/perso.vim b/plugin/perso.vim
index 8b3217d..360c8f8 100755
--- a/plugin/perso.vim
+++ b/plugin/perso.vim
@@ -94,6 +94,10 @@ autocmd FileType mail                 let b:comment_leader = '>'
 autocmd FileType vim                  let b:comment_leader = '"'
 autocmd FileType haskell              let b:comment_leader = '--'
 
+
+autocmd FileType c,cpp,java,go,scala  set foldmethod=syntax
+
+
 noremap <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
 noremap <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
 
-- 
cgit v1.2.3


From 3d20eda4fc61037d1ea6c9756ea784557f7b604e Mon Sep 17 00:00:00 2001
From: ache <ache@ache.one>
Date: Mon, 15 Jan 2018 09:19:30 +0100
Subject: Fix the main args of the C template

---
 template/skel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/skel.c b/template/skel.c
index 9b6b772..6bb89d5 100644
--- a/template/skel.c
+++ b/template/skel.c
@@ -3,6 +3,6 @@
 
 
 
-int main(char* argv[], int argc) {
+int main(int argc, char* argv[]) {
 
 }
-- 
cgit v1.2.3


From b9310462afc2be878747eb38667075f201a743d6 Mon Sep 17 00:00:00 2001
From: ache <ache@ache.one>
Date: Mon, 15 Jan 2018 09:33:43 +0100
Subject: Color fix for graphics vim

---
 colors/jallybeans.vim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/colors/jallybeans.vim b/colors/jallybeans.vim
index 9789490..8b1a4ed 100644
--- a/colors/jallybeans.vim
+++ b/colors/jallybeans.vim
@@ -480,3 +480,8 @@ delf s:grey_color
 delf s:grey_level
 delf s:grey_number
 " }}}
+
+" Gui
+
+
+hi Normal guifg=white guibg=black
-- 
cgit v1.2.3