Textile formatting:

* escape html tags, except pre tags (#807, #795) * try to avoid unwanted quick phrase modifiers git-svn-id: http://redmine.rubyforge.org/svn/trunk@1216 e93f8b46-1217-0410-a6f0-8f06a7374b81

Textile formatting:
* escape html tags, except pre tags (#807, #795) * try to avoid unwanted quick phrase modifiers git-svn-id: http://redmine.rubyforge.org/svn/trunk@1216 e93f8b46-1217-0410-a6f0-8f06a7374b81
a92cce38 · Jean-Philippe Lang · 522b9e6b · a92cce38
Commit a92cce38 authored Mar 09, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

redcloth.rb lib/redcloth.rb +11 -4

No files found.
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -295,6 +295,7 @@ class RedCloth < String
        @pre_list = []
        rip_offtags text
        no_textile text
+        escape_html_tags text
        hard_break text 
        unless @lite_mode
            refs text
@@ -375,18 +376,18 @@ class RedCloth < String
        re =
            case rtype
            when :limit
-                /(\W)
+                /(^|[>\s])
                (#{rcq})
                (#{C})
                (?::(\S+?))?
-                (\S.*?\S|\S)
+                ([^\s\-].*?[^\s\-]|\w)
                #{rcq}
-                (?=\W)/x
+                (?=[[:punct:]]|\s|$)/x
            else
                /(#{rcq})
                (#{C})
                (?::(\S+))?
-                (\S.*?\S|\S)
+                ([^\s\-].*?[^\s\-]|\w)
                #{rcq}/xm 
            end
        [rc, ht, re, rtype]
@@ -1128,5 +1129,11 @@ class RedCloth < String
            end
        end
    end
+    
+    ALLOWED_TAGS = %w(redpre pre)
+    
+    def escape_html_tags(text)
+      text.gsub!(%r{<((\/?)(\w+))}) {|m| ALLOWED_TAGS.include?($3) ? "<#{$1}" : "&lt;#{$1}" }
+    end
 end