Permalink
Browse files

Version 2.1.7: Changes: Fixed bugs in Identifier and Multi. Cosmetic …

…fixes.
  • Loading branch information...
1 parent 571608a commit 2be0ccf9deefeec326f30b145a994ce1ca47a382 @isene isene committed with Oct 17, 2012
Showing with 36 additions and 23 deletions.
  1. +14 −3 doc/hyperlist.txt
  2. +22 −20 syntax/hyperlist.vim
View
@@ -12,7 +12,7 @@ this plugin to make a password safe.
The VIM plugin version numbers correspond to the HyperList definition version
numbers with the VIM plugin adding another increment of versioning, e.g VIM
-plugin version 2.1.5 would be compatible with HyperList definition version 2.1.
+plugin version 2.1.7 would be compatible with HyperList definition version 2.1.
This documentation contains the full HyperList definition. For a more
comprehensive manual that also includes plenty of examples, read the official
@@ -863,11 +863,11 @@ HLstart
\
Qualifier
Any statement in square brackets that qualifies an Item
- Specifies under what conditions an Item is to be executed, exists or is valid
+ Specifies under what conditions an Item is to be executed, exists or is valid
Several Qualifiers can be strung together, separated by commas
All Qualifiers need to be fulfilled for the Item to be valid
EXAMPLE: "[+YYYY-MM-DD 02.30, Button color = Red, 4, ?] Push button"
- Successive Qualifiers can be strung together, separated by periods\textcolor; EXAMPLE:
+ Successive Qualifiers can be strung together, separated by periods\textcolor; EXAMPLE:
"[Apples. Oranges. Grapes]"
Do Item in the context of "apples", then "oranges", then "grapes"
EXAMPLES:
@@ -1010,6 +1010,17 @@ HyperList definition itself; Geir Isene <g@isene.com>. More at http//isene.com
==============================================================================
7 Changelog *HyperList-Changelog*
+VERSION 2.1.7 2012-10-17
+
+ Changes:
+ Fixed bugs in Identifier and Multi
+ Cosmetic fixes
+
+VERSION 2.1.6 2012-10-15
+
+ Changes:
+ Improved the GotoRef function.
+
VERSION 2.1.5 2012-10-13
Changes:
View
@@ -12,9 +12,10 @@
" Further, I am under no obligation to maintain or extend
" this software. It is provided on an 'as is' basis without
" any expressed or implied warranty.
-" Version: 2.1.6 - compatible with the HyperList definition v. 2.1
-" Modified: 2012-10-15
-" Changes: Fixed GotoRef function
+" Version: 2.1.7 - compatible with the HyperList definition v. 2.1
+" Modified: 2012-10-17
+" Changes: Fixed bugs in Identifier and Multi
+" Cosmetic fixes
" INSTRUCTIONS {{{1
"
@@ -422,18 +423,19 @@ endfunction
" Syntax definitions {{{1
" HyperList elements {{{2
-" Identifier (any number in front)
-syn match HLident "^\(\t\|\*\)*[0-9.]* "
+
+" Identifier (any number in front)
+syn match HLident '^\(\t\|\*\)*[0-9.]* '
" Multi-line
-syn match HLmulti "^\(\t\|\*\)*+ "
+syn match HLmulti '^\(\t\|\*\)*+ '
" State & Transitions
-syn match HLstate "\(^\|\(\s\|\*\)\(S: \|| \)\)\@<=[^;]*" contains=HLtodo,HLop,HLcomment,HLref,HLqual,HLsc,HLmove,HLtag,HLquote
-syn match HLtrans "\(^\|\(\s\|\*\)\(T: \|/ \)\)\@<=[^;]*" contains=HLtodo,HLop,HLcomment,HLref,HLqual,HLsc,HLmove,HLtag,HLquote
+syn match HLstate '\(\(^\|\s\|\*\)\(S: \|| \)\)\@<=.*' contains=HLtodo,HLop,HLcomment,HLref,HLqual,HLsc,HLmove,HLtag,HLquote
+syn match HLtrans '\(\(^\|\s\|\*\)\(T: \|/ \)\)\@<=.*' contains=HLtodo,HLop,HLcomment,HLref,HLqual,HLsc,HLmove,HLtag,HLquote
" Qualifiers are enclosed within [ ]
-syn match HLqual "\[.\{-}\]" contains=HLtodo,HLref,HLcomment
+syn match HLqual '\[.\{-}\]' contains=HLtodo,HLref,HLcomment
" Tags - anything that ends in a colon
syn match HLtag '\(^\|\s\|\*\)\@<=[a-zA-ZæøåÆØÅáéóúãõâêôçàÁÉÓÚÃÕÂÊÔÇÀü0-9,._&?%= \-\/+<>#'\*:]\{-2,}:\s' contains=HLtodo,HLcomment,HLquote,HLref
@@ -442,36 +444,36 @@ syn match HLtag '\(^\|\s\|\*\)\@<=[a-zA-ZæøåÆØÅáéóúãõâêôçàÁ
syn match HLop '\(^\|\s\|\*\)\@<=[A-ZÆØÅáéóúãõâêôçàÁÉÓÚÃÕÂÊÔÇÀü_/\-()]\{-2,}:\s' contains=HLcomment,HLquote
" Mark semicolon as stringing together lines
-syn match HLsc ";"
+syn match HLsc ';'
" References start with a hash (#)
-syn match HLref "#\{1,2}\(\'[a-zA-ZæøåÆØÅáéóúãõâêôçàÁÉÓÚÃÕÂÊÔÇÀü0-9,.:/ _&?%=+\-\*]\+\'\|[a-zA-ZæøåÆØÅáéóúãõâêôçàÁÉÓÚÃÕÂÊÔÇÀü0-9.:/_&?%=+\-\*]\+\)" contains=HLcomment
+syn match HLref '#\{1,2}\(\'[a-zA-ZæøåÆØÅáéóúãõâêôçàÁÉÓÚÃÕÂÊÔÇÀü0-9,.:/ _&?%=+\-\*]\+\'\|[a-zA-ZæøåÆØÅáéóúãõâêôçàÁÉÓÚÃÕÂÊÔÇÀü0-9.:/_&?%=+\-\*]\+\)' contains=HLcomment
" Reserved key words
syn keyword HLkey END SKIP
" Marking literal start and end (a whole literal region is folded as one block)
-syn match HLlit "\(\s\|\*\)\@<=\\$"
+syn match HLlit '\(\s\|\*\)\@<=\\$'
" Content of litaral (with no syntax highlighting)
-syn match HLlc "\(\s\|\*\)\\\_.\{-}\(\s\|\*\)\\" contains=HLlit
+syn match HLlc '\(\s\|\*\)\\\_.\{-}\(\s\|\*\)\\' contains=HLlit
" Comments are enclosed within ( )
-syn match HLcomment "(.\{-})" contains=HLtodo,HLref
+syn match HLcomment '(.\{-})' contains=HLtodo,HLref
" Text in quotation marks
-syn match HLquote '".\{-}"' contains=HLtodo,HLref
+syn match HLquote '".\{-}"' contains=HLtodo,HLref
" TODO or FIXME
syn keyword HLtodo TODO FIXME
" Item motion
-syn match HLmove ">>\|<<\|->\|<-"
+syn match HLmove '>>\|<<\|->\|<-'
" Bold and Italic
-syn match HLb " \@<=\*.\{-}\* "
-syn match HLi " \@<=/.\{-}/ "
-syn match HLu " \@<=_.\{-}_ "
+syn match HLb ' \@<=\*.\{-}\* '
+syn match HLi ' \@<=/.\{-}/'
+syn match HLu ' \@<=_.\{-}_'
" Cluster the above
syn cluster HLtxt contains=HLident,HLmulti,HLop,HLqual,HLtag,HLref,HLkey,HLlit,HLlc,HLcomment,HLquote,HLsc,HLtodo,HLmove,HLb,HLi,HLu,HLstate,HLtrans
@@ -501,7 +503,7 @@ syn match HLvim "^vim:.*"
" Highlighting and Linking {{{1
hi Folded ctermfg=NONE guifg=NONE gui=bold term=bold cterm=bold guibg=NONE ctermbg=NONE
hi def link HLident Define
-hi def link HLmulti Define
+hi def link HLmulti Statement
hi def link HLtag String
hi def link HLop Function
hi def link HLqual Type

0 comments on commit 2be0ccf

Please sign in to comment.