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

Timestamp:

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

Author:

jgarber

Message:

Convert tabs to spaces

Files:

• trunk/lib/redcloth/textile.rb (modified) (6 diffs)

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