From 35c7c0a82da47161083581f389eefcff7b3c4eb2 Mon Sep 17 00:00:00 2001 From: Valdis Vitolins Date: Sat, 17 Sep 2016 19:21:23 +0300 Subject: [PATCH] Fixes for rule conditions. FIXME and !!! keywords in comments --- dictsource/en_rules | 1 - vim/syntax/espeakrules.vim | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dictsource/en_rules b/dictsource/en_rules index 784c7d5e..6fe28591 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -6915,7 +6915,6 @@ contin) u ju: ψ ps'aI_ ω 'oUmIg@_ ?3 ω oUm'eIg@_ - ο 'oUmIkr0n_ // default group for "non of the above" diff --git a/vim/syntax/espeakrules.vim b/vim/syntax/espeakrules.vim index 679ec291..1b8b1f55 100644 --- a/vim/syntax/espeakrules.vim +++ b/vim/syntax/espeakrules.vim @@ -20,7 +20,7 @@ syn region espeakRule start="^\.group"hs=s+6 end="^\."me=e-2,he=e-2 contains=esp " One rule line in Rule region syn region espeakRuleLine start="^[^\.]" end="$" contains=espeak1Cols,espeak2Cols,espeak3Cols,espeak4Cols,espeak5Cols,espeakComment -syn match espeakRuleCond /^?\d*/ +syn match espeakRuleCond /^?\!\{-}\d\+/ contained syn match espeakCharGroup /^\.L\d\{2}/ syn match espeakCharGroup /L\d\{2}/ contained syn match espeakRuleSymbol /[@#&ABCDHFGKNVXYZ]/ contained @@ -29,16 +29,16 @@ syn match espeakRulePrePoFix /[SP]\d\+/ contained syn match espeakRuleNote /\(\$w_alt\d*\|\$p_alt\d*\|$noprefix\)/ contained syn match espeakComment "//.*$" contains=espeakTodo syn match espeakComment "//.*$" contains=espeakTodo contained -syn match espeakTodo /TODO/ +syn match espeakTodo /\(TODO\|FIXME\|\!\!\!\)/ "syn match espeakError /^\s*\S\+/ contains=espeakComment syn match espeakRuleGroupKeyword /^\.group/ nextgroup=espeakGroupName contained syn match espeakGroupName /\s*\S\+/ nextgroup=espeakComment contained syn match espeak1Cols /^\s*\S\+/ contains=espeakComment contained syn match espeak2Cols /^\s*\S\+\s\+\S\+/ contains=espeakRuleCond,espeakRuleSpell,espeakCharGroup,espeakComment contained -syn match espeak3Cols /^\s*\S\+\s\+\S\+\s\+\S\+/ contains=espeakRulePre,espeakRuleCond,espeakRulePos,espeakRuleSpell,espeakComment contained -syn match espeak4Cols /^\s*\S\+\s\+\S\+\s\+\S\+\s\+\S\+/ contains=espeakRulePre,espeakRuleCond,espeakRulePos,espeakRuleSpell,espeakComment contained -syn match espeak5Cols /^\s*\S\+\s\+\S\+\s\+\S\+\s\+\S\+\s\+\S\+/ contains=espeakRulePre,espeakRuleCond,espeakRulePos,espeakRuleSpell,espeakComment contained +syn match espeak3Cols /^\s*\S\+\s\+\S\+\s\+\S\+/ contains=espeakRuleCond,espeakRulePre,espeakRulePos,espeakRuleSpell,espeakComment contained +syn match espeak4Cols /^\s*\S\+\s\+\S\+\s\+\S\+\s\+\S\+/ contains=espeakRuleCond,espeakRulePre,espeakRulePos,espeakRuleSpell,espeakComment contained +syn match espeak5Cols /^\s*\S\+\s\+\S\+\s\+\S\+\s\+\S\+\s\+\S\+/ contains=espeakRuleCond,espeakRulePre,espeakRulePos,espeakRuleSpell,espeakComment contained syn match espeakRulePre /\S\+)/ contains=espeakCharGroup,espeakRuleSymbol,espeakRuleSpecial contained syn match espeakRulePos /\s*(\S\+/ contains=espeakCharGroup,espeakRulePrePoFix,espeakRuleNote,espeakRuleSymbol,espeakRuleSpecial contained