meteor 0.9.8.3 → 0.9.8.4

data/demo/demo_xml.rb

@@ -1,66 +1,56 @@
 #!bin ruby
 # -* coding: UTF-8 -*-
 
-require 'rubygems'
+#require 'rubygems'
 require 'meteor'
 
-#pf = Meteor::ParserFactory.new
-#pf.parser(Meteor::Parser::XML,'sample.xml', 'UTF-8')
-#pf.bind(Meteor::Parser::XML,'sample.xml')
-
-#root = pf.element('sample')
-
-Meteor::ElementFactory.bind(Meteor::XML,'sample.xml', 'UTF-8')
-root = Meteor::ElementFactory.element('sample')
+Meteor::ElementFactory.link(Meteor::XML,'ml/sample.xml', 'UTF-8')
+root = Meteor::ElementFactory.element('/ml/sample')
 
 start_time = Time.new.to_f
 
-#elm_ =  root.element('test1')
+#elm_ =  root.element('kobe')
 #puts elm_.name
 #puts elm_.attributes
 #puts elm_.mixed_content
+#puts elm_.text
 
 #elm_ =  root.element('test')
 #puts elm_.name
 #puts elm_.attributes
 #puts elm_.mixed_content
 
-elm1 = root.element('test','manbo'=>'manbo')
-#elm1 = root.element("manbo"=>"manbo")
-#elm2 = root.element("id"=>"aa","id2"=>"bb")
-#elm2 = root.element("id"=>"aa")
-#elm3 = root.element("potato","id"=>"aa")
-#elm4 = root.element("potato","id"=>"aa","id2"=>"bb")
-#elm4 = root.element("potato","id2"=>"bb")
+elm1 = root.element('test', manbo: 'manbo')  #elm1 = root.element(manbo: "manbo")
+#elm2 = root.element(id: "aa", id2: "bb")    #elm2 = root.element(id: "aa")
+#elm3 = root.element("potato", id: "aa")
+#elm4 = root.element("potato", id: "aa", id2: "bb")  #elm4 = root.element("potato", id2: "bb")
+
 elm7 = root.element("kobe")
-#elm7 = root.element("momo"=>"mono")
-#elm8 = root.element("manbo"=>"mango")
-#elm8 = root.element("momo"=>"momo")
+#elm7 = root.element(momo: "mono")
+#elm8 = root.element(manbo: "mango")
+#elm8 = root.element(momo: "momo")
 
-#elm9 = root.element("hamachi","id"=>"aa",'id2'=>'bb')
+#elm9 = root.element("hamachi",id: "aa",id2: 'bb')
 #elm_c1 = root.cxtag("cs")
 
-#elm8.attr("manbo"=>"mangoo")
-
 #puts elm8.name
 #puts elm8.attributes
 #puts elm8.mixed_content
 
-#elm1.attr("id2"=>"cc")
-#elm1["id2"]="cc"
+#elm1.attr(id2: "cc")
+#elm1["id2"] = "cc"
 
-#elm8.attr("manbo"=>"mangoo")
-##elm9.content("\\1")
-#elm9.content = "\\1"
+#elm8['mango'] = "mangoo"  #elm8.attr(manbo: "mangoo")
+#elm9.content = "\\1"      #elm9.content("\\1")
 
-#elm2.attr('id3'=>'cc')
-#elm3.attr('id3'=>'cc')
-#elm3['id3'] = 'cc'
-#elm4.attr('id3'=>'cc')
-#elm9.attr('id3'=>'cc')
+#elm2.attr(id3: 'cc')
 
-#co_ps = elm1.element()
-#map = co_ps.attr_map
+#elm3['id3'] = 'cc'  #elm3.attr(id3: 'cc')
+#elm3['id3'] = 'cc'  #elm4.attr(id3: 'cc')
+#elm9['id3'] = 'cc'  #elm9.attr(id3: 'cc')
+
+#co_elm = elm1.element()
+#map = co_elm.attr_map
 #map.names.each { |item|
 #  puts item
 #  puts map.fetch(item)
@@ -73,7 +63,7 @@ elm5_ = elm_.element('tech')
   elm5 = elm5_.clone
   elm5['mono'] = i.to_s
   elm5.content = i.to_s
-  elm_.flush
+  elm_.flash
 end
 
 #am3 = elm3.attr_map
@@ -85,29 +75,38 @@ end
 elm_ = root.element(elm7)
 
 10.times { |i|
-  elm_["momo"]= i.to_s
+  elm_["momo"]= i
   elm_["eco"] = "えま"
-  elm_.content = i.to_s
-  #elm_["content"] = i.to_s
-  elm_.flush
+  elm_.content = i  #elm_["content"] = i.to_s
+  elm_.flash
 }
 
-#co_ps = root.element(elm_c1)
+#co_elm = root.element(elm_c1)
 #
 #10.times { |i|
-#  #co_ps.content(i.to_s)
-#  co_ps[":content"]=i.to_s
-#  co_ps.flush
+#  co_elm.content = i  #co_elm.content(i)
+#  co_elm.flash
 #}
 
-root.flush
+#elm3['id3'] = 'dd'  #elm3.attr(id3: 'dd')
 
-#elm3.attr('id3'=>'dd')
+root.flash
 
 end_time = Time.new.to_f
 
 puts root.document
 
+#elms = root.elements("potato2")
+##elms = root.elements("kobe")
+#elms = root.elements("potato")
+
+elms = root.elements("test")  #elms = root.css('test')
+elms.each{|elm|
+  puts elm.document
+  puts elm.attributes
+  puts elm.mixed_content
+}
+
 puts '' + (end_time - start_time).to_s + ' sec'
 
 #start_time = Time.new.to_f

data/demo/{sample.xml → ml/sample.xml}

@@ -29,7 +29,7 @@
 <mink>komaneti</mink>
 
 <potato id="aa" lc="/cc">
