Split out doctype compiler

lib/hamlit/doctype_compiler.rb

@@ -0,0 +1,17 @@
+require 'hamlit/concerns/format_normalizable'
+require 'hamlit/filter'
+
+module Hamlit
+  class DoctypeCompiler < Hamlit::Filter
+    include Concerns::FormatNormalizable
+
+    def on_haml_doctype(format, type)
+      case type
+      when 'XML'
+        return [:static, "<?xml version='1.0' encoding='utf-8' ?>"]
+      end
+
+      [:html, :doctype, normalize_format(format).to_s]
+    end
+  end
+end

lib/hamlit/engine.rb

@@ -1,6 +1,7 @@
 require 'temple'
 require 'hamlit/attribute_compiler'
 require 'hamlit/dynamic_formatter'
+require 'hamlit/doctype_compiler'
 require 'hamlit/filter_compiler'
 require 'hamlit/filter_formatter'
 require 'hamlit/html'
@@ -16,6 +17,7 @@ module Hamlit
 
     use MultilinePreprocessor
     use Parser
+    use DoctypeCompiler
     use AttributeCompiler
     use NewAttributeCompier
     use FilterFormatter

lib/hamlit/parser.rb

@@ -2,7 +2,6 @@ require 'strscan'
 require 'temple'
 require 'hamlit/concerns/balanceable'
 require 'hamlit/concerns/escapable'
-require 'hamlit/concerns/format_normalizable'
 require 'hamlit/concerns/indentable'
 require 'hamlit/concerns/line_reader'
 
@@ -10,7 +9,6 @@ module Hamlit
   class Parser < Temple::Parser
     include Concerns::Balanceable
     include Concerns::Escapable
-    include Concerns::FormatNormalizable
     include Concerns::Indentable
     include Concerns::LineReader
 
@@ -77,14 +75,12 @@ module Hamlit
     def parse_doctype(scanner)
       raise SyntaxError unless scanner.scan(/!!!/)
 
+      type = nil
       if scanner.scan(/ +/) && scanner.rest?
-        case scanner.rest.strip
-        when 'XML'
-          return [:static, "<?xml version='1.0' encoding='utf-8' ?>"]
-        end
+        type = scanner.rest.strip
       end
 
-      [:html, :doctype, normalize_format(options[:format]).to_s]
+      [:haml, :doctype, options[:format], type]
     end
 
     def parse_tag(scanner)