package

build/demo/kitchen-sink/kitchen-sink-uncompressed.js

@@ -13314,7 +13314,7 @@ function string(state) {
     }, {
         token : "string", // multi line string start
         merge : true,
-        regex : '["].*$',
+        regex : '["].*',
         next : state + "-qqstring"
     }, {
         token : "string",
@@ -13322,7 +13322,7 @@ function string(state) {
     }, {
         token : "string", // multi line string start
         merge : true,
-        regex : "['].*$",
+        regex : "['].*",
         next : state + "-qstring"
     }];
 }
@@ -13331,7 +13331,7 @@ function multiLineString(quote, state) {
     return [{
         token : "string",
         merge : true,
-        regex : ".*" + quote,
+        regex : ".*?" + quote,
         next : state
     }, {
         token : "string",
@@ -13355,11 +13355,12 @@ exports.tag = function(states, name, nextState) {
         next : name + "embed-attribute-list"
     }];
 
-    states[name + "-qstring"] = multiLineString("'", name);
-    states[name + "-qqstring"] = multiLineString("\"", name);
+    states[name + "-qstring"] = multiLineString("'", name + "embed-attribute-list");
+    states[name + "-qqstring"] = multiLineString("\"", name + "embed-attribute-list");
     
     states[name + "embed-attribute-list"] = [{
         token : "meta.tag",
+        merge : true,
         regex : "\/?>",
         next : nextState
     }, {

build/kitchen-sink.html

@@ -11,7 +11,7 @@
     
     Ace
       version 0.2.0
-      commit  0867c5ec409c2d108cfaf6d423a238f4d55555c6
+      commit  0c14c86c9408e3afe81f256116b4c6e663df6865
 
     
     -->