Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

app/metal/itex.rb

@@ -13,30 +13,63 @@ class Itex
   end
   
   private
-  
+
+  # plugable XML parser; falls back to REXML
+  begin
+    require 'nokogiri'
+    def self.xmlparse(text)
+      Nokogiri::XML(text) { |config| config.options = Nokogiri::XML::ParseOptions::STRICT }
+    end
+  rescue LoadError
+    require 'rexml/document'
+    def self.xmlparse(text)
+      REXML::Document.new(text)
+    end
+  end
+
+  #error message to return
+  def self.error(str)
+    "<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><merror><mtext>" +
+       str + "</mtext></merror></math>"
+  end
+
+  # itex2MML parser
+  begin
+    require 'itextomml'
+    def self.parse_itex(tex, filter)
+      Itex2MML::Parser.new.send(filter, tex).to_utf8
+    end
+  rescue LoadError
+    def self.parse_itex(tex, filter)
+      error("Please install the itex2MML Ruby bindings.")
+    end  
+  end
+
+  # the actual response
   def self.response(env)
-    @params = Rack::Request.new(env).params
-    tex = (@params['tex'] || '').purify
-    case @params['display']
+    params = Rack::Request.new(env).params
+    tex = (params['tex'] || '').purify.strip
+    case params['display']
       when 'block'
         filter = :block_filter
       else
          filter = :inline_filter
     end
     return "<math xmlns='http://www.w3.org/1998/Math/MathML' display='" +
-        filter.to_s[/(.*?)_filter/] + "'/>" if tex.strip == ''
-    estart = "<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><merror><mtext>"
-    eend = "</mtext></merror></math>"
+        filter.to_s[/(.*?)_filter/] + "'/>" if tex == ''
     begin
-      require 'itextomml'
-      @itex2mml_parser ||=  Itex2MML::Parser.new
-      @itex2mml_parser.send(filter, tex).to_utf8
-    rescue LoadError
-      estart + "Please install the itex2MML Ruby bindings." + eend  
+      doc = parse_itex(tex, filter)
+      # make sure the result is well-formed, before sending it off
+      begin
+        xmlparse(doc)
+      rescue
+        return error("Ill-formed XML.")
+      end
+      return doc
     rescue Itex2MML::Error => e
-      estart + e.to_s + eend
+      error(e.to_s)
     rescue
-      estart + "Unknown Error" + eend
+      error("Unknown Error")
     end
   end
 end

app/views/layouts/error.html.erb

@@ -31,7 +31,11 @@
   </h1>
 
 <div id="Error-Content">
-<%= h @content_for_layout %>
+<%= if :raw
+      @content_for_layout
+    else
+      h @content_for_layout
+    end %>
 
 </div> <!-- Error-Content -->