-    <potato id="/bb"><test></test></potato>
+    <potato id="/bb"></potato>
 </potato>
 
 <potato id="aa" id2="bb" lc="/cc">

data/lib/meteor.rb

@@ -1,7 +1,7 @@
 # -* coding: UTF-8 -*-
 # Meteor -  A lightweight (X)HTML(5) & XML parser
 #
-# Copyright (C) 2008-2014 Yasumasa Ashida.
+# Copyright (C) 2008-2016 Yasumasa Ashida.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -18,12 +18,12 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # @author Yasumasa Ashida
-# @version 0.9.8.3
+# @version 0.9.8.4
 #
 
 module Meteor
 
-  VERSION = '0.9.8.3'.freeze
+  VERSION = '0.9.8.4'.freeze
 
   #require 'fileutils'
 
@@ -37,10 +37,11 @@ module Meteor
   SEVEN = 7
 
   HTML = ZERO
-  XHTML = ONE
-  HTML5 = TWO
-  XHTML5 = THREE
-  XML = FOUR
+  HTML5 = ONE
+  XHTML5 = TWO
+  HTML4 = THREE
+  XHTML4 = FOUR
+  XML = FIVE
 
   #
   # Element Class (要素クラス)
@@ -241,7 +242,7 @@ module Meteor
       if @document_sync
         @document_sync = false
         case @parser.doc_type
-          when Parser::HTML, Parser::HTML5
+          when Parser::HTML, Parser::HTML5, Parser::HTML4
             if @cx
               #@pattern_cc = '' << SET_CX_1 << elm.tag << SPACE << elm.attributes << SET_CX_2 << elm.mixed_content << SET_CX_3 << elm.tag << SET_CX_4
               @document = "<!-- @#{@tag} #{@attributes} -->#{@mixed_content}<!-- /@#{@tag} -->"
@@ -254,7 +255,7 @@ module Meteor
                 #@document = "<#{@name}#{@attributes}>"
               end
             end
-          when Parser::XHTML, Parser::XHTML5, Parser::XML
+          when Parser::XHTML4, Parser::XHTML5, Parser::XML
             if @cx
               #@pattern_cc = '' << SET_CX_1 << elm.tag << SPACE << elm.attributes << SET_CX_2 << elm.mixed_content << SET_CX_3 << elm.tag << SET_CX_4
               @document = "<!-- @#{@tag} #{@attributes} -->#{@mixed_content}<!-- /@#{@tag} -->"
@@ -496,6 +497,8 @@ module Meteor
       @parser.content(self, *args)
     end
 
+    alias :text :content
+
     #
     # set content of element (要素の内容をセットする)
     # @param [String] value content (要素の内容)
@@ -505,6 +508,8 @@ module Meteor
       @parser.content(self, value)
     end
 
+    alias :text= :content=
+
     #
     # set attribute (属性をセットする)
     # @param [String,Symbol] name attribute name (属性の名前)
@@ -512,7 +517,11 @@ module Meteor
     # @return [Meteor::Element] element (要素)
     #
     def []=(name, value)
-      @parser.attr(self, name, value)
+      if value != nil
+        @parser.attr(self, name, value)
+      else
+        @parser.remove_attr(self, name)
+      end
     end
 
     #
@@ -543,10 +552,12 @@ module Meteor
     #
     # reflect (反映する)
     #
-    def flush
-      @parser.flush
+    def flash
+      @parser.flash
     end
 
+    alias :flush :flash
+
     #
     # @overload execute(hook)
     #  run action of Hooker (Hookerクラスの処理を実行する)
@@ -766,10 +777,11 @@ module Meteor
   #
   class Parser
     HTML = ZERO
-    XHTML = ONE
-    HTML5 = TWO
-    XHTML5 = THREE
-    XML = FOUR
+    HTML5 = ONE
+    XHTML5 = TWO
+    HTML4 = THREE
+    XHTML4 = FOUR
+    XML = FIVE
   end
 
   #
@@ -917,41 +929,41 @@ module Meteor
     end
 
     #
-    #@overload bind(relative_path,enc)
+    #@overload link(relative_path,enc)
     # generate parser (パーサを作成する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload bind(relative_path)
+    #@overload link(relative_path)
     # generate parser (パーサを作成する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload bind(type,relative_path,enc)
+    #@overload link(type,relative_path,enc)
     # generate parser (パーサを作成する)
     # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload bind(type,relative_path)
+    #@overload link(type,relative_path)
     # generate parser (パーサを作成する)
     # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def bind(*args)
+    def link(*args)
       case args.length
         when 1
-          bind_1(args[0])
+          link_1(args[0])
         when 2
           if args[0].kind_of?(Fixnum) || args[0].kind_of?(Symbol)
-            bind_2_n(args[0], args[1])
+            link_2_n(args[0], args[1])
           elsif args[0].kind_of?(String)
-            bind_2_s(args[0], args[1])
+            link_2_s(args[0], args[1])
           else
             raise ArgumentError
           end
         when 3
-          bind_3(args[0], args[1], args[2])
+          link_3(args[0], args[1], args[2])
         else
           raise ArgumentError
       end
@@ -971,10 +983,10 @@ module Meteor
         if CURRENT_DIR.eql?(paths[0])
           paths.delete_at 0
           paths[paths.length - 1] = File.basename(paths[paths.length - 1], ABST_EXT_NAME)
-          return paths.join(SLASH)
+          return '' << SLASH << paths.join(SLASH)
         else
           paths[paths.length - 1] = File.basename(paths[paths.length - 1], ABST_EXT_NAME)
-          return paths.join(SLASH)
+          return '' << SLASH << paths.join(SLASH)
         end
       end
     end
@@ -988,20 +1000,20 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser(パーサ)
     #
-    def bind_3(type, relative_path, enc)
+    def link_3(type, relative_path, enc)
 
       relative_url = path_to_url(relative_path)
 
       case type
