Changeset 129 for trunk/lib/redcloth/base.rb

Timestamp:

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

Author:

jgarber

Message:

Convert tabs to spaces

Files:

• trunk/lib/redcloth/base.rb (modified) (7 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|