Changeset 74

Timestamp:

08/19/2006 15:00:19 (2 years ago)

Author:

why

Message:

• lib/markaby/builder.rb: merged in all remaining changes from xhtml-careful. is now passing all tests.
  
• lib/markaby/tags.rb: ditto.
  
• lib/markaby/cssproxy.rb: ditto.
  
• Rakefile: ditto.
  
• test/test_markaby.rb: had to alter a few tests. for one, the html method no longer outputs doctype. use xhtml_transitional or xhtml_strict. secondly, if capture is passed back into a block, it is output. so, give the parent block nil in those cases.
  

Location:

trunk

Files:

• Rakefile (modified) (2 diffs)
• lib/markaby.rb (modified) (1 diff)
• lib/markaby/builder.rb (modified) (15 diffs)
• lib/markaby/cssproxy.rb (modified) (3 diffs)
• lib/markaby/tags.rb (modified) (2 diffs)
• test/test_markaby.rb (modified) (6 diffs)

trunk/Rakefile

@@ -8 +8 @@
 include FileUtils
 
+REV = File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
+VERS = "0.5" + (REV ? ".#{REV}" : "")
+
+task :default => [:package]
+
 setup_tests
 setup_rdoc ['README', 'CHANGELOG', 'lib/**/*.rb']
@@ -13 +18 @@
 summary = "Markup as Ruby, write HTML in your native Ruby tongue"
 test_file = "test/test_markaby.rb"
-setup_gem("markaby", "0.5",  "Tim Fletcher and _why", summary, [['builder', '>=2.0.0']], test_file)
+setup_gem("markaby", VERS,  "Tim Fletcher and _why", summary, [['builder', '>=2.0.0']], test_file)

trunk/lib/markaby.rb

@@ -33 +33 @@
 require 'markaby/cssproxy'
 require 'markaby/metaid'
-require 'markaby/tags'
 require 'markaby/template'

trunk/lib/markaby/builder.rb

@@ +1 @@
+require 'markaby/tags'
+
 module Markaby
   # The Markaby::Builder class is the central gear in the system.  When using
@@ -20 +22 @@
 
     @@default = {
-      :indent => 2,
+      :indent => 0,
       :output_helpers => true,
+      :output_xml_instruction => true,
       :output_meta_tag => true,
-      :image_tag_options => { :border => '0', :alt => '' }
+      :auto_validation => true,
+      :image_tag_options => { :border => '0', :alt => '' },
+      :tagset => Markaby::XHTMLTransitional
     }
 
@@ -30 +35 @@
     end
 
-    def self.ignored_helpers
-      @@ignored_helpers ||= []
-    end
-
-    def self.ignore_helpers(*helpers)
-      ignored_helpers.concat helpers
-    end
-
-    XHTMLTransitional = ["-//W3C//DTD XHTML 1.0 Transitional//EN", "DTD/xhtml1-transitional.dtd"]
-    
-    XHTMLStrict = ["-//W3C//DTD XHTML 1.0 Strict//EN", "DTD/xhtml1-strict.dtd"]
-
-    attr_accessor :output_helpers
+    def self.ignored_helpers 
+      @@ignored_helpers ||= [] 
+    end 
+ 
+    def self.ignore_helpers(*helpers) 
+      ignored_helpers.concat helpers 
+    end 
+
+    attr_accessor :output_helpers, :tagset
 
     # Create a Markaby builder object.  Pass in a hash of variable assignments to
@@ -62 +63 @@
       @streams = [[]]
       @assigns = assigns
-      @margin = -1
-
-      @indent = @@default[:indent]
-      @output_helpers = @@default[:output_helpers]
-      @output_meta_tag = @@default[:output_meta_tag]
-
-      use_tagset Markaby::XHTMLTransitionalTags
-
-      if helpers
+      @elements = {}
+
+      @@default.each do |k, v|
+        instance_variable_set("@#{k}", @assigns[k] || v)
+      end
+
+      if helpers.nil?
+        @helpers = nil
+      else
         @helpers = helpers.dup
         for iv in helpers.instance_variables
@@ -86 +87 @@
       end
 
-      @margin += 1
-      @builder = ::Builder::XmlMarkup.new(:indent => @indent, :margin => @margin, :target => @streams.last)
-
-      def @builder.target=(io)
-        @target = io
-      end
-
-      instance_eval(&block) if block
+      @builder = ::Builder::XmlMarkup.new(:indent => @indent, :target => @streams.last)
+      class << @builder
+          attr_accessor :target, :level
+      end
+
+      if block
+        text(capture(&block))
+      end
     end
 
     # Returns a string containing the HTML stream.  Internally, the stream is stored as an Array.
     def to_s
-      @streams.last.join
+      @streams.last.to_s
     end
 
@@ -109 +110 @@
     alias_method :concat, :text
 
+    # Emulate ERB to satisfy helpers like <tt>form_for</tt>.
+    def _erbout; self end
+
     # Captures the HTML code built inside the +block+.  This is done by creating a new
     # stream for the builder object, running the block and passing back its stream as a string.
@@ -117 +121 @@
     def capture(&block)
       @streams.push(builder.target = [])
+      @builder.level += 1
       str = instance_eval(&block)
-      str = to_s unless @streams.last.compact.empty?
+      str = @streams.last.join if @streams.last.any?
       @streams.pop
+      @builder.level -= 1
       builder.target = @streams.last
       str
+    end
+
+    # Content_for will store the given block in an instance variable for later use 
+    # in another template or in the layout.
+    #
+    # The name of the instance variable is content_for_<name> to stay consistent 
+    # with @content_for_layout which is used by ActionView's layouts.
+    #
+    # Example:
+    #
+    #   content_for("header") do
+    #     h1 "Half Shark and Half Lion"
+    #   end
+    #
+    # If used several times, the variable will contain all the parts concatenated.
+    def content_for(name, &block)
+      @helpers.assigns["content_for_#{name}"] =
+        eval("@content_for_#{name} = (@content_for_#{name} || '') + capture(&block)")
     end
 
@@ -127 +151 @@
     # the arguments are the same as the tags implemented via method_missing.
     def tag!(tag, *args, &block)
-      if @tagset
-        if !@tagset.has_key?(tag)
-          raise InvalidXhtmlError, "no element `#{tag}' for #{doctype}"
-        elsif args.last.respond_to?(:to_hash)
-          attrs = args.last.to_hash
-          attrs.each do |k, v|
-            unless k =~ /:/ or @tagset[tag].include? k.to_s.downcase.intern
-              raise InvalidXhtmlError, "no attribute `#{k}' on #{tag} elements"
-            end
+      ele_id = nil
+      if @auto_validation and @tagset
+          if !@tagset.tagset.has_key?(tag)
+              raise InvalidXhtmlError, "no element `#{tag}' for #{tagset.doctype}"
+          elsif args.last.respond_to?(:to_hash)
+              attrs = args.last.to_hash
+              attrs.each do |k, v|
+                  atname = k.to_s.downcase.intern
+                  unless k =~ /:/ or @tagset.tagset[tag].include? atname
+                      raise InvalidXhtmlError, "no attribute `#{k}' on #{tag} elements"
+                  end
+                  if atname == :id
+                      ele_id = v.to_s
+                      if @elements.has_key? ele_id
+                          raise InvalidXhtmlError, "id `#{ele_id}' already used (id's must be unique)."
+                      end
+                  end
+              end
           end
-        end
       end
       if block
@@ -143 +175 @@
         block = proc { text(str) }
       end
-      fragment { @builder.method_missing(tag, *args, &block) }
+
+      f = fragment { @builder.method_missing(tag, *args, &block) }
+      @elements[ele_id] = f if ele_id
+      f
     end
 
@@ -152 +187 @@
     # variables.  Here is the order of interception:
     #
-    # * If +sym+ is a helper method, the helper method is called
-    #   and output to the stream.
     # * If +sym+ is a recognized HTML tag, the tag is output
     #   or a CssProxy is returned if no arguments are given.
@@ -160 +193 @@
     # * If +sym+ is also the name of an instance variable, the
     #   value of the instance variable is returned.
+    # * If +sym+ is a helper method, the helper method is called
+    #   and output to the stream.
     # * Otherwise, +sym+ and its arguments are passed to tag!
     def method_missing(sym, *args, &block)
-      if @helpers.respond_to?(sym) && !self.class.ignored_helpers.include?(sym)
+      if @helpers.respond_to?(sym, true) && !self.class.ignored_helpers.include?(sym)
         r = @helpers.send(sym, *args, &block)
-        @output_helpers ? fragment { @builder << r } : r
-      elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s)
+        if @output_helpers
+          fragment { @builder << r }
+        else
+          r
+        end
+      elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s) 
         @builder.__send__(sym, *args, &block)
-      elsif @tagset and @tagset_tags.include?(sym)
-        if @tagset_self_closing.include?(sym) and block
-          raise InvalidXhtmlError, "the `#{sym}' element is self-closing, please remove the block"
-        end
-        if args.empty? and block.nil? and not NO_PROXY.include?(sym)
-          return CssProxy.new do |args, block|
-            if @tagset_forms.include?(sym) and args.last.respond_to?(:to_hash) and args.last[:id]
-              args.last[:name] ||= args.last[:id]
-            end
-            tag!(sym, *args, &block)
-          end
-        end
-        #if not @tagset_self_closing.include?(sym) and args.first.respond_to?(:to_hash)
-        #  block ||= proc{}
-        #end
-        tag!(sym, *args, &block)
       elsif instance_variable_get("@#{sym}")
         instance_variable_get("@#{sym}")
@@ -192 +215 @@
     end
 
-    undef_method :p, :select, :sub
-
-    # Builds a image tag.  Assumes <tt>:border => '0', :alt => ''</tt>.
-    def img(opts = {})
-      tag!(:img, @@default[:image_tag_options].merge(opts))
+    def html_tag(sym, *args, &block)
+      if @auto_validation and @tagset.self_closing.include?(sym) and block
+        raise InvalidXhtmlError, "the `\#{sym}' element is self-closing, please remove the block"
+      end
+      if args.empty? and block.nil? and not NO_PROXY.include?(sym)
+        return CssProxy.new do |args, block|
+          if @tagset.forms.include?(sym) and args.last.respond_to?(:to_hash) and args.last[:id]
+            args.last[:name] ||= args.last[:id]
+          end
+          tag!(sym, *args, &block)
+        end
+      end
+      if not @tagset.self_closing.include?(sym) and args.first.respond_to?(:to_hash)
+        block ||= proc{}
+      end
+      tag!(sym, *args, &block)
+    end
+
+    XHTMLTransitional.tags.each do |k|
+      class_eval %{
+        def #{k}(*args, &block)
+          html_tag(#{k.inspect}, *args, &block)
+        end
+      }
     end
 
@@ -204 +246 @@
       tag!(:head, *args) do
         tag!(:meta, "http-equiv" => "Content-Type", "content" => "text/html; charset=utf-8") if @output_meta_tag
-        instance_eval &block
-      end
-    end
-
-    def use_tagset(tagset)
-      return if @tagset == tagset
-      @tagset = tagset
-      @tagset_tags = tagset.keys
-      @tagset_forms = @tagset_tags & FORM_TAGS
-      @tagset_self_closing = @tagset_tags & SELF_CLOSING_TAGS
+        instance_eval(&block)
+      end
     end
 
@@ -219 +253 @@
     # are prepended.  Also assumes <tt>:xmlns => "http://www.w3.org/1999/xhtml",
     # :lang => "en"</tt>.
-    def html(*doctype, &block)
-      if doctype.empty?
-        doctype = XHTMLTransitional
-        use_tagset Markaby::XHTMLTransitionalTags
-      end
-      declare!(:DOCTYPE, :html, :PUBLIC, *doctype)
-      tag!(:html, :xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en", &block)
-    end
-    alias_method :xhtml_transitional, :html
+    def xhtml_transitional(&block)
+      self.tagset = Markaby::XHTMLTransitional
+      xhtml_html &block
+    end
 
     # Builds an html tag with XHTML 1.0 Strict doctype instead.
     def xhtml_strict(&block)
-      use_tagset Markaby::XHTMLStrictTags
-      instruct!
-      html *XHTMLStrict, &block
+      self.tagset = Markaby::XHTMLStrict
+      xhtml_html &block
     end
 
     private
+
+    def xhtml_html(&block)
+      instruct! if @output_xml_instruction
+      declare!(:DOCTYPE, :html, :PUBLIC, *tagset.doctype)
+      tag!(:html, :xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en", &block)
+    end
 
     def fragment
@@ -250 +284 @@
   class Fragment < ::Builder::BlankSlate
     def initialize(s, a, b)
-      @s, @f1, @f2 = s, a, b
+      @s, @f1, @f2 = s, a, b 
     end
     def method_missing(*a)
       unless @str
-        @str = @s[@f1, @f2].to_s
+        @str = @s[@f1, @f2].to_s  
         @s[@f1, @f2] = [nil] * @f2
         @str

trunk/lib/markaby/cssproxy.rb

@@ -13 +13 @@
     end
   
+    # Adds attributes to an element, for internal use only.  For example, if you
+    # want to write a wrapper which sets a bunch of default attributes for a certain
+    # tag.  Like the default `img' method included with Markaby automatically sets an
+    # empty alt attribute.
+    def merge!(opts)
+      @opts.merge! opts
+      self
+    end
+
     # Adds attributes to an element.  Bang methods set the :id attribute.
     # Other methods add to the :class attribute.  If a block is supplied,
@@ -19 +28 @@
       idc = id_or_class.to_s
       case idc
+      when "pass"
       when /!$/
         @opts[:id] = $`
@@ -34 +44 @@
       end
     end
+
+    def to_str
+      @blk.call([[@opts]]).to_s
+    end
+    alias_method :to_s, :to_str
+
   end
 end

trunk/lib/markaby/tags.rb

@@ -1 +1 @@
 module Markaby
-
-  # Common sets of attributes.
-  AttrCustom = [:id, :class, :style]
-  AttrEvents = [:onclick, :ondblclick, :onmousedown, :onmouseup, :onmouseover, :onmousemove, 
-      :onmouseout, :onkeypress, :onkeydown, :onkeyup]
-  AttrAnno = [:title, :lang, :dir]
-  Attrs = AttrCustom + AttrEvents + AttrAnno
-
-  # Very basic rules from the XHTML 1.0 Strict DTD.
-  XHTMLStrictTags = {
-    :pre => AttrCustom + AttrAnno + [:space], 
-    :em => Attrs,
-    :code => Attrs,
-    :h2 => Attrs,
-    :h3 => Attrs,
-    :h1 => Attrs,
-    :h6 => Attrs,
-    :dl => Attrs,
-    :h4 => Attrs,
-    :h5 => Attrs,
-    :area => Attrs + [:accesskey, :tabindex, :onfocus, :onblur, :shape, :coords, :href, :nohref, :alt], 
-    :meta => [:lang, :dir, :id, :name, :content, :scheme, "http-equiv".intern], 
-    :table => [], 
-    :dfn => Attrs,
-    :label => Attrs + [:for, :accesskey, :onfocus, :onblur], 
-    :select => Attrs + [:name, :size, :multiple, :disabled, :tabindex, :onfocus, :onblur, :onchange], 
-    :noscript => Attrs,
-    :style => [:lang, :dir, :id, :type, :media, :title, :space], 
-    :strong => Attrs,
-    :span => Attrs,
-    :sub => Attrs,
-    :img => Attrs + [:src, :alt, :longdesc, :height, :width, :usemap, :ismap], 
-    :title => [:lang, :dir, :id], 
-    :bdo => AttrCustom + [:title] + AttrEvents + [:lang, :dir], 
-    :tr => [], 
-    :tbody => [], 
-    :param => [:id, :name, :value, :valuetype, :type], 
-    :li => Attrs,
-    :acronym => Attrs,
-    :html => [:lang, :dir, :id, :xmlns], 
-    :caption => [], 
-    :tfoot => [], 
-    :th => [], 
-    :sup => Attrs,
-    :var => Attrs,
-    :input => Attrs + [:accesskey, :tabindex, :onfocus, :onblur, :type, :name, :value, :checked, :disabled, :readonly, :size, :maxlength, :src, :alt, :usemap, :onselect, :onchange, :accept], 
-    :td => Attrs + [:summary, :width, :border, :frame, :rules, :cellspacing, :cellpadding, :span, :align, :char, :charoff, :valign, :abbr, :axis, :headers, :scope, :rowspan, :colspan], 
-    :samp => Attrs,
-    :cite => Attrs,
-    :thead => [], 
-    :body => Attrs + [:onload, :onunload], 
-    :map => AttrCustom + [:lang, :dir, ] + AttrEvents + [:title, :name], 
-    :head => [:lang, :dir, :id, :profile], 
-    :blockquote => Attrs + [:cite], 
-    :fieldset => Attrs,
-    :option => Attrs + [:selected, :disabled, :label, :value], 
-    :form => Attrs + [:action, :method, :enctype, :onsubmit, :onreset, :accept, 'accept-charset'], 
-    :hr => Attrs,
-    :big => Attrs,
-    :dd => Attrs,
-    :object => Attrs + [:declare, :classid, :codebase, :data, :type, :codetype, :archive, :standby, :height, :width, :usemap, :name, :tabindex], 
-    :base => [:href, :id], 
-    :link => Attrs + [:charset, :href, :hreflang, :type, :rel, :rev, :media], 
-    :kbd => Attrs,
-    :br => AttrCustom + [:title], 
-    :address => Attrs,
-    :optgroup => Attrs + [:disabled, :label], 
-    :dt => Attrs,
-    :ins => Attrs + [:cite, :datetime], 
-    :b => Attrs,
-    :legend => Attrs + [:accesskey], 
-    :abbr => Attrs,
-    :a => Attrs + [:accesskey, :tabindex, :onfocus, :onblur, :charset, :type, :name, :href, :hreflang, :rel, :rev, :shape, :coords], 
-    :ol => Attrs,
-    :textarea => Attrs + [:accesskey, :tabindex, :onfocus, :onblur, :name, :rows, :cols, :disabled, :readonly, :onselect, :onchange], 
-    :colgroup => [], 
-    :i => Attrs,
-    :button => Attrs + [:accesskey, :tabindex, :onfocus, :onblur, :name, :value, :type, :disabled], 
-    :script => [:id, :charset, :type, :src, :defer, :space], 
-    :col => [], 
-    :q => Attrs + [:cite], 
-    :p => Attrs,
-    :del => Attrs + [:cite, :datetime], 
-    :small => Attrs,
-    :div => Attrs,
-    :tt => Attrs,
-    :ul => Attrs  
-  }
-
-  # Additional tags found in XHTML 1.0 Transitional
-  XHTMLTransitionalTags = XHTMLStrictTags.merge \
-    :strike => Attrs,
-    :center => Attrs,
-    :dir => Attrs + [:compact], 
-    :noframes => Attrs,
-    :basefont => [:id, :size, :color, :face], 
-    :u => Attrs,
-    :menu => Attrs + [:compact], 
-    :iframe => AttrCustom + [:title, :longdesc, :name, :src, :frameborder, :marginwidth, :marginheight, :scrolling, :align, :height, :width], 
-    :font => AttrCustom + AttrAnno + [:size, :color, :face], 
-    :s => Attrs,
-    :applet => AttrCustom + [:title, :codebase, :archive, :code, :object, :alt, :name, :width, :height, :align, :hspace, :vspace], 
-    :isindex => AttrCustom + AttrAnno + [:prompt]
-
-  # Additional attributes found in XHTML 1.0 Transitional
-  { :script => [:language],
-    :a => [:target],
-    :td => [:bgcolor, :nowrap, :height],
-    :p => [:align],
-    :h5 => [:align],
-    :h3 => [:align],
-    :li => [:type, :value],
-    :div => [:align],
-    :pre => AttrEvents + [:width],
-    :body => [:background, :bgcolor, :text, :link, :vlink, :alink],
-    :ol => [:type, :compact, :start],
-    :h4 => [:align],
-    :h2 => [:align],
-    :object => [:align, :border, :hspace, :vspace],
-    :img => [:name, :align, :border, :hspace, :vspace],
-    :link => [:target],
-    :legend => [:align],
-    :dl => [:compact],
-    :input => [:align],
-    :h6 => [:align],
-    :hr => [:align, :noshade, :size, :width],
-    :base => [:target],
-    :ul => [:type, :compact],
-    :br => [:clear],
-    :form => [:name, :target],
-    :area => [:target],
-    :h1 => [:align]
-  }.each do |k, v|
-      XHTMLTransitionalTags[k] += v
-  end
 
   FORM_TAGS = [ :form, :input, :select, :textarea ]
@@ -140 +5 @@
   NO_PROXY = [ :hr, :br ]
 
+  # Common sets of attributes.
+  AttrCore = [:id, :class, :style, :title]
+  AttrI18n = [:lang, :'xml:lang', :dir]
+  AttrEvents = [:onclick, :ondblclick, :onmousedown, :onmouseup, :onmouseover, :onmousemove, 
+      :onmouseout, :onkeypress, :onkeydown, :onkeyup]
+  AttrFocus = [:accesskey, :tabindex, :onfocus, :onblur]
+  AttrHAlign = [:align, :char, :charoff]
+  AttrVAlign = [:valign]
+  Attrs = AttrCore + AttrI18n + AttrEvents
+
+  # All the tags and attributes from XHTML 1.0 Strict
+  class XHTMLStrict
+    class << self
+      attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
+    end
+    @doctype = ["-//W3C//DTD XHTML 1.0 Strict//EN", "DTD/xhtml1-strict.dtd"]
+    @tagset = {
+      :html => AttrI18n + [:id, :xmlns],
+      :head => AttrI18n + [:id, :profile],
+      :title => AttrI18n + [:id],
+      :base => [:href, :id],
+      :meta => AttrI18n + [:id, :http, :name, :content, :scheme, :'http-equiv'],
+      :link => Attrs + [:charset, :href, :hreflang, :type, :rel, :rev, :media],
+      :style => AttrI18n + [:id, :type, :media, :title, :'xml:space'],
+      :script => [:id, :charset, :type, :src, :defer, :'xml:space'],
+      :noscript => Attrs,
+      :body => Attrs + [:onload, :onunload],
+      :div => Attrs,
+      :p => Attrs,
+      :ul => Attrs,
+      :ol => Attrs,
+      :li => Attrs,
+      :dl => Attrs,
+      :dt => Attrs,
+      :dd => Attrs,
+      :address => Attrs,
+      :hr => Attrs,
+      :pre => Attrs + [:'xml:space'],
+      :blockquote => Attrs + [:cite],
+      :ins => Attrs + [:cite, :datetime],
+      :del => Attrs + [:cite, :datetime],
+      :a => Attrs + AttrFocus + [:charset, :type, :name, :href, :hreflang, :rel, :rev, :shape, :coords],
+      :span => Attrs,
+      :bdo => AttrCore + AttrEvents + [:lang, :'xml:lang', :dir],
+      :br => AttrCore,
+      :em => Attrs,
+      :strong => Attrs,
+      :dfn => Attrs,
+      :code => Attrs,
+      :samp => Attrs,
+      :kbd => Attrs,
+      :var => Attrs,
+      :cite => Attrs,
+      :abbr => Attrs,
+      :acronym => Attrs,
+      :q => Attrs + [:cite],
+      :sub => Attrs,
+      :sup => Attrs,
+      :tt => Attrs,
+      :i => Attrs,
+      :b => Attrs,
+      :big => Attrs,
+      :small => Attrs,
+      :object => Attrs + [:declare, :classid, :codebase, :data, :type, :codetype, :archive, :standby, :height, :width, :usemap, :name, :tabindex],
+      :param => [:id, :name, :value, :valuetype, :type],
+      :img => Attrs + [:src, :alt, :longdesc, :height, :width, :usemap, :ismap],
+      :map => AttrI18n + AttrEvents + [:id, :class, :style, :title, :name],
+      :area => Attrs + AttrFocus + [:shape, :coords, :href, :nohref, :alt],
+      :form => Attrs + [:action, :method, :enctype, :onsubmit, :onreset, :accept, :accept],
+      :label => Attrs + [:for, :accesskey, :onfocus, :onblur],
+      :input => Attrs + AttrFocus + [:type, :name, :value, :checked, :disabled, :readonly, :size, :maxlength, :src, :alt, :usemap, :onselect, :onchange, :accept],
+      :select => Attrs + [:name, :size, :multiple, :disabled, :tabindex, :onfocus, :onblur, :onchange],
+      :optgroup => Attrs + [:disabled, :label],
+      :option => Attrs + [:selected, :disabled, :label, :value],
+      :textarea => Attrs + AttrFocus + [:name, :rows, :cols, :disabled, :readonly, :onselect, :onchange],
+      :fieldset => Attrs,
+      :legend => Attrs + [:accesskey],
+      :button => Attrs + AttrFocus + [:name, :value, :type, :disabled],
+      :table => Attrs + [:summary, :width, :border, :frame, :rules, :cellspacing, :cellpadding],
+      :caption => Attrs,
+      :colgroup => Attrs + AttrHAlign + AttrVAlign + [:span, :width],
+      :col => Attrs + AttrHAlign + AttrVAlign + [:span, :width],
+      :thead => Attrs + AttrHAlign + AttrVAlign,
+      :tfoot => Attrs + AttrHAlign + AttrVAlign,
+      :tbody => Attrs + AttrHAlign + AttrVAlign,
+      :tr => Attrs + AttrHAlign + AttrVAlign,
+      :th => Attrs + AttrHAlign + AttrVAlign + [:abbr, :axis, :headers, :scope, :rowspan, :colspan],
+      :td => Attrs + AttrHAlign + AttrVAlign + [:abbr, :axis, :headers, :scope, :rowspan, :colspan],
+      :h1 => Attrs,
+      :h2 => Attrs,
+      :h3 => Attrs,
+      :h4 => Attrs,
+      :h5 => Attrs,
+      :h6 => Attrs
+    }
+
+    @tags = @tagset.keys
+    @forms = @tags & FORM_TAGS
+    @self_closing = @tags & SELF_CLOSING_TAGS
+  end
+
+  # Additional tags found in XHTML 1.0 Transitional
+  class XHTMLTransitional
+    class << self
+      attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
+    end
+    @doctype = ["-//W3C//DTD XHTML 1.0 Transitional//EN", "DTD/xhtml1-transitional.dtd"]
+    @tagset = XHTMLStrict.tagset.merge \
+      :strike => Attrs,
+      :center => Attrs,
+      :dir => Attrs + [:compact], 
+      :noframes => Attrs,
+      :basefont => [:id, :size, :color, :face], 
+      :u => Attrs,
+      :menu => Attrs + [:compact], 
+      :iframe => AttrCore + [:longdesc, :name, :src, :frameborder, :marginwidth, :marginheight, :scrolling, :align, :height, :width],
+      :font => AttrCore + AttrI18n + [:size, :color, :face],
+      :s => Attrs,
+      :applet => AttrCore + [:codebase, :archive, :code, :object, :alt, :name, :width, :height, :align, :hspace, :vspace],
+      :isindex => AttrCore + AttrI18n + [:prompt]
+
+    # Additional attributes found in XHTML 1.0 Transitional
+    { :script => [:language],
+      :a => [:target],
+      :td => [:bgcolor, :nowrap, :width, :height],
+      :p => [:align],
+      :h5 => [:align],
+      :h3 => [:align],
+      :li => [:type, :value],
+      :div => [:align],
+      :pre => [:width],
+      :body => [:background, :bgcolor, :text, :link, :vlink, :alink],
+      :ol => [:type, :compact, :start],
+      :h4 => [:align],
+      :h2 => [:align],
+      :object => [:align, :border, :hspace, :vspace],
+      :img => [:name, :align, :border, :hspace, :vspace],
+      :link => [:target],
+      :legend => [:align],