htmlmin 0.0.6 → 0.0.7

data/README.md

@@ -8,7 +8,7 @@ Please report issues on [Github] (https://github.com/aishek/htmlmin/issues).
 
 For feedback, suggestions, etc. write to <aishek@gmail.com>.
 
-**Important**: this project is in beta and may contain bugs. Current version: 0.0.6
+**Important**: this project is in beta and may contain bugs. Current version: 0.0.7
 
 # Installation
 
@@ -22,6 +22,10 @@ Usage:
 
     require 'htmlmin'
     options = {
+      :indent_doctype => true, # inserts "\n" after first doctype declaration
+      
+      :minify_shorttag_closer => false, # e.g. <br/> => <br>
+      
       :remove_comments => true,
       :remove_conditional_comments => true, # only downlevel-hidden conditional comments e.g. <!--[if expression]> HTML <![endif]-->
 
@@ -36,11 +40,13 @@ Usage:
 
 # Minification
 
-* Insert newline after DOCTYPE declaration
 * Removal of whitespace
 * Removal of comments
 * Minification of HTML entities
 * Replace HTML entities by equal chars
+* Minify shorttag close symbol
+* Minify shorttag close whitespace
+* Insert newline after DOCTYPE declaration
 
 # Development roadmap
 
@@ -55,8 +61,8 @@ Usage:
 * Do not perform minify in code, samp, pre tags's content
 * ~~Replace entities with numeric entities for shorter strings~~
 * ~~Replace entities with characters for shorter strings~~
-* Minify shorttag close symbol
-* Minify shorttag close whitespace
+* ~~Minify shorttag close symbol~~
+* ~~Minify shorttag close whitespace~~
 * Replace http:// with // in href and src attributes
 * Minify whitespaces between tag attributes
 * Minify quotes in one-word attributes

data/lib/htmlmin.rb

@@ -1,5 +1,6 @@
 require "htmlmin/version"
 require "htmlmin/buffer"
+require "htmlmin/attr_buffer"
 require "htmlmin/state"
 require "htmlmin/max_line_len"
 require "htmlmin/slot_machines"
@@ -21,10 +22,16 @@ module HTMLMin
     extend HTMLMin::SlotMachines::Doctype
     extend HTMLMin::SlotMachines::Entity
     extend HTMLMin::SlotMachines::Tag
+    extend HTMLMin::AttrBuffer
+    extend HTMLMin::SlotMachines::Attr
 
     class << self     
       
       DEFAULT_OPTIONS = {
+        :indent_doctype => true,
+        
+        :minify_shorttag_closer => true,
+        
         :remove_comments => true,
         :remove_conditional_comments => true,
         
@@ -57,6 +64,7 @@ module HTMLMin
       
       def init_slot_machine
         init_max_line_len
+        expect_doctype
         clear_buffer
         
         reset_saved_state

data/lib/htmlmin/attr_buffer.rb

@@ -0,0 +1,77 @@
+module HTMLMin
+  
+  module AttrBuffer
+    
+    private 
+
+    SPACES = ["\s", "\n", "\r", "\t", " "]
+
+    def clear_attr_buffer
+      @attr_buffer = []
+    end
+
+    def start_attr_buffer
+      @attr_buffer << ""
+    end
+
+    def start_attr_buffer_spaces
+      start_attr_buffer if @attr_buffer.empty? || !(@attr_buffer.last.is_a? String)
+    end
+    
+    def last_attr_buffer_item
+      @attr_buffer.last.is_a?(Array) ? @attr_buffer.last.last : @attr_buffer.last
+    end
+    
+    def add_to_attr_buffer(char)
+      last_attr_buffer_item << char
+    end
+    
+    def process_attr_buffer
+      new_attr_buffer = []
+      @attr_buffer.each do |item|
+        new_item = minify_attr_buffer_item_spaces(item)
+        new_attr_buffer << new_item
+      end      
+      new_attr_buffer = remove_shorttag_closer(new_attr_buffer) if @settings[:minify_shorttag_closer]
+      new_attr_buffer = remove_end_whitespaces(new_attr_buffer)
+      
+      @attr_buffer = new_attr_buffer
+    end
+
+    def remove_end_whitespaces(buffer)
+      reversed = buffer.reverse
+      shorttag = reversed.first == '/'
+      reversed.shift if shorttag
+      
+      result = reversed.drop_while {|item| item == ' ' }
+      result = result.reverse
+      result << '/' if shorttag
+      
+      result
+    end
+
+    def remove_shorttag_closer(buffer)
+      buffer.pop
+      buffer
+    end
+
+    def minify_attr_buffer_item_spaces(item)
+      new_item = item
+      unless item.is_a? Array
+        new_item = new_item.chars.drop_while {|char| SPACES.include? char }
+        new_item = new_item.join
+        new_item = ' ' if new_item.empty?
+      end
+      new_item
+    end
+
+    def flush_attr_buffer
+      attr_buffer_chars = @attr_buffer.flatten.join.chars
+      attr_buffer_chars.each do |char|
+        add_to_buffer char
+      end
+    end
+    
+  end
+  
+end

data/lib/htmlmin/buffer.rb

@@ -5,7 +5,7 @@ module HTMLMin
     private 
 
     def add_to_buffer(char)
-      @result_buffer.push(char)
+      @result_buffer << char
     end
     
     def space_in_buffer?

data/lib/htmlmin/slot_machines.rb

@@ -2,4 +2,5 @@ require 'htmlmin/slot_machines/common'
 require 'htmlmin/slot_machines/comment'
 require 'htmlmin/slot_machines/doctype'
 require 'htmlmin/slot_machines/tag'
+require 'htmlmin/slot_machines/attr'
 require 'htmlmin/slot_machines/entity'

data/lib/htmlmin/slot_machines/attr.rb

@@ -0,0 +1,72 @@
+module HTMLMin
+  
+  module SlotMachines
+    
+    module Attr
+
+      private
+
+      def tag_attr_spaces(char)
+        case char
+          # when 'a'..'z', 'A'..'Z'
+          #   add_to_buffer char
+          when "\s", "\n", "\r", "\t", " "
+            start_attr_buffer_spaces
+            add_to_attr_buffer char
+            
+            change_state_to :tag_attr_spaces
+          when '/'
+            start_attr_buffer
+            add_to_attr_buffer char
+
+            change_state_to :tag_attr_spaces_tag_end_char_expected
+          when '>'
+            unshift_spaces_from_buffer if saved_state_unshiftable?
+            
+            flush_attr_buffer
+            add_to_buffer char
+            flush_buffer
+          
+            change_state_to :entity_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
+          else
+            reset_saved_state
+
+            flush_attr_buffer
+            flush_buffer
+          
+            add_to_result char
+            change_state_to :start
+        end
+      end
+      
+      def tag_attr_spaces_tag_end_char_expected(char)
+        case char
+          when '>'
+            unshift_spaces_from_buffer if saved_state_unshiftable?
+            
+            process_attr_buffer
+            flush_attr_buffer
+            add_to_buffer char
+            flush_buffer
+          
+            change_state_to :entity_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
+          else
+            reset_saved_state
+          
+            flush_attr_buffer
+            flush_buffer
+          
+            add_to_result char
+            change_state_to :start
+        end
+      end
+
+    end
+  
+  end
+
+end

data/lib/htmlmin/slot_machines/comment.rb

@@ -17,6 +17,7 @@ module HTMLMin
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           when '&'
+            expect_no_doctype
             reset_saved_state
 
             flush_buffer
@@ -24,6 +25,7 @@ module HTMLMin
             add_to_buffer char
             change_state_to :entity
           else
+            expect_no_doctype
             reset_saved_state
 
             flush_buffer

data/lib/htmlmin/slot_machines/common.rb

@@ -12,14 +12,19 @@ module HTMLMin
             add_to_buffer char
             change_state_to :comment_or_doctype_begin
           when "/"
+            expect_no_doctype
+
             add_to_buffer char
             change_state_to :tagend_body_expected
           when 'a'..'z', 'A'..'Z'
+            expect_no_doctype
+
             add_to_buffer char
             change_state_to :tag
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            expect_no_doctype
             reset_saved_state
 
             flush_buffer
@@ -35,10 +40,20 @@ module HTMLMin
             add_to_buffer char
             change_state_to :comment_begin_1
           when 'D'
-            add_to_buffer char
-            change_state_to :doctype_begin_1
+            if expect_doctype?
+              add_to_buffer char
+              change_state_to :doctype_begin_1
+            else
+              reset_saved_state
+
+              flush_buffer
+
+              add_to_result char
+              change_state_to :start
+            end
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -48,6 +63,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -57,7 +73,7 @@ module HTMLMin
       end
       
       def add_to_result(char)
-        @result += char
+        @result << char
         
         check_max_line_len(char) if @settings[:max_line_len] > 0
       end
@@ -78,6 +94,8 @@ module HTMLMin
             flush_buffer if saved_state_empty?
             change_state_to_tag_or_tagend_or_comment_or_doctype_begin char
           when '&'
+            expect_no_doctype
+
             reset_saved_state
             flush_buffer
 
@@ -86,6 +104,8 @@ module HTMLMin
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            expect_no_doctype
+
             reset_saved_state
             flush_buffer
 
@@ -101,11 +121,15 @@ module HTMLMin
           when "<"
             change_state_to_tag_or_tagend_or_comment_or_doctype_begin char
           when '&'
+            expect_no_doctype
+            
             add_to_buffer char
             change_state_to :entity
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            expect_no_doctype
+
             add_to_result char
             change_state_to :start
         end

data/lib/htmlmin/slot_machines/doctype.rb

@@ -6,6 +6,22 @@ module HTMLMin
 
       private
 
+      def expect_doctype
+        @expect_doctype = true
+      end
+
+      def expect_doctype?
+        @expect_doctype
+      end
+
+      def expect_no_doctype
+        @expect_doctype = false
+      end
+
+      def indent_doctype?
+        @settings[:indent_doctype]
+      end
+
       def doctype_begin_1(char)
         case char
           when "O"
@@ -13,12 +29,14 @@ module HTMLMin
             change_state_to :doctype_begin_2
           when "\s", "\n", "\r", "\t", " "
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
           
             change_state_to_spaces char
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -28,6 +46,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
 
@@ -43,6 +62,7 @@ module HTMLMin
             change_state_to :doctype_begin_3
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -50,6 +70,7 @@ module HTMLMin
             change_state_to :entity
           when "\s", "\n", "\r", "\t", " "
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
             change_state_to_spaces char
@@ -57,6 +78,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
 
@@ -72,6 +94,7 @@ module HTMLMin
             change_state_to :doctype_begin_4
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -79,6 +102,7 @@ module HTMLMin
             change_state_to :entity
           when "\s", "\n", "\r", "\t", " "
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
             change_state_to_spaces char
@@ -86,6 +110,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
 
@@ -101,6 +126,7 @@ module HTMLMin
             change_state_to :doctype_begin_5
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -108,6 +134,7 @@ module HTMLMin
             change_state_to :entity
           when "\s", "\n", "\r", "\t", " "
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
             change_state_to_spaces char
@@ -115,6 +142,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
 
@@ -130,6 +158,7 @@ module HTMLMin
             change_state_to :doctype_begin_6
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -137,6 +166,7 @@ module HTMLMin
             change_state_to :entity
           when "\s", "\n", "\r", "\t", " "
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
             change_state_to_spaces char
@@ -144,6 +174,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
 
@@ -159,6 +190,7 @@ module HTMLMin
             change_state_to :doctype_begin_7
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -166,6 +198,7 @@ module HTMLMin
             change_state_to :entity
           when "\s", "\n", "\r", "\t", " "
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
             change_state_to_spaces char
@@ -173,6 +206,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
 
@@ -191,6 +225,7 @@ module HTMLMin
             change_state_to :doctype
           when '&'
             reset_saved_state
+            expect_no_doctype
 
             flush_buffer
 
@@ -198,6 +233,7 @@ module HTMLMin
             change_state_to :entity
           when "\s", "\n", "\r", "\t"
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
             change_state_to_spaces char
@@ -205,6 +241,7 @@ module HTMLMin
             flush_buffer
           else
             reset_saved_state
+            expect_no_doctype
             
             flush_buffer
       
@@ -220,12 +257,13 @@ module HTMLMin
 
             flush_buffer
           
-            add_to_result "\n" 
+            add_to_result "\n" if indent_doctype?
+
+            expect_no_doctype
             change_state_to :entity_ended
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
-            
             add_to_buffer char
         end        
       end

data/lib/htmlmin/slot_machines/tag.rb

@@ -10,6 +10,41 @@ module HTMLMin
         case char
           when 'a'..'z', 'A'..'Z'
             add_to_buffer char
+          when "\s", "\n", "\r", "\t", " "
+            clear_attr_buffer
+
+            start_attr_buffer_spaces
+            add_to_attr_buffer char
+            
+            change_state_to :tag_attr_spaces
+          when '/'
+            clear_attr_buffer
+            
+            start_attr_buffer
+            add_to_attr_buffer char
+            
+            change_state_to :tag_attr_spaces_tag_end_char_expected
+          when '>'
+            unshift_spaces_from_buffer if saved_state_unshiftable?
+            
+            add_to_buffer char
+            flush_buffer
+          
+            change_state_to :entity_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
+          else
+            reset_saved_state
+
+            flush_buffer
+
+            add_to_result char
+            change_state_to :start
+        end
+      end
+
+      def tag_end_char_expected(char)
+        case char
           when '>'
             unshift_spaces_from_buffer if saved_state_unshiftable?
             

data/lib/htmlmin/version.rb

@@ -1,3 +1,3 @@
 module Htmlmin
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/input/doctype_4.txt

@@ -0,0 +1,6 @@
+<!-- -->
+<!-- -->
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

data/test/input/doctype_5.txt

@@ -0,0 +1,2 @@
+x
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head>

data/test/input/doctype_6.txt

@@ -0,0 +1,2 @@
+ 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head>

data/test/input/shorttag_1.txt

@@ -0,0 +1,6 @@
+<br/>
+<br />
+<div 
+
+
+      />

data/test/input/shorttag_2.txt

@@ -0,0 +1,6 @@
+<br/>
+<br />
+<div 
+
+
+      />

data/test/options/doctype_4.rb

@@ -0,0 +1,9 @@
+{
+  :indent_doctype => true,
+  
+  :remove_comments => true,
+  :remove_conditional_comments => true,
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/options/doctype_5.rb

@@ -0,0 +1,9 @@
+{
+  :indent_doctype => true,
+  
+  :remove_comments => true,
+  :remove_conditional_comments => true,
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/options/doctype_6.rb

@@ -0,0 +1,9 @@
+{
+  :indent_doctype => true,
+  
+  :remove_comments => true,
+  :remove_conditional_comments => true,
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/options/shorttag_1.rb

@@ -0,0 +1,12 @@
+{
+  :minify_shorttag_closer => false,
+
+  :minify_whitespaces => true,
+  :remove_comments => true,
+  :remove_conditional_comments => true,
+  :minify_entities => false,
+  :entities_to_chars => false,
+  :max_line_len => 0,
+
+  :debug => false
+}

data/test/options/shorttag_2.rb

@@ -0,0 +1,12 @@
+{
+  :minify_shorttag_closer => true,
+
+  :minify_whitespaces => true,
+  :remove_comments => true,
+  :remove_conditional_comments => true,
+  :minify_entities => false,
+  :entities_to_chars => false,
+  :max_line_len => 0,
+
+  :debug => false
+}

data/test/output/doctype_4.txt

@@ -0,0 +1,2 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

data/test/output/doctype_5.txt

@@ -0,0 +1 @@
+x <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head>

data/test/output/doctype_6.txt

@@ -0,0 +1 @@
+&nbsp; <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><head>

data/test/output/shorttag_1.txt

@@ -0,0 +1 @@
+<br/><br/><div/>

data/test/output/shorttag_2.txt

@@ -0,0 +1 @@
+<br><br><div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htmlmin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies: []
 description: HTMLMin is a HTML-code minification tool implemented in Ruby. It works
   like a slot machine.
@@ -25,9 +25,11 @@ files:
 - Rakefile
 - htmlmin.gemspec
 - lib/htmlmin.rb
+- lib/htmlmin/attr_buffer.rb
 - lib/htmlmin/buffer.rb
 - lib/htmlmin/max_line_len.rb
 - lib/htmlmin/slot_machines.rb
+- lib/htmlmin/slot_machines/attr.rb
 - lib/htmlmin/slot_machines/comment.rb
 - lib/htmlmin/slot_machines/common.rb
 - lib/htmlmin/slot_machines/doctype.rb
@@ -48,12 +50,17 @@ files:
 - test/input/doctype_1.txt
 - test/input/doctype_2.txt
 - test/input/doctype_3.txt
+- test/input/doctype_4.txt
+- test/input/doctype_5.txt
+- test/input/doctype_6.txt
 - test/input/entity_1.txt
 - test/input/entity_2.txt
 - test/input/line_length_1.txt
 - test/input/line_length_2.txt
 - test/input/line_length_3.txt
 - test/input/line_length_4.txt
+- test/input/shorttag_1.txt
+- test/input/shorttag_2.txt
 - test/input/tag_1.txt
 - test/input/tag_2.txt
 - test/input/tag_3.txt
@@ -67,12 +74,17 @@ files:
 - test/options/comment_7.rb
 - test/options/comment_8.rb
 - test/options/doctype_3.rb
+- test/options/doctype_4.rb
+- test/options/doctype_5.rb
+- test/options/doctype_6.rb
 - test/options/entity_1.rb
 - test/options/entity_2.rb
 - test/options/line_length_1.rb
 - test/options/line_length_2.rb
 - test/options/line_length_3.rb
 - test/options/line_length_4.rb
+- test/options/shorttag_1.rb
+- test/options/shorttag_2.rb
 - test/options/tag_2.rb
 - test/options/tag_3.rb
 - test/output/cc_1.txt
@@ -88,12 +100,17 @@ files:
 - test/output/doctype_1.txt
 - test/output/doctype_2.txt
 - test/output/doctype_3.txt
+- test/output/doctype_4.txt
+- test/output/doctype_5.txt
+- test/output/doctype_6.txt
 - test/output/entity_1.txt
 - test/output/entity_2.txt
 - test/output/line_length_1.txt
 - test/output/line_length_2.txt
 - test/output/line_length_3.txt
 - test/output/line_length_4.txt
+- test/output/shorttag_1.txt
+- test/output/shorttag_2.txt
 - test/output/tag_1.txt
 - test/output/tag_2.txt
 - test/output/tag_3.txt
@@ -140,12 +157,17 @@ test_files:
 - test/input/doctype_1.txt
 - test/input/doctype_2.txt
 - test/input/doctype_3.txt
+- test/input/doctype_4.txt
+- test/input/doctype_5.txt
+- test/input/doctype_6.txt
 - test/input/entity_1.txt
 - test/input/entity_2.txt
 - test/input/line_length_1.txt
 - test/input/line_length_2.txt
 - test/input/line_length_3.txt
 - test/input/line_length_4.txt
+- test/input/shorttag_1.txt
+- test/input/shorttag_2.txt
 - test/input/tag_1.txt
 - test/input/tag_2.txt
 - test/input/tag_3.txt
@@ -159,12 +181,17 @@ test_files:
 - test/options/comment_7.rb
 - test/options/comment_8.rb
 - test/options/doctype_3.rb
+- test/options/doctype_4.rb
+- test/options/doctype_5.rb
+- test/options/doctype_6.rb
 - test/options/entity_1.rb
 - test/options/entity_2.rb
 - test/options/line_length_1.rb
 - test/options/line_length_2.rb
 - test/options/line_length_3.rb
 - test/options/line_length_4.rb
+- test/options/shorttag_1.rb
+- test/options/shorttag_2.rb
 - test/options/tag_2.rb
 - test/options/tag_3.rb
 - test/output/cc_1.txt
@@ -180,12 +207,17 @@ test_files:
 - test/output/doctype_1.txt
 - test/output/doctype_2.txt
 - test/output/doctype_3.txt
+- test/output/doctype_4.txt
+- test/output/doctype_5.txt
+- test/output/doctype_6.txt
 - test/output/entity_1.txt
 - test/output/entity_2.txt
 - test/output/line_length_1.txt
 - test/output/line_length_2.txt
 - test/output/line_length_3.txt
 - test/output/line_length_4.txt
+- test/output/shorttag_1.txt
+- test/output/shorttag_2.txt
 - test/output/tag_1.txt
 - test/output/tag_2.txt
 - test/output/tag_3.txt