lib/trac-wiki/parser.rb in trac-wiki-0.2.23 vs lib/trac-wiki/parser.rb in trac-wiki-0.2.24

@@ -280,10 +280,11 @@
     # Example custom behaviour:
     #
     # make_local_link("LocalLink") #=> "/LocalLink"
     # make_local_link("Wikipedia:Bread") #=> "http://en.wikipedia.org/wiki/Bread"
     def make_local_link(link) #:doc:
+      # FIXME: xss when no_escape
       link, anch = link.split(/#/, 2)
       if no_escape?
         return "#{@base}#{link}" if ! anch
         return "##{anch}" if  link == ''
         return "#{@base}#{link}##{anch}"
@@ -476,13 +477,12 @@
         #print "MACRO.inline(#{$1}), next:#{str}"
         return str
       when str =~ /\A`(.*?)`/                  # inline pre (tt)
         @tree.tag(:tt, $1)
       when math? && str =~ /\A\$(.+?)\$/       # inline math  (tt)
-        @tree.add("\\( #{$1} \\)")
-        #@tree.add("$#{$1}$")
-        #@tree.tag(:span, {class:'math'},  $1)
+        #@tree.add("\\( #{$1} \\)")
+        @tree.tag(:span, {class:'math'},  $1)
         @was_math = true
       when str =~ /\A(\&\w*;)/       # html entity 
         #print "add html ent: #{$1}\n"
         @tree.add_raw($1)
       when str =~ /\A([:alpha:]|[:digit:])+/
@@ -643,10 +643,11 @@
       end
     end
 
     def do_math(text)
       end_paragraph
-      @tree.add("$$#{text}$$\n")
+      #@tree.add("$$#{text}$$\n")
+      @tree.tag(:div, {class:'math'}, text)
       @was_math = true
     end
     def do_merge(merge_type, who)
       merge_class = case merge_type[0]
                       when '<' ; 'merge-mine'