From 1db52faf7049d8c9845099499e6ebd62f66f058e Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 9 Feb 2016 01:38:07 +0100 Subject: [PATCH] Improved Vim file (utf8) --- example/Makefile | 4 +-- vim/irpf90.vim | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/example/Makefile b/example/Makefile index 437a0ad..76d3850 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,7 +1,7 @@ -IRPF90 = python ../src/irpf90.py -I input -a -d -j +IRPF90 = python ../src/irpf90.py -I input -a -d FC = ifort FCFLAGS= -O2 -NINJA = ninja -j 1 -v +NINJA = SRC= OBJ= diff --git a/vim/irpf90.vim b/vim/irpf90.vim index c7774f2..504a241 100644 --- a/vim/irpf90.vim +++ b/vim/irpf90.vim @@ -373,4 +373,83 @@ map K :call ReadMan() set equalprg=irpf90_indent +if exists('g:no_irpf90_conceal') || !has('conceal') || &enc != 'utf-8' + finish +endif + +syntax match irpf90NiceOperator "<-" conceal cchar=← +syntax match irpf90NiceOperator "->" conceal cchar=→ +syntax match irpf90NiceOperator "==" conceal cchar=≡ +syntax match irpf90NiceOperator ".eq." conceal cchar=≡ +syntax match irpf90NiceOperator "/=" conceal cchar=≠ +syntax match irpf90NiceOperator ".ne." conceal cchar=≠ +syntax match irpf90NiceOperator ".or." conceal cchar=∨ +syntax match irpf90NiceOperator ".and." conceal cchar=∧ +syntax match irpf90NiceOperator "*" conceal cchar=× + +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 + " Match greater than and lower than w/o messing with Kleisli composition + syntax match irpf90NiceOperator "<=" conceal cchar=≤ + syntax match irpf90NiceOperator ">=" conceal cchar=≥ + syntax match irpf90NiceOperator "\.le\." conceal cchar=≤ + syntax match irpf90NiceOperator "\.ge\." conceal cchar=≥ + syntax match irpf90NiceOperator "\.lt\." conceal cchar=< + syntax match irpf90NiceOperator "\.gt\." conceal cchar=> + syntax match irpf90NiceOperator "<\Delta\>" conceal cchar=Δ + syntax match irpf90NiceOperator "<\lapl_" conceal cchar=Δ + syntax match irpf90NiceOperator "\" conceal cchar=Λ + syntax match irpf90NiceOperator "\" conceal cchar=Π + syntax match irpf90NiceOperator "\" conceal cchar=Σ + syntax match irpf90NiceOperator "\" conceal cchar=Ψ + syntax match irpf90NiceOperator "\" conceal cchar=Ω + syntax match irpf90NiceOperator "\" conceal cchar=α + syntax match irpf90NiceOperator "\" conceal cchar=β + syntax match irpf90NiceOperator "\" conceal cchar=γ + syntax match irpf90NiceOperator "\" conceal cchar=δ + syntax match irpf90NiceOperator "\" conceal cchar=ε + syntax match irpf90NiceOperator "\" conceal cchar=ζ + syntax match irpf90NiceOperator "\" conceal cchar=θ + syntax match irpf90NiceOperator "\" conceal cchar=η + syntax match irpf90NiceOperator "\" conceal cchar=λ + syntax match irpf90NiceOperator "\" conceal cchar=μ + syntax match irpf90NiceOperator "\" conceal cchar=ν + syntax match irpf90NiceOperator "\" conceal cchar=π + syntax match irpf90NiceOperator "\" conceal cchar=ρ + syntax match irpf90NiceOperator "\" conceal cchar=σ + syntax match irpf90NiceOperator "\" conceal cchar=τ + syntax match irpf90NiceOperator "\" conceal cchar=φ + syntax match irpf90NiceOperator "\" conceal cchar=∇ + syntax match irpf90NiceOperator "\" conceal cchar=χ + syntax match irpf90NiceOperator "\" conceal cchar=ψ + syntax match irpf90NiceOperator "\" conceal cchar=ω + syntax match irpf90NiceOperator "=>" conceal cchar=⇒ + syntax match irpf90NiceOperator "\:\:" conceal cchar=∷ + syntax match irpf90NiceOperator "++" conceal cchar=⧺ + syntax match irpf90NiceOperator "\" conceal cchar=∀ +endif + +hi link irpf90NiceOperator Operator +hi! link Conceal Operator +setlocal conceallevel=2 + +" vim: set fenc=utf-8: " vim: ts=8 tw=132 +