Small tweaks

src/cpp.ts

@@ -282,16 +282,12 @@ export var language = <ILanguage> {
 
 		comment: [
 			[/[^\/*]+/, 'comment' ],
-			// [/\/\*/, 'comment', '@push' ],    // nested comment not allowed :-(
-			// [/\/\*/,    'comment.invalid' ],	// this breaks block comments in the shape of /* //*/
 			[/\*\//,    'comment', '@pop'  ],
 			[/[\/*]/,   'comment' ]
 		],
 		//Identical copy of comment above, except for the addition of .doc
 		doccomment: [
 			[/[^\/*]+/, 'comment.doc' ],
-			// [/\/\*/, 'comment.doc', '@push' ],    // nested comment not allowed :-(
-			[/\/\*/,    'comment.doc.invalid' ],
 			[/\*\//,    'comment.doc', '@pop'  ],
 			[/[\/*]/,   'comment.doc' ]
 		],

src/css.ts

@@ -184,12 +184,14 @@ export var language = <IMonarchLanguage> {
 		stringenddoublequote: [
 			['\\\\.', 'string'],
 			['"', { token: 'string', next: '@pop' }],
+			[/[^\\"]+/, 'string'],
 			['.', 'string']
 		],
 
 		stringendquote: [
 			['\\\\.', 'string'],
 			['\'', { token: 'string', next: '@pop' }],
+			[/[^\\']+/, 'string'],
 			['.', 'string']
 		]
 	}

src/html.ts

@@ -144,7 +144,8 @@ export var language = <ILanguage> {
 		],
 
 		scriptEmbedded: [
-			[/<\/script/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }]
+			[/<\/script/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
+			[/[^<]+/, '']
 		],
 
 		// -- END <script> tags handling
@@ -191,7 +192,8 @@ export var language = <ILanguage> {
 		],
 
 		styleEmbedded: [
-			[/<\/style/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }]
+			[/<\/style/, { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
+			[/[^<]+/, '']
 		],
 
 	// -- END <style> tags handling