emblem-source 0.3.2 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI1ZDM3YTlmODA2ZGVhNzg2NzM3ODBlNDU1NTRhM2RkNjRmNzcyNA==
+    YWFkODYyOWU0MGQ3N2M5ZWZjYjVhMGI0NDczM2RhNTQxMTAzYzRmOQ==
   data.tar.gz: !binary |-
-    OGI0NGQyNDRjOWVlOWU5YTM0MTY4YTI2YmY3OTg1NDM1MGMxYTNiYg==
+    ZjE0YTNiNjYxYmUwZjYyYmE5MmQ0MDllNDEwNTk0YWE1MjJjNDk1YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmVlNDVkOTQ5MzVkYzJlMTJlY2MyZWNhM2ZjYTViNWIzNDQ2ZGNmY2Q5MzBi
-    ZGZiMmMxZmQwOGZjNTVjYjFjNzQ3NDMzYWVjYTMxNDU4MjliMGMzMWJkMjhm
-    MTA5NmNkZTk4MWZmZjA0OWU0YTMwNDhkNzQxNjNiNjkzNTBkMzU=
+    YWNkNDFjOGYzZjkzOThmNjY4MDc0YThlOGMxYWE0ZjI1NDA1NDRkNTQyMDAz
+    ZGEyNzg3NWE1MjhhZTVjODFlNGVlOWJjNDA1NGNjYThmZGUwZDEyZTViMWU5
+    MjNlYzg0YTExMmY2MTc0MGYxMzZiNWMzNmRhMDgyOTRlMzc3NmQ=
   data.tar.gz: !binary |-
-    Y2Q2MjFjOWQxNDA1OTliMjkxNTRhMjBkMzFhNWM4OTYzOGVlYTI4NjRkYzhi
-    MjZlMjJjOTJjNTJkMjI3OWMwOTQ2MzZjMjMxOGU4MTdhN2IzZDU2NTBmZjhl
-    YjU4MzFkNTI2YmY1MWRmNDMyYTE5YjI0NGRkMTRlZTc4ZjZmMTk=
+    MzQ1ZTg1MGRkMGRiOGJlNmNkYjljNmFmNzc1NmMwZTEyZDg2NjQ5MjExNDI5
+    YWRlNWY1MjE4MWUyZjM5NGZlMTQzY2ZmMDZkM2M1YmI3NmU5NzgzMDQ3ODNj
+    ZGQ4YTI5MmY1NGE1ZGRmOGRkYWQzY2YxMzQ4M2NlZDY1NDBiN2M=

data/dist/emblem.js

@@ -103,7 +103,7 @@ this.Emblem = {};
 
 Emblem = this.Emblem;
 
-Emblem.VERSION = "0.3.2";
+Emblem.VERSION = "0.3.4";
 
 module.exports = Emblem;
 