-        when Parser::HTML, :html
-          html = Meteor::Ml::Html::ParserImpl.new
+        when Parser::HTML4, :html4
+          html4 = Meteor::Ml::Html4::ParserImpl.new
           html.read(File.expand_path(relative_path, @root), enc)
-          @cache[relative_url] = html
-        when Parser::XHTML
-          xhtml = Meteor::Ml::Xhtml::ParserImpl.new
-          xhtml.read(File.expand_path(relative_path, @root), enc)
-          @cache[relative_url] = xhtml
-        when Parser::HTML5, :html5
+          @cache[relative_url] = html4
+        when Parser::XHTML4, :xhtml4
+          xhtml4 = Meteor::Ml::Xhtml4::ParserImpl.new
+          xhtml4.read(File.expand_path(relative_path, @root), enc)
+          @cache[relative_url] = xhtml4
+        when Parser::HTML, :html, Parser::HTML5, :html5
           html5 = Meteor::Ml::Html5::ParserImpl.new
           html5.read(File.expand_path(relative_path, @root), enc)
           @cache[relative_url] = html5
@@ -1016,7 +1028,7 @@ module Meteor
       end
     end
 
-    private :bind_3
+    private :link_3
 
     #
     # generate parser (パーサを作成する)
@@ -1024,16 +1036,16 @@ module Meteor
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def bind_2_n(type, relative_path)
+    def link_2_n(type, relative_path)
 
       relative_url = path_to_url(relative_path)
 
       case type
-        when Parser::HTML, :html
-          ps = Meteor::Ml::Html::ParserImpl.new
+        when Parser::HTML4, :html4
+          ps = Meteor::Ml::Html4::ParserImpl.new
         when Parser::XHTML, :xhtml
-          ps = Meteor::Ml::Xhtml::ParserImpl.new
-        when Parser::HTML5, :html5
+          ps = Meteor::Ml::Xhtml4::ParserImpl.new
+        when Parser::HTML, :html, Parser::HTML5, :html5
           ps = Meteor::Ml::Html5::ParserImpl.new
         when Parser::XHTML5, :xhtml5
           ps = Meteor::Ml::Xhtml5::ParserImpl.new
@@ -1046,7 +1058,7 @@ module Meteor
 
     end
 
-    private :bind_2_n
+    private :link_2_n
 
     #
     # generate parser (パーサを作成する)
@@ -1054,16 +1066,16 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def bind_2_s(relative_path,enc)
+    def link_2_s(relative_path,enc)
 
       relative_url = path_to_url(relative_path)
 
       case @type
-        when Parser::HTML, :html
-          ps = Meteor::Ml::Html::ParserImpl.new
+        when Parser::HTML4, :html4
+          ps = Meteor::Ml::Html4::ParserImpl.new
         when Parser::XHTML, :xhtml
-          ps = Meteor::Ml::Xhtml::ParserImpl.new
-        when Parser::HTML5, :html5
+          ps = Meteor::Ml::Xhtml4::ParserImpl.new
+        when Parser::HTML, :html, Parser::HTML5, :html5
           ps = Meteor::Ml::Html5::ParserImpl.new
         when Parser::XHTML5, :xhtml5
           ps = Meteor::Ml::Xhtml5::ParserImpl.new
@@ -1076,23 +1088,23 @@ module Meteor
 
     end
 
-    private :bind_2_s
+    private :link_2_s
 
     #
     # generate parser (パーサを作成する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def bind_1(relative_path)
+    def link_1(relative_path)
 
       relative_url = path_to_url(relative_path)
 
       case @type
-        when Parser::HTML, :html
-          ps = Meteor::Ml::Html::ParserImpl.new
+        when Parser::HTML4, :html4
+          ps = Meteor::Ml::Html4::ParserImpl.new
         when Parser::XHTML, :xhtml
-          ps = Meteor::Ml::Xhtml::ParserImpl.new
-        when Parser::HTML5, :html5
+          ps = Meteor::Ml::Xhtml4::ParserImpl.new
+        when Parser::HTML, :html, Parser::HTML5, :html5
           ps = Meteor::Ml::Html5::ParserImpl.new
         when Parser::XHTML5, :xhtml5
           ps = Meteor::Ml::Xhtml5::ParserImpl.new
@@ -1107,7 +1119,7 @@ module Meteor
 
     end
 
-    private :bind_1
+    private :link_1
 
     #
     #@overload parser(key)
@@ -1132,7 +1144,7 @@ module Meteor
         when 1
           parser_1(args[0])
         when 2,3
-          bind(args)
+          link(args)
       end
       #parser_1(key)
     end
@@ -1145,11 +1157,11 @@ module Meteor
     def parser_1(key)
       @pif = @cache[key.to_s]
       case @pif.doc_type
-        when Meteor::Parser::HTML
-          Meteor::Ml::Html::ParserImpl.new(@pif)
-        when Meteor::Parser::XHTML
-          Meteor::Ml::Xhtml::ParserImpl.new(@pif)
-        when Meteor::Parser::HTML5
+        when Meteor::Parser::HTML4
+          Meteor::Ml::Html4::ParserImpl.new(@pif)
+        when Meteor::Parser::XHTML4
+          Meteor::Ml::Xhtml4::ParserImpl.new(@pif)
+        when Meteor::Parser::HTML, Meteor::Parser::HTML5
           Meteor::Ml::Html5::ParserImpl.new(@pif)
         when Meteor::Parser::XHTML5
           Meteor::Ml::Xhtml5::ParserImpl.new(@pif)
@@ -1170,24 +1182,24 @@ module Meteor
     end
 
     #
-    # @overload bind_str(type, relative_url, doc)
+    # @overload link_str(type, relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [Fixnum] type type of parser (パーサ・タイプ)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
-    # @overload bind_str(relative_url, doc)
+    # @overload link_str(relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
     #
-    def bind_str(*args)
+    def link_str(*args)
       case args.length
         when 2
-          bind_str_2(args[0],args[1])
+          link_str_2(args[0],args[1])
         when 3
