diff --git a/src/irpf90.vim b/src/irpf90.vim index d5515b4..e4a4c99 100644 --- a/src/irpf90.vim +++ b/src/irpf90.vim @@ -2,9 +2,8 @@ " Language: IRPF90 " Version: 0.1 " URL: -" Last Change: 2011 Nov. 9 +" Last Change: 2018 Nov. 28 " Maintainer: -" Usage: Do :help irpf90-syntax from Vim " Credits: " Version 0.1 was based on the fortran 95 syntax file by Ajit J. Thakkar @@ -373,119 +372,119 @@ map K :call ReadMan() set equalprg=irpf90_indent -if exists('g:no_irpf90_conceal') || !has('conceal') || &enc != 'utf-8' - finish -endif +"if exists('g:no_irpf90_conceal') || !has('conceal') || &enc != 'utf-8' +" finish +"endif -syntax match irpf90NiceOperator "<-" conceal cchar=← -iab ← <- -syntax match irpf90NiceOperator "->" conceal cchar=→ -iab → -> -syntax match irpf90NiceOperator "==" conceal cchar=≡ -iab ≡ == -syntax match irpf90NiceOperator "\.eq\." conceal cchar=≡ -syntax match irpf90NiceOperator "/=" conceal cchar=≠ -iab ≠ /= -syntax match irpf90NiceOperator "\.ne\." conceal cchar=≠ -syntax match irpf90NiceOperator "\.or\." conceal cchar=∨ -iab ∨ .or. -syntax match irpf90NiceOperator "\.and\." conceal cchar=∧ -iab ∧ .and. -syntax match irpf90NiceOperator "*" conceal cchar=× -iab × * - -let s:extraConceal = 1 -" Some windows font don't support some of the characters, -" so if they are the main font, we don't load them :) -if has("win32") - let s:incompleteFont = [ 'Consolas' - \ , 'Lucida Console' - \ , 'Courier New' - \ ] - let s:mainfont = substitute( &guifont, '^\([^:,]\+\).*', '\1', '') - for s:fontName in s:incompleteFont - if s:mainfont ==? s:fontName - let s:extraConceal = 0 - break - endif - endfor -endif - -if s:extraConceal - syntax match irpf90NiceOperator "<=" conceal cchar=≤ - syntax match irpf90NiceOperator "\.le\." conceal cchar=≤ - iab ≤ <= - syntax match irpf90NiceOperator ">=" conceal cchar=≥ - syntax match irpf90NiceOperator "\.ge\." conceal cchar=≥ - iab ≥ >= - syntax match irpf90NiceOperator "\.lt\." conceal cchar=< - syntax match irpf90NiceOperator "\.gt\." conceal cchar=> - syntax match irpf90NiceOperator "=>" conceal cchar=⇒ - iab ⇒ => - syntax match irpf90NiceOperator "\:\:" conceal cchar=∷ - iab ∷ :: - syntax match irpf90NiceOperator "++" conceal cchar=⧺ - iab ⧺ ++ - syntax match irpf90NiceOperator "\" conceal cchar=Δ - iab Δ Delta - syntax match irpf90NiceOperator "\C\" conceal cchar=Λ - iab Λ Lambda - syntax match irpf90NiceOperator "\C\" conceal cchar=Π - iab Π Pi - syntax match irpf90NiceOperator "\C\" conceal cchar=Σ - iab Σ Sigma - syntax match irpf90NiceOperator "\C\" conceal cchar=Ψ - iab Ψ Psi - syntax match irpf90NiceOperator "\C\" conceal cchar=Ω - iab Ω Omega - syntax match irpf90NiceOperator "\C\" conceal cchar=α - iab α alpha - syntax match irpf90NiceOperator "\C\" conceal cchar=β - iab β beta - syntax match irpf90NiceOperator "\C\" conceal cchar=γ - iab γ gamma - syntax match irpf90NiceOperator "\C\" conceal cchar=δ - iab δ delta - syntax match irpf90NiceOperator "\C\" conceal cchar=ε - iab ε epsilon - syntax match irpf90NiceOperator "\C\" conceal cchar=ζ - iab ζ zeta - syntax match irpf90NiceOperator "\C\" conceal cchar=θ - iab θ theta - syntax match irpf90NiceOperator "\C\" conceal cchar=η - iab η eta - syntax match irpf90NiceOperator "\C\" conceal cchar=λ - iab λ lambda - syntax match irpf90NiceOperator "\C\" conceal cchar=μ - iab μ mu - syntax match irpf90NiceOperator "\C\" conceal cchar=ν - iab ν nu - syntax match irpf90NiceOperator "\C\" conceal cchar=π - iab π pi - syntax match irpf90NiceOperator "\C\" conceal cchar=ρ - iab ρ rho - syntax match irpf90NiceOperator "\C\" conceal cchar=σ - iab σ sigma - syntax match irpf90NiceOperator "\C\" conceal cchar=τ - iab τ tau - syntax match irpf90NiceOperator "\C\" conceal cchar=φ - iab φ phi - syntax match irpf90NiceOperator "\C\" conceal cchar=∇ - iab ∇ nabla - syntax match irpf90NiceOperator "\C\" conceal cchar=χ - iab χ chi - syntax match irpf90NiceOperator "\C\" conceal cchar=ψ - iab ψ psi - syntax match irpf90NiceOperator "\C\" conceal cchar=ω - iab ω omega -endif - -hi link irpf90NiceOperator Operator -hi! link Conceal Operator -setlocal conceallevel=2 +"syntax match irpf90NiceOperator "<-" conceal cchar=← +"iab ← <- +"syntax match irpf90NiceOperator "->" conceal cchar=→ +"iab → -> +"syntax match irpf90NiceOperator "==" conceal cchar=≡ +"iab ≡ == +"syntax match irpf90NiceOperator "\.eq\." conceal cchar=≡ +"syntax match irpf90NiceOperator "/=" conceal cchar=≠ +"iab ≠ /= +"syntax match irpf90NiceOperator "\.ne\." conceal cchar=≠ +"syntax match irpf90NiceOperator "\.or\." conceal cchar=∨ +"iab ∨ .or. +"syntax match irpf90NiceOperator "\.and\." conceal cchar=∧ +"iab ∧ .and. +"syntax match irpf90NiceOperator "*" conceal cchar=× +"iab × * +" +"let s:extraConceal = 1 +"" Some windows font don't support some of the characters, +"" so if they are the main font, we don't load them :) +"if has("win32") +" let s:incompleteFont = [ 'Consolas' +" \ , 'Lucida Console' +" \ , 'Courier New' +" \ ] +" let s:mainfont = substitute( &guifont, '^\([^:,]\+\).*', '\1', '') +" for s:fontName in s:incompleteFont +" if s:mainfont ==? s:fontName +" let s:extraConceal = 0 +" break +" endif +" endfor +"endif +" +"if s:extraConceal +" syntax match irpf90NiceOperator "<=" conceal cchar=≤ +" syntax match irpf90NiceOperator "\.le\." conceal cchar=≤ +" iab ≤ <= +" syntax match irpf90NiceOperator ">=" conceal cchar=≥ +" syntax match irpf90NiceOperator "\.ge\." conceal cchar=≥ +" iab ≥ >= +" syntax match irpf90NiceOperator "\.lt\." conceal cchar=< +" syntax match irpf90NiceOperator "\.gt\." conceal cchar=> +" syntax match irpf90NiceOperator "=>" conceal cchar=⇒ +" iab ⇒ => +" syntax match irpf90NiceOperator "\:\:" conceal cchar=∷ +" iab ∷ :: +" syntax match irpf90NiceOperator "++" conceal cchar=⧺ +" iab ⧺ ++ +" syntax match irpf90NiceOperator "\" conceal cchar=Δ +" iab Δ Delta +" syntax match irpf90NiceOperator "\C\" conceal cchar=Λ +" iab Λ Lambda +" syntax match irpf90NiceOperator "\C\" conceal cchar=Π +" iab Π Pi +" syntax match irpf90NiceOperator "\C\" conceal cchar=Σ +" iab Σ Sigma +" syntax match irpf90NiceOperator "\C\" conceal cchar=Ψ +" iab Ψ Psi +" syntax match irpf90NiceOperator "\C\" conceal cchar=Ω +" iab Ω Omega +" syntax match irpf90NiceOperator "\C\" conceal cchar=α +" iab α alpha +" syntax match irpf90NiceOperator "\C\" conceal cchar=β +" iab β beta +" syntax match irpf90NiceOperator "\C\" conceal cchar=γ +" iab γ gamma +" syntax match irpf90NiceOperator "\C\" conceal cchar=δ +" iab δ delta +" syntax match irpf90NiceOperator "\C\" conceal cchar=ε +" iab ε epsilon +" syntax match irpf90NiceOperator "\C\" conceal cchar=ζ +" iab ζ zeta +" syntax match irpf90NiceOperator "\C\" conceal cchar=θ +" iab θ theta +" syntax match irpf90NiceOperator "\C\" conceal cchar=η +" iab η eta +" syntax match irpf90NiceOperator "\C\" conceal cchar=λ +" iab λ lambda +" syntax match irpf90NiceOperator "\C\" conceal cchar=μ +" iab μ mu +" syntax match irpf90NiceOperator "\C\" conceal cchar=ν +" iab ν nu +" syntax match irpf90NiceOperator "\C\" conceal cchar=π +" iab π pi +" syntax match irpf90NiceOperator "\C\" conceal cchar=ρ +" iab ρ rho +" syntax match irpf90NiceOperator "\C\" conceal cchar=σ +" iab σ sigma +" syntax match irpf90NiceOperator "\C\" conceal cchar=τ +" iab τ tau +" syntax match irpf90NiceOperator "\C\" conceal cchar=φ +" iab φ phi +" syntax match irpf90NiceOperator "\C\" conceal cchar=∇ +" iab ∇ nabla +" syntax match irpf90NiceOperator "\C\" conceal cchar=χ +" iab χ chi +" syntax match irpf90NiceOperator "\C\" conceal cchar=ψ +" iab ψ psi +" syntax match irpf90NiceOperator "\C\" conceal cchar=ω +" iab ω omega +"endif +" +"hi link irpf90NiceOperator Operator +"hi! link Conceal Operator +"setlocal conceallevel=2 " vim: set fenc=utf-8: " vim: ts=8 tw=132 diff --git a/src/version.py b/src/version.py index 2196826..a26c301 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.7.2" +version = "1.7.3"