--- twiki.vim.orig	2006-08-11 13:10:40.000000000 -0300
+++ twiki.vim	2006-08-11 13:46:05.000000000 -0300
@@ -36,6 +36,9 @@
   let main_syntax = 'twiki'
 endif
 
+" add the HTML syntax
+runtime! syntax/html.vim
+
 " Don't use standard HiLink, it will not work with included syntax files
 if version < 508
   command! -nargs=+ TwikiHiLink   highlight link <args>
@@ -53,7 +56,11 @@
 syntax match twikiBulletedList "^\(   \)\+\*\ze "
 syntax match twikiOrderedList  "^\(   \)\+1\ze "
 
-syntax match twikiVariable "\([^!]\|^\)\zs%\w\+%"
+syntax match twikiSimpleVariable "\([^!]\|^\)\zs%\w\+%"
+syntax region twikiVariable start="\([^!]\|^\)\zs%\w\+{" end="}%" contains=twikiVariableParam,twikiVariableValue
+TwikiHiLink twikiSimpleVariable twikiVariable
+syntax match twikiVariableParam contained "[a-z0-9]*="
+syntax region twikiVariableValue start="\"" skip="\\\"" end="\"" contains=twikiSimpleVariable,twikiVariable
 syntax match twikiTag      "<\w\+>"
 
 syntax match twikiDelimiter "|"
@@ -61,11 +68,13 @@
 syntax region twikiComment  start="<!--" end="-->"
 syntax region twikiVerbatim matchgroup=twikiTag
     \ start="<verbatim>" end="</verbatim>"
+syntax region twikiPre matchgroup=twikiTag contains=twikiVariable,twikiSimpleVariable
+    \ start="<pre>" end="</pre>"
 
 syntax region twikiHeading matchgroup=twikiHeadingMarker oneline
     \ start="^---+\+" end="$"
 
-let s:wikiWord = '\u[a-z0-9]\+\(\u[a-z0-9]\+\)\+'
+let s:wikiWord = '\(\w\+\.\)\?\u[a-z0-9]\+\(\u[a-z0-9]\+\)\+'
 
 execute 'syntax match twikiAnchor +^#'.s:wikiWord.'\ze\(\>\|_\)+'
 execute 'syntax match twikiWord +\(\s\|^\)\zs\(\u\l\+\.\)\='.s:wikiWord.'\(#'.s:wikiWord.'\)\=\ze\(\>\|_\)+'
@@ -103,11 +112,14 @@
 TwikiHiLink twikiHeading       String
 TwikiHiLink twikiHeadingMarker Operator
 TwikiHiLink twikiVariable      PreProc
+TwikiHiLink twikiVariableParam Type
+TwikiHiLink twikiVariableValue String
 TwikiHiLink twikiTag           PreProc
 TwikiHiLink twikiComment       Comment
 TwikiHiLink twikiWord          Tag
 TwikiHiLink twikiAnchor        PreProc
 TwikiHiLink twikiVerbatim      Constant
+TwikiHiLink twikiPre           Constant
 TwikiHiLink twikiBulletedList  Operator
 TwikiHiLink twikiOrderedList   Operator