-          bind_str_3(args[0],args[1],args[2])
+          link_str_3(args[0],args[1],args[2])
         else
           raise ArgumentError
       end
@@ -1200,13 +1212,13 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def bind_str_3(type, relative_url, doc)
+    def link_str_3(type, relative_url, doc)
       case type
-        when Parser::HTML, :html
-          ps = Meteor::Ml::Html::ParserImpl.new
+        when Parser::HTML4, :html
+          ps = Meteor::Ml::Html4::ParserImpl.new
         when Parser::XHTML, :xhtml
-          ps = Meteor::Ml::Xhtml::ParserImpl.new
-        when Parser::HTML5, :html5
+          ps = Meteor::Ml::Xhtml4::ParserImpl.new
+        when Parser::HTML, :html, Parser::HTML5, :html5
           ps = Meteor::Ml::Html5::ParserImpl.new
         when Parser::XHTML5, :xhtml5
           ps = Meteor::Ml::Xhtml5::ParserImpl.new
@@ -1219,7 +1231,7 @@ module Meteor
       @cache[relative_url] = ps
     end
 
-    private :bind_str_3
+    private :link_str_3
 
     #
     # generate parser (パーサを作成する)
@@ -1227,13 +1239,13 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def bind_str_2(relative_url, doc)
+    def link_str_2(relative_url, doc)
       case @type
-        when Parser::HTML, :html
-          ps = Meteor::Ml::Html::ParserImpl.new
+        when Parser::HTML4, :html4
+          ps = Meteor::Ml::Html4::ParserImpl.new
         when Parser::XHTML, :xhtml
-          ps = Meteor::Ml::Xhtml::ParserImpl.new
-        when Parser::HTML5, :html5
+          ps = Meteor::Ml::Xhtml4::ParserImpl.new
+        when Parser::HTML, :html, Parser::HTML5, :html5
           ps = Meteor::Ml::Html5::ParserImpl.new
         when Parser::XHTML5, :xhtml5
           ps = Meteor::Ml::Xhtml5::ParserImpl.new
@@ -1247,9 +1259,9 @@ module Meteor
 
     end
 
-    private :bind_str_2
+    private :link_str_2
 
-    alias :paraser_str :bind_str
+    alias :paraser_str :link_str
 
     #
     # set parser (パーサをセットする)
@@ -1281,46 +1293,49 @@ module Meteor
     #
     # set options (オプションをセットする)
     # @param [Hash] opts option (オプション)
-    # @option opts [String] :base_dir base directory (基準ディレクトリ)
-    # @option opts [String] :base_enc default character encoding (デフォルト文字エンコーディング)
-    # @option opts [FixNum] :base_type default type of parser (デフォルトのパーサ・タイプ)
+    # @option opts [String] :root root directory (基準ディレクトリ)
+    # @option @deprecated opts [String] :base_dir root directory (基準ディレクトリ)
+    # @option opts [String] :enc default character encoding (デフォルト文字エンコーディング)
+    # @option @deprecated opts [String] :base_enc default character encoding (デフォルト文字エンコーディング)
+    # @option opts [FixNum,Symbol] :type default type of parser (デフォルトのパーサ・タイプ)
+    # @option @deprecated opts [FixNum | Symbol] :base_type default type of parser (デフォルトのパーサ・タイプ)
     #
     def self.options=(opts)
       @@pf.options = opts
     end
 
     #
-    #@overload bind(type,relative_path,enc)
+    #@overload link(type,relative_path,enc)
     # generate parser (パーサを作成する)
     # @param [Fixnum] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload bind(type,relative_path)
+    #@overload link(type,relative_path)
     # generate parser (パーサを作成する)
     # @param [Fixnum] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def self.bind(*args)
-      @@pf.bind(*args)
+    def self.link(*args)
+      @@pf.link(*args)
     end
 
     #
-    # @overload bind_str(type, relative_url, doc)
+    # @overload link_str(type, relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [Fixnum] type type of parser (パーサ・タイプ)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
-    # @overload bind_str(relative_url, doc)
+    # @overload link_str(relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
     #
-    def self.bind_str(*args)
-      @@pf.bind_str(args)
+    def self.link_str(*args)
+      @@pf.link_str(args)
     end
 
     #
@@ -1738,6 +1753,8 @@ module Meteor
         @element_cache = Hash.new
         #フックドキュメント
         @document_hook = ''
+
+        @error_check = true
       end
 
       #
@@ -1927,18 +1944,27 @@ module Meteor
       def element_with_1(tag)
 
         @elm_ = Meteor::Element.new(tag)
-        #属性
-        @elm_.attributes = @res[2]
-        #内容
-        @elm_.mixed_content = @res[3]
-        #全体
-        @elm_.document = @res[0]
 
+        unless @on_search
+          #属性
+          @elm_.attributes = @res[2]
+          #内容
+          @elm_.mixed_content = @res[3]
+          #全体
+          @elm_.document = @res[0]
+        else
+          #属性
+          @elm_.attributes = @res[1]
+          #内容
+          @elm_.mixed_content = @res[2]
+          #全体
+          @elm_.document = @res[0]
+        end
+        #内容あり要素検索用パターン
         #@pattern_cc = '' << TAG_OPEN << @_tag << TAG_SEARCH_NC_1_1 << @_tag
         #@pattern_cc << TAG_SEARCH_NC_1_2 << @_tag << TAG_CLOSE
-        @pattern_cc = "<#{@_tag}(?:|\\s[^<>]*)>((?!(#{@_tag}[^<>]*>)).)*<\\/#{@_tag}>"
+        @pattern_cc = "<#{@_tag}(|\\s[^<>]*)>(((?!(#{@_tag}[^<>]*>)).)*)<\\/#{@_tag}>"
 
-        #内容あり要素検索用パターン
         @elm_.pattern = @pattern_cc
 
         @elm_.empty = true
@@ -1958,8 +1984,8 @@ module Meteor
         #全体
         @elm_.document = @res[0]
         #空要素検索用パターン