@@ -367,34 +367,38 @@ Emblem.Parser = (function() {
         peg$c38 = function(t) { return ['tagName', t]; },
         peg$c39 = function(i) { return ['elementId', i]; },
         peg$c40 = function(c) { return ['class', c]; },
-        peg$c41 = function(id, classes) { return [id, classes]; },
-        peg$c42 = function(classes) { return [null, classes]; },
-        peg$c43 = function(a) { return a; },
-        peg$c44 = function(h) { return new AST.HashNode(h); },
-        peg$c45 = "PathIdent",
-        peg$c46 = "..",
-        peg$c47 = "\"..\"",
-        peg$c48 = ".",
-        peg$c49 = "\".\"",
-        peg$c50 = /^[a-zA-Z0-9_$\-!?\^]/,
-        peg$c51 = "[a-zA-Z0-9_$\\-!?\\^]",
-        peg$c52 = function(s) { return s; },
-        peg$c53 = "Key",
-        peg$c54 = ":",
-        peg$c55 = "\":\"",
-        peg$c56 = function(h) { return [h[0], h[2]]; },
-        peg$c57 = function(s, p) { return { part: p, separator: s }; },
-        peg$c58 = function(first, tail) {
+        peg$c41 = function(a) {
+          return a;
+        },
+        peg$c42 = function(id, classes) { return [id, classes]; },
+        peg$c43 = function(classes) { return [null, classes]; },
+        peg$c44 = function(a) { return a; },
+        peg$c45 = function(h) { return new AST.HashNode(h); },
+        peg$c46 = "PathIdent",
+        peg$c47 = "..",
+        peg$c48 = "\"..\"",
+        peg$c49 = ".",
+        peg$c50 = "\".\"",
+        peg$c51 = /^[a-zA-Z0-9_$\-!?\^]/,
+        peg$c52 = "[a-zA-Z0-9_$\\-!?\\^]",
+        peg$c53 = function(s) { return s; },
+        peg$c54 = "Key",
+        peg$c55 = ":",
+        peg$c56 = "\":\"",
+        peg$c57 = function(h) { return [h[0], h[2]]; },
+        peg$c58 = function(n) { return n; },
+        peg$c59 = function(s, p) { return { part: p, separator: s }; },
+        peg$c60 = function(first, tail) {
           var ret = [{ part: first }];
           for(var i = 0; i < tail.length; ++i) {
             ret.push(tail[i]);
           }
           return ret;
         },
-        peg$c59 = "PathSeparator",
-        peg$c60 = /^[\/.]/,
-        peg$c61 = "[\\/.]",
-        peg$c62 = function(v) { 
+        peg$c61 = "PathSeparator",
+        peg$c62 = /^[\/.]/,
+        peg$c63 = "[\\/.]",
+        peg$c64 = function(v) { 
           var last = v[v.length - 1];
           var match;
           var suffixModifier;
@@ -408,30 +412,32 @@ Emblem.Parser = (function() {
 
           return idNode;
         },
-        peg$c63 = function(v) { return new AST.StringNode(v); },
-        peg$c64 = function(v) { return new AST.IntegerNode(v); },
-        peg$c65 = function(v) { return new AST.BooleanNode(v); },
-        peg$c66 = "Boolean",
-        peg$c67 = "true",
-        peg$c68 = "\"true\"",
-        peg$c69 = "false",
-        peg$c70 = "\"false\"",
-        peg$c71 = "Integer",
-        peg$c72 = /^[0-9]/,
-        peg$c73 = "[0-9]",
-        peg$c74 = function(s) { return parseInt(s); },
-        peg$c75 = "\"",
-        peg$c76 = "\"\\\"\"",
-        peg$c77 = "'",
-        peg$c78 = "\"'\"",
-        peg$c79 = function(p) { return p[1]; },
-        peg$c80 = /^[^"}]/,
-        peg$c81 = "[^\"}]",
-        peg$c82 = /^[^'}]/,
-        peg$c83 = "[^'}]",
-        peg$c84 = /^[A-Za-z]/,
-        peg$c85 = "[A-Za-z]",
-        peg$c86 = function(ind, nodes, w) {
+        peg$c65 = function(v) { return new AST.StringNode(v); },
+        peg$c66 = function(v) { return new AST.IntegerNode(v); },
+        peg$c67 = function(v) { return new AST.BooleanNode(v); },
+        peg$c68 = "Boolean",
+        peg$c69 = "true",
+        peg$c70 = "\"true\"",
+        peg$c71 = "false",
+        peg$c72 = "\"false\"",
+        peg$c73 = "Integer",
+        peg$c74 = "-",
+        peg$c75 = "\"-\"",
+        peg$c76 = /^[0-9]/,
+        peg$c77 = "[0-9]",
+        peg$c78 = function(s) { return parseInt(s); },
+        peg$c79 = "\"",
+        peg$c80 = "\"\\\"\"",
+        peg$c81 = "'",
+        peg$c82 = "\"'\"",
+        peg$c83 = function(p) { return p[1]; },
+        peg$c84 = /^[^"}]/,
+        peg$c85 = "[^\"}]",
+        peg$c86 = /^[^'}]/,
+        peg$c87 = "[^'}]",
+        peg$c88 = /^[A-Za-z]/,
+        peg$c89 = "[A-Za-z]",
+        peg$c90 = function(ind, nodes, w) {
           nodes.unshift(new AST.ContentNode(ind));
 
           for(var i = 0; i < w.length; ++i) {
@@ -441,12 +447,12 @@ Emblem.Parser = (function() {
           }
           return nodes; 
         },
-        peg$c87 = /^[|`']/,
-        peg$c88 = "[|`']",
-        peg$c89 = "<",
-        peg$c90 = "\"<\"",
-        peg$c91 = function() { return '<'; },
-        peg$c92 = function(s, nodes, indentedNodes) { 
+        peg$c91 = /^[|`']/,
+        peg$c92 = "[|`']",
+        peg$c93 = "<",
+        peg$c94 = "\"<\"",
+        peg$c95 = function() { return '<'; },
+        peg$c96 = function(s, nodes, indentedNodes) { 
           if(nodes.length || !indentedNodes) {
             nodes.push("\n");
           }
@@ -479,50 +485,50 @@ Emblem.Parser = (function() {
 
           return ret;
         },
-        peg$c93 = function(first, tail) {
+        peg$c97 = function(first, tail) {
           return textNodesResult(first, tail);
         },
-        peg$c94 = function(first, tail) { return textNodesResult(first, tail); },
-        peg$c95 = "{",
-        peg$c96 = "\"{\"",
-        peg$c97 = /^[^}]/,
-        peg$c98 = "[^}]",
-        peg$c99 = function(text) {
+        peg$c98 = function(first, tail) { return textNodesResult(first, tail); },
+        peg$c99 = "{",
+        peg$c100 = "\"{\"",
+        peg$c101 = /^[^}]/,
+        peg$c102 = "[^}]",
+        peg$c103 = function(text) {
           // Force interpretation as mustache.
           // TODO: change to just parse with a specific rule?
           text = "=" + text;
           return Emblem.parse(text).statements[0];
         },
-        peg$c100 = function(m) { m.escaped = true; return m; },
-        peg$c101 = function(m) { m.escaped = false; return m; },
-        peg$c102 = function(a) { return new AST.ContentNode(a); },
-        peg$c103 = "any character",
-        peg$c104 = "SingleMustacheOpen",
-        peg$c105 = "DoubleMustacheOpen",
-        peg$c106 = "{{",
-        peg$c107 = "\"{{\"",
-        peg$c108 = "TripleMustacheOpen",
-        peg$c109 = "{{{",
-        peg$c110 = "\"{{{\"",
-        peg$c111 = "SingleMustacheClose",
-        peg$c112 = "}",
-        peg$c113 = "\"}\"",
-        peg$c114 = "DoubleMustacheClose",
-        peg$c115 = "}}",
-        peg$c116 = "\"}}\"",
-        peg$c117 = "TripleMustacheClose",
-        peg$c118 = "}}}",
-        peg$c119 = "\"}}}\"",
-        peg$c120 = "InterpolationOpen",
-        peg$c121 = "#{",
-        peg$c122 = "\"#{\"",
-        peg$c123 = "InterpolationClose",
-        peg$c124 = "==",
-        peg$c125 = "\"==\"",
-        peg$c126 = function() { return false; },
-        peg$c127 = function() { return true; },
-        peg$c128 = function(h, s) { return h || s; },
-        peg$c129 = function(h, inTagMustaches, fullAttributes) {
+        peg$c104 = function(m) { m.escaped = true; return m; },
+        peg$c105 = function(m) { m.escaped = false; return m; },
+        peg$c106 = function(a) { return new AST.ContentNode(a); },
+        peg$c107 = "any character",
+        peg$c108 = "SingleMustacheOpen",
+        peg$c109 = "DoubleMustacheOpen",
+        peg$c110 = "{{",
+        peg$c111 = "\"{{\"",
+        peg$c112 = "TripleMustacheOpen",
+        peg$c113 = "{{{",
+        peg$c114 = "\"{{{\"",
+        peg$c115 = "SingleMustacheClose",
+        peg$c116 = "}",
+        peg$c117 = "\"}\"",
+        peg$c118 = "DoubleMustacheClose",
+        peg$c119 = "}}",
+        peg$c120 = "\"}}\"",
+        peg$c121 = "TripleMustacheClose",
+        peg$c122 = "}}}",
+        peg$c123 = "\"}}}\"",
+        peg$c124 = "InterpolationOpen",
+        peg$c125 = "#{",
+        peg$c126 = "\"#{\"",
+        peg$c127 = "InterpolationClose",
+        peg$c128 = "==",
+        peg$c129 = "\"==\"",
+        peg$c130 = function() { return false; },
+        peg$c131 = function() { return true; },
+        peg$c132 = function(h, s) { return h || s; },
+        peg$c133 = function(h, inTagMustaches, fullAttributes) {
           var tagName = h[0] || 'div',
               shorthandAttributes = h[1] || [],
               id = shorthandAttributes[0],
@@ -558,9 +564,9 @@ Emblem.Parser = (function() {
             return [tagOpenContent, new AST.ContentNode('</' + tagName + '>')];
           }
         },
-        peg$c130 = function(s) { return { shorthand: s, id: true}; },
-        peg$c131 = function(s) { return { shorthand: s }; },
-        peg$c132 = function(shorthands) {
+        peg$c134 = function(s) { return { shorthand: s, id: true}; },
+        peg$c135 = function(s) { return { shorthand: s }; },
+        peg$c136 = function(shorthands) {
           var id, classes = [];
           for(var i = 0, len = shorthands.length; i < len; ++i) {
             var shorthand = shorthands[i];
@@ -573,28 +579,39 @@ Emblem.Parser = (function() {
 
           return [id, classes];
         },
-        peg$c133 = function(a) {
-          return [new AST.ContentNode(' ')].concat(a); 
+        peg$c137 = function(a) {
+          if (a.length) {
+            return [new AST.ContentNode(' ')].concat(a); 
+          } else {
+            return [];
+          }
         },
-        peg$c134 = /^[A-Za-z.0-9_\-]/,
-        peg$c135 = "[A-Za-z.0-9_\\-]",
-        peg$c136 = function(id) { return new AST.MustacheNode([id]); },
-        peg$c137 = function(event, mustacheNode) {
+        peg$c138 = /^[A-Za-z.0-9_\-]/,
+        peg$c139 = "[A-Za-z.0-9_\\-]",
+        peg$c140 = function(id) { return new AST.MustacheNode([id]); },
+        peg$c141 = function(event, mustacheNode) {
           // Unshift the action helper and augment the hash
           return [unshiftParam(mustacheNode, 'action', [['on', new AST.StringNode(event)]])];
         },
-        peg$c138 = function(value) { return value.replace(/ *$/, ''); },
-        peg$c139 = "!",
-        peg$c140 = "\"!\"",
-        peg$c141 = function(key, value) { return IS_EMBER; },
-        peg$c142 = function(key, value) { 
+        peg$c142 = function(key, boolValue) { 
+          if (boolValue === 'true') {
+            return [ new AST.ContentNode(key) ];
+          } else {
+            return [];
+          }
+        },
+        peg$c143 = function(value) { return value.replace(/ *$/, ''); },
+        peg$c144 = "!",
+        peg$c145 = "\"!\"",
+        peg$c146 = function(key, value) { return IS_EMBER; },
+        peg$c147 = function(key, value) { 
           var hashNode = new AST.HashNode([[key, new AST.StringNode(value)]]);
           var params = [new AST.IdNode([{part: 'bindAttr'}])];
           var mustacheNode = new AST.MustacheNode(params, hashNode);
 
           return [mustacheNode];
         },
-        peg$c143 = function(key, id) { 
+        peg$c148 = function(key, id) { 
           var mustacheNode = new AST.MustacheNode([id]);
 
           if(IS_EMBER && id._emblemSuffixModifier === '!') {
@@ -607,54 +624,52 @@ Emblem.Parser = (function() {
             new AST.ContentNode('"'),
           ];
         },
-        peg$c144 = function(key, nodes) { 
+        peg$c149 = function(key, nodes) { 
           var result = [ new AST.ContentNode(key + '=' + '"') ].concat(nodes);
           return result.concat([new AST.ContentNode('"')]);
         },
-        peg$c145 = "_",
-        peg$c146 = "\"_\"",
-        peg$c147 = "-",
-        peg$c148 = "\"-\"",
-        peg$c149 = "%",
-        peg$c150 = "\"%\"",
-        peg$c151 = "#",
-        peg$c152 = "\"#\"",
-        peg$c153 = function(c) { return c;},
-        peg$c154 = "CSSIdentifier",
-        peg$c155 = /^[_a-zA-Z0-9\-]/,
-        peg$c156 = "[_a-zA-Z0-9\\-]",
-        peg$c157 = /^[_a-zA-Z]/,
-        peg$c158 = "[_a-zA-Z]",
-        peg$c159 = /^[\x80-\xFF]/,
-        peg$c160 = "[\\x80-\\xFF]",
-        peg$c161 = "KnownHTMLTagName",
-        peg$c162 = function(t) { return !!KNOWN_TAGS[t]; },
-        peg$c163 = function(t) { return t; },
-        peg$c164 = "a JS event",
-        peg$c165 = function(t) { return !!KNOWN_EVENTS[t]; },
-        peg$c166 = "INDENT",
-        peg$c167 = "\uEFEF",
-        peg$c168 = "\"\\uEFEF\"",
-        peg$c169 = function() { return ''; },
-        peg$c170 = "DEDENT",
-        peg$c171 = "\uEFFE",
-        peg$c172 = "\"\\uEFFE\"",
-        peg$c173 = "Unmatched DEDENT",
-        peg$c174 = "\uEFEE",
-        peg$c175 = "\"\\uEFEE\"",
-        peg$c176 = "LineEnd",
-        peg$c177 = "\r",
-        peg$c178 = "\"\\r\"",
-        peg$c179 = "\uEFFF",
-        peg$c180 = "\"\\uEFFF\"",
-        peg$c181 = "\n",
-        peg$c182 = "\"\\n\"",
-        peg$c183 = "ANYDEDENT",
-        peg$c184 = "RequiredWhitespace",
-        peg$c185 = "OptionalWhitespace",
-        peg$c186 = "InlineWhitespace",
-        peg$c187 = /^[ \t]/,
-        peg$c188 = "[ \\t]",
+        peg$c150 = "_",
+        peg$c151 = "\"_\"",
+        peg$c152 = "%",
+        peg$c153 = "\"%\"",
+        peg$c154 = "#",
+        peg$c155 = "\"#\"",
+        peg$c156 = function(c) { return c;},
+        peg$c157 = "CSSIdentifier",
+        peg$c158 = /^[_a-zA-Z0-9\-]/,
+        peg$c159 = "[_a-zA-Z0-9\\-]",
+        peg$c160 = /^[_a-zA-Z]/,
+        peg$c161 = "[_a-zA-Z]",
+        peg$c162 = /^[\x80-\xFF]/,
+        peg$c163 = "[\\x80-\\xFF]",
+        peg$c164 = "KnownHTMLTagName",
+        peg$c165 = function(t) { return !!KNOWN_TAGS[t]; },
+        peg$c166 = function(t) { return t; },
+        peg$c167 = "a JS event",
+        peg$c168 = function(t) { return !!KNOWN_EVENTS[t]; },
+        peg$c169 = "INDENT",
+        peg$c170 = "\uEFEF",
+        peg$c171 = "\"\\uEFEF\"",
+        peg$c172 = function() { return ''; },
+        peg$c173 = "DEDENT",
+        peg$c174 = "\uEFFE",
+        peg$c175 = "\"\\uEFFE\"",
+        peg$c176 = "Unmatched DEDENT",
+        peg$c177 = "\uEFEE",
+        peg$c178 = "\"\\uEFEE\"",
+        peg$c179 = "LineEnd",
+        peg$c180 = "\r",
+        peg$c181 = "\"\\r\"",
+        peg$c182 = "\uEFFF",
+        peg$c183 = "\"\\uEFFF\"",
+        peg$c184 = "\n",
+        peg$c185 = "\"\\n\"",
+        peg$c186 = "ANYDEDENT",
+        peg$c187 = "RequiredWhitespace",
+        peg$c188 = "OptionalWhitespace",
+        peg$c189 = "InlineWhitespace",
+        peg$c190 = /^[ \t]/,
+        peg$c191 = "[ \\t]",
 
         peg$currPos          = 0,
         peg$reportedPos      = 0,
@@ -978,7 +993,7 @@ Emblem.Parser = (function() {
     }
 
     function peg$parselegacyPartialInvocation() {
-      var s0, s1, s2, s3, s4, s5, s6, s7;
+      var s0, s1, s2, s3, s4, s5, s6;
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 62) {
@@ -993,30 +1008,24 @@ Emblem.Parser = (function() {
         if (s2 !== null) {
           s3 = peg$parselegacyPartialName();
           if (s3 !== null) {
-            s4 = peg$parse_();
+            s4 = [];
+            s5 = peg$parseinMustacheParam();
+            while (s5 !== null) {
+              s4.push(s5);
+              s5 = peg$parseinMustacheParam();
+            }
             if (s4 !== null) {
-              s5 = [];
-              s6 = peg$parseinMustacheParam();
-              while (s6 !== null) {
-                s5.push(s6);
-                s6 = peg$parseinMustacheParam();
-              }
+              s5 = peg$parse_();
               if (s5 !== null) {
-                s6 = peg$parse_();
+                s6 = peg$parseTERM();
                 if (s6 !== null) {
-                  s7 = peg$parseTERM();
-                  if (s7 !== null) {
-                    peg$reportedPos = s0;
-                    s1 = peg$c15(s3, s5);
-                    if (s1 === null) {
-                      peg$currPos = s0;
-                      s0 = s1;
-                    } else {
-                      s0 = s1;
-                    }
-                  } else {
+                  peg$reportedPos = s0;
+                  s1 = peg$c15(s3, s4);
+                  if (s1 === null) {
                     peg$currPos = s0;
-                    s0 = peg$c0;
+                    s0 = s1;
+                  } else {
+                    s0 = s1;
                   }
                 } else {
                   peg$currPos = s0;
@@ -1886,47 +1895,67 @@ Emblem.Parser = (function() {
     }
 
     function peg$parsehtmlMustacheAttribute() {
-      var s0, s1;
+      var s0, s1, s2, s3;
 
       s0 = peg$currPos;
-      s1 = peg$parsetagNameShorthand();
+      s1 = peg$parse_();
       if (s1 !== null) {
-        peg$reportedPos = s0;
-        s1 = peg$c38(s1);
-      }
-      if (s1 === null) {
-        peg$currPos = s0;
-        s0 = s1;
-      } else {
-        s0 = s1;
-      }
-      if (s0 === null) {
-        s0 = peg$currPos;
-        s1 = peg$parseidShorthand();
-        if (s1 !== null) {
-          peg$reportedPos = s0;
-          s1 = peg$c39(s1);
+        s2 = peg$currPos;
+        s3 = peg$parsetagNameShorthand();
+        if (s3 !== null) {
+          peg$reportedPos = s2;
+          s3 = peg$c38(s3);
         }
-        if (s1 === null) {
-          peg$currPos = s0;
-          s0 = s1;
+        if (s3 === null) {
+          peg$currPos = s2;
+          s2 = s3;
         } else {
-          s0 = s1;
+          s2 = s3;
         }
-        if (s0 === null) {
-          s0 = peg$currPos;
-          s1 = peg$parseclassShorthand();
-          if (s1 !== null) {
-            peg$reportedPos = s0;
-            s1 = peg$c40(s1);
+        if (s2 === null) {
+          s2 = peg$currPos;
+          s3 = peg$parseidShorthand();
+          if (s3 !== null) {
+            peg$reportedPos = s2;
+            s3 = peg$c39(s3);
           }
+          if (s3 === null) {
+            peg$currPos = s2;
+            s2 = s3;
+          } else {
+            s2 = s3;
+          }
+          if (s2 === null) {
+            s2 = peg$currPos;
+            s3 = peg$parseclassShorthand();
+            if (s3 !== null) {
+              peg$reportedPos = s2;
+              s3 = peg$c40(s3);
+            }
+            if (s3 === null) {
+              peg$currPos = s2;
+              s2 = s3;
+            } else {
+              s2 = s3;
+            }
+          }
+        }
+        if (s2 !== null) {
+          peg$reportedPos = s0;
+          s1 = peg$c41(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
           } else {
             s0 = s1;
           }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$c0;
         }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$c0;
       }
 
       return s0;
@@ -1957,7 +1986,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c41(s1, s2);
+          s1 = peg$c42(s1, s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -1992,7 +2021,7 @@ Emblem.Parser = (function() {
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c42(s1);
+        s1 = peg$c43(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2005,31 +2034,22 @@ Emblem.Parser = (function() {
     }
 
     function peg$parseinMustacheParam() {
-      var s0, s1, s2;
+      var s0, s1;
 
       s0 = peg$currPos;
-      s1 = peg$parse_();
+      s1 = peg$parsehtmlMustacheAttribute();
+      if (s1 === null) {
+        s1 = peg$parseparam();
+      }
       if (s1 !== null) {
-        s2 = peg$parsehtmlMustacheAttribute();
-        if (s2 === null) {
-          s2 = peg$parseparam();
-        }
-        if (s2 !== null) {
-          peg$reportedPos = s0;
-          s1 = peg$c43(s2);
-          if (s1 === null) {
-            peg$currPos = s0;
-            s0 = s1;
-          } else {
-            s0 = s1;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$c0;
-        }
-      } else {
+        peg$reportedPos = s0;
+        s1 = peg$c44(s1);
+      }
+      if (s1 === null) {
         peg$currPos = s0;
-        s0 = peg$c0;
+        s0 = s1;
+      } else {
+        s0 = s1;
       }
 
       return s0;
@@ -2051,7 +2071,7 @@ Emblem.Parser = (function() {
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c44(s1);
+        s1 = peg$c45(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2067,41 +2087,41 @@ Emblem.Parser = (function() {
       var s0, s1, s2, s3;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c46) {
-        s0 = peg$c46;
+      if (input.substr(peg$currPos, 2) === peg$c47) {
+        s0 = peg$c47;
         peg$currPos += 2;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c47); }
+        if (peg$silentFails === 0) { peg$fail(peg$c48); }
       }
       if (s0 === null) {
         if (input.charCodeAt(peg$currPos) === 46) {
-          s0 = peg$c48;
+          s0 = peg$c49;
           peg$currPos++;
         } else {
           s0 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c49); }
+          if (peg$silentFails === 0) { peg$fail(peg$c50); }
         }
         if (s0 === null) {
           s0 = peg$currPos;
           s1 = peg$currPos;
           s2 = [];
-          if (peg$c50.test(input.charAt(peg$currPos))) {
+          if (peg$c51.test(input.charAt(peg$currPos))) {
             s3 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s3 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c51); }
+            if (peg$silentFails === 0) { peg$fail(peg$c52); }
           }
           if (s3 !== null) {
             while (s3 !== null) {
               s2.push(s3);
-              if (peg$c50.test(input.charAt(peg$currPos))) {
+              if (peg$c51.test(input.charAt(peg$currPos))) {
                 s3 = input.charAt(peg$currPos);
                 peg$currPos++;
               } else {
                 s3 = null;
-                if (peg$silentFails === 0) { peg$fail(peg$c51); }
+                if (peg$silentFails === 0) { peg$fail(peg$c52); }
               }
             }
           } else {
@@ -2130,7 +2150,7 @@ Emblem.Parser = (function() {
             }
             if (s2 !== null) {
               peg$reportedPos = s0;
-              s1 = peg$c52(s1);
+              s1 = peg$c53(s1);
               if (s1 === null) {
                 peg$currPos = s0;
                 s0 = s1;
@@ -2150,7 +2170,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c45); }
+        if (peg$silentFails === 0) { peg$fail(peg$c46); }
       }
 
       return s0;
@@ -2165,11 +2185,11 @@ Emblem.Parser = (function() {
       s2 = peg$parsenmchar();
       if (s2 === null) {
         if (input.charCodeAt(peg$currPos) === 58) {
-          s2 = peg$c54;
+          s2 = peg$c55;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c55); }
+          if (peg$silentFails === 0) { peg$fail(peg$c56); }
         }
       }
       while (s2 !== null) {
@@ -2177,11 +2197,11 @@ Emblem.Parser = (function() {
         s2 = peg$parsenmchar();
         if (s2 === null) {
           if (input.charCodeAt(peg$currPos) === 58) {
-            s2 = peg$c54;
+            s2 = peg$c55;
             peg$currPos++;
           } else {
             s2 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c55); }
+            if (peg$silentFails === 0) { peg$fail(peg$c56); }
           }
         }
       }
@@ -2192,7 +2212,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c53); }
+        if (peg$silentFails === 0) { peg$fail(peg$c54); }
       }
 
       return s0;
@@ -2202,7 +2222,7 @@ Emblem.Parser = (function() {
       var s0, s1, s2, s3, s4, s5;
 
       s0 = peg$currPos;
-      s1 = peg$parse_();
+      s1 = peg$parse__();
       if (s1 !== null) {
         s2 = peg$currPos;
         s3 = peg$parsekey();
@@ -2320,7 +2340,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c56(s2);
+          s1 = peg$c57(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -2340,17 +2360,37 @@ Emblem.Parser = (function() {
     }
 
     function peg$parseparam() {
-      var s0;
+      var s0, s1, s2;
 
-      s0 = peg$parsebooleanNode();
-      if (s0 === null) {
-        s0 = peg$parseintegerNode();
-        if (s0 === null) {
-          s0 = peg$parsepathIdNode();
-          if (s0 === null) {
-            s0 = peg$parsestringNode();
+      s0 = peg$currPos;
+      s1 = peg$parse__();
+      if (s1 !== null) {
+        s2 = peg$parsebooleanNode();
+        if (s2 === null) {
+          s2 = peg$parseintegerNode();
+          if (s2 === null) {
+            s2 = peg$parsepathIdNode();
+            if (s2 === null) {
+              s2 = peg$parsestringNode();
+            }
           }
         }
+        if (s2 !== null) {
+          peg$reportedPos = s0;
+          s1 = peg$c58(s2);
+          if (s1 === null) {
+            peg$currPos = s0;
+            s0 = s1;
+          } else {
+            s0 = s1;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$c0;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$c0;
       }
 
       return s0;
@@ -2369,7 +2409,7 @@ Emblem.Parser = (function() {
           s5 = peg$parsepathIdent();
           if (s5 !== null) {
             peg$reportedPos = s3;
-            s4 = peg$c57(s4, s5);
+            s4 = peg$c59(s4, s5);
             if (s4 === null) {
               peg$currPos = s3;
               s3 = s4;
@@ -2392,7 +2432,7 @@ Emblem.Parser = (function() {
             s5 = peg$parsepathIdent();
             if (s5 !== null) {
               peg$reportedPos = s3;
-              s4 = peg$c57(s4, s5);
+              s4 = peg$c59(s4, s5);
               if (s4 === null) {
                 peg$currPos = s3;
                 s3 = s4;
@@ -2410,7 +2450,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c58(s1, s2);
+          s1 = peg$c60(s1, s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -2433,17 +2473,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (peg$c60.test(input.charAt(peg$currPos))) {
+      if (peg$c62.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c61); }
+        if (peg$silentFails === 0) { peg$fail(peg$c63); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c59); }
+        if (peg$silentFails === 0) { peg$fail(peg$c61); }
       }
 
       return s0;
@@ -2456,7 +2496,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsepath();
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c62(s1);
+        s1 = peg$c64(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2475,7 +2515,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsestring();
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c63(s1);
+        s1 = peg$c65(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2494,7 +2534,7 @@ Emblem.Parser = (function() {
       s1 = peg$parseinteger();
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c64(s1);
+        s1 = peg$c66(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2513,7 +2553,7 @@ Emblem.Parser = (function() {
       s1 = peg$parseboolean();
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c65(s1);
+        s1 = peg$c67(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2529,57 +2569,80 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 4) === peg$c67) {
-        s0 = peg$c67;
+      if (input.substr(peg$currPos, 4) === peg$c69) {
+        s0 = peg$c69;
         peg$currPos += 4;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c68); }
+        if (peg$silentFails === 0) { peg$fail(peg$c70); }
       }
       if (s0 === null) {
-        if (input.substr(peg$currPos, 5) === peg$c69) {
-          s0 = peg$c69;
+        if (input.substr(peg$currPos, 5) === peg$c71) {
+          s0 = peg$c71;
           peg$currPos += 5;
         } else {
           s0 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c70); }
+          if (peg$silentFails === 0) { peg$fail(peg$c72); }
         }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c66); }
+        if (peg$silentFails === 0) { peg$fail(peg$c68); }
       }
 
       return s0;
     }
 
     function peg$parseinteger() {
-      var s0, s1, s2, s3;
+      var s0, s1, s2, s3, s4, s5;
 
       peg$silentFails++;
       s0 = peg$currPos;
       s1 = peg$currPos;
-      s2 = [];
-      if (peg$c72.test(input.charAt(peg$currPos))) {
-        s3 = input.charAt(peg$currPos);
+      s2 = peg$currPos;
+      if (input.charCodeAt(peg$currPos) === 45) {
+        s3 = peg$c74;
         peg$currPos++;
       } else {
         s3 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c73); }
+        if (peg$silentFails === 0) { peg$fail(peg$c75); }
+      }
+      if (s3 === null) {
+        s3 = peg$c1;
       }
       if (s3 !== null) {
-        while (s3 !== null) {
-          s2.push(s3);
-          if (peg$c72.test(input.charAt(peg$currPos))) {
-            s3 = input.charAt(peg$currPos);
-            peg$currPos++;
-          } else {
-            s3 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c73); }
+        s4 = [];
+        if (peg$c76.test(input.charAt(peg$currPos))) {
+          s5 = input.charAt(peg$currPos);
+          peg$currPos++;
+        } else {
+          s5 = null;
+          if (peg$silentFails === 0) { peg$fail(peg$c77); }
+        }
+        if (s5 !== null) {
+          while (s5 !== null) {
+            s4.push(s5);
+            if (peg$c76.test(input.charAt(peg$currPos))) {
+              s5 = input.charAt(peg$currPos);
+              peg$currPos++;
+            } else {
+              s5 = null;
+              if (peg$silentFails === 0) { peg$fail(peg$c77); }
+            }
           }
+        } else {
+          s4 = peg$c0;
+        }
+        if (s4 !== null) {
+          s3 = [s3, s4];
+          s2 = s3;
+        } else {
+          peg$currPos = s2;
+          s2 = peg$c0;
         }
       } else {
+        peg$currPos = s2;
         s2 = peg$c0;
       }
       if (s2 !== null) {
@@ -2588,7 +2651,7 @@ Emblem.Parser = (function() {
       s1 = s2;
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c74(s1);
+        s1 = peg$c78(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2599,7 +2662,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c71); }
+        if (peg$silentFails === 0) { peg$fail(peg$c73); }
       }
 
       return s0;
@@ -2611,21 +2674,21 @@ Emblem.Parser = (function() {
       s0 = peg$currPos;
       s1 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 34) {
-        s2 = peg$c75;
+        s2 = peg$c79;
         peg$currPos++;
       } else {
         s2 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c76); }
+        if (peg$silentFails === 0) { peg$fail(peg$c80); }
       }
       if (s2 !== null) {
         s3 = peg$parsehashDoubleQuoteStringValue();
         if (s3 !== null) {
           if (input.charCodeAt(peg$currPos) === 34) {
-            s4 = peg$c75;
+            s4 = peg$c79;
             peg$currPos++;
           } else {
             s4 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c76); }
+            if (peg$silentFails === 0) { peg$fail(peg$c80); }
           }
           if (s4 !== null) {
             s2 = [s2, s3, s4];
@@ -2645,21 +2708,21 @@ Emblem.Parser = (function() {
       if (s1 === null) {
         s1 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 39) {
-          s2 = peg$c77;
+          s2 = peg$c81;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c78); }
+          if (peg$silentFails === 0) { peg$fail(peg$c82); }
         }
         if (s2 !== null) {
           s3 = peg$parsehashSingleQuoteStringValue();
           if (s3 !== null) {
             if (input.charCodeAt(peg$currPos) === 39) {
-              s4 = peg$c77;
+              s4 = peg$c81;
               peg$currPos++;
             } else {
               s4 = null;
-              if (peg$silentFails === 0) { peg$fail(peg$c78); }
+              if (peg$silentFails === 0) { peg$fail(peg$c82); }
             }
             if (s4 !== null) {
               s2 = [s2, s3, s4];
@@ -2679,7 +2742,7 @@ Emblem.Parser = (function() {
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c79(s1);
+        s1 = peg$c83(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -2708,12 +2771,12 @@ Emblem.Parser = (function() {
         s3 = peg$c0;
       }
       if (s3 !== null) {
-        if (peg$c80.test(input.charAt(peg$currPos))) {
+        if (peg$c84.test(input.charAt(peg$currPos))) {
           s4 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s4 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c81); }
+          if (peg$silentFails === 0) { peg$fail(peg$c85); }
         }
         if (s4 !== null) {
           s3 = [s3, s4];
@@ -2740,12 +2803,12 @@ Emblem.Parser = (function() {
           s3 = peg$c0;
         }
         if (s3 !== null) {
-          if (peg$c80.test(input.charAt(peg$currPos))) {
+          if (peg$c84.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c81); }
+            if (peg$silentFails === 0) { peg$fail(peg$c85); }
           }
           if (s4 !== null) {
             s3 = [s3, s4];
@@ -2784,12 +2847,12 @@ Emblem.Parser = (function() {
         s3 = peg$c0;
       }
       if (s3 !== null) {
-        if (peg$c82.test(input.charAt(peg$currPos))) {
+        if (peg$c86.test(input.charAt(peg$currPos))) {
           s4 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s4 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c83); }
+          if (peg$silentFails === 0) { peg$fail(peg$c87); }
         }
         if (s4 !== null) {
           s3 = [s3, s4];
@@ -2816,12 +2879,12 @@ Emblem.Parser = (function() {
           s3 = peg$c0;
         }
         if (s3 !== null) {
-          if (peg$c82.test(input.charAt(peg$currPos))) {
+          if (peg$c86.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c83); }
+            if (peg$silentFails === 0) { peg$fail(peg$c87); }
           }
           if (s4 !== null) {
             s3 = [s3, s4];
@@ -2846,12 +2909,12 @@ Emblem.Parser = (function() {
     function peg$parsealpha() {
       var s0;
 
-      if (peg$c84.test(input.charAt(peg$currPos))) {
+      if (peg$c88.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c85); }
+        if (peg$silentFails === 0) { peg$fail(peg$c89); }
       }
 
       return s0;
@@ -2875,7 +2938,7 @@ Emblem.Parser = (function() {
             s4 = peg$parseanyDedent();
             if (s4 !== null) {
               peg$reportedPos = s0;
-              s1 = peg$c86(s1, s2, s3);
+              s1 = peg$c90(s1, s2, s3);
               if (s1 === null) {
                 peg$currPos = s0;
                 s0 = s1;
@@ -2909,12 +2972,12 @@ Emblem.Parser = (function() {
       var s0, s1, s2;
 
       s0 = peg$currPos;
-      if (peg$c87.test(input.charAt(peg$currPos))) {
+      if (peg$c91.test(input.charAt(peg$currPos))) {
         s1 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c88); }
+        if (peg$silentFails === 0) { peg$fail(peg$c92); }
       }
       if (s1 !== null) {
         if (input.charCodeAt(peg$currPos) === 32) {
@@ -2929,7 +2992,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c52(s1);
+          s1 = peg$c53(s1);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -2949,11 +3012,11 @@ Emblem.Parser = (function() {
         s1 = peg$currPos;
         peg$silentFails++;
         if (input.charCodeAt(peg$currPos) === 60) {
-          s2 = peg$c89;
+          s2 = peg$c93;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c90); }
+          if (peg$silentFails === 0) { peg$fail(peg$c94); }
         }
         peg$silentFails--;
         if (s2 !== null) {
@@ -2964,7 +3027,7 @@ Emblem.Parser = (function() {
         }
         if (s1 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c91();
+          s1 = peg$c95();
         }
         if (s1 === null) {
           peg$currPos = s0;
@@ -3016,7 +3079,7 @@ Emblem.Parser = (function() {
           }
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c92(s1, s2, s3);
+            s1 = peg$c96(s1, s2, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -3092,7 +3155,7 @@ Emblem.Parser = (function() {
           s3 = peg$parseTERM();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c93(s1, s2);
+            s1 = peg$c97(s1, s2);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -3120,25 +3183,25 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 34) {
-        s1 = peg$c75;
+        s1 = peg$c79;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c76); }
+        if (peg$silentFails === 0) { peg$fail(peg$c80); }
       }
       if (s1 !== null) {
         s2 = peg$parseattributeTextNodesInner();
         if (s2 !== null) {
           if (input.charCodeAt(peg$currPos) === 34) {
-            s3 = peg$c75;
+            s3 = peg$c79;
             peg$currPos++;
           } else {
             s3 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c76); }
+            if (peg$silentFails === 0) { peg$fail(peg$c80); }
           }
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c43(s2);
+            s1 = peg$c44(s2);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -3160,25 +3223,25 @@ Emblem.Parser = (function() {
       if (s0 === null) {
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 39) {
-          s1 = peg$c77;
+          s1 = peg$c81;
           peg$currPos++;
         } else {
           s1 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c78); }
+          if (peg$silentFails === 0) { peg$fail(peg$c82); }
         }
         if (s1 !== null) {
           s2 = peg$parseattributeTextNodesInnerSingle();
           if (s2 !== null) {
             if (input.charCodeAt(peg$currPos) === 39) {
-              s3 = peg$c77;
+              s3 = peg$c81;
               peg$currPos++;
             } else {
               s3 = null;
-              if (peg$silentFails === 0) { peg$fail(peg$c78); }
+              if (peg$silentFails === 0) { peg$fail(peg$c82); }
             }
             if (s3 !== null) {
               peg$reportedPos = s0;
-              s1 = peg$c43(s2);
+              s1 = peg$c44(s2);
               if (s1 === null) {
                 peg$currPos = s0;
                 s0 = s1;
@@ -3253,7 +3316,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c94(s1, s2);
+          s1 = peg$c98(s1, s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -3323,7 +3386,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c94(s1, s2);
+          s1 = peg$c98(s1, s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -3360,11 +3423,11 @@ Emblem.Parser = (function() {
       s1 = peg$currPos;
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 123) {
-        s2 = peg$c95;
+        s2 = peg$c99;
         peg$currPos++;
       } else {
         s2 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c96); }
+        if (peg$silentFails === 0) { peg$fail(peg$c100); }
       }
       peg$silentFails--;
       if (s2 === null) {
@@ -3376,21 +3439,21 @@ Emblem.Parser = (function() {
       if (s1 !== null) {
         s2 = peg$currPos;
         s3 = [];
-        if (peg$c97.test(input.charAt(peg$currPos))) {
+        if (peg$c101.test(input.charAt(peg$currPos))) {
           s4 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s4 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c98); }
+          if (peg$silentFails === 0) { peg$fail(peg$c102); }
         }
         while (s4 !== null) {
           s3.push(s4);
-          if (peg$c97.test(input.charAt(peg$currPos))) {
+          if (peg$c101.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c98); }
+            if (peg$silentFails === 0) { peg$fail(peg$c102); }
           }
         }
         if (s3 !== null) {
@@ -3399,7 +3462,7 @@ Emblem.Parser = (function() {
         s2 = s3;
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c99(s2);
+          s1 = peg$c103(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -3433,7 +3496,7 @@ Emblem.Parser = (function() {
               s5 = peg$parsedoubleClose();
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c100(s3);
+                s1 = peg$c104(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -3473,7 +3536,7 @@ Emblem.Parser = (function() {
                 s5 = peg$parsehashStacheClose();
                 if (s5 !== null) {
                   peg$reportedPos = s0;
-                  s1 = peg$c100(s3);
+                  s1 = peg$c104(s3);
                   if (s1 === null) {
                     peg$currPos = s0;
                     s0 = s1;
@@ -3520,7 +3583,7 @@ Emblem.Parser = (function() {
               s5 = peg$parsetripleClose();
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c101(s3);
+                s1 = peg$c105(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -3572,7 +3635,7 @@ Emblem.Parser = (function() {
       s1 = s2;
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c102(s1);
+        s1 = peg$c106(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -3605,7 +3668,7 @@ Emblem.Parser = (function() {
       s1 = s2;
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c102(s1);
+        s1 = peg$c106(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -3626,11 +3689,11 @@ Emblem.Parser = (function() {
       s2 = peg$parsenonMustacheUnit();
       if (s2 === null) {
         if (input.charCodeAt(peg$currPos) === 34) {
-          s2 = peg$c75;
+          s2 = peg$c79;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c76); }
+          if (peg$silentFails === 0) { peg$fail(peg$c80); }
         }
       }
       peg$silentFails--;
@@ -3646,7 +3709,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c103); }
+          if (peg$silentFails === 0) { peg$fail(peg$c107); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
@@ -3678,11 +3741,11 @@ Emblem.Parser = (function() {
       s2 = peg$parsenonMustacheUnit();
       if (s2 === null) {
         if (input.charCodeAt(peg$currPos) === 39) {
-          s2 = peg$c77;
+          s2 = peg$c81;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c78); }
+          if (peg$silentFails === 0) { peg$fail(peg$c82); }
         }
       }
       peg$silentFails--;
@@ -3698,7 +3761,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c103); }
+          if (peg$silentFails === 0) { peg$fail(peg$c107); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
@@ -3742,7 +3805,7 @@ Emblem.Parser = (function() {
       s1 = s2;
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c102(s1);
+        s1 = peg$c106(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -3774,7 +3837,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c103); }
+          if (peg$silentFails === 0) { peg$fail(peg$c107); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
@@ -3832,7 +3895,7 @@ Emblem.Parser = (function() {
               s5 = peg$parsesingleClose();
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c100(s3);
+                s1 = peg$c104(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -3882,16 +3945,16 @@ Emblem.Parser = (function() {
 
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 123) {
-        s0 = peg$c95;
+        s0 = peg$c99;
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c96); }
+        if (peg$silentFails === 0) { peg$fail(peg$c100); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c104); }
+        if (peg$silentFails === 0) { peg$fail(peg$c108); }
       }
 
       return s0;
@@ -3901,17 +3964,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c106) {
-        s0 = peg$c106;
+      if (input.substr(peg$currPos, 2) === peg$c110) {
+        s0 = peg$c110;
         peg$currPos += 2;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c107); }
+        if (peg$silentFails === 0) { peg$fail(peg$c111); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c105); }
+        if (peg$silentFails === 0) { peg$fail(peg$c109); }
       }
 
       return s0;
@@ -3921,17 +3984,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 3) === peg$c109) {
-        s0 = peg$c109;
+      if (input.substr(peg$currPos, 3) === peg$c113) {
+        s0 = peg$c113;
         peg$currPos += 3;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c110); }
+        if (peg$silentFails === 0) { peg$fail(peg$c114); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c108); }
+        if (peg$silentFails === 0) { peg$fail(peg$c112); }
       }
 
       return s0;
@@ -3942,16 +4005,16 @@ Emblem.Parser = (function() {
 
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 125) {
-        s0 = peg$c112;
+        s0 = peg$c116;
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c113); }
+        if (peg$silentFails === 0) { peg$fail(peg$c117); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c111); }
+        if (peg$silentFails === 0) { peg$fail(peg$c115); }
       }
 
       return s0;
@@ -3961,17 +4024,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c115) {
-        s0 = peg$c115;
+      if (input.substr(peg$currPos, 2) === peg$c119) {
+        s0 = peg$c119;
         peg$currPos += 2;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c116); }
+        if (peg$silentFails === 0) { peg$fail(peg$c120); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c114); }
+        if (peg$silentFails === 0) { peg$fail(peg$c118); }
       }
 
       return s0;
@@ -3981,17 +4044,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 3) === peg$c118) {
-        s0 = peg$c118;
+      if (input.substr(peg$currPos, 3) === peg$c122) {
+        s0 = peg$c122;
         peg$currPos += 3;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c119); }
+        if (peg$silentFails === 0) { peg$fail(peg$c123); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c117); }
+        if (peg$silentFails === 0) { peg$fail(peg$c121); }
       }
 
       return s0;
@@ -4001,17 +4064,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c121) {
-        s0 = peg$c121;
+      if (input.substr(peg$currPos, 2) === peg$c125) {
+        s0 = peg$c125;
         peg$currPos += 2;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c122); }
+        if (peg$silentFails === 0) { peg$fail(peg$c126); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c120); }
+        if (peg$silentFails === 0) { peg$fail(peg$c124); }
       }
 
       return s0;
@@ -4022,16 +4085,16 @@ Emblem.Parser = (function() {
 
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 125) {
-        s0 = peg$c112;
+        s0 = peg$c116;
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c113); }
+        if (peg$silentFails === 0) { peg$fail(peg$c117); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c123); }
+        if (peg$silentFails === 0) { peg$fail(peg$c127); }
       }
 
       return s0;
@@ -4041,12 +4104,12 @@ Emblem.Parser = (function() {
       var s0, s1, s2;
 
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c124) {
-        s1 = peg$c124;
+      if (input.substr(peg$currPos, 2) === peg$c128) {
+        s1 = peg$c128;
         peg$currPos += 2;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c125); }
+        if (peg$silentFails === 0) { peg$fail(peg$c129); }
       }
       if (s1 !== null) {
         if (input.charCodeAt(peg$currPos) === 32) {
@@ -4061,7 +4124,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c126();
+          s1 = peg$c130();
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4098,7 +4161,7 @@ Emblem.Parser = (function() {
           }
           if (s2 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c127();
+            s1 = peg$c131();
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4144,7 +4207,7 @@ Emblem.Parser = (function() {
           }
           if (s3 !== null) {
             peg$reportedPos = peg$currPos;
-            s4 = peg$c128(s1, s2);
+            s4 = peg$c132(s1, s2);
             if (s4) {
               s4 = peg$c1;
             } else {
@@ -4194,7 +4257,7 @@ Emblem.Parser = (function() {
           }
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c129(s1, s2, s3);
+            s1 = peg$c133(s1, s2, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4226,7 +4289,7 @@ Emblem.Parser = (function() {
       s3 = peg$parseidShorthand();
       if (s3 !== null) {
         peg$reportedPos = s2;
-        s3 = peg$c130(s3);
+        s3 = peg$c134(s3);
       }
       if (s3 === null) {
         peg$currPos = s2;
@@ -4239,7 +4302,7 @@ Emblem.Parser = (function() {
         s3 = peg$parseclassShorthand();
         if (s3 !== null) {
           peg$reportedPos = s2;
-          s3 = peg$c131(s3);
+          s3 = peg$c135(s3);
         }
         if (s3 === null) {
           peg$currPos = s2;
@@ -4255,7 +4318,7 @@ Emblem.Parser = (function() {
           s3 = peg$parseidShorthand();
           if (s3 !== null) {
             peg$reportedPos = s2;
-            s3 = peg$c130(s3);
+            s3 = peg$c134(s3);
           }
           if (s3 === null) {
             peg$currPos = s2;
@@ -4268,7 +4331,7 @@ Emblem.Parser = (function() {
             s3 = peg$parseclassShorthand();
             if (s3 !== null) {
               peg$reportedPos = s2;
-              s3 = peg$c131(s3);
+              s3 = peg$c135(s3);
             }
             if (s3 === null) {
               peg$currPos = s2;
@@ -4283,7 +4346,7 @@ Emblem.Parser = (function() {
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c132(s1);
+        s1 = peg$c136(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -4324,17 +4387,20 @@ Emblem.Parser = (function() {
       if (s1 !== null) {
         s2 = peg$parseactionAttribute();
         if (s2 === null) {
-          s2 = peg$parseboundAttribute();
+          s2 = peg$parsebooleanAttribute();
           if (s2 === null) {
-            s2 = peg$parserawMustacheAttribute();
+            s2 = peg$parseboundAttribute();
             if (s2 === null) {
-              s2 = peg$parsenormalAttribute();
+              s2 = peg$parserawMustacheAttribute();
+              if (s2 === null) {
+                s2 = peg$parsenormalAttribute();
+              }
             }
           }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c133(s2);
+          s1 = peg$c137(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4356,12 +4422,12 @@ Emblem.Parser = (function() {
     function peg$parseboundAttributeValueChar() {
       var s0;
 
-      if (peg$c134.test(input.charAt(peg$currPos))) {
+      if (peg$c138.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c135); }
+        if (peg$silentFails === 0) { peg$fail(peg$c139); }
       }
       if (s0 === null) {
         s0 = peg$parsenonSeparatorColon();
@@ -4379,7 +4445,7 @@ Emblem.Parser = (function() {
         s1 = peg$parsepathIdNode();
         if (s1 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c136(s1);
+          s1 = peg$c140(s1);
         }
         if (s1 === null) {
           peg$currPos = s0;
@@ -4398,21 +4464,21 @@ Emblem.Parser = (function() {
       s0 = peg$currPos;
       s1 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 34) {
-        s2 = peg$c75;
+        s2 = peg$c79;
         peg$currPos++;
       } else {
         s2 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c76); }
+        if (peg$silentFails === 0) { peg$fail(peg$c80); }
       }
       if (s2 !== null) {
         s3 = peg$parseinMustache();
         if (s3 !== null) {
           if (input.charCodeAt(peg$currPos) === 34) {
-            s4 = peg$c75;
+            s4 = peg$c79;
             peg$currPos++;
           } else {
             s4 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c76); }
+            if (peg$silentFails === 0) { peg$fail(peg$c80); }
           }
           if (s4 !== null) {
             s2 = [s2, s3, s4];
@@ -4432,21 +4498,21 @@ Emblem.Parser = (function() {
       if (s1 === null) {
         s1 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 39) {
-          s2 = peg$c77;
+          s2 = peg$c81;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c78); }
+          if (peg$silentFails === 0) { peg$fail(peg$c82); }
         }
         if (s2 !== null) {
           s3 = peg$parseinMustache();
           if (s3 !== null) {
             if (input.charCodeAt(peg$currPos) === 39) {
-              s4 = peg$c77;
+              s4 = peg$c81;
               peg$currPos++;
             } else {
               s4 = null;
-              if (peg$silentFails === 0) { peg$fail(peg$c78); }
+              if (peg$silentFails === 0) { peg$fail(peg$c82); }
             }
             if (s4 !== null) {
               s2 = [s2, s3, s4];
@@ -4466,7 +4532,7 @@ Emblem.Parser = (function() {
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c79(s1);
+        s1 = peg$c83(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -4495,7 +4561,62 @@ Emblem.Parser = (function() {
           s3 = peg$parseactionValue();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c137(s1, s3);
+            s1 = peg$c141(s1, s3);
+            if (s1 === null) {
+              peg$currPos = s0;
+              s0 = s1;
+            } else {
+              s0 = s1;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$c0;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$c0;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$c0;
+      }
+
+      return s0;
+    }
+
+    function peg$parsebooleanAttribute() {
+      var s0, s1, s2, s3;
+
+      s0 = peg$currPos;
+      s1 = peg$parsekey();
+      if (s1 !== null) {
+        if (input.charCodeAt(peg$currPos) === 61) {
+          s2 = peg$c4;
+          peg$currPos++;
+        } else {
+          s2 = null;
+          if (peg$silentFails === 0) { peg$fail(peg$c5); }
+        }
+        if (s2 !== null) {
+          if (input.substr(peg$currPos, 4) === peg$c69) {
+            s3 = peg$c69;
+            peg$currPos += 4;
+          } else {
+            s3 = null;
+            if (peg$silentFails === 0) { peg$fail(peg$c70); }
+          }
+          if (s3 === null) {
+            if (input.substr(peg$currPos, 5) === peg$c71) {
+              s3 = peg$c71;
+              peg$currPos += 5;
+            } else {
+              s3 = null;
+              if (peg$silentFails === 0) { peg$fail(peg$c72); }
+            }
+          }
+          if (s3 !== null) {
+            peg$reportedPos = s0;
+            s1 = peg$c142(s1, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4523,11 +4644,11 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 123) {
-        s1 = peg$c95;
+        s1 = peg$c99;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c96); }
+        if (peg$silentFails === 0) { peg$fail(peg$c100); }
       }
       if (s1 !== null) {
         s2 = peg$parse_();
@@ -4569,15 +4690,15 @@ Emblem.Parser = (function() {
             s4 = peg$parse_();
             if (s4 !== null) {
               if (input.charCodeAt(peg$currPos) === 125) {
-                s5 = peg$c112;
+                s5 = peg$c116;
                 peg$currPos++;
               } else {
                 s5 = null;
-                if (peg$silentFails === 0) { peg$fail(peg$c113); }
+                if (peg$silentFails === 0) { peg$fail(peg$c117); }
               }
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c138(s3);
+                s1 = peg$c143(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -4644,11 +4765,11 @@ Emblem.Parser = (function() {
             s4 = peg$currPos;
             peg$silentFails++;
             if (input.charCodeAt(peg$currPos) === 33) {
-              s5 = peg$c139;
+              s5 = peg$c144;
               peg$currPos++;
             } else {
               s5 = null;
-              if (peg$silentFails === 0) { peg$fail(peg$c140); }
+              if (peg$silentFails === 0) { peg$fail(peg$c145); }
             }
             peg$silentFails--;
             if (s5 === null) {
@@ -4659,7 +4780,7 @@ Emblem.Parser = (function() {
             }
             if (s4 !== null) {
               peg$reportedPos = peg$currPos;
-              s5 = peg$c141(s1, s3);
+              s5 = peg$c146(s1, s3);
               if (s5) {
                 s5 = peg$c1;
               } else {
@@ -4667,7 +4788,7 @@ Emblem.Parser = (function() {
               }
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c142(s1, s3);
+                s1 = peg$c147(s1, s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -4715,7 +4836,7 @@ Emblem.Parser = (function() {
           s3 = peg$parsepathIdNode();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c143(s1, s3);
+            s1 = peg$c148(s1, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4755,7 +4876,7 @@ Emblem.Parser = (function() {
           s3 = peg$parseattributeTextNodes();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c144(s1, s3);
+            s1 = peg$c149(s1, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4796,44 +4917,33 @@ Emblem.Parser = (function() {
       return s0;
     }
 
-    function peg$parseattributeValue() {
-      var s0;
-
-      s0 = peg$parsestring();
-      if (s0 === null) {
-        s0 = peg$parseparam();
-      }
-
-      return s0;
-    }
-
     function peg$parseattributeChar() {
       var s0;
 
       s0 = peg$parsealpha();
       if (s0 === null) {
-        if (peg$c72.test(input.charAt(peg$currPos))) {
+        if (peg$c76.test(input.charAt(peg$currPos))) {
           s0 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s0 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c73); }
+          if (peg$silentFails === 0) { peg$fail(peg$c77); }
         }
         if (s0 === null) {
           if (input.charCodeAt(peg$currPos) === 95) {
-            s0 = peg$c145;
+            s0 = peg$c150;
             peg$currPos++;
           } else {
             s0 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c146); }
+            if (peg$silentFails === 0) { peg$fail(peg$c151); }
           }
           if (s0 === null) {
             if (input.charCodeAt(peg$currPos) === 45) {
-              s0 = peg$c147;
+              s0 = peg$c74;
               peg$currPos++;
             } else {
               s0 = null;
-              if (peg$silentFails === 0) { peg$fail(peg$c148); }
+              if (peg$silentFails === 0) { peg$fail(peg$c75); }
             }
           }
         }
@@ -4847,11 +4957,11 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 37) {
-        s1 = peg$c149;
+        s1 = peg$c152;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c150); }
+        if (peg$silentFails === 0) { peg$fail(peg$c153); }
       }
       if (s1 !== null) {
         s2 = peg$parsecssIdentifier();
@@ -4881,17 +4991,17 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 35) {
-        s1 = peg$c151;
+        s1 = peg$c154;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c152); }
+        if (peg$silentFails === 0) { peg$fail(peg$c155); }
       }
       if (s1 !== null) {
         s2 = peg$parsecssIdentifier();
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c153(s2);
+          s1 = peg$c156(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4915,11 +5025,11 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 46) {
-        s1 = peg$c48;
+        s1 = peg$c49;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c49); }
+        if (peg$silentFails === 0) { peg$fail(peg$c50); }
       }
       if (s1 !== null) {
         s2 = peg$parsecssIdentifier();
@@ -4952,7 +5062,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c154); }
+        if (peg$silentFails === 0) { peg$fail(peg$c157); }
       }
 
       return s0;
@@ -4979,12 +5089,12 @@ Emblem.Parser = (function() {
     function peg$parsenmchar() {
       var s0;
 
-      if (peg$c155.test(input.charAt(peg$currPos))) {
+      if (peg$c158.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c156); }
+        if (peg$silentFails === 0) { peg$fail(peg$c159); }
       }
       if (s0 === null) {
         s0 = peg$parsenonascii();
@@ -4996,12 +5106,12 @@ Emblem.Parser = (function() {
     function peg$parsenmstart() {
       var s0;
 
-      if (peg$c157.test(input.charAt(peg$currPos))) {
+      if (peg$c160.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c158); }
+        if (peg$silentFails === 0) { peg$fail(peg$c161); }
       }
       if (s0 === null) {
         s0 = peg$parsenonascii();
@@ -5013,12 +5123,12 @@ Emblem.Parser = (function() {
     function peg$parsenonascii() {
       var s0;
 
-      if (peg$c159.test(input.charAt(peg$currPos))) {
+      if (peg$c162.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c160); }
+        if (peg$silentFails === 0) { peg$fail(peg$c163); }
       }
 
       return s0;
@@ -5052,11 +5162,11 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 37) {
-        s1 = peg$c149;
+        s1 = peg$c152;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c150); }
+        if (peg$silentFails === 0) { peg$fail(peg$c153); }
       }
       if (s1 !== null) {
         s2 = peg$parse_();
@@ -5064,7 +5174,7 @@ Emblem.Parser = (function() {
           s3 = peg$parsetagString();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c52(s3);
+            s1 = peg$c53(s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -5089,7 +5199,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c161); }
+        if (peg$silentFails === 0) { peg$fail(peg$c164); }
       }
 
       return s0;
@@ -5102,7 +5212,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsetagString();
       if (s1 !== null) {
         peg$reportedPos = peg$currPos;
-        s2 = peg$c162(s1);
+        s2 = peg$c165(s1);
         if (s2) {
           s2 = peg$c1;
         } else {
@@ -5110,7 +5220,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c163(s1);
+          s1 = peg$c166(s1);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -5132,12 +5242,12 @@ Emblem.Parser = (function() {
     function peg$parsetagChar() {
       var s0;
 
-      if (peg$c155.test(input.charAt(peg$currPos))) {
+      if (peg$c158.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c156); }
+        if (peg$silentFails === 0) { peg$fail(peg$c159); }
       }
       if (s0 === null) {
         s0 = peg$parsenonSeparatorColon();
@@ -5151,11 +5261,11 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 58) {
-        s1 = peg$c54;
+        s1 = peg$c55;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c55); }
+        if (peg$silentFails === 0) { peg$fail(peg$c56); }
       }
       if (s1 !== null) {
         s2 = peg$currPos;
@@ -5203,7 +5313,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsetagString();
       if (s1 !== null) {
         peg$reportedPos = peg$currPos;
-        s2 = peg$c165(s1);
+        s2 = peg$c168(s1);
         if (s2) {
           s2 = peg$c1;
         } else {
@@ -5211,7 +5321,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c163(s1);
+          s1 = peg$c166(s1);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -5229,7 +5339,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c164); }
+        if (peg$silentFails === 0) { peg$fail(peg$c167); }
       }
 
       return s0;
@@ -5244,7 +5354,7 @@ Emblem.Parser = (function() {
         s2 = peg$parse__();
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c52(s2);
+          s1 = peg$c53(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -5269,15 +5379,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61423) {
-        s1 = peg$c167;
+        s1 = peg$c170;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c168); }
+        if (peg$silentFails === 0) { peg$fail(peg$c171); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c169();
+        s1 = peg$c172();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -5288,7 +5398,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c166); }
+        if (peg$silentFails === 0) { peg$fail(peg$c169); }
       }
 
       return s0;
@@ -5300,15 +5410,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61438) {
-        s1 = peg$c171;
+        s1 = peg$c174;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c172); }
+        if (peg$silentFails === 0) { peg$fail(peg$c175); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c169();
+        s1 = peg$c172();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -5319,7 +5429,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c170); }
+        if (peg$silentFails === 0) { peg$fail(peg$c173); }
       }
 
       return s0;
@@ -5331,15 +5441,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61422) {
-        s1 = peg$c174;
+        s1 = peg$c177;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c175); }
+        if (peg$silentFails === 0) { peg$fail(peg$c178); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c169();
+        s1 = peg$c172();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -5350,7 +5460,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c173); }
+        if (peg$silentFails === 0) { peg$fail(peg$c176); }
       }
 
       return s0;
@@ -5362,34 +5472,34 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 13) {
-        s1 = peg$c177;
+        s1 = peg$c180;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c178); }
+        if (peg$silentFails === 0) { peg$fail(peg$c181); }
       }
       if (s1 === null) {
         s1 = peg$c1;
       }
       if (s1 !== null) {
         if (input.charCodeAt(peg$currPos) === 61439) {
-          s2 = peg$c179;
+          s2 = peg$c182;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c180); }
+          if (peg$silentFails === 0) { peg$fail(peg$c183); }
         }
         if (s2 !== null) {
           if (input.charCodeAt(peg$currPos) === 10) {
-            s3 = peg$c181;
+            s3 = peg$c184;
             peg$currPos++;
           } else {
             s3 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c182); }
+            if (peg$silentFails === 0) { peg$fail(peg$c185); }
           }
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c126();
+            s1 = peg$c130();
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -5411,7 +5521,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c176); }
+        if (peg$silentFails === 0) { peg$fail(peg$c179); }
       }
 
       return s0;
@@ -5428,7 +5538,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c183); }
+        if (peg$silentFails === 0) { peg$fail(peg$c186); }
       }
 
       return s0;
@@ -5456,7 +5566,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c184); }
+        if (peg$silentFails === 0) { peg$fail(peg$c187); }
       }
 
       return s0;
@@ -5475,7 +5585,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c185); }
+        if (peg$silentFails === 0) { peg$fail(peg$c188); }
       }
 
       return s0;
@@ -5485,17 +5595,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (peg$c187.test(input.charAt(peg$currPos))) {
+      if (peg$c190.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c188); }
+        if (peg$silentFails === 0) { peg$fail(peg$c191); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c186); }
+        if (peg$silentFails === 0) { peg$fail(peg$c189); }
       }
 
       return s0;
@@ -5527,7 +5637,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c103); }
+          if (peg$silentFails === 0) { peg$fail(peg$c107); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;