From 27fe66f0ce38238f2235daf5e650b7cb9e1f920e Mon Sep 17 00:00:00 2001
From: Juriy Zaytsev <kangax@gmail.com>
Date: Fri, 5 Feb 2010 18:01:26 -0500
Subject: [PATCH] Use proper characters when checking attribute value for
 validity when ommitting quotes; Make sure lower-case doctype matches.

---
 htmlparser.js | 17 +++++++----------
 master.js     |  4 +++-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/htmlparser.js b/htmlparser.js
index 63c5123..a58e9f0 100644
--- a/htmlparser.js
+++ b/htmlparser.js
@@ -29,7 +29,7 @@
 	var startTag = /^<(\w+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
 		  endTag = /^<\/(\w+)[^>]*>/,
 		  attr = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g,
-		  doctype = /<!DOCTYPE [^>]+>/;
+		  doctype = /^<!DOCTYPE [^>]+>/i;
 		
 	// Empty Elements - HTML 4.01
 	var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed");
@@ -73,15 +73,12 @@
 						chars = false;
 					}
 				}
-	      else if ( html.indexOf("<!DOCTYPE") == 0 ) {
-	        match = html.match( doctype );
-
-	        if ( match ) {
-	          if ( handler.doctype )
-  						handler.doctype( match[0] );
-  					html = html.substring( match[0].length );
-  					chars = false;
-	        }
+	      else if ( match = doctype.exec( html )) {
+	        if ( handler.doctype )
+						handler.doctype( match[0] );
+					html = html.substring( match[0].length );
+					chars = false;
+				
 				// end tag
 				} else if ( html.indexOf("</") == 0 ) {
 					match = html.match( endTag );
diff --git a/master.js b/master.js
index 7fd9137..64f9123 100644
--- a/master.js
+++ b/master.js
@@ -32,7 +32,9 @@
     return str.replace(/^\s+/, ' ').replace(/\s+$/, ' ');
   }
   function canRemoveAttributeQuotes(value) {
-    return /^[\w-]+$/.test(value);
+    // http://www.w3.org/TR/html4/intro/sgmltut.html#attributes
+    // avoid \w, which could match unicode in certain implementations
+    return /^[a-zA-Z0-9-._:]+$/.test(value);
   }
   function isAttributeRedundant(tag, attributeName, attributeValue) {
     return (
-- 
2.34.1