-        @pattern_cc = '' << TAG_OPEN << @_tag << TAG_SEARCH_NC_1_3
-        #@pattern_cc = "<#{@_tag}(?:|\\s[^<>]*)\\/>"
+        @pattern_cc = '' << TAG_OPEN << @_tag << TAG_SEARCH_1_3
+        #@pattern_cc = "<#{@_tag}(|\\s[^<>]*)\\/>"
         @elm_.pattern = @pattern_cc
 
         @elm_.empty = false
@@ -2021,7 +2047,9 @@ module Meteor
           #@pattern_cc = @pattern_cc_2
           element_with_3_1(tag)
         else
-          puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+          if @error_check
+            puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+          end
           @elm_ = nil
         end
 
@@ -2046,6 +2074,7 @@ module Meteor
       private :element_quote_3
 
       def element_with_3_1(tag)
+        #puts  @res.captures.length
         case @res.captures.length
         when FOUR
           #要素
@@ -2060,7 +2089,7 @@ module Meteor
           #@pattern_cc = ''<< TAG_OPEN << @_tag << TAG_SEARCH_NC_2_1 << @_attr_name << ATTR_EQ
           #@pattern_cc << @_attr_value << TAG_SEARCH_NC_2_2 << @_tag
           #@pattern_cc << TAG_SEARCH_NC_1_2 << @_tag << TAG_CLOSE
-          @pattern_cc = "<#{@_tag}\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*>((?!(#{@_tag}[^<>]*>)).)*<\\/#{@_tag}>"
+          @pattern_cc = "<#{@_tag}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>(((?!(#{@_tag}[^<>]*>)).)*)<\\/#{@_tag}>"
 
           @elm_.pattern = @pattern_cc
 
@@ -2081,7 +2110,7 @@ module Meteor
           #@pattern_cc = ''<< TAG_OPEN << @_tag << TAG_SEARCH_NC_2_1 << @_attr_name << ATTR_EQ
           #@pattern_cc << @_attr_value << TAG_SEARCH_NC_2_2 << @_tag
           #@pattern_cc << TAG_SEARCH_NC_1_2 << @_tag << TAG_CLOSE
-          @pattern_cc = "<#{@_tag}\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*>((?!(#{@_tag}[^<>]*>)).)*<\\/#{@_tag}>"
+          @pattern_cc = "<#{@_tag}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>((?!(#{@_tag}[^<>]*>)).)*<\\/#{@_tag}>"
 
           @elm_.pattern = @pattern_cc
 
@@ -2092,10 +2121,17 @@ module Meteor
         when THREE,SIX
           #内容
           @elm_ = Meteor::Element.new(tag)
-          #属性
-          @elm_.attributes = @res[1].chop
-          #内容
-          @elm_.mixed_content = @res[3]
+          unless @on_search
+            #属性
+            @elm_.attributes = @res[1].chop
+            #内容
+            @elm_.mixed_content = @res[3]
+          else
+            #属性
+            @elm_.attributes = @res[1].chop
+            #内容
+            @elm_.mixed_content = @res[3]
+          end
           #全体
           @elm_.document = @res[0]
           #内容あり要素検索用パターン
@@ -2171,7 +2207,7 @@ module Meteor
       private :element_pattern_with_3_2
 
       def element_without_3(tag)
-        element_without_3_1(tag, TAG_SEARCH_NC_2_3_2)
+        element_without_3_1(tag, TAG_SEARCH_2_3_2)
       end
 
       private :element_without_3
@@ -2185,7 +2221,7 @@ module Meteor
         #全体
         @elm_.document = @res[0]
         #空要素検索用パターン
-        @pattern_cc = '' << TAG_OPEN << @_tag << TAG_SEARCH_NC_2_1 << @_attr_name << ATTR_EQ << @_attr_value << closer
+        @pattern_cc = '' << TAG_OPEN << @_tag << TAG_SEARCH_2_1 << @_attr_name << ATTR_EQ << @_attr_value << closer
         #@pattern_cc = "<#{@_tag}\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}#{closer}"
         @elm_.pattern = @pattern_cc
 
@@ -2214,7 +2250,9 @@ module Meteor
         if @res
           element_3(@res[1], attr_name, attr_value)
         else
-          puts Meteor::Exception::NoSuchElementException.new(attr_name, attr_value).message
+          if @error_check
+            puts Meteor::Exception::NoSuchElementException.new(attr_name, attr_value).message
+          end
           @elm_ = nil
         end
 #=end
@@ -2261,7 +2299,9 @@ module Meteor
           #@pattern_cc = @pattern_cc_2
           element_with_2_1
         else
-          puts Meteor::Exception::NoSuchElementException.new(attr_name, attr_value).message
+          if @error_check
+            puts Meteor::Exception::NoSuchElementException.new(attr_name, attr_value).message
+          end
           @elm_ = nil
         end
 =end
@@ -2490,7 +2530,9 @@ module Meteor
           #@pattern_cc = @pattern_cc_2
           element_with_5_1(tag)
         else
-          puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+          if @error_check
+            puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+          end
           @elm_ = nil
         end
 
@@ -2529,7 +2571,7 @@ module Meteor
           #@pattern_cc << @_attr_value2 << TAG_SEARCH_NC_2_6 << @_attr_name1 << ATTR_EQ
           #@pattern_cc << @_attr_value1 << TAG_SEARCH_NC_2_2_2 << @_tag
           #@pattern_cc << TAG_SEARCH_NC_1_2 << @_tag << TAG_CLOSE
-          @pattern_cc = "<#{@_tag}\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*>((?!(#{@_tag}[^<>]*>)).)*<\\/#{@_tag}>"
+          @pattern_cc = "<#{@_tag}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_tag}[^<>]*>)).)*)<\\/#{@_tag}>"
 
           @elm_.pattern = @pattern_cc
           #
