From: Julien Moutinho <julm+tool+hledger@autogeree.net>
Date: Tue, 29 Jul 2014 02:10:04 +0000 (+0200)
Subject: Correction : vim/syntax/hledger.vim
X-Git-Tag: v2014.08.02~8
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%40%20%27info_classement_2%27%20=%3E%20%27%C3%82%C2%A0out%20of%20%40liste%40%27%2C%20%27info_code_acces%27%20=%3E%20%27Do%20not%20forget%20your%20own%20access%20codes%21%27%2C%20%27info_compatibilite_html%27%20=%3E%20%27HTML%20norm%20to%20apply%27%2C-%27info_compresseur_gzip%27%20=%3E%20%27It%20is%20advisable%20to%20check%20first%20whether%20your%20hosting%20provider%20already%20systematically%20compresses%20PHP%20scripts.%20To%20do%20this%20you%20can%20use%20a%20service%20such%20as%20%40testgzip%40%27%2C-%27info_compresseur_texte%27%20=%3E%20%27If%20your%20server%20does%20not%20compress%20HTML%20pages%20before%20sending%20them%2C%20you%20can%20attempt%20to%20force%20compression%20in%20order%20to%20reduce%20the%20size%20of%20the%20pages%20transmitted.%3Cb%3EWarning%3C/b%3E:%20this%20can%20have%20a%20noticeable%20adverse%20effect%20on%20the%20performance%20of%20some%20servers%2C%20%27%2C%20%27info_config_suivi%27%20=%3E%20%27If%20this%20address%20corresponds%20to%20a%20mailing%20list%2C%20you%20can%20indicate%20the%20subscription%20address%20for%20this%20list.%20This%20may%20be%20a%20URL%20%28e.g.%20a%20webpage%20enabling%20subscription%20online%29%2C%20or%20an%20email%20address%20with%20a%20specific%20subject%20%28for%20instance:%20%3Ctt%3E%40adresse_suivi%40?a=commitdiff_plain;h=cb540d8637cf0196f2bd2a192597afe9fadcdf19;p=tool%2Fhledger.git

Correction : vim/syntax/hledger.vim
---

diff --git a/vim/syntax/hledger.vim b/vim/syntax/hledger.vim
index 3f58d7a..1943692 100644
--- a/vim/syntax/hledger.vim
+++ b/vim/syntax/hledger.vim
@@ -8,7 +8,6 @@ if exists("b:current_syntax")
 	finish
  endif
 
-
 syn clear
 syn sync fromstart
 syn sync linebreaks=1
@@ -22,41 +21,53 @@ syn match  hledgerAccountSeparator     ":" contained
 syn region hledgerInclude   start=/^!include/ end=/^/
 syn region hledgerDirective start=/^[A-Z]/    end=/^/ contains=hledgerComment
 
-syn region hledgerTransaction        start=/^\d[^ 	]\+ / end=/^\s*$/
-syn match  hledgerTransactionHead    "^[0-9/]\+\(=[0-9/]\+\)\?\(\s\+[!*]\)\?" contained containedin=hledgerTransaction
-syn match  hledgerTransactionDate    "[0-9/]\+" contained containedin=hledgerTransactionHead
-syn match  hledgerTransactionComment ";.*" contained containedin=hledgerTransaction,hledgerPosting,hledgerPostingOdd
+syn region hledgerTransaction            start=/^\d[^ 	]\+/ end=/^\s*$/
+syn match  hledgerTransactionHead        "^[0-9/]\+\(=[0-9/]\+\)\?\(\s\+[!*]\)\?" contained containedin=hledgerTransaction nextgroup=hledgerTransactionDescription
+syn match  hledgerTransactionDate        "[0-9/]\+" contained containedin=hledgerTransactionHead
+syn match  hledgerTransactionDescription "\s[^;]\+"ms=s+1 contained containedin=hledgerTransaction
+syn match  hledgerTransactionComment     ";.*" contained containedin=hledgerTransaction,hledgerPosting,hledgerPostingOdd
 
-syn region hledgerPostingOdd         start=/^\s\+[^; 	]/ end=/^/ contained containedin=hledgerTransaction nextgroup=hledgerPosting
-syn region hledgerPosting            start=/^\s\+[^; 	]/ end=/^/ contained containedin=hledgerTransaction nextgroup=hledgerPostingOdd
+syn match  hledgerPostingAmountOdd   "  \(\s*[^; ]\+\)\+"ms=s+0 contained containedin=hledgerPostingOdd  contains=hledgerNumberOdd
+syn match  hledgerPostingAmount      "  \(\s*[^; ]\+\)\+"ms=s+0 contained containedin=hledgerPosting contains=hledgerNumber
 syn match  hledgerPostingAccountOdd  "^\s\+[^; 	][^; 	]*" contained containedin=hledgerPostingOdd  nextgroup=hledgerPostingAmountOdd  contains=hledgerNumberOdd,hledgerAccountSeparatorOdd
 syn match  hledgerPostingAccount     "^\s\+[^; 	][^; 	]*" contained containedin=hledgerPosting nextgroup=hledgerPostingAmount contains=hledgerNumber,hledgerAccountSeparator
-syn match  hledgerPostingAmountOdd   "   *\([^;]*\|$\)" contained containedin=hledgerPostingOdd  contains=hledgerNumberOdd
-syn match  hledgerPostingAmount      "   *\([^;]*\|$\)" contained containedin=hledgerPosting contains=hledgerNumber
+syn region hledgerPostingOdd         start=/^\s\+[^; 	]/ end=/^/ contained containedin=hledgerTransaction nextgroup=hledgerPosting
+syn region hledgerPosting            start=/^\s\+[^; 	]/ end=/^/ contained containedin=hledgerTransaction nextgroup=hledgerPostingOdd
 
-syn match  hledgerTag      /[^:, ]\+:[^,]*/ contained containedin=hledgerTransactionComment nextgroup=hledgerTagValue
-syn match  hledgerTagValue /:[^,]*/ms=s+1  contained containedin=hledgerTag
+syn match  hledgerTag      /[^;, :]\+:[^;,]*/ contained containedin=hledgerTransactionComment nextgroup=hledgerTagValue
+syn match  hledgerTagValue /[^;, :]:[^,;]*/ms=s+2  contained containedin=hledgerTag
 
 if version >= 508 || !exists("did_hledger_syntax_inits")
-	hi hledgerComment              term=bold      cterm=bold ctermfg=6 ctermbg=0    gui=bold guifg=#4169E1
-	hi hledgerInclude              term=bold      cterm=bold                        gui=bold
-	hi hledgerDirective            term=bold      cterm=bold                        gui=bold
-	hi hledgerAccountSeparatorOdd  term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=black   guibg=gray90
-	hi hledgerAccountSeparator     term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=black   guibg=lightgreen
-	hi hledgerNumberOdd            term=bold      cterm=bold ctermfg=4 ctermbg=none gui=bold guifg=blue    guibg=gray90
-	hi hledgerNumber               term=bold      cterm=bold ctermfg=4 ctermbg=none gui=bold guifg=blue    guibg=lightgreen
-	hi hledgerPostingOdd                          cterm=bold           ctermbg=none                        guibg=gray90
-	hi hledgerPosting                             cterm=bold           ctermbg=none                        guibg=lightgreen
-	hi hledgerPostingAccountOdd    term=underline cterm=bold ctermfg=0 ctermbg=none          guifg=gray30  guibg=gray90
-	hi hledgerPostingAccount       term=underline cterm=bold ctermfg=0 ctermbg=none          guifg=gray30  guibg=lightgreen
-	hi hledgerPostingAmountOdd                    cterm=bold ctermfg=3 ctermbg=none gui=bold               guibg=gray90
-	hi hledgerPostingAmount                       cterm=bold ctermfg=3 ctermbg=none gui=bold               guibg=lightgreen
-	hi hledgerTag                  term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=orange
-	hi hledgerTagValue             term=bold      cterm=bold ctermfg=1 ctermbg=none gui=NONE guifg=red
-	hi hledgerTransaction                         cterm=bold           ctermbg=none gui=bold
-	hi hledgerTransactionComment   term=bold      cterm=bold ctermfg=6 ctermbg=none gui=bold guifg=#4169E1
-	hi hledgerTransactionDate                     cterm=bold ctermfg=5 ctermbg=none gui=bold               guibg=lightgoldenrod
-	hi hledgerTransactionHead      term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=black   guibg=lightgreen
+	if version < 508
+		let did_hledger_syntax_inits = 1
+		command! -nargs=+ HiLink hi link <args>
+	else
+		command! -nargs=+ HiLink hi def link <args>
+	 endif
+	hi SpecialKey                                                                   gui=bold                      guifg=lightgoldenrod
+	hi Comment                       term=bold      cterm=bold ctermfg=6 ctermbg=0    gui=bold guifg=#4169E1
+	hi Comment                       term=bold      cterm=bold ctermfg=6 ctermbg=0    gui=bold guifg=#4169E1
+	HiLink hledgerComment Comment
+	hi hledgerInclude                term=bold      cterm=bold                        gui=bold
+	hi hledgerDirective              term=bold      cterm=bold                        gui=bold
+	hi hledgerAccountSeparatorOdd    term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=DarkGoldenrod2 guibg=gray90
+	hi hledgerAccountSeparator       term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=DarkGoldenrod2 guibg=lightgreen
+	hi hledgerNumberOdd              term=bold      cterm=bold ctermfg=4 ctermbg=none gui=bold guifg=blue           guibg=gray90
+	hi hledgerNumber                 term=bold      cterm=bold ctermfg=4 ctermbg=none gui=bold guifg=blue           guibg=lightgreen
+	hi hledgerPostingOdd                            cterm=bold           ctermbg=none                               guibg=NONE
+	hi hledgerPosting                               cterm=bold           ctermbg=none                               guibg=NONE
+	hi hledgerPostingAccountOdd      term=underline cterm=bold ctermfg=0 ctermbg=none          guifg=gray30         guibg=gray90
+	hi hledgerPostingAccount         term=underline cterm=bold ctermfg=0 ctermbg=none          guifg=gray30         guibg=lightgreen
+	hi hledgerPostingAmountOdd                      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=DarkGoldenrod2 guibg=gray90
+	hi hledgerPostingAmount                         cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=DarkGoldenrod2 guibg=lightgreen
+	hi hledgerTag                    term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=orange
+	hi hledgerTagValue               term=bold      cterm=bold ctermfg=1 ctermbg=none gui=NONE guifg=red
+	hi hledgerTransaction                           cterm=bold           ctermbg=none gui=bold
+	hi hledgerTransactionComment     term=bold      cterm=bold ctermfg=6 ctermbg=none gui=bold guifg=#4169E1
+	hi hledgerTransactionDate                       cterm=bold ctermfg=5 ctermbg=none gui=bold                      guibg=lightgoldenrod
+	hi hledgerTransactionDescription                cterm=bold ctermfg=5 ctermbg=none gui=bold                      guibg=lightgoldenrod
+	hi hledgerTransactionHead        term=bold      cterm=bold ctermfg=3 ctermbg=none gui=bold guifg=black          guibg=lightgreen
+	delcommand HiLink
  endif
 
 let b:current_syntax = "hledger"