HTML (Template Toolkit).rb in ver-2010.08

- old
+ new

@@ -1,14 +1,14 @@
 # Encoding: UTF-8
 
 {fileTypes: ["tt"],
  firstLineMatch: "\\[%.+?%\\]",
  foldingStartMarker: 
-  /(<(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\b.*?>|^ *\[%[^%]*\b(?:FOR|WRAPPER|SWITCH|FOREACH|IF|UNLESS|BLOCK|MACRO|FILTER|PERL|TRY)\b(?!.*END *%\]))/,
+  /(?<_1><(?i:(?<_2>head|table|tr|div|style|script|ul|ol|form|dl))\b.*?>|^ *\[%[^%]*\b(?:FOR|WRAPPER|SWITCH|FOREACH|IF|UNLESS|BLOCK|MACRO|FILTER|PERL|TRY)\b(?!.*END *%\]))/,
  foldingStopMarker: 
-  /(<\/(?i:(head|table|tr|div|style|script|ul|ol|form|dl))>|^ *\[% *END *%\])/,
- keyEquivalent: /^~T/,
+  /(?<_1><\/(?i:(?<_2>head|table|tr|div|style|script|ul|ol|form|dl))>|^ *\[% *END *%\])/,
+ keyEquivalent: "^~T",
  name: "HTML (Template Toolkit)",
  patterns: 
   [{begin: /(?=\[% *(?:RAW)?PERL\b.*? *%\])/,
     contentName: "source.perl",
     end: "(\\[%) *(END) *(%\\])",
@@ -25,14 +25,14 @@
    entities: 
     {patterns: 
       [{captures: 
          {1 => {name: "punctuation.definition.constant.html"},
           3 => {name: "punctuation.definition.constant.html"}},
-        match: /(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)/,
+        match: /(?<_1>&)(?<_2>[a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(?<_3>;)/,
         name: "constant.character.entity.html"},
        {match: /&/, name: "invalid.illegal.bad-ampersand.html"}]},
-   keyword: {match: /\b([A-Za-z0-9_]+)/, name: "string.unquoted.tt"},
+   keyword: {match: /\b(?<_1>[A-Za-z0-9_]+)/, name: "string.unquoted.tt"},
    :"string-double-quoted" => 
     {begin: /"/,
      beginCaptures: {0 => {name: "punctuation.definition.string.begin.tt"}},
      end: "\"",
      endCaptures: {0 => {name: "punctuation.definition.string.end.tt"}},
@@ -45,11 +45,11 @@
      endCaptures: {0 => {name: "punctuation.definition.string.end.tt"}},
      name: "string.quoted.single.tt",
      patterns: [{include: "#embedded-code"}, {include: "#entities"}]},
    :"tag-generic-attribute" => 
     {captures: {2 => {name: "punctuation.separator.key-value.tt"}},
-     match: /\b([a-zA-Z_:-]+)\s*(=)/,
+     match: /\b(?<_1>[a-zA-Z_:-]+)\s*(?<_2>=)/,
      name: "entity.other.attribute-name.tt"},
    :"tag-stuff" => 
     {patterns: 
       [{include: "#tag-generic-attribute"},
        {include: "#string-double-quoted"},
@@ -63,22 +63,22 @@
         name: "meta.tag.template.tt",
         patterns: [{include: "#tt-stuff"}]}]},
    :"tt-stuff" => 
     {patterns: 
       [{captures: {1 => {name: "punctuation.definition.comment.tt"}},
-        match: /(#).*?(?=%\])/,
+        match: /(?<_1>#).*?(?=%\])/,
         name: "comment.line.number-sign.tt"},
        {captures: 
          {1 => {name: "string.quoted.double.filename.tt"},
           2 => {name: "punctuation.definition.string.begin.tt"},
           4 => {name: "punctuation.definition.string.begin.tt"},
           5 => {name: "string.unquoted.other.filename.tt"}},
         match: 
-         /((")([a-z][a-z0-9_]+\/)+[a-z0-9_\.]+("))|(\b([a-z][a-z0-9_]+\/)+[a-z0-9_\.]+\b)/},
+         /(?<_1>(?<_2>")(?<_3>[a-z][a-z0-9_]+\/)+[a-z0-9_\.]+(?<_4>"))|(?<_5>\b(?<_6>[a-z][a-z0-9_]+\/)+[a-z0-9_\.]+\b)/},
        {include: "#string-double-quoted"},
        {include: "#string-single-quoted"},
        {captures: {1 => {name: "punctuation.definition.variable.tt"}},
-        match: /(\$?)\b[a-z]([a-z0-9_]\.?)*\b/,
+        match: /(?<_1>\$?)\b[a-z](?<_2>[a-z0-9_]\.?)*\b/,
         name: "variable.other.tt"},
        {match: 
          /\b(?:IF|END|BLOCK|INCLUDE|ELSE|ELSIF|SWITCH|CASE|UNLESS|WRAPPER|FOR|FOREACH|LAST|NEXT|USE|WHILE|FILTER|IN|GET|CALL|SET|INSERT|MACRO|PERL|TRY|CATCH|THROW|FINAL|STOP|META|DEBUG|RAWPERL)\b/,
         name: "keyword.control.tt"},
        {match: /\||\|\||=|_|-|\*|\/|\?|:|div|mod|;|\+/,