From: itozyun <itozyun@user.sourceforge.jp>
Date: Tue, 11 Feb 2014 21:50:54 +0000 (+0900)
Subject: Version 0.6.17, X.Dom.Query work a little.
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=df4575c24267b984d159fa0e69a60831d18bdc8d;p=pettanr%2FclientJs.git

Version 0.6.17, X.Dom.Query work a little.
---

diff --git a/0.4.x/test/index.html b/0.4.x/test/index.html
index 01f0bb4..d99f1ce 100644
--- a/0.4.x/test/index.html
+++ b/0.4.x/test/index.html
@@ -35,6 +35,8 @@
 					<h2>テストインデックス</h2>
 					<h3>ぺったんR html 実証サンプル</h3>
 					<dl class="dl-table clearfix">
+						<dt><a href="html2comic_0.4.html">version 0.4 (14.01.11)</a></dt>
+						<dd>ぺったんR html 実証サンプル version 0.4</dd>	
 						<dt><a href="html2comic_0.3.html">version 0.3 (13.09.23)</a></dt>
 						<dd>ぺったんR html 実証サンプル version 0.3</dd>	
 						<dt><a href="html2comic_0.2.html">version 0.2 (13.08.10)</a></dt>
diff --git a/0.6.x/js/core/00_X.js b/0.6.x/js/core/00_X.js
index 5dfe13e..93757f8 100644
--- a/0.6.x/js/core/00_X.js
+++ b/0.6.x/js/core/00_X.js
@@ -1,9 +1,9 @@
-if( !window['console'] ) console = { log : function(){} };
+if( !window['console'] ) console = { log : function(a){alert(a)} };
 
 var undefined,
 	X = X || {
 		
-		VERSION : '0.6.13',
+		VERSION : '0.6.17',
 		
 		bootTime : + new Date,
 		
@@ -11,11 +11,13 @@ var undefined,
 		
 		emptyFunction : new Function,
 		
+		// defer の場合もあるので、document.readyState を見る
 		inHead        : (function( s ){
+			if( !s ) return;
 			s = s[ s.length - 1 ];
 			// Dom0 || Dom1
 			return ( s.parentElement || s.parentNode ).tagName.toLowerCase() === 'head';
-		})( document.scripts || document.getElementsByTagName( 'script' ) || document.all.tags( 'script' ) ),
+		})( document.scripts || document.getElementsByTagName && document.getElementsByTagName( 'script' ) || document.all && document.all.tags( 'script' ) ),
 
 		parse : function( v ){
 			var _v, n;
@@ -39,23 +41,6 @@ var undefined,
 			return v;
 		},
 		
-		skipCleanupTagNames : 'pre,textarea,code,kbd,samp,xmp,plaintext,listing'.split( ',' ),
-		
-		cleanupWhiteSpace : function( text ){
-			var _ = ' ', __ = '  ';
-			text.indexOf( '\r\n' ) !== -1 && ( text = text.split( '\r\n' ).join( _ ) );
-			text.indexOf( '\n\r' ) !== -1 && ( text = text.split( '\n\r' ).join( _ ) );
-			text.indexOf( '\t' )   !== -1 && ( text = text.split( '\t' ).join( _ ) );
-			text.indexOf( '\r' )   !== -1 && ( text = text.split( '\r' ).join( _ ) );
-			text.indexOf( '\n' )   !== -1 && ( text = text.split( '\n' ).join( _ ) );
-			text.indexOf( '\f' )   !== -1 && ( text = text.split( '\f' ).join( _ ) );
-			text.indexOf( '\b' )   !== -1 && ( text = text.split( '\b' ).join( _ ) );
-			while( text.indexOf( __ ) !== -1 ){
-				text = text.split( __ ).join( _ );
-			};
-			return text;
-		},
-		
 		isEmptyObject : function( v ){
 			if( v.length !== 0 ) return false;
 			for( var p in v ){
@@ -70,6 +55,10 @@ var undefined,
 				if( array1.indexOf( array2[ --i ] ) === -1 ) return false;
 			};
 			return true;
+		},
+		
+		findFromArray : function( fakeArray, elm ){
+			
 		}
 	};
 	
diff --git a/0.6.x/js/core/00_builtin.js b/0.6.x/js/core/00_builtin.js
index f2a5207..71dc2cd 100644
--- a/0.6.x/js/core/00_builtin.js
+++ b/0.6.x/js/core/00_builtin.js
@@ -12,7 +12,10 @@ Function.prototype.apply || (Function.prototype.apply = function (x, y) {
 	if( x === window ){
 		x.__apply = void 0;
 	} else {
-		delete x.__apply ? x.__apply : x.constructor.prototype.__apply ;
+		if( x.constructor && x.constructor.prototype.__apply ){
+			delete x.__apply;
+		} else
+		if( x.__apply ) delete x.__apply;
 	};
 	
 	x.__apply = this;
@@ -41,7 +44,11 @@ Function.prototype.apply || (Function.prototype.apply = function (x, y) {
 	if( x === window ){
 		x.__apply = void 0;
 	} else {
-		delete x.__apply ? x.__apply : x.constructor.prototype.__apply ;
+		//delete x.__apply ? x.__apply : x.constructor.prototype.__apply ;
+		if( x.constructor && x.constructor.prototype.__apply ){
+			delete x.__apply;
+		} else
+		if( x.__apply ) delete x.__apply;
 	};
 	return r;
 });
@@ -161,7 +168,7 @@ window.decodeURI || (window.decodeURI = function (x) {
 */
 
 // 手抜き
-window.decodeURIComponent || (window.decodeURIComponent = window.decodeURI);
+//window.decodeURIComponent || (window.decodeURIComponent = window.decodeURI);
 
 
 /*
@@ -169,6 +176,7 @@ window.decodeURIComponent || (window.decodeURIComponent = window.decodeURI);
  */
 
 // replace(RegExp, Function)対応
+/*
 if (window.ActiveXObject ? !Number.prototype.toFixed : (!navigator.taintEnabled && !document.createElement("input").setSelectionRange))
 	(function () {
 		var g = String.prototype.replace;
@@ -204,4 +212,6 @@ if (window.ActiveXObject ? !Number.prototype.toFixed : (!navigator.taintEnabled
 			}
 			return g.call(s, x, z);
 		};
-	})();
\ No newline at end of file
+	})(); */
+	
+
diff --git a/0.6.x/js/core/06_XEventDispatcher.js b/0.6.x/js/core/06_XEventDispatcher.js
index 0cf8f6c..5c4aac4 100644
--- a/0.6.x/js/core/06_XEventDispatcher.js
+++ b/0.6.x/js/core/06_XEventDispatcher.js
@@ -10,12 +10,21 @@ X.EventDispatcher =
 			_dispatching  : 0, // dispatch 中の unlisten で使用
 			_unlistens    : null, // dispatch 中の unlisten で使用
 			_needsIndex   : false, // listening で index を返す
+			_reserves     : null,
 			_killReserved : false,
 			
 			listen : function( type, arg1, arg2, arg3 ){
 				var list = this._listeners,
-					f;
+					r, f;
+				if( this._dispatching ){
+					// todo
+					// reserve
+					if( !this._reserves ) this._reserves = [];
+					this._reserves[ this._reserves.length ] = [ type, arg1, arg2, arg3 ];
+					return this;
+				} else
 				if( this.listening( type, arg1, arg2, arg3 ) ) return this;
+
 				if( !list ) list = this._listeners = {};
 				if( !( list = list[ type ] ) ) list = this._listeners[ type ] = [];
 				list[ list.length ] = f =
@@ -33,7 +42,7 @@ X.EventDispatcher =
 			},
 			unlisten : function( type, arg1, arg2, arg3 ){
 				var list = this._listeners,
-					i, f;
+					unlistens, i, f;
 				if( !list ) return this;
 				if( type === undefined ){
 					// 全て削除
@@ -51,14 +60,27 @@ X.EventDispatcher =
 					return this;
 				};
 				
+				if( this._reserves ){
+					for( i = this._reserves.length; i; ){
+						f = this._reserves[ --i ];
+						if( f[ 0 ] === type && f[ 1 ] === arg1 && f[ 2 ] === arg2 && f[ 3 ] === arg3 ){
+							this._reserves.splice( i, 1 );
+							if( !this._reserves.legth ) delete this._reserves;
+							return this;
+						};
+					};
+				};
+				
 				this._needsIndex = true;
 				i = this.listening( type, arg1, arg2, arg3 );
 				delete this._needsIndex;
 				if( i === false ) return this;
 
 				f = ( list = list[ type ] )[ i ];
-				if( this._dispatching ){
-					this._unlistens[ this._unlistens.length ] = f;
+				if( unlistens = this._unlistens ){
+					( unlistens = unlistens[ type ] ) ?
+						( unlistens[ unlistens.length ] = f ) :
+						( this._unlistens[ type ] = [ f ] );
 				} else {
 					delete f.once;
 					f.kill === X.Callback._kill && f.kill();
@@ -71,10 +93,16 @@ X.EventDispatcher =
 				return this;
 			},
 			listening : function( type, arg1, arg2, arg3 ){
-				var list = this._listeners, i, f;
+				var list = this._listeners, unlistens, i, f;
 				if( type === undefined ) return !!list;
 				if( !list || !( list = list[ type ] ) ) return false;
 				if( arg1 === undefined ) return true;
+				if( ( unlistens = this._unlistens ) && ( unlistens = unlistens[ type ] ) ){
+					for( i = unlistens.length; i; ){
+						f = unlistens[ --i ];
+						if( f === arg1 || ( f.same && f.same( arg1, arg2, arg3 ) ) ) return false;
+					};
+				};
 				for( i = list.length; i; ){
 					f = list[ --i ];
 					if( f === arg1 || ( f.same && f.same( arg1, arg2, arg3 ) ) ) return this._needsIndex ? i : true;
@@ -89,25 +117,30 @@ X.EventDispatcher =
 			 */
 			dispatch : function( e ){
 				// dispatch 中の listen は？
-				var list = this._listeners,
-					ret  = X.Callback.NONE,
-					i, f, r, sysOnly;
+				var list  = this._listeners,
+					ret   = X.Callback.NONE,
+					type  = e.type,
+					unlistens, i, l, f, r, sysOnly;
 
-				if( !list || !( list = list[ e.type ] ) ) return ret;
+				if( !list || !( list = list[ type ] ) ) return ret;
 				
 				++this._dispatching;
-				this._unlistens = this._unlistens || [];
+				
+				// todo:
+				// type も保存
+				this._unlistens = this._unlistens || {};
+				unlistens = this._unlistens[ type ];
 				
 				for( i = 0; i < list.length; ++i ){
 					f = list[ i ];
-					if( this._unlistens.length && this._unlistens.indexOf( f ) !== -1 ){
-						continue;
-					};
+					if( unlistens && unlistens.indexOf( f ) !== -1 ) continue;
 
 					r = typeof f === 'function' ? f( e ) : f.handleEvent( e );
 					
 					if( f.once === true || r & X.Callback.UN_LISTEN ){
-						this._unlistens[ this._unlistens.length ] = f;
+						unlistens ?
+							( unlistens[ unlistens.length ] = f ) :
+							( unlistens = this._unlistens[ type ] = [ f ] );
 					};
 
 					if( r & X.Callback.STOP_NOW ){
@@ -118,13 +151,30 @@ X.EventDispatcher =
 				
 				if( ( --this._dispatching ) === 0 ){
 					// dispatch 中に unlisten された要素の削除
-					for( i = this._unlistens.length ; i; ){
-						this.unlisten( e.type, this._unlistens[ --i ] );
-					};
+					unlistens = this._unlistens;
 					delete this._dispatching;
-					delete this._unlistens;
+					delete this._unlistens;					
+					
+					for( type in unlistens ){
+						list = unlistens[ type ];
+						for( i = list.length; i; ){
+							this.unlisten( type, list[ --i ] );
+						};
+						unlistens.length = 0;
+					};
 					
-					this._killReserved && this.kill();
+					if( this._killReserved ){
+						this.kill();
+					} else
+					if( list = this._reserves ){
+						for( i = 0, l = list.length; i < l; ++i ){
+							f = list[ i ];
+							this.listen( f[ 0 ], f[ 1 ], f[ 2 ], f[ 3 ] );
+							f.length = 0;
+						};
+						list.length = 0;
+						delete this._reserves;
+					};
 				};
 				
 				return ret;
diff --git a/0.6.x/js/dom/10_XDom.js b/0.6.x/js/dom/10_XDom.js
index 0cdeed8..d51ae76 100644
--- a/0.6.x/js/dom/10_XDom.js
+++ b/0.6.x/js/dom/10_XDom.js
@@ -114,16 +114,23 @@
 
 })( window, document );
 
-X.Dom.Dirty = {
-	CLEAN     :  0,
-	TREE      :  1, // width, height, x, y
-	CONTENT   :  2,  // width, height, x, y textNode の内容
-	CLASSNAME :  4, // _getCharSize, width, height, x, y
-	CSS       :  8, // _getCharSize, width, height, x, y
-	ATTR      : 16  // _getCharSize, width, height, x, y
+X.Dom.skipCleanupTagNames = 'pre,textarea,code,kbd,samp,xmp,plaintext,listing'.split( ',' );
+		
+X.Dom.cleanupWhiteSpace = function( text ){
+	var _ = ' ', __ = '  ';
+	text.indexOf( '\r\n' ) !== -1 && ( text = text.split( '\r\n' ).join( _ ) );
+	text.indexOf( '\n\r' ) !== -1 && ( text = text.split( '\n\r' ).join( _ ) );
+	text.indexOf( '\t' )   !== -1 && ( text = text.split( '\t' ).join( _ ) );
+	text.indexOf( '\r' )   !== -1 && ( text = text.split( '\r' ).join( _ ) );
+	text.indexOf( '\n' )   !== -1 && ( text = text.split( '\n' ).join( _ ) );
+	text.indexOf( '\f' )   !== -1 && ( text = text.split( '\f' ).join( _ ) );
+	text.indexOf( '\b' )   !== -1 && ( text = text.split( '\b' ).join( _ ) );
+	while( text.indexOf( __ ) !== -1 ){
+		text = text.split( __ ).join( _ );
+	};
+	return text;
 };
 
-
 /*
  * original
  * AS3で相対パスを絶対パスに変換する
@@ -162,3 +169,13 @@ X.Dom.getAbsolutePath = function( path ){
 	};
 	return [ _ary[ 0 ], ss, ary.join( s ), s, path ].join( '' );
 };
+
+
+X.Dom.Dirty = {
+	CLEAN     :  0,
+	TREE      :  1, // width, height, x, y
+	CONTENT   :  2,  // width, height, x, y textNode の内容
+	CLASSNAME :  4, // _getCharSize, width, height, x, y
+	CSS       :  8, // _getCharSize, width, height, x, y
+	ATTR      : 16  // _getCharSize, width, height, x, y
+};
\ No newline at end of file
diff --git a/0.6.x/js/dom/11_XDomNode.js b/0.6.x/js/dom/11_XDomNode.js
index 960cc1f..cf650fb 100644
--- a/0.6.x/js/dom/11_XDomNode.js
+++ b/0.6.x/js/dom/11_XDomNode.js
@@ -21,6 +21,7 @@ X.Dom.Node = X.EventDispatcher.inherits(
 
 		_attrs     : null, // X.Dom.Attr
 		_attrText  : '',
+		_attrUpdated : false,
 		_css       : null, // X.Dom.Style
 		_cssText   : '',
 		_styleText : '',
@@ -147,6 +148,20 @@ Node.createText = function( text ){
 	return new Node( text );
 };
 
+
+Node.getRoot = function( xnode ){
+	return Node._document;
+	//return xnode.root._rawNode.documentElement ? node : node.ownerDocument || node.document;
+};
+	// XMLかどうかを判別する
+Node.isXmlDocument =
+	X.UA.IE && X.UA.IE < 5 ?
+		X.emptyFunction :
+		(function( root ){
+			return root._rawNode.createElement( 'p' ).tagName !== root._rawNode.createElement( 'P' ).tagName;
+		});
+
+
 /* --------------------------------------
  *  Dom Core 1
  */
@@ -187,7 +202,7 @@ Node._systemNode = null;// = Node._chashe[ ? ]
  */
 Node.prototype._create =
 	// document.createElement of ie4 is only for OPTION & IMAGE.
-	document.appendChild ? (function( isChild ){
+	document.getElementById ? (function( isChild ){
 		var tag = this._tag, node, frg;
 /*
  * http://d.hatena.ne.jp/uupaa/20080718/1216362040
@@ -203,7 +218,7 @@ Node.prototype._create =
 				tag && X.UA.IE ?
 					document.createElement( [
 						'<', this._tag,
-							'UID="', this._uid, '"',
+							' UID="', this._uid, '"',
 							this._id ? ' id="' + this._id + '"' : '',
 							this._classText,
 							( this._attrUpdated ? ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ) : this._attrText ),
@@ -212,6 +227,7 @@ Node.prototype._create =
 				tag ?
 					document.createElement( tag ) :
 					document.createTextNode( this._text ) );
+			delete this._attrUpdated;
 		};
 		// fragument がある場合 children も足して
 		// Mozilla: 1.0+, IE: 6.0+, Netscape: 2.0+, Safari: 1.0+, Opera: 7.0+
@@ -242,14 +258,13 @@ Node.prototype._create =
 			};
 		};
 		html = [
-			'<', this._tag, ' id="', ( this._id || ( 'ie4uid' + this._uid ) ), '"',
+			'<', this._tag, ' id=', ( this._id || ( 'ie4uid' + this._uid ) ),
 			this._classText,
 			( this._attrUpdated ? ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ) : this._attrText ),
 			this._styleText,
 		'>' ];
 		delete this._attrUpdated;
 		
-		
 		if( ( children = this._xnodes ) && ( l = children.length ) ){
 			for( i = 0; i < l; ++i ){
 				html[ html.length ] = children[ i ]._create( true, true );
@@ -261,10 +276,10 @@ Node.prototype._create =
 	(function(){});
 
 Node.prototype._afterCreate =
-	( document.appendChild ) ? (function( parent ){
+	( document.getElementById ) ? (function( parent ){
 		var _children = this._xnodes,
 			node      = this._rawNode,
-			eChildren = node.childNodes,
+			eChildren = node && node.nodeType === 1 && node.childNodes,
 			attrs, p, _child, i, l;
 		this.parent = parent;
 		if( this._xnodeType !== 1 ) return this;
@@ -338,7 +353,7 @@ Node.prototype.create = function( tag, opt_attrs, opt_css ){
 	elm = this._ie4getRawNode ? this._ie4getRawNode() : this._rawNode;
 	
 	if( elm && !Node.skipCreate ){
-		if( document.appendChild ){
+		if( document.getElementById ){
 			// ie では iframe の frameborder が無視されるので、<iframe class=> を渡す
 			elm.appendChild( document.createElement( tag ) );
 			xnode = new Node( elm.lastChild );
@@ -466,7 +481,7 @@ Node.prototype.append = function( v ){
 		case Node.IS_RAW_HTML :
 		case Node.IS_RAW_TEXT :
 			if( elm ){
-				if( document.appendChild ){
+				if( document.getElementById ){
 					elm.appendChild( v );
 				} else
 				if( document.all ){
@@ -487,7 +502,7 @@ Node.prototype.append = function( v ){
 			// 親の xnodes から v を消す
 			v.parent && ( i = v.parent._xnodes.indexOf( v ) ) !== -1 && v.parent._xnodes.splice( i, 1 );
 			if( elm ){
-				if( document.appendChild ){
+				if( document.getElementById ){
 					elm.appendChild( v._create() );
 					v._afterCreate( this );
 				} else
@@ -549,7 +564,7 @@ Node.prototype.appendAt = function( start, v ){
 		case Node.IS_RAW_HTML :
 		case Node.IS_RAW_TEXT :
 			if( elm ){
-				if( document.appendChild ){
+				if( document.getElementById ){
 					elm.insertBefore( v, elm.childNodes[ start ] );
 				} else
 				if( document.all ){
@@ -594,7 +609,7 @@ Node.prototype.appendAt = function( start, v ){
 			// 親の xnodes から v を消す
 			v.parent && ( i = v.parent._xnodes.indexOf( v ) ) !== -1 && v.parent._xnodes.splice( i, 1 );
 			if( elm ){
-				if( document.appendChild ){
+				if( document.getElementById ){
 					elm.insertBefore( v._create(), elm.childNodes[ start ] );
 					v._afterCreate( this );
 				} else
@@ -667,10 +682,10 @@ Node.prototype.replace = function( v ){
  *  Remove
  */
 Node.prototype.remove = function(){
-	var parent = this.parent;
+	var parent = this.parent, elm;
 		
 	if( !parent ) return this;
-	if( document.removeChild ){
+	if( document.getElementById ){
 		if( this._rawNode ){
 			this._xnodeType === 1 && this._beforeRemove();
 			parent._rawNode.removeChild( this._rawNode );
@@ -698,7 +713,7 @@ Node.prototype.remove = function(){
 };
 
 Node.prototype._beforeRemove = 
-	document.removeChild ?
+	document.getElementById ?
 		( function(){
 			var elm = this._rawNode, children,
 				child, i, l;
@@ -728,7 +743,7 @@ Node.prototype._beforeRemove =
 		(function(){});
 
 Node.prototype.empty =
-	document.removeChild ?
+	document.getElementById ?
 		( function(){
 			var elm = this._rawNode, children,
 				child, i, l;
@@ -775,7 +790,7 @@ Node.prototype.destroy = function(){
 		// stop()
 		// remove() empty()
 		
-		document.removeChild && this.parent._rawNode.removeChild( elm );
+		document.getElementById && this.parent._rawNode.removeChild( elm );
 	};
 	delete Node._chashe[ this._uid ];
 	this.kill();
@@ -818,14 +833,18 @@ if( !document.getElementById && document.all ){
 		var children = this._xnodes,
 			i, l, html;
 		if( !this._ie4dirtyChildren ){
-			for( i = 0, l = children.length; i < l; ++i ){
-				children[ i ]._ie4commitUpdate();
+			if( children && ( l = children.length ) ){
+				for( i = 0; i < l; ++i ){
+					children[ i ]._ie4commitUpdate();
+				};				
 			};
 			return this;
 		};
 		html = [];
-		for( i = 0, l = children.length; i < l; ++i ){
-			html[ html.length ] = children[ i ]._create( true );
+		if( children && ( l = children.length ) ){
+			for( i = 0; i < l; ++i ){
+				html[ html.length ] = children[ i ]._create( true );
+			};	
 		};
 		this._rawNode.innerHTML = html.join( '' );
 		return this;
@@ -835,13 +854,17 @@ if( !document.getElementById && document.all ){
 		var children = this._xnodes,
 			i, l;
 		if( !this._ie4dirtyChildren ){
-			for( i = 0, l = children.length; i < l; ++i ){
-				children[ i ]._ie4afterUpdate();
+			if( children && ( l = children.length ) ){
+				for( i = 0; i < l; ++i ){
+					children[ i ]._ie4afterUpdate();
+				};				
 			};
 			return this;
 		};
-		for( i = 0, l = children.length; i < l; ++i ){
-			children[ i ]._afterCreate( this );
+		if( children && ( l = children.length ) ){
+			for( i = 0; i < l; ++i ){
+				children[ i ]._afterCreate( this );
+			};	
 		};
 		delete this._ie4dirtyChildren;
 	};
@@ -879,9 +902,12 @@ Node.prototype.contains = function( v ){
 				return false;
 		};		
 	};
+	//if( document.compareDocumentPosition ){
+	//	
+	//};
 	children = this._xnodes;
 	if( children.indexOf( v ) !== -1 ) return true;
-	if( ( node = this._rawNode ) && node === v.parentNode ) return;
+	if( ( node = this._rawNode ) && node === v.parentNode ) return false;
 	for( i = children.length; i; ){
 		if( children[ --i ].contains( v ) ) return true;
 	};
@@ -946,7 +972,7 @@ Node.prototype.className = function( v ){
 	// getter
 	if(  typeof v !== 'string' ) return this._className;
 	// setter
-	if( this._className === v ) return;
+	if( this._className === v ) return this;
 	if( !v ) delete this._className;
 	node = this._ie4getRawNode ? this._ie4getRawNode() : this._rawNode;
 	if( node ) node.className = v;
@@ -964,14 +990,18 @@ Node.prototype.toggleClass = function(){
 	
 };
 Node.prototype.hasClass = function( className ){
-	var cnames  = ( this._className || '' ).split( ' ' ),
-		_cnames = className.split( ' ' ),
-		i       = _cnames.length,
-		_cname;
-	for( ; i; ){
-		_cname = _cnames[ --i ];
-		if( _cname === '' ) continue;
-		if( cnames.indexOf( _cname ) === -1 ) return false;
+	var _ = ' ',
+		_className = this._className, i, name;
+	if( _className === className ) return true;
+	if( !_className ) return false;
+	
+	_className = _ + _className + _;
+	if( _className.indexOf( _ + className + _ ) !== -1 ) return true; // lucky hit
+	
+	for( className = className.split( _ ), i = className.length; i; ){
+		name = className[ --i ];
+		if( name === '' ) continue;
+		if( _className.indexOf( _ + name + _ ) === -1 ) return false;
 	};
 	return true;
 };
diff --git a/0.6.x/js/dom/12_XDomEvent.js b/0.6.x/js/dom/12_XDomEvent.js
index 781cd59..c601263 100644
--- a/0.6.x/js/dom/12_XDomEvent.js
+++ b/0.6.x/js/dom/12_XDomEvent.js
@@ -101,8 +101,8 @@ if( window.addEventListener ){
 			this.offsetX       = e.offsetX; // イベントターゲット左上からの座標
 			this.offsetY       = e.offsetY;			
 		} else {
-			this.offsetX       = e.x - e.srcElement.offsetLeft; // e.x はイベントが発生要素の親要素を基準にした座標。
-			this.offsetY       = e.y - e.srcElement.offsetTop;	
+			//this.offsetX       = e.x - e.srcElement.offsetLeft; // e.x はイベント発生要素の親要素を基準にした座標。
+			//this.offsetY       = e.y - e.srcElement.offsetTop;	
 		};
 		
 		this.keyCode       = e.keyCode;
@@ -187,13 +187,11 @@ X.Dom.Node.prototype._addEvent =
 
 X.Dom.Node.prototype.unlisten = function( type /* , arg2, arg3, arg4 */ ){
 	var list = this._listeners,
-		l    = list && type && list[ type ] && list[ type ].length;
+		l    = !this._dispatching && list && type !== undefined && list[ type ] && list[ type ].length;
 	
 	X.EventDispatcher.prototype.unlisten.apply( this, arguments );
 	
-	if( type !== undefined && !this._dispatching && l && !list[ type ] ){
-		this._removeEvent( type );
-	};
+	l && !list[ type ] && this._removeEvent( type );
 	
 	return this;
 };
@@ -312,7 +310,7 @@ X.Dom.listenOnce( X.Dom.Event.VIEW_RESIZED, function(e){ console.log( 'X.Dom VIE
 X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){
 	
 	Node._html = document.documentElement ? new Node( document.documentElement ) : null;
-	
+	//alert( document.all.tags('html')[ 0 ].tagName );
 	var r    = Node.root = new Node( document.body ),
 		body = r._rawNode,
 		createTree, n = 0, s;
@@ -335,10 +333,10 @@ X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){
 						xnode._xnodes[ xnode._xnodes.length ] = _xnode = new Node( child );
 						// attr の取得
 						_xnode.parent = xnode;
-						child.childNodes.length && createTree( _xnode, child, skipCleanup || 0 <= X.skipCleanupTagNames.indexOf( child.tagName.toLowerCase() ) );
+						child.childNodes.length && createTree( _xnode, child, skipCleanup || 0 <= X.Dom.skipCleanupTagNames.indexOf( child.tagName ) );//.toLowerCase() ) );
 						break;
 					case 3 :
-						if( skipCleanup || ( ( text = child.data ) && ( text = X.cleanupWhiteSpace( text ) ) !== ' ' ) ){
+						if( skipCleanup || ( ( text = child.data ) && ( text = X.Dom.cleanupWhiteSpace( text ) ) !== ' ' ) ){
 							if( !skipCleanup ) child.data = text;
 							if( !xnode._xnodes ) xnode._xnodes = [];
 							xnode._xnodes[ xnode._xnodes.length ] = _xnode = new Node( child );
@@ -372,21 +370,22 @@ X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){
 					_xnode.parent    = xnode;
 					_xnode._ie4dirty = true;
 					if( _xnode._xnodeType === 1 ){
-						tag = child.tagName.toLowerCase();
+						tag = child.tagName; //.toLowerCase();
 						if( _xnode._tag !== tag ){
 							alert( _xnode._tag + ' !== ' + child.tagName + ' * ' + child.outerHTML );
 						} else {
 							_xnode._rawNode = child;
-							!( _xnode._id = child.getAttribute( 'id' ) ) && child.setAttribute( 'id', ( _xnode._ie4uid = 'ie4uid' + _xnode._uid ) );
+							//!( _xnode._id = child.getAttribute( 'id' ) ) && child.setAttribute( 'id', ( _xnode._ie4uid = 'ie4uid' + _xnode._uid ) );
+							!_xnode._id && child.setAttribute( 'id', ( _xnode._ie4uid = 'ie4uid' + _xnode._uid ) );
 							child.setAttribute( 'UID', '' + _xnode._uid );
-							child.children.length && createTree( _xnode, child.children, skipCleanup || 0 <= X.skipCleanupTagNames.indexOf( tag ) );
+							child.children.length && createTree( _xnode, child.children, skipCleanup || 0 <= X.Dom.skipCleanupTagNames.indexOf( tag ) );
 							f = true;
 							++j;
 							break;
 						};
 					} else
 					if( _xnode._xnodeType === 3 ){
-						if( !skipCleanup && ( !( text = _xnode._text ) || ( text = X.cleanupWhiteSpace( text ) ) === ' ' ) ){
+						if( !skipCleanup && ( !( text = _xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ) ){
 							_xnode.remove();
 							++n;
 							continue;
@@ -410,10 +409,11 @@ X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){
 		r._xnodes.push.apply( r._xnodes, X.Dom.parse( body.innerHTML, true ) );
 		delete Node.skipCreate;
 		createTree( r, body.children );
+		//alert(n +  ' ' + body.innerHTML);
 		r._ie4reserveUpdate();
 		//alert(n +  ' ' + body.innerHTML);
 		r._ie4startUpdate();
-		//alert(n +  ' ' + body.innerHTML);
+		alert(n +  ' ' + body.innerHTML);
 	} else {
 		
 	};
diff --git a/0.6.x/js/dom/14_XDomAttr.js b/0.6.x/js/dom/14_XDomAttr.js
index 39c88ba..a9566b0 100644
--- a/0.6.x/js/dom/14_XDomAttr.js
+++ b/0.6.x/js/dom/14_XDomAttr.js
@@ -216,6 +216,7 @@ X.Dom.Node.prototype.attr = function( nameOrObj /* v */ ){
 			this.__attr( node, attrs, p, nameOrObj[ p ] );
 		};
 		delete this._attrText; // = X.Dom.Attr.objToAttrText( attrs );
+		this._attrUpdated = true;
 		return this;
 	} else
 	if( 1 < arguments.length ){
@@ -227,6 +228,7 @@ X.Dom.Node.prototype.attr = function( nameOrObj /* v */ ){
 			attrs, nameOrObj, arguments[ 1 ]
 		);
 		delete this._attrText; // = X.Dom.Attr.objToAttrText( attrs );
+		this._attrUpdated = true;
 		return this;
 	} else
 	if( typeof nameOrObj === 'string' ){
@@ -257,7 +259,7 @@ X.Dom.Node.prototype.__attr = function( node, attrs, name, v ){
 	};
 	// id
 	if( name === 'id' ){
-		this._id = v === 'ie4uid' + this._uid ? undefined : !v ? undefined : v;
+		this._id = v === 'ie4uid' + this._uid ? undefined : v || undefined;
 		return;
 	};
 	// update this._attrs
diff --git a/0.6.x/js/dom/17_XDomNodeList.js b/0.6.x/js/dom/17_XDomNodeList.js
index 8f98950..4894dc0 100644
--- a/0.6.x/js/dom/17_XDomNodeList.js
+++ b/0.6.x/js/dom/17_XDomNodeList.js
@@ -3,26 +3,43 @@ X.Dom.NodeList = function( v ){
 	var args = [],
 		l    = arguments.length,
 		i    = 0,
-		indexOf, xnode;
+		indexOf, xnode, j, n = 0, skip;
 	for( ; i < l; ++i ){
+		//args.push( arguments[ i ] );
 		args.push.apply( args, arguments[ i ] );
 	};
+	//alert( arguments[ 0 ].length + ' , ' + args.length )
 	if( ( l = args.length ) === 1 ) return new X.Dom.Node( args[ 0 ] );
-	if( !this || this.append !== Node.prototype.append ) return new X.Dom.NodeList( args );
+	if( !this || this.append !== X.Dom.NodeList.prototype.append ) return new X.Dom.NodeList( args );
 	
-	this.__ = { type : 2 };
-	indexOf = Array.prototype.indexOf;
 	for( i = 0; i < l; ++i ){
 		xnode = args[ i ];
-		xnode = xnode && xnode.constructor === X.Dom.Node ? xnode : new X.Dom.Node( xnode );
-		if( xnode._xnodeType !== 0 && indexOf.call( this, xnode ) === -1 ){
-			this[ this.length ] = xnode;
-			++this.length;
+		//xnode = xnode && xnode.constructor === X.Dom.Node ? xnode : new X.Dom.Node( xnode );
+		skip  = false;
+		if( xnode._xnodeType === 0 ) continue;
+		for( j = 0; j < n; ++j ){
+			if( this[ j ] === xnode ){
+				skip = true;
+				break;
+			};
+		};
+		if( !skip ){
+			this[ n ] = xnode;
+			n = ++this.length;	
 		};
 	};
 };
 X.Dom.NodeList.prototype.length = 0;
 
+X.Dom.NodeList.prototype.each = function( func ){
+	var l = this.length,
+		i = 0;
+	for( i = 0, l = this.length; i < l; ++i ){
+		if( func.call( this[ i ], i ) === false ) break;
+	};
+	return this;
+};
+
 /* --------------------------------------
  *  Fuction Base, multi, getter, setter,
  */
@@ -35,14 +52,12 @@ X.Dom.NodeList.prototype.length = 0;
 		v = src[ p ];
 		if( typeof v === 'funciton' && !target[ p ] ){
 			target[ p ] = multi = new Function( [
-				'function functionBase(){',
-					'var a=arguments,s=a.callee,f=s.f,t=this,i,l=t.length;',
-					'if(0<l){',
-						'for(i=0;i<l;++i)if(i===l-1)return f.apply(t[i],a)else f.apply(t[i],a);',
-					'}',
-					'return f.apply(t,a)',
-				'}'			
-			].join( '' ));
+				'var a=arguments,s=a.callee,f=s.f,t=this,i,l=t.length;',
+				'if(0<l){',
+					'for(i=0;i<l;++i)if(i===l-1)return f.apply(t[i],a)else f.apply(t[i],a);',
+				'}',
+				'return f.apply(t,a)'
+			].join( '' ) );
 			multi.f = src[ p ];
 		};
 	};
diff --git a/0.6.x/js/dom/18_XDomQuery.js b/0.6.x/js/dom/18_XDomQuery.js
index 2ea6a34..6796d0d 100644
--- a/0.6.x/js/dom/18_XDomQuery.js
+++ b/0.6.x/js/dom/18_XDomQuery.js
@@ -1,255 +1,690 @@
-/* --------------------------------------
- *  getByID
- */
-X.Dom.getByID =
-	document.getElementById ?
-		(function( id ){
-			return new X.Dom.Node( document.getElementById( id ) );
-		}) :
-	document.all ?
-		(function( id ){
-			return new X.Dom.Node( document.all[ id ] );	
-		}) :
-		(function( id ){});
-
-/* --------------------------------------
- *  getByTag
- */
-Node.prototype.getByTag =
-	document.getElementsByTagName ?
-		function( tag ){
-			var parent = this.parent, elm, tags;
-			if( !parent || this._xnodeType !== -1 ) return;
-			if( !( elm = this._rawNode ) ) return;
-			return new X.Dom.NodeList( document.getElementsByTagName( tag ) );
-		} :
-	document.all ?
-		(function( tag ){
-			var parent = this.parent, elm, tags;
-			if( !parent || this._xnodeType !== -1 ) return;
-			if( !( elm = this._ie4getRawNode() ) ) return;
-			Node.root._ie4reserved === true && Node.root._ie4startUpdate();
-			return new X.Dom.NodeList( elm.all.tags( tag ) );	
-		}) :
-		(function( tag ){});
-
-/* --------------------------------------
- *  getByClass
- */
-Node.prototype.getByClass =
-		document.getElementsByClassName ?
-			(function( className ){
-				var parent = this.parent, elm;
-				if( !parent ) return;
-				if( !( elm = this._rawNode ) || elm.nodeType !== 1 ) return;
-				return new X.Dom.NodeList( elm.getElementsByClassName( className ) );
-			}) :
-		document.getElementsByTagName ?
-			(function( className ){
-				var parent = this.parent,
-					live   = parent.getElementsByTagName( '*' ),
-					nodes  = [],
-                    test   = X.matchTest,
-                    node, i;
-                className = className.split( ' ' );
-                for( i = live.length; i; ){
-                	nodes[ --i ] = live[ i ];
-                };
-				for( i = nodes.length; i; ){
-					node = nodes[ --i ];
-					( node.nodeType !== 1 || !node.className || !node.className.length || !test( node.className.split( ' ' ), className ) ) && nodes.splice( i, 1 );
-				};
-				return new X.Dom.NodeList( nodes );
-			}) :
-		document.all ?
-			(function( parent, className ){
-				var live  = parent.all,
-					nodes = [],
-                    test  = X.matchTest,
-                    node, i;
-                for( i = live.length; i; ){
-                	nodes[ --i ] = live[ i ];
-                };
-				for( i = nodes.length; i; ){
-					node = nodes[ --i ];
-					( !node.className || !node.className.length || !test( node.className.split( ' ' ), className ) ) && nodes.splice( i, 1 );
-				};
-				return new X.Dom.NodeList( nodes );
-			}) :
-			(function(){});
-
-X.Dom.find = Node.prototype.find = function( v ){
-	var root      = this.cnstructor === Node ? this : Node.root,
-		selectors = X.Dom.Query._parse( v ),
-		l, i, nodes, _nodes, selector,
-		name, key, operator, value,
-		j, m;
-	
-	if( !selectors ) return;
-	l     = selectors.length;
-	i     = 0;
-	nodes = [];
-	
-	for( ; i < l; ++i ){
-		selector = selectors[ i ];
-		if( 2 <= selector.length ){
-			operator = selector[ 2 ];
-			value    = selector[ 3 ];
-			name     = key = selector[ 1 ];
-			selector = selector[ 0 ];
-		};
-		switch( selector ){
-			case 4 : // # id
-				nodes = [ X.Dom.getById( name ) ];
-				break;
-			case 5 : // . classname
-				_nodes = [];
-				for( j = 0, m = nodes.length; j < m; ++j ){
-					_nodes = _nodes.concat( nodes[ j ].getByClass( name ) );
-				};
-				nodes = _nodes;
-				break;
-			case 6 : // :focus, :disabled ...
-				switch( name ){
-					case 'focus' :
-					case 'disabled' :
-					case 'checked' :
-					case 'enabled' :
-					case 'empty' :
-					case 'only-of-type' :
-					case '' :
-					case 'target' :
-					case 'link' :
-					case 'visited' :
-					case 'hover' :
-					case 'active' :
-					case 'first-line' :
-					case 'first-letter' :
-					case 'before' :
-					case 'after' :
-					case ':selection' :
-					case 'lang()' :
-					case 'not()' :
-				};
-				break;
-			case 7 : // [
-				
-				break;	
-			case 8 : // . tagname
-				_nodes = [];
-				for( j = 0, m = nodes.length ; j < m; ++j ){
-					_nodes = _nodes.concat( nodes[ j ].getByTag( name ) );
-				};
-				nodes = _nodes;
-				break;
-		};
-	};
-	return new X.Dom.NodeList( nodes );
-};
-
-X.Dom.Query = {
-	
-};
-
-X.Dom.Query._parse = function( query ){
-	var HASH_SELECTOR = {
-		' '   : 0,
-		'>'   : 1,
-		'+'   : 2,
-		'~'   : 3,
-		'#'   : 4,
-		'.'   : 5,
-		':'   : 6,
-		'['   : 7,
-		scope : 9,
-		root  : 10,
-		link  : 11
-	};
-	var OPERATORS = { "!=": 2, "~=": 3, "^=": 4, "$=": 5, "*=": 6, "|=": 7 };
-	var ALPHABET  = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-0123456789\\';
-
-	query += ' ';
-	var result    = [],
-		i         = 0,
-		l         = query.length,
-		phase     = 0,
-		selector  = -1,
-		last      = 0,
-		chr, index, start, name, key, value, operator, nameChr, name1st, escape;
-	while( i < l ){
-		chr     = query.charAt( i );
-		index   = ALPHABET.indexOf( chr );
-		nameChr = index !== -1;
-		name1st = nameChr && index < 52;
-		switch( phase ){
-			case 99 :
-				return;
-			case 0 :
-				name1st ? // tagName
-					( ( selector = 8 ) && ( phase = 2 ) && ( start = i ) ) :
-				( index = HASH_SELECTOR.indexOf( chr ) ) === 7 ? // [
-					( ( selector = 7 ) && ( phase = 3 ) ) :
-				0 <= index ?
-					( ( selector = index ) && ( phase = index < 4 ? 9 : 1 ) ) :
-				chr !== ' ' &&
-					( phase = 99 );
-				break;
-			case 1 :
-				name1st ?
-					( ( start = i ) && ( phase = 2 ) ) :
-					( phase = 99 );
-				break;
-			case 2 :
-				!nameChr &&
-				!( escape && ( selector === 4 || selector === 5 ) &&  ( chr === ':' || chr === '.' ) ) // id or class の場合 : . を直前にエスケープした場合に限り使える
-					&& ( name = query.substring( start, i ) ) && ( phase = 9 );
-				break;
-			case 3 : // start attr filter
-				name1st ?
-					( ( phase = 4 ) && ( start = i ) ) :
-					( phase = 99 );
-				break;
-			case 4 : // attr filter key
-				chr === '=' ?
-					( ( operator = 1 ) && ( phase = 5 ) && ( key = query.substring( start, i ) ) && ( start = i ) ) :
-				( index = OPERATORS[ query.substr( i, 2 ) ] ) ?
-					( ( operator = index ) && ( phase = 5 ) && ( key = query.substring( start, i ) )  && ( start = i ) && ++i ) :
-				chr !== ' ' &&
-					( phase = 99 );
-				break;
-			case 5 : // attr filter value
-				chr === ']' ?
-					( ( phase = 9 ) && ( value = query.substring( start, i ) ) ) :
-				!nameChr &&
-					( phase = 99 );
-				break;
-			default :
-		};
-		//alert( chr + ' ' + phase + ' ' + selector + ' ' + name + ' ' + name1st )
-		if( phase === 9 ){
-			if( last < 4 && selector < 4 ){
-				if( last === 0 ){
-					result[ result.length - 1 ] = selector; // override
-					last = selector;
-				} else {
-					return; // error
-				};
-			} else { // 前回今回とも子孫セレクタの場合、保存しない
-				result[ result.length ] =
-					selector < 4 ?
-						selector :
-					selector === 7 ?
-						[ selector, key, operator, value ] :
-						[ selector, name.split( '\\' ).join( '' ) ];
-				last = selector;
-			};
-			selector = -1;
-			phase    = 0;
-		} else
-		if( phase === 99 ) return;
-
-		escape = chr === '\\' && !escape;
-	};
-	return result;
-};
-
+/**
+ * Original code by ofk ( kQuery, ksk )
+ * http://d.hatena.ne.jp/ofk/comment/20090106/1231258010
+ * http://d.hatena.ne.jp/ofk/20090111/1231668170 
+ *
+ * セレクタ Level 3
+ * http://standards.mitsue.co.jp/resources/w3c/TR/css3-selectors/#nth-child-pseudo
+ */
+
+X.Dom.Query = {
+	_PSEUDO    : {
+		'nth-child'        : 9,
+		'nth-last-child'   : 14,
+		'nth-of-type'      : 11,
+		'nth-last-of-type' : 16,
+		root               : 4,
+		link               : 4,
+		lang               : 4,
+		empty              : 5,
+		target             : 6,
+		invalid            : 7,
+		enabled            : 7,
+		checked            : 7,
+		disabled           : 8,
+		contains           : 8,
+		'last-child'       : 10,
+		'only-child'       : 10,			
+		'first-child'      : 11,
+		'last-of-type'     : 12,
+		'only-of-type'     : 12,		
+		'first-of-type'    : 13
+	},
+	
+	_COMBINATOR : {
+		''    : 0, // none
+		' '   : 1, // 子孫セレクタ
+		'>'   : 2, // 子セレクタ
+		'+'   : 3, // 兄弟セレクタ,共通の親を持つ、1番目要素が2番目要素の1つ前にある
+		'~'   : 4, // 一般兄弟セレクタ,共通の親を持つ、1番目要素が2番目要素の前 (直前でなくともよい) にある
+		','   : 5
+	},
+	_SELECTOR : {
+		''    : 0, // none
+		tag   : 1,
+		'#'   : 2,
+		'.'   : 3,
+		':'   : 4,
+		'['   : 5,
+		not   : 6,
+		scope : 7,
+		root  : 8,
+		link  : 9
+	},
+	_OPERATORS : { '==' : 1, '!=': 2, '~=': 3, '^=': 4, '$=': 5, '*=': 6, '|=': 7 },
+	_ALPHABET  : 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-0123456789\\',
+	_NUMBER    : '+-0123456789'
+};
+			
+/*
+ * セレクタ文字の解析
+ * 結合子 + 単体セレクタ( タグ,*,#,.,[],: )
+ * ' ' 子孫セレクタ, '>' 直下,'+','~' の場合、tagName|* を返す
+ * return [ pointer, [ selector, ... ] ] error: return pointer
+ */
+X.Dom.Query._parse = function( query, last ){
+	var COMBINATOR = X.Dom.Query._COMBINATOR,
+		SELECTOR   = X.Dom.Query._SELECTOR,
+		OPERATORS  = X.Dom.Query._OPERATORS,
+		ALPHABET   = X.Dom.Query._ALPHABET,
+		NUMBER     = X.Dom.Query._NUMBER,
+		result     = [],
+		i          = -1,
+		l          = query.length,
+		phase      = 0x0,
+		combinator = 0,
+		selector   = 0,
+		chr, chrCode, nameChr, name1st,
+		tmp, escape, quot, start,
+		name, key, value, operator, a, b, not;
+	query += ' ';
+	while( i < l ){
+		chr     = query.charAt( ++i );
+		chrCode = ALPHABET.indexOf( chr );
+		nameChr = chrCode !== -1;
+		name1st = nameChr && chrCode < 52;
+		switch( phase ){
+			case 0x0 :
+				name1st ? // tagName
+					( ( selector = 1 ) && ( phase = 0x2 ) && ( start = i ) ) :
+				!not && ( tmp = COMBINATOR[ chr ] ) ? (
+					( 1 < tmp && 1 < combinator ) ?
+						( phase = 0xf ) :
+						( phase = tmp === 5 ? 0xe : 0x0 ) & ( ( 1 < tmp || combinator < 1 ) && ( combinator = tmp ) ) & ( tmp === 5 && ++i ) ) : // ' ' でない結合子の上書きはエラー
+				( tmp = SELECTOR[ chr ] ) ? // [
+					( selector = tmp ) && ( phase = selector === 5 ? 0x4 : 0x1 ) : // 7:[, 0<:
+				chr === '*' ?
+					( ( selector = 1 ) && ( name = chr ) && ( phase = 0xe ) && ++i ) :
+					chr !== ' ' && ( phase = 0xf );
+				//console.log( '0x0: ' + name1st + ' ' + chrCode + ' ' + chr + ' ' + phase + ' tmp:' + tmp + ' comb:' + combinator );
+				break;
+			case 0x1 :
+				name1st ?
+					( ( start = i ) && ( phase = 0x2 ) ) :
+					chr !== ' ' && ( phase = 0xf );
+				break;
+			case 0x2 :
+				!nameChr && !( escape && ( selector === 2 || selector === 3 ) && ( chr === ':' || chr === '.' ) ) ? // id or class の場合 : . を直前にエスケープした場合に限り使える
+					( name = query.substring( start, i ) ) && ( phase = selector === 4 && name !== 'not' && chr === '(' ? 0x8 : 0xe ) :
+				SELECTOR[ chr ] < 4 && ( phase = 0xe );
+				break;
+			
+			case 0x3 : //:nth-
+				break;
+			
+			case 0x4 : // start attr filter
+				name1st ?
+					( ( phase = 0x5 ) && ( start = i ) ) :
+					( phase = 0xf );
+				break;
+			case 0x5 : // attr filter key
+				chr === '=' ?
+					( ( operator = 1 ) && ( phase = 0x6 ) && ( key || ( key = query.substring( start, i ) ) ) && ( start = i + 1 ) ) :
+				chr === ']' ?
+					( !( operator = 0 ) && ( phase = 0xe ) && ( key || ( key = query.substring( start, i ) ) ) && ++i ) :
+				chr === ' ' ?
+					( key || ( key = query.substring( start, i ) ) ) :
+				( operator = OPERATORS[ query.substr( i, 2 ) ] ) ?
+					( ( phase = 0x6 ) && ( key || ( key = query.substring( start, i ) ) ) && ( start = ++i ) ) :
+					!nameChr && ( phase = 0xf );
+				//console.log( name1st + ' ' + chrCode + chr + phase );
+				break;
+			case 0x6 :
+				( chr === '"' || chr === "'" ) && !escape && !quot ?
+					( quot = chr ) && ( start = i + 1 ) && ( phase = 0x7 ) :
+					chr !== ' ' && ( start = i ) && ( phase = 0x7 );
+				break;
+				
+			case 0x7 : // attr filter value
+				chr === quot ?
+					!escape && !value && ( value = query.substring( start, i ) ) :
+				chr === ']' ?
+					( ( value || ( value = query.substring( start, i ) ) ) && ( phase = 0xe ) && ++i ) :	
+				chr === ' ' && !quot && !value && ( value = query.substring( start, i ) );			
+					//( chr === '"' || chr === "'" ) && !quot && ( quot = chr ) && ( start = i + 1 );
+				break;
+				
+			case 0x8 : // 4, 2n, even, odd, -n+4,
+				NUMBER.indexOf( chr ) !== -1 ?
+					( start = i ) && ( phase = 0x9 ) :
+				chr === 'n' ?
+					( phase = 0xa ) && ( a = 1 ) && ( start = i + 1 ) :
+				query.substr( i, 4 ) === 'even' ?
+					( ( a = 2 ) && !( b = 0 ) && ( i += 3 ) ) :
+				query.substr( i, 3 ) === 'odd' ?
+					( ( a = 2 ) && ( b = 1 ) && ( i += 2 ) ) :					
+				chr === ')' && ( phase = a ? 0xe : 0xf ) && ++i;
+				//console.log( '0x8: ' + name1st + ' ' + chrCode + ' ' + chr + ' ' + phase );
+				break;
+			case 0x9 :
+				tmp = query.substring( start, i );
+				chr === 'n' ?
+					( phase = 0xa ) && ( start = i + 1 ) && ( a = tmp === '+' ? 1 : tmp === '-' ? -1 : parseFloat( tmp ) ) :
+				chr === ')' && ( phase = 0xe ) && ( b = parseFloat( tmp ) ) && ++i && ( a = 0 );
+				//console.log( '0x9: ' + name1st + ' ' + chrCode + ' ' + chr + ' ' + phase );
+				break;
+			case 0xa :
+				chr === ')' && ( phase = 0xe ) && ++i && ( b = parseFloat( query.substring( start, i ) ) || 0 );
+				//console.log( '0xa: ' + start + ' ' + i );
+				break;
+			default :
+		};
+		//alert( chr + ' ' + phase + ' ' + selector + ' ' + name + ' ' + name1st )
+		if( phase === 0xe ){
+			if( selector === 4 ){// :not
+				if( name === 'not' ){
+					if( not ) return i; // error
+					not      = true;
+					selector = 0;
+					phase    = 0x0;
+					name     = null;
+					continue;
+				} else {
+					if( a !== a || b !== b ) return i;
+					result = [ not ? 0 : combinator, selector, name, a, b ];
+					break;	
+				};
+				// lang result = [ not ? 0 : combinator, selector, name, lan ];
+				// contains result = [ not ? 0 : combinator, selector, name, text ];
+			};
+			result =
+				combinator === 5 ?
+					5 :
+				selector === 5 ?
+					[ not ? 0 : combinator, selector, key, operator, value ] :
+					[ not ? 0 : combinator, selector, name.split( '\\' ).join( '' ) ];
+			break;
+		} else
+		if( phase === 0xf ) return i;
+
+		escape = chr === '\\' && !escape;
+	};
+	//if( phase !== 0xe ) return i;
+	if( not && ( tmp = query.substr( i ).indexOf( ')' ) ) === -1 ) return i;
+	return not ? [ i + tmp + 1, [ combinator, 6, result ] ] : [ i, result ];
+};
+
+	// セレクター
+	X.Dom.find = Node.prototype.find = function( queryString ){
+		var scope   = [ this.cnstructor === Node ? this : Node.root ],
+			noLower   = 'title id name class for href src',
+			ARY_PUSH  = Array.prototype.push,
+			ret       = [], // 結果要素
+			root      = X.Dom.Node.getRoot( scope[ 0 ] ),
+			isXML     = !!X.Dom.Node.isXmlDocument( root ),
+			isMulti   = 1 < scope.length,// 要素をマージする必要がある
+			parents   = scope, // 探索元の親要素
+			l, i, n, parsed,
+			xnodes, // 一時保存用
+			merge, // 要素がコメントノードで汚染されている場合使う
+			combinator, selector, name, tagName, 
+			isAll, isStart = true, isNot,
+			uid, tmp, xnode, filter, key, op, val, toLower, useName,
+            links, className, attr, flag;
+
+		// 文字列以外は空で返す
+		if( typeof queryString !== 'string' ) return ret;
+		
+		
+		
+		xnodes = [];
+		
+		// 以下、パースと探索
+		for( ; queryString.length; ){
+			console.log( 'queryString[' + queryString + ']' + queryString.length );
+			
+			// 初期化処理
+			if( !parsed ){
+				parsed = X.Dom.Query._parse( queryString );
+				
+				if( typeof parsed === 'number' ){
+					// error
+					return [];
+				};
+				
+				queryString = queryString.substr( parsed[ 0 ] );
+				parsed      = parsed[ 1 ];
+				
+				console.log( 'X.Dom.Query._parse ' + parsed );
+				
+				if( parsed === 5 ){
+					isMulti = true;
+					parents = scope;
+					xnodes && xnodes.length && ARY_PUSH.apply( ret, xnodes );
+					parsed  = null;
+					xnodes  = null;
+					isStart = true;
+					continue;
+				};
+			};
+			
+
+			
+			combinator  = parsed[ 0 ];
+			selector    = parsed[ 1 ];
+			name        = parsed[ 2 ];
+			tagName     = selector === 1 ? ( isXML ? name : name.toUpperCase() ) : '*';
+			isAll       = tagName === '*';
+	
+			if( !isStart ){
+				if( !xnodes.length ){
+					parsed = null;
+					continue;					
+				} else
+				if( combinator !== 0 ){
+					parents = xnodes;
+					xnodes  = [];
+					console.log( 'cobinator !== 0 ' + parents.length + ' : ' + xnodes.length );
+				};
+			};
+			
+			i = 0;
+			l = parents.length;
+			n = -1;	
+			isMulti = isMulti || 1 < l;
+			
+			//console.log( 'combinator ' + combinator );
+	
+			switch( combinator ){
+				// > TagName|*
+				case 2 :
+					for( ; i < l; ++i ){
+						for( xnode = parents[ i ].firstChild(); xnode; xnode = xnode.nextNode() ){
+							if( xnode._xnodeType === 1 && ( isAll || tagName === xnode._tag ) ) xnodes[ ++n ] = xnode;
+						};				
+					};
+					break;
+				// + TagName|*
+				case 3 :
+					for( ; i < l; ++i ){
+						for( xnode = parents[ i ].nextNode(); xnode; xnode = xnode.nextNode() ){
+							if( xnode._xnodeType === 1 ){
+								if( isAll || tagName === xnode._tag ) xnodes[ ++n ] = xnode;
+								break;
+							};									
+						};								
+					};
+					break;
+				// ~ TagName|*
+				case 4 :
+					merge  = {};
+					for( ; i < l; ++i ){
+						for( xnode = parents[ i ].nextNode(); xnode; xnode = xnode.nextNode() ){
+							if( xnode._xnodeType === 1 && ( isAll || tagName === xnode._tag ) ){
+								uid = xnode._uid;
+								if( merge[ uid ] ){
+									break;
+								} else {
+									merge[ uid ] = true;
+									xnodes[ ++n ] = xnode;
+								};
+							};									
+						};								
+					};
+					break;
+					
+				default :
+					if( combinator === 1 || isStart ){
+						console.log( l + ' > ' + xnodes.length + ' tag:' + tagName );
+						for( ; i < l; ++i ){
+							xnode = parents[ i ];
+							xnode._xnodes && xnode._xnodes.length && X.Dom.Query._fetchElements( xnodes, xnode, isAll ? null : tagName );
+						};
+						console.log( l + ' >> ' + xnodes.length + ' tag:' + tagName );
+					};
+			};
+			
+			isStart = false;
+			
+			//alert( 'pre-selector:' + ( xnodes && xnodes.length ) )
+			
+			switch( selector ){
+				// #, ID
+				case 2 :
+					filter = [ 'id', 1, name ]; break;
+				// ., class
+				case 3 :
+					filter = [ 'class', 3 /*'~='*/, name ]; break;
+				// :, 擬似クラス
+				case 4 :
+					if( !( filter = X.Dom.Query._filter[ name ] ) ){
+						return [];
+					};
+					break;
+				// [] 属性
+				case 5 :
+					filter = [ name, parsed[ 3 ], parsed[ 4 ] ]; break;
+				// :not
+				case 6 :
+					isNot  = true;
+					parsed = parsed[ 2 ];
+					continue;
+				// scope
+				case 7 :
+					xnodes = scope; break;
+				// root
+				case 8 :
+					xnodes = [ Node._html ]; break;
+				// link
+				case 9 :
+					if( links = root._rawNode.links ){
+						for( xnodes = [], i = links.length; i; ){
+							xnodes[ --i ] = new Node( links[ i ] );
+						};
+					};
+			};
+			
+			if( filter && xnodes.length ){
+				// filter.mが関数の場合
+				if( filter.m ){
+					xnodes = filter.m(
+						{
+							not : isNot,
+							xml : isXML
+						},
+						xnodes,
+						parsed[ 3 ], parsed[ 4 ]
+					);
+				} else
+				// filterが関数の場合
+				if( typeof filter === 'function' ){
+					tmp = [];
+					for( i = 0, n = -1; xnode = xnodes[ i ]; ++i ){
+						if( ( !!filter( xnode ) ) ^ isNot ) tmp[ ++n ] = xnode;	
+					};
+					xnodes = tmp;
+				} else {
+				// 属性セレクター			
+					tmp = [];
+					key = filter[ 0 ];
+					op  = filter[ 1 ];
+					val = filter[ 2 ]; 
+					// [class~='val']
+					if( !isXML && key === 'class' && op === 3 ){
+						val = ' ' + val + ' ';
+						for( i = 0, n = -1; xnode = xnodes[ i ]; ++i ){
+							className = xnode._className;
+							if( !!( className && ( ' ' + className + ' ' ).indexOf( val ) > -1 ) ^ isNot ) tmp[ ++n ] = xnode;
+						};
+					} else {
+					// 通常
+						// 諦めて、funcAttrを呼ぶ
+						// flag_call  = ($.browser.safari && key === 'selected');
+						// getAttributeを使わない
+						useName = X.UA.IE && key !== 'href' && key !== 'src';
+						toLower = !!val && !isXML && noLower.indexOf( key ) === -1; //!noLower.test(key);
+						if( toLower ) val = val.toLowerCase();
+						if( op === 3 ) val = ' ' + val + ' ';
+
+						for( i = 0, n = -1, l = xnodes.length; i < l; ++i ){
+							xnode = xnodes[ i ];
+							attr =
+								key === 'id' ? xnode._id :
+								key === 'class' ? xnode._className :
+								xnode._attrs && xnode._attrs[ key ];
+								//flag_call ?
+								//	funcAttr( elem, key ) :
+								//useName ?
+								//	elem[ X.Dom.Attr.renameForDOM[ key ] || key ] :
+								//	elem.getAttribute( key, 2 );
+							flag = attr != null && ( !useName || attr !== '' );
+							if( flag && op ){
+								if( toLower ) attr = attr.toLowerCase();
+								
+								switch( op ){
+									case 1: // =
+										flag = attr === val;
+										break;
+									case 2: // !=
+										flag = attr !== val;
+										break;
+									case 3: // ~=
+										flag = ( ' ' + attr + ' ' ).indexOf( val ) !== -1;
+										break;
+									case 4: // ^=
+										flag = attr.indexOf( val ) === 0;
+										break;
+									case 5: // $=
+										flag = attr.lastIndexOf( val ) + val.length === attr.length;
+										break;
+									case 6: // *=
+										flag = attr.indexOf( val ) !== -1;
+										break;
+									case 7: // |=
+										flag = attr === val || attr.substring( 0, val.length + 1 ) === val + '-';
+										break;
+								};
+							};
+							if( !!flag ^ isNot ) tmp[ ++n ] = xnode;
+						};
+					};
+					xnodes = tmp;
+				};
+			};
+			filter  = null;
+			isNot   = false;
+			parsed  = null;
+			
+			alert( '//end :' + ( xnodes && xnodes.length ) );
+		};
+		console.log( 'multi:' + ( xnodes && xnodes.length ) )
+		
+		if( isMulti ){
+			xnodes && xnodes.length && ARY_PUSH.apply( ret, xnodes );
+			//for( i = 0, l = xnodes.length, n = ret.length - 1; i < l; ++i ){
+			//	ret[ ++n ] = xnodes[ i ];
+			//};
+			xnodes = [];
+			merge  = {};
+			for( i = 0, n = -1, l = ret.length; i < l; ++i ){
+				//alert( 'multi:' + i )
+				xnode = ret[ i ];
+				uid   = xnode._uid;
+				if( !merge[ uid ] ){
+					merge[ uid ] = true;
+					xnodes[ ++n ] = xnode;
+				};
+			};
+		};
+
+		return xnodes.length === 1 ? xnodes[ 0 ] : new X.Dom.NodeList( xnodes );
+	};
+	
+	X.Dom.Query._fetchElements = function( list, parent, tag ){
+		var xnodes = parent._xnodes,
+			l      = xnodes.length,
+			i      = 0,
+			child;
+		for( ; i < l; ++i ){
+			child = xnodes[ i ];
+			if( child._xnodeType === 1 ){
+				( !tag || child._tag === tag ) && ( list[ list.length ] = child );
+				//console.log( parent._tag + ' > ' + child._tag + ' == ' + tag+ ' l:' + list.length );
+				child._xnodes && child._xnodes.length && X.Dom.Query._fetchElements( list, child, tag );
+			};
+		};
+	};
+
+	X.Dom.Query._funcSelectorChild = function( type, flag_all, flags, xnodes ){
+		var res      = [],
+			flag_not = flags.not,
+			i = 0, n = -1, xnode, node,
+			tagName, tmp;
+		for( ; xnode = xnodes[ i ]; ++i ){
+			tagName = flag_all || xnode._tag;
+			tmp     = null;
+			if( /* tmp === null && */ type <= 0 ){
+				for( node = xnode.prevNode(); node; node = node.prevNode() ){
+					if( node._xnodeType === 1 && ( flag_all || tagName === node._tag ) ){
+						tmp = false;
+						break;
+					};
+				};
+			};
+			if( tmp === null && 0 <= type ){
+				for( node = xnode.nextNode(); node; node = node.nextNode() ){
+					if( node._xnodeType === 1 && ( flag_all || tagName === node._tag ) ){
+						tmp = false;
+						break;
+					};		
+				};						
+			};
+			if( tmp === null ) tmp = true;
+			if( tmp ^ flag_not ) res[ ++n ] = xnode;
+		};
+		return res;
+	};
+	X.Dom.Query._funcSelectorNth = function( pointer, sibling, flag_all, flags, xnodes, a, b ){
+		var _data    = funcData,
+			res      = [],
+			checked  = {},
+			flag_not = flags.not,
+			i = 0, n = -1, elem, uid,
+			c, xnode, tmp, node, tagName;
+		for( ; xnode = xnodes[ i ]; ++i ){
+			uid = xnode._uid;
+			tmp = checked[ uid ];
+			if( tmp === void 0 ){
+				for( c = 0, node = xnode.parent[ pointer ](), tagName = flag_all || xnode._tag; node; node = node[ sibling ]() ){
+					if( node._xnodeType === 1 && ( flag_all || tagName === node._tag ) ){
+						++c;
+						checked[ node._uid ] = a === 0 ? c === b : (c - b) % a === 0 && (c - b) / a >= 0;
+					};							
+				};
+				tmp = checked[ uid ];
+			};
+			if( tmp ^ flag_not ) res[ ++n ] = elem;
+		};
+		return res;
+	};
+	X.Dom.Query._funcSelectorProp = function( prop, flag, flags, xnodes ){
+		var res = [],
+			flag_not = flag ? flags.not : !flags.not,
+			i = 0, n = -1, xnode;
+		for( ; xnode = xnodes[ i ]; ++i ){
+			if( xnode._attrs && xnode._attrs[ prop ] ^ flag_not ) res[ ++n ] = xnode;
+		};
+		return res;
+	};
+
+X.Dom.Query._filter = {
+	root : function( elem ){
+		return elem === ( elem.ownerDocument || elem.document ).documentElement;
+	},
+	target : {
+		m : function( flags, xnodes ){
+			var res  = [],
+				hash = location.hash.slice( 1 ),
+				flag_not = flags.not,
+				i = 0, n = -1, xnode;
+			for ( ; xnode = xnodes[ i ]; ++i ){
+				if( ( ( xnode._id || xnode._attrs && xnode._attrs.name ) === hash ) ^ flag_not ) res[ ++n ] = xnode;						
+			};
+			return res;
+		}
+	},
+	'first-child' : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( -1, true, flags, xnodes ); }
+	},
+	'last-child' : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 1, true, flags, xnodes ); }
+	},
+	'only-child' : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 0, true, flags, xnodes ); }
+	},
+	'first-of-type' : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( -1, false, flags, xnodes ); }
+	},
+	'last-of-type' : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 1, false, flags, xnodes ); }
+	},
+	'only-of-type' : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 0, false, flags, xnodes ); }
+	},
+	'nth-child' : {
+		m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'firstChild', 'nextNode', true, flags, xnodes, a, b ); }
+	},
+	'nth-last-child' : {
+		m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'lastChild', 'prevNode', true, flags, xnodes, a, b ); }
+	},
+	'nth-of-type' : {
+		m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'firstChild', 'nextNode', false, flags, xnodes, a, b ); }
+	},
+	'nth-last-of-type' : {
+		m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'lastChild', 'prevNode', false, flags, xnodes, a, b ); }
+	},
+	empty : {
+		m : function( flags, xnodes ){
+			var res = [],
+				flag_not = flags.not,
+				i = 0, n = -1, xnode, tmp, node;
+			for( ; xnode = xnodes[i]; ++i ){
+				tmp = true;
+				for( node = xnode.firstChild(); node; node = node.nextSibling() ){
+					if( node._xnodeType === 1 || ( node._xnodeType === 3 && node._text ) ){
+						tmp = false;
+						break;
+					};				
+				};
+				if( tmp ^ flag_not ) res[ ++n ] = xnode;
+			};
+			return res;
+		}
+	},
+	link : {
+		m : function( flags, xnodes ){
+			var links = ( xnodes[ 0 ].ownerDocument || xnodes[ 0 ].document ).links,
+				_data = funcData,
+				res   = [],
+				checked, flag_not, i, link, xnode, n;
+			if( !links ) return res;
+			checked = {};
+			flag_not = flags.not;
+			for( i = 0; link = links[ i ]; ++i ){
+				checked[ ( new Node( link ) )._uid ] = true;
+			};
+			for( i = 0, n = -1; xnode = xnodes[ i ]; ++i ){
+				if( checked[ xnode._uid ] ^ flag_not ) res[ ++n ] = xnode;
+			};
+			return res;
+		}
+	},
+	lang : {
+		m : function( flags, xnodes, arg ){
+			var res = [],
+				//reg = new RegExp('^' + arg, 'i'),
+				flag_not = flags.not,
+				i = 0, n = -1, xnode, tmp, lang;
+			arg = arg.toLowerCase();
+			for( ; tmp = xnode = xnodes[ i ]; ++i ){
+				while( tmp && !( lang = tmp._attrs && tmp._attrs[ 'lang' ] ) ){
+					tmp = tmp.parent;
+				};
+				//tmp = !!(tmp && reg.test(tmp.getAttribute('lang')));
+				if( ( !!( tmp && lang && lang.toLowerCase().indexOf( arg ) === 0 ) ) ^ flag_not ) res[ ++n ] = xnode;
+			};
+			return res;
+		}
+	},
+	enabled : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorProp( 'disabled', false, flags, xnodes ); }
+	},
+	disabled : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorProp( 'disabled', true, flags, xnodes ); }
+	},
+	checked : {
+		m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorProp( 'checked', true, flags, xnodes ); }
+	},
+	contains : {
+		m : function( flags, xnodes, arg ){
+			var res = [],
+				textContent = $.browser.msie || $.browser.opera ? 'innerText' : 'textContent',
+				flag_not = flags.not,
+				i = 0, n = -1, elem;
+			for( ; elem = xnodes[ i ]; ++i ){
+				if ( ( -1 < ( elem[ textContent ] || '' ).indexOf( arg ) ) ^ flag_not ) res[ ++n ] = elem;						
+			};
+			return res;
+		}
+	}
+};
\ No newline at end of file
diff --git a/0.6.x/js/dom/19_XDomParser.js b/0.6.x/js/dom/19_XDomParser.js
index 8ffdcdc..311de29 100644
--- a/0.6.x/js/dom/19_XDomParser.js
+++ b/0.6.x/js/dom/19_XDomParser.js
@@ -56,7 +56,7 @@
 			last  = stack[ stack.length - 1 ];
 			
 			// Make sure we're not in a script or style element
-			if ( last && special[ last ] === 1 ) {
+			if ( last && special[ last.toLowerCase() ] === 1 ) {
 				if( 0 <= ( index = _parseEndTag( stack, handler, html ) ) ){
 					//handler.chars( html.substring( 0, index ) );
 					html = html.substring( index );
@@ -173,7 +173,7 @@
 			++i;
 		};
 		if( phase === 9 ){
-			if( parseStartTag( stack, last, handler, tagName.toLowerCase(), attrs, empty, i ) === false ) return false;;
+			if( parseStartTag( stack, last, handler, tagName /*.toLowerCase() */, attrs, empty, i ) === false ) return false;
 			return i;
 		};
 		return 0; // error
@@ -207,7 +207,7 @@
 			++i;
 		};
 		if( phase === 9 ){
-			parseEndTag( stack, handler, tagName.toLowerCase() );
+			parseEndTag( stack, handler, tagName ); //.toLowerCase()
 			return i;
 		};
 		return 0; // error
@@ -227,14 +227,14 @@
 	};
 
 	function parseStartTag( stack, last, handler, tagName, attrs, unary, index ) {
-		if ( block[ tagName ] === 1 ) {
-			while ( last && inline[ last ] === 1 ) {
+		if ( block[ tagName.toLowerCase() ] === 1 ) {
+			while ( last && inline[ last.toLowerCase() ] === 1 ) {
 				parseEndTag( stack, handler, last );
 				last = stack[ stack.length - 1 ];
 			};
 		};
-		closeSelf[ tagName ] === 1 && ( last === tagName || ( sisters[ tagName ] && sisters[ tagName ][ last ] === 1 ) ) && parseEndTag( stack, handler, last );
-		unary = empty[ tagName ] === 1 || !!unary;
+		closeSelf[ tagName.toLowerCase() ] === 1 && ( last === tagName || ( sisters[ tagName.toLowerCase() ] && sisters[ tagName.toLowerCase() ][ last.toLowerCase() ] === 1 ) ) && parseEndTag( stack, handler, last );
+		unary = empty[ tagName.toLowerCase() ] === 1 || !!unary;
 		!unary && ( stack[ stack.length ] = tagName );
 		
 		return handler.start( tagName, attrs, unary, index );
@@ -274,8 +274,7 @@ X.Dom._htmlStringToXNode = {
 			nest   = this.nest,
 			flat   = this.flat,
 			l      = nest.length,
-			_attrs = {},
-			attr, name, i, toIndex;
+			attr, name, i, _attrs; //, toIndex;
 		if( l ){
 			xnode = nest[ l - 1 ].create( tagName );
 		} else {
@@ -283,10 +282,10 @@ X.Dom._htmlStringToXNode = {
 		};
 		if( !noChild ) nest[ l ] = xnode;
 		if( i = attrs.length ){
-			toIndex = X.Dom.Attr.toIndex;
+			//toIndex = X.Dom.Attr.toIndex;
+			_attrs = {};
 			for( ; i; ){
-				attr = attrs[ --i ];
-				if( attr ){
+				if( attr = attrs[ --i ] ){
 					if( typeof attr === 'string' ){
 						name = attr;
 						//i    = toIndex[ name ];
@@ -300,9 +299,7 @@ X.Dom._htmlStringToXNode = {
 					};
 				};
 			};
-			//xnode._attrs = _attrs;
 			xnode.attr( _attrs );
-			// xnode.css()
 		};
 	},
 	end : function(){
@@ -315,9 +312,7 @@ X.Dom._htmlStringToXNode = {
 			this.flat[ this.flat.length ] = X.Dom.Node.createText( text );
 		};
 	},
-	comment : function(){
-		
-	}
+	comment : X.emptyFunction
 };
 
 X.Dom.parse = function( html, ignoreError ){