@@ -2552,7 +2594,7 @@ module Meteor
           #@pattern_cc << @_attr_value2 << TAG_SEARCH_NC_2_6 << @_attr_name1 << ATTR_EQ
           #@pattern_cc << @_attr_value1 << TAG_SEARCH_NC_2_2_2 << @_tag
           #@pattern_cc << TAG_SEARCH_NC_1_2 << @_tag << TAG_CLOSE
-          @pattern_cc = "<#{@_tag}\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*>((?!(#{@_tag}[^<>]*>)).)*<\\/#{@_tag}>"
+          @pattern_cc = "<#{@_tag}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_tag}[^<>]*>)).)*)<\\/#{@_tag}>"
 
           @elm_.pattern = @pattern_cc
           #
@@ -2651,7 +2693,7 @@ module Meteor
       private :element_pattern_with_5_2
 
       def element_without_5(tag)
-        element_without_5_1(tag, TAG_SEARCH_NC_2_3_2_2)
+        element_without_5_1(tag, TAG_SEARCH_2_3_2_2)
       end
 
       private :element_without_5
@@ -2670,7 +2712,7 @@ module Meteor
         #@pattern_cc << @_attr_value2 << TAG_SEARCH_NC_2_7 << @_attr_name2 << ATTR_EQ
         #@pattern_cc << @_attr_value2 << TAG_SEARCH_NC_2_6 << @_attr_name1 << ATTR_EQ
         #@pattern_cc << @_attr_value1 << closer
-        @pattern_cc = "<#{@_tag}\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}#{closer}"
+        @pattern_cc = "<#{@_tag}(\\s[^<>]*(#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}#{closer}"
 
         @elm_.pattern = @pattern_cc
 
@@ -2702,7 +2744,9 @@ module Meteor
           #@elm_ = element_5(@res[1], attr_name1, attr_value1,attr_name2, attr_value2)
           element_5(@res[1], attr_name1, attr_value1, attr_name2, attr_value2)
         else
-          puts Meteor::Exception::NoSuchElementException.new(attr_name1, attr_value1, attr_name2, attr_value2).message
+          if @error_check
+            puts Meteor::Exception::NoSuchElementException.new(attr_name1, attr_value1, attr_name2, attr_value2).message
+          end
           @elm_ = nil
         end
 
@@ -2999,6 +3043,8 @@ module Meteor
       def elements_(*args)
         elm_arr = Array.new
 
+        @on_search = true
+
         case args.size
           when ONE
             @elm_ = element_1(*args)
@@ -3016,15 +3062,18 @@ module Meteor
           return elm_arr
         end
 
-        @patten_cc = @elm_.pattern
+        @pattern_cc = @elm_.pattern
+
+        #puts @pattern_cc
 
-        @patten = Meteor::Core::Util::PatternCache.get(@pattern_cc)
+        @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
 
         @position = 0
 
         while (@res = @pattern.match(@root.document,@position))
-
-          if @res
+          @position = @res.end(0)
+          #puts @res[0]
+          #if @res
             case args.size
               when ONE
                 if @elm_.empty
@@ -3051,10 +3100,10 @@ module Meteor
 
             @element_cache.store(@elm_.object_id, @elm_)
 
-            @position = @res.end(0)
-          else
-            break
-          end
+            @on_search = false
+          #else
+          #  break
+          #end
         end
 
         elm_arr
@@ -3163,13 +3212,21 @@ module Meteor
             when ZERO
               get_attr_value(elm, attr.to_s)
             when ONE
-              elm.document_sync = true
-              set_attribute_3(elm, attr.to_s,args[0])
+              if args[0] != nil
+                elm.document_sync = true
+                set_attribute_3(elm, attr.to_s,args[0])
+              else
+                remove_attr(elm, attr.to_s)
+              end
           end
 
         elsif attr.kind_of?(Hash) && attr.size == 1
-          elm.document_sync = true
-          set_attribute_3(elm, attr.keys[0].to_s, attr.values[0])
+          if attr.values[0] != nil
+            elm.document_sync = true
+            set_attribute_3(elm, attr.keys[0].to_s, attr.values[0])
+          else
+            remove_attr(elm, attr.keys[0].to_s)
+          end
         #elsif attrs.kind_of?(Hash) && attrs.size >= 1
         #  elm.document_sync = true
         #  attrs.each{|name,value|
@@ -3418,13 +3475,13 @@ module Meteor
           when TWO
             #if args[0].kind_of?(Meteor::Element) && args[1].kind_of?(String)
             args[0].document_sync = true
-            set_content_2(args[0], args[1])
+            set_content_2(args[0], args[1].to_s)
             #else
             #  raise ArgumentError
             #end
           when THREE
             args[0].document_sync = true
-            set_content_3(args[0], args[1], args[2])
+            set_content_3(args[0], args[1].to_s, args[2])
           else
             raise ArgumentError
         end
@@ -3499,8 +3556,6 @@ module Meteor
         elm
       end
 
-      private :remove_attr
-
       def remove_attrs_(elm, attr_name)
         #属性検索用パターン
         @pattern = Meteor::Core::Util::PatternCache.get('' << attr_name << ERASE_ATTR_1)
@@ -3681,7 +3736,7 @@ module Meteor
       #
       # reflect (反映する)
       #
-      def flush
+      def flash
 
         if self.element_hook
           if self.element_hook.origin.mono
@@ -3691,11 +3746,15 @@ module Meteor
               #@root.hookDocument << @root.element.mixed_content << SET_CX_3
               #@root.hookDocument << @root.element.tag << SET_CX_4
               self.document_hook << "<!-- @#{self.element_hook.tag} #{self.element_hook.attributes}-->#{self.element_hook.mixed_content}<!-- /@#{self.element_hook.tag} -->"
+
+              #self.document_hook << @root.kaigyo_code << "<!-- @#{self.element_hook.tag} #{self.element_hook.attributes}-->#{self.element_hook.mixed_content}<!-- /@#{self.element_hook.tag} -->"
             else
               #@root.hookDocument << TAG_OPEN << @root.element.tag
               #@root.hookDocument << @root.element.attributes << TAG_CLOSE << @root.element.mixed_content
               #@root.hookDocument << TAG_OPEN3 << @root.element.tag << TAG_CLOSE
               self.document_hook << "<#{self.element_hook.tag}#{self.element_hook.attributes}>#{self.element_hook.mixed_content}</#{self.element_hook.tag}>"
+
+              #self.document_hook << @root.kaigyo_code << "<#{self.element_hook.tag}#{self.element_hook.attributes}>#{self.element_hook.mixed_content}</#{self.element_hook.tag}>"
             end
             self.element_hook = Element.new!(self.element_hook.origin, self)
           else
@@ -3708,11 +3767,15 @@ module Meteor
               #@root.hookDocument << @root.document << SET_CX_3
               #@root.hookDocument << @root.element.tag << SET_CX_4
               self.document_hook << "<!-- @#{self.element_hook.tag} #{@_attributes}-->#{@root.document}<!-- /@#{self.element_hook.tag} -->"
+
+              #self.document_hook << @root.kaigyo_code << "<!-- @#{self.element_hook.tag} #{@_attributes}-->#{@root.document}<!-- /@#{self.element_hook.tag} -->"
             else
               #@root.hookDocument << TAG_OPEN << @root.element.tag
               #@root.hookDocument << @_attributes << TAG_CLOSE << @root.document
               #@root.hookDocument << TAG_OPEN3 << @root.element.tag << TAG_CLOSE
               self.document_hook << "<#{self.element_hook.tag}#{@_attributes}>#{@root.document}</#{self.element_hook.tag}>"
+
+              #self.document_hook << @root.kaigyo_code << "<#{self.element_hook.tag}#{@_attributes}>#{@root.document}</#{self.element_hook.tag}>"
             end
             self.element_hook = Element.new!(self.element_hook.origin, self)
           end
@@ -3756,6 +3819,7 @@ module Meteor
           else
             pif2.root_element.document = String.new(elm.document)
           end
+          pif2.root_element.kaigyo_code = elm.parser.root_element.kaigyo_code
 
           @elm_
         end
@@ -3826,11 +3890,11 @@ module Meteor
 
       def create(pif)
         case pif.doc_type
-          when Parser::HTML
-            Meteor::Ml::Html::ParserImpl.new
-          when Parser::XHTML
-            Meteor::Ml::Xhtml::ParserImpl.new
-          when Parser::HTML5
+          when Parser::HTML4
+            Meteor::Ml::Html4::ParserImpl.new
+          when Parser::XHTML4
+            Meteor::Ml::Xhtml4::ParserImpl.new
+          when Parser::HTML, Parser::HTML5
             Meteor::Ml::Html5::ParserImpl.new
           when Parser::XHTML5
             Meteor::Ml::Xhtml5::ParserImpl.new
@@ -3952,10 +4016,10 @@ module Meteor
   end
 
   module Ml
-    module Html
+    module Html4
 
       #
-      # HTML parser (HTMLパーサ)
+      # HTML4 parser (HTMLパーサ)
       #
       class ParserImpl < Meteor::Core::Kernel
 
@@ -4091,7 +4155,7 @@ module Meteor
         #
         def initialize(*args)
           super()
-          @doc_type = Parser::HTML
+          @doc_type = Parser::HTML4
           case args.length
             when ZERO
               #initialize_0
@@ -4156,12 +4220,16 @@ module Meteor
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #
         def analyze_content_type
+          @error_check = false
+
           element_3(META_S, HTTP_EQUIV, CONTENT_TYPE)
 
           if !@elm_
             element_3(META, HTTP_EQUIV, CONTENT_TYPE)
           end
 
+          @error_check = true
+
           if @elm_
             @root.content_type = @elm_.attr(CONTENT)
           else
@@ -4180,6 +4248,7 @@ module Meteor
           for a in KAIGYO_CODE
             if @root.document.include?(a)
               @root.kaigyo_code = a
+              #puts "kaigyo:" << @root.kaigyo_code
             end
           end
 
@@ -4205,7 +4274,9 @@ module Meteor
             if @res
               element_without_1(tag)
             else
-              puts Meteor::Exception::NoSuchElementException.new(tag).message
+              if @error_check
+                puts Meteor::Exception::NoSuchElementException.new(tag).message
+              end
               @elm_ = nil
             end
           else
@@ -4221,7 +4292,9 @@ module Meteor
             if @res
               element_with_1(tag)
             else
-              puts Meteor::Exception::NoSuchElementException.new(tag).message
+              if @error_check
+                puts Meteor::Exception::NoSuchElementException.new(tag).message
+              end
               @elm_ = nil
             end
           end
@@ -4269,7 +4342,9 @@ module Meteor
             if @res
               element_without_3(tag)
             else
-              puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+              if @error_check
+                puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+              end
               @elm_ = nil
             end
           else
@@ -4290,7 +4365,9 @@ module Meteor
             if @res
               element_with_3_1(tag)
             else
-              puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+              if @error_check
+                puts Meteor::Exception::NoSuchElementException.new(tag, attr_name, attr_value).message
+              end
               @elm_ = nil
             end
           end
@@ -4301,7 +4378,7 @@ module Meteor
         private :element_3
 
         def element_without_3(tag)
-          element_without_3_1(tag, TAG_SEARCH_NC_2_4_3)
+          element_without_3_1(tag, TAG_SEARCH_2_4_3)
         end
 
         private :element_without_3
@@ -4326,7 +4403,9 @@ module Meteor
           if @res
             element_3(@res[1], attr_name, attr_value)
           else
-            puts Meteor::Exception::NoSuchElementException.new(attr_name, attr_value).message
+            if @error_check
+              puts Meteor::Exception::NoSuchElementException.new(attr_name, attr_value).message
+            end
             @elm_ = nil
           end
 
@@ -4365,7 +4444,9 @@ module Meteor
             if @res
               element_without_5(tag)
             else
-              puts Meteor::Exception::NoSuchElementException.new(tag, attr_name1, attr_value1, attr_name2, attr_value2).message
+              if @error_check
+                puts Meteor::Exception::NoSuchElementException.new(tag, attr_name1, attr_value1, attr_name2, attr_value2).message
+              end
               @elm_ = nil
             end
           else
@@ -4389,7 +4470,9 @@ module Meteor
             if @res
               element_with_5_1(tag)
             else
-              puts Meteor::Exception::NoSuchElementException.new(tag, attr_name1, attr_value1, attr_name2, attr_value2).message
+              if @error_check
+                puts Meteor::Exception::NoSuchElementException.new(tag, attr_name1, attr_value1, attr_name2, attr_value2).message
+              end
               @elm_ = nil
             end
           end
@@ -4400,7 +4483,7 @@ module Meteor
         private :element_5
 
         def element_without_5(tag)
-          element_without_5_1(tag, TAG_SEARCH_NC_2_4_3_2)
+          element_without_5_1(tag, TAG_SEARCH_2_4_3_2)
         end
 
         private :element_without_5
@@ -4432,7 +4515,9 @@ module Meteor
           if @res
             element_5(@res[1], attr_name1, attr_value1, attr_name2, attr_value2)
           else
-            puts Meteor::Exception::NoSuchElementException.new(attr_name1, attr_value1, attr_name2, attr_value2).message
+            if @error_check
+              puts Meteor::Exception::NoSuchElementException.new(attr_name1, attr_value1, attr_name2, attr_value2).message
+            end
             @elm_ = nil
           end
 
@@ -4654,10 +4739,10 @@ module Meteor
 
     end
 
-    module Xhtml
+    module Xhtml4
 
       #
-      # XHTML parser (XHTMLパーサ)
+      # XHTML4 parser (XHTML4パーサ)
       #
       class ParserImpl < Meteor::Core::Kernel
 
@@ -4794,7 +4879,7 @@ module Meteor
         #
         def initialize(*args)
           super()
-          @doc_type = Parser::XHTML
+          @doc_type = Parser::XHTML4
           case args.length
             when ZERO
               #initialize_0
@@ -4858,12 +4943,16 @@ module Meteor
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #
         def analyze_content_type
+          @error_check = false
+
           element_3(META_S, HTTP_EQUIV, CONTENT_TYPE)
 
           if !@elm_
             element_3(META, HTTP_EQUIV, CONTENT_TYPE)
           end
 
+          @error_check = true
+
           if @elm_
             @root.content_type = @elm_.attr(CONTENT)
           else
@@ -5093,7 +5182,7 @@ module Meteor
       #
       # HTML5 parser (HTML5パーサ)
       #
-      class ParserImpl < Meteor::Ml::Html::ParserImpl
+      class ParserImpl < Meteor::Ml::Html4::ParserImpl
 
         CHARSET = 'charset'.freeze
         UTF8 = 'utf-8'.freeze
@@ -5164,12 +5253,16 @@ module Meteor
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #
         def analyze_content_type
+          @error_check = false
+
           element_3(META_S, HTTP_EQUIV, CONTENT_TYPE)
 
           if !@elm_
             element_3(META, HTTP_EQUIV, CONTENT_TYPE)
           end
 
+          @error_check = true
+
           if @elm_
             @root.content_type = @elm_.attr(CONTENT)
             @root.charset = @elm_.attr(CHARSET)
@@ -5233,7 +5326,7 @@ module Meteor
       #
       # XHTML5 parser (XHTML5パーサ)
       #
-      class ParserImpl < Meteor::Ml::Xhtml::ParserImpl
+      class ParserImpl < Meteor::Ml::Xhtml4::ParserImpl
 
         CHARSET = 'charset'.freeze
         UTF8 = 'utf-8'.freeze
@@ -5300,12 +5393,16 @@ module Meteor
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #
         def analyze_content_type
+          @error_check = false
+
           element_3(META_S, HTTP_EQUIV, CONTENT_TYPE)
 
           if !@elm_
             element_3(META, HTTP_EQUIV, CONTENT_TYPE)
           end
 
+          @error_check = true
+
           if @elm_
             @root.content_type = @elm_.attr(CONTENT)
             @root.charset = @elm_.attr(CHARSET)
@@ -5373,6 +5470,9 @@ module Meteor
       #
       class ParserImpl < Meteor::Core::Kernel
 
+        #KAIGYO_CODE = "\r?\n|\r".freeze
+        KAIGYO_CODE = ["\r\n".freeze, "\n".freeze, "\r".freeze]
+
         PATTERN_UNESCAPE = '&(amp|quot|apos|gt|lt);'.freeze
 
         @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
@@ -5427,13 +5527,50 @@ module Meteor
 
         private :initialize_1
 
+
+        #
+        # parse document (ドキュメントを解析する)
+        #
+        def parse
+          analyze_ml
+        end
+
+        #
+        # analyze document (ドキュメントをパースする)
+        #
+        def analyze_ml
+          #改行コードの取得
+          analyze_kaigyo_code
+
+          @res = nil
+        end
+
+        private :analyze_ml
+
+        #
         # get content type (コンテントタイプを取得する)
-        # @return [Streing] content type (コンテントタイプ)
+        # @return [String] conent type (コンテントタイプ)
         #
         def content_type
           @root.content_type
         end
 
+        #
+        # analuze document , set newline (ドキュメントをパースし、改行コードをセットする)
+        #
+        def analyze_kaigyo_code
+          #改行コード取得
+
+          for a in KAIGYO_CODE
+            if @root.document.include?(a)
+              @root.kaigyo_code = a
+              #puts "kaigyo:" << @root.kaigyo_code
+            end
+          end
+
+        end
+
+        private :analyze_kaigyo_code
 
         def escape(content)
           #特殊文字の置換