Changeset 129

Timestamp:

01/16/2007 15:23:36 (18 months ago)

Author:

jgarber

Message:

Convert tabs to spaces

Location:

trunk

Files:

• lib/redcloth/base.rb (modified) (7 diffs)
• lib/redcloth/docbook.rb (modified) (7 diffs)
• lib/redcloth/textile.rb (modified) (6 diffs)
• run-tests.rb (modified) (2 diffs)

trunk/lib/redcloth/base.rb

@@ -10 +10 @@
                       :block_markdown_bq, :block_markdown_lists, 
                       :inline_markdown_reflink, :inline_markdown_link]
-                DOCBOOK_RULES = [:refs_docbook, :block_docbook_table, :block_docbook_lists, :block_docbook_simple_lists,
-                                 :block_docbook_defs, :block_docbook_prefix, :inline_docbook_image, :inline_docbook_link,
+    DOCBOOK_RULES = [:refs_docbook, :block_docbook_table, :block_docbook_lists, :block_docbook_simple_lists,
+                     :block_docbook_defs, :block_docbook_prefix, :inline_docbook_image, :inline_docbook_link,
                      :inline_docbook_code, :inline_docbook_glyphs, :inline_docbook_span,
                      :inline_docbook_wiki_words, :inline_docbook_wiki_links, :inline_docbook_autolink_urls,
@@ -98 +98 @@
         text = self.dup
         
-        return "" if text == ""
+        return "" if text == ""
 
         @urlrefs = {}
@@ -401 +401 @@
     BLOCK_GROUP_SPLITTER = "XXX_BLOCK_GROUP_XXX\n\n"
     def blocks( text, deep_code = false )
-                        @current_class ||= nil
-                        
-                        # Find all occurences of div(class). and process them as blocks
-                        text.gsub!( /^div\((.*?)\)\.\s*(.*?)(?=div\([^\)]+\)\.\s*)/m ) do |blk|
-                                block_class = (@current_class == $1) ? nil : %{ class=#{$1.inspect}}
-                                @current_class = $1
-                                BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : textile_p('div', block_class, nil, "\n\n#{$2.strip}\n\n") )
-                        end
-                        
-                        # Take care of the very last div
-                        text.sub!( /div\((.*?)\)\.\s*(.*)/m ) do |blk|
-                                block_class = (@current_class == $1) ? nil : %{ class=#{$1.inspect}}
-                                @current_class = $1
-                                BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : textile_p('div', block_class, nil, "\n\n#{$2.strip}\n\n") )
-                        end
+      @current_class ||= nil
+      
+      # Find all occurences of div(class). and process them as blocks
+      text.gsub!( /^div\((.*?)\)\.\s*(.*?)(?=div\([^\)]+\)\.\s*)/m ) do |blk|
+        block_class = (@current_class == $1) ? nil : %{ class=#{$1.inspect}}
+        @current_class = $1
+        BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : textile_p('div', block_class, nil, "\n\n#{$2.strip}\n\n") )
+      end
+      
+      # Take care of the very last div
+      text.sub!( /div\((.*?)\)\.\s*(.*)/m ) do |blk|
+        block_class = (@current_class == $1) ? nil : %{ class=#{$1.inspect}}
+        @current_class = $1
+        BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : textile_p('div', block_class, nil, "\n\n#{$2.strip}\n\n") )
+      end
       
       # Handle the text now that the placeholders for divs are set, splitting at BLOCK_GROUP_SPLITTER
@@ -422 +422 @@
       end.join)
     end
-                
-                def block_groups( text, deep_code = false )
-                  text.replace text.split( BLOCKS_GROUP_RE ).collect { |blk| blk(blk, deep_code) }.join("\n")
-                end
-
-                # Surrounds blocks with paragraphs and shelves them when necessary
-                def blk( text, deep_code = false )
-                        return text if text =~ /<[0-9]+>/
-                        
-                  plain = text !~ /\A[#*> ]/
+    
+    def block_groups( text, deep_code = false )
+      text.replace text.split( BLOCKS_GROUP_RE ).collect { |blk| blk(blk, deep_code) }.join("\n")
+    end
+
+    # Surrounds blocks with paragraphs and shelves them when necessary
+    def blk( text, deep_code = false )
+      return text if text =~ /<[0-9]+>/
+      
+      plain = text !~ /\A[#*> ]/
 
       # skip blocks that are complex HTML
@@ -467 +467 @@
               text << "\n#{ code_blk }"
           end
-                                        return text
+          return text
       end
       
     end
-                
+    
     def refs( text )
         @rules.each do |rule_name|
@@ -482 +482 @@
         ret || [text, nil]
     end
-                
-                # Puts text in storage and returns is placeholder
-                #  e.g. shelve("some text") => <1>
+    
+    # Puts text in storage and returns is placeholder
+    #  e.g. shelve("some text") => <1>
     def shelve( val ) 
         @shelf << val
@@ -490 +490 @@
     end
     
-                # Retrieves text from storage using its placeholder
-                #  e.g. retrieve("<1>") => "some text"
+    # Retrieves text from storage using its placeholder
+    #  e.g. retrieve("<1>") => "some text"
     def retrieve( text ) 
         @shelf.each_with_index do |r, i|

trunk/lib/redcloth/docbook.rb

@@ -193 +193 @@
       text.gsub!( /(\w)(\^[0-9,]+\^)/, '\1 \2' )
       text.gsub!( /(\w)(\~[0-9,]+\~)/, '\1 \2' )
-                        
-                        {'w' => 'warning', 'n' => 'note', 'c' => 'comment', 'pro' => 'production', 'dt' => 'dt', 'dd' => 'dd'}.each do |char, word|
-                          parts = text.split(/^\s*#{char}\./)
-                          text.replace(parts.first + "\n" + parts[1..-1].map do |part|
-                                  if part =~ /\.#{char}\s*$/
-                                  "div(#{word}).\n" + part.sub(/\.#{char}\s*$/, "\ndiv(#{word}). \n")
-                            else
-                              "#{char}.#{part}"
-                            end+"\n"
-                                end.join("\n"))
-                                
-                                self.class.class_eval %!
-                                def docbook_#{char}(tag, atts, cite, content)
+      
+      {'w' => 'warning', 'n' => 'note', 'c' => 'comment', 'pro' => 'production', 'dt' => 'dt', 'dd' => 'dd'}.each do |char, word|
+        parts = text.split(/^\s*#{char}\./)
+        text.replace(parts.first + "\n" + parts[1..-1].map do |part|
+          if part =~ /\.#{char}\s*$/
+            "div(#{word}).\n" + part.sub(/\.#{char}\s*$/, "\ndiv(#{word}). \n")
+          else
+            "#{char}.#{part}"
+          end+"\n"
+        end.join("\n"))
+        
+        self.class.class_eval %!
+          def docbook_#{char}(tag, atts, cite, content)
             docbook_p('p', #{word.inspect}, cite, content)
           end
         !
-                        end
-
-                        {'bq' => 'blockquote'}.each do |char, word|
-                          parts = text.split(/^\s*#{char}\./)
-                          text.replace(parts.first + "\n" + parts[1..-1].map do |part|
-                                  if part =~ /\.#{char}\s*$/
-                                  "div(#{word}).\n\n<para>" + part.sub(/\.#{char}\s*$/, "</para>\n\ndiv(#{word}). ")
-                            else
-                              "#{char}.#{part}"
-                            end
-                                end.join("\n"))
+      end
+
+      {'bq' => 'blockquote'}.each do |char, word|
+        parts = text.split(/^\s*#{char}\./)
+        text.replace(parts.first + "\n" + parts[1..-1].map do |part|
+          if part =~ /\.#{char}\s*$/
+            "div(#{word}).\n\n<para>" + part.sub(/\.#{char}\s*$/, "</para>\n\ndiv(#{word}). ")
+          else
+            "#{char}.#{part}"
+          end
+        end.join("\n"))
       end
 
@@ -240 +240 @@
       text.gsub!( NB, "" )
       text << "</#{@div_atts}>" if @div_atts
-                        text.gsub!(%r{<(#{DOCBOOK_PARAS.join("|")})([^>]*)>\s*<para>(.*?)</para>\s*</\1>}mi) { |m| t, c = $~[1..2]; "<#{t}#{c}>" << $3.gsub(/<para>/, "<#{t}#{c}>").gsub(/<\/para>/, "</#{t}>") << "</#{t}>" }
-                        text.gsub! %r{<para[^>]*>\s*<para([^>]*)>}i,'<para\1>' # clean multiple paragraphs in a row just in case
-                        text.gsub! %r{</para>\s*</para>}i,'</para>' # clean multiple paragraphs in a row just in case
-                        text.gsub! %r{<para[^>]*>\s*</para>\s*}i, '' # clean emtpy paras
+      text.gsub!(%r{<(#{DOCBOOK_PARAS.join("|")})([^>]*)>\s*<para>(.*?)</para>\s*</\1>}mi) { |m| t, c = $~[1..2]; "<#{t}#{c}>" << $3.gsub(/<para>/, "<#{t}#{c}>").gsub(/<\/para>/, "</#{t}>") << "</#{t}>" }
+      text.gsub! %r{<para[^>]*>\s*<para([^>]*)>}i,'<para\1>' # clean multiple paragraphs in a row just in case
+      text.gsub! %r{</para>\s*</para>}i,'</para>' # clean multiple paragraphs in a row just in case
+      text.gsub! %r{<para[^>]*>\s*</para>\s*}i, '' # clean emtpy paras
       text.gsub! %r{<(/?)sup>}i,            '<\1superscript>'
       text.gsub! %r{<(/?)sub>}i,            '<\1subscript>'
@@ -448 +448 @@
     # Parses docbook definition lists and generates HTML
     def block_docbook_defs( text )
-                        text.gsub!(/^-\s+(.*?):=(.*?)=:\s*$/m) do |m|
-                                "- #{$1.strip} := <para>"+$2.split(/\n/).map{|w|w.strip}.delete_if{|w|w.empty?}.join("</para><para>")+"</para>"
-                        end
-                                
+        text.gsub!(/^-\s+(.*?):=(.*?)=:\s*$/m) do |m|
+          "- #{$1.strip} := <para>"+$2.split(/\n/).map{|w|w.strip}.delete_if{|w|w.empty?}.join("</para><para>")+"</para>"
+        end
+        
         text.gsub!( DEFS_RE ) do |match|
             lines = match.split( /\n/ )
@@ -466 +466 @@
 
                 if line_id == lines.length - 1
-                                                                                lines[-1] << "\n</variablelist>"
+                    lines[-1] << "\n</variablelist>"
                 end
             end
@@ -489 +489 @@
         text.gsub!( /(.)\n(?! *[#*\s|]|$)/, "\\1<sbr />" ) if hard_breaks
     end
-                
+    
     def docbook_bq( tag, atts, cite, content )
         cite, cite_title = check_refs( cite )
@@ -869 +869 @@
     DOCBOOK_PARAS = ['para', 'remark', 'tip', 'important']
     def docbook_blocks( text, deep_code = false )
-                        @current_class ||= nil
-                        
-                        # Find all occurences of div(class). and process them as blocks
-                        text.gsub!( /^div\((.*?)\)\.\s*(.*?)(?=div\([^\)]+\)\.\s*)/m ) do |blk|
-                                block_class = (@current_class == $1) ? nil : %{ role=#{$1.inspect}}
-                                @current_class = $1
-                                BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : docbook_div('div', block_class, nil, "\n\n#{$2.strip}\n\n", false) )
-                        end
-                        
-                        # Take care of the very last div
-                        text.sub!( /div\((.*?)\)\.\s*(.*)/m ) do |blk|
-                                block_class = (@current_class == $1) ? nil : %{ role=#{$1.inspect}}
-                                @current_class = $1
-                                BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : docbook_div('div', block_class, nil, "\n\n#{$2.strip}\n\n", false) )
-                        end
+      @current_class ||= nil
+      
+      # Find all occurences of div(class). and process them as blocks
+      text.gsub!( /^div\((.*?)\)\.\s*(.*?)(?=div\([^\)]+\)\.\s*)/m ) do |blk|
+        block_class = (@current_class == $1) ? nil : %{ role=#{$1.inspect}}
+        @current_class = $1
+        BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : docbook_div('div', block_class, nil, "\n\n#{$2.strip}\n\n", false) )
+      end
+      
+      # Take care of the very last div
+      text.sub!( /div\((.*?)\)\.\s*(.*)/m ) do |blk|
+        block_class = (@current_class == $1) ? nil : %{ role=#{$1.inspect}}
+        @current_class = $1
+        BLOCK_GROUP_SPLITTER + ( ($2.strip.empty? || block_class.nil?) ? $2 : docbook_div('div', block_class, nil, "\n\n#{$2.strip}\n\n", false) )
+      end
       
       # Handle the text now that the placeholders for divs are set, splitting at BLOCK_GROUP_SPLITTER
@@ -903 +903 @@
       end.join)
     end
-                
-                def docbook_block_groups( text, deep_code = false )
-                  text.replace text.split( BLOCKS_GROUP_RE ).collect { |blk| docbook_blk(blk, deep_code) }.join("\n")
-                end
-
-                def docbook_blk( text, deep_code = false )
-                        return text if text =~ /<[0-9]+>/
-                        
-                  plain = text !~ /\A[#*> ]/
+    
+    def docbook_block_groups( text, deep_code = false )
+      text.replace text.split( BLOCKS_GROUP_RE ).collect { |blk| docbook_blk(blk, deep_code) }.join("\n")
+    end
+
+    def docbook_blk( text, deep_code = false )
+      return text if text =~ /<[0-9]+>/
+      
+      plain = text !~ /\A[#*> ]/
 
       # skip blocks that are complex HTML

trunk/lib/redcloth/textile.rb

@@ -46 +46 @@
     
     def textile_pre_process(text)
-                        {'w' => 'warning', 'n' => 'note', 'c' => 'comment', 'pro' => 'production', 'dt' => 'dt', 'dd' => 'dd'}.each do |char, word|
-                          parts = text.split(/^\s*#{char}\./)
-                          text.replace(parts.first + "\n" + parts[1..-1].map do |part|
-                                  if part =~ /\.#{char}\s*$/
-                                  "div(#{word})." + part.sub(/\.#{char}\s*$/, "div(#{word}). \n")
-                            else
-                              "#{char}.#{part}"
-                            end
-                                end.join("\n"))
-                                
-                                self.class.class_eval %!
-                                def textile_#{char}(tag, atts, cite, content)
+      {'w' => 'warning', 'n' => 'note', 'c' => 'comment', 'pro' => 'production', 'dt' => 'dt', 'dd' => 'dd'}.each do |char, word|
+        parts = text.split(/^\s*#{char}\./)
+        text.replace(parts.first + "\n" + parts[1..-1].map do |part|
+          if part =~ /\.#{char}\s*$/
+            "div(#{word})." + part.sub(/\.#{char}\s*$/, "div(#{word}). \n")
+          else
+            "#{char}.#{part}"
+          end
+        end.join("\n"))
+        
+        self.class.class_eval %!
+          def textile_#{char}(tag, atts, cite, content)
             textile_p('p', %{ class=#{word.inspect}}, cite, content)
           end
         !
-                        end
-                        {'bq' => 'blockquote'}.each do |char, word|
-                          parts = text.split(/^\s*#{char}\./)
-                                text.replace(parts.first + "\n" + parts[1..-1].map do |part|
-                                  if part =~ /\.#{char}\s*$/
-                                  "div(#{word})." + part.sub(/\.#{char}\s*$/, "div(#{word}). ")
-                            else
-                              "#{char}.#{part}"
-                            end
-                                end.join("\n"))
-                        end
-                        
+      end
+      {'bq' => 'blockquote'}.each do |char, word|
+        parts = text.split(/^\s*#{char}\./)
+        text.replace(parts.first + "\n" + parts[1..-1].map do |part|
+          if part =~ /\.#{char}\s*$/
+            "div(#{word})." + part.sub(/\.#{char}\s*$/, "div(#{word}). ")
+          else
+            "#{char}.#{part}"
+          end
+        end.join("\n"))
+      end
+      
       text.gsub!( BACKTICK_CODE_RE ) do |m|
           before,lang,code,after = $~[1..4]
@@ -124 +124 @@
     # Parses Textile lists and generates HTML
     def block_textile_lists( text )
-                                orig_text = text.dup
-                                
-                                # Take care of _*'s and _#'s to turn them into paragraphs
-                                text.gsub!(/([\*#] )((.*?\n\s*_[\*#].*?)+)/) do |m|
-                                        "#{$1}<p>"+$2.split(/_[\*#]/).map{|w|w.strip}.delete_if{|w|w.empty?}.join("</p><p>")+"</p>"
-                                end
-                                
+        orig_text = text.dup
+        
+        # Take care of _*'s and _#'s to turn them into paragraphs
+        text.gsub!(/([\*#] )((.*?\n\s*_[\*#].*?)+)/) do |m|
+          "#{$1}<p>"+$2.split(/_[\*#]/).map{|w|w.strip}.delete_if{|w|w.empty?}.join("</p><p>")+"</p>"
+        end
+        
         @last_line ||= -1
         
@@ -155 +155 @@
                                 lines[line_id - 1] << "</li>\n#{"\t"*(depth.size-1)}</#{ lT( depth[i] ) }l>"
                                 depth.pop
-                                                                                                                                tab_in = true
+                                tab_in = true
                             end
                         end
                         if depth.last && depth.last.length == tl.length
-                                                                                                                lines[line_id - 1] << "</li>"
+                            lines[line_id - 1] << "</li>"
                         end
                     end
@@ -200 +200 @@
                 
                 if line_id == lines.length - 1
-                                                                                tabs = depth.size-1
+                    tabs = depth.size-1
                     depth.reverse.delete_if do |v|
-                                                                                                lines[-1] << "</li>\n#{"\t"*tabs}</#{ lT( v ) }l>"
-                                                                                                tabs -= 1
-                                                                                end
+                        lines[-1] << "</li>\n#{"\t"*tabs}</#{ lT( v ) }l>"
+                        tabs -= 1
+                    end
                 end
             end
@@ -215 +215 @@
     # Parses Textile definition lists and generates HTML
     def block_textile_defs( text )
-                        text.gsub!(/^-\s+(.*?):=(.*?)=:\s*$/m) do |m|
-                                "- #{$1.strip} := <p>"+$2.split(/\n/).map{|w|w.strip}.delete_if{|w|w.empty?}.join("</p><p>")+"</p>"
-                        end
-                                
+        text.gsub!(/^-\s+(.*?):=(.*?)=:\s*$/m) do |m|
+          "- #{$1.strip} := <p>"+$2.split(/\n/).map{|w|w.strip}.delete_if{|w|w.empty?}.join("</p><p>")+"</p>"
+        end
+        
         text.gsub!( DEFS_RE ) do |match|
             lines = match.split( /\n/ )
@@ -232 +232 @@
 
                 if line_id == lines.length - 1
-                                                                                lines[-1] << "\n</dl>"
+                    lines[-1] << "\n</dl>"
                 end
             end

trunk/run-tests.rb

@@ -21 +21 @@
                        red.to_html( :markdown )
                    elsif testfile =~ /docbook/
-                                                                                         red.to_docbook
+                       red.to_docbook
                    elsif testfile =~ /textile/
                        red.to_html( :textile )
@@ -41 +41 @@
       puts
       puts "---"
-                        puts "in: "; p input
+      puts "in: "; p input
       puts "out: "; p out
       puts "expected: "; p expected