From f0cf0ec625dc6d6340be3579c9d00e5b31b618f9 Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Tue, 5 Jun 2007 17:13:44 -0500 Subject: [PATCH] Sanitize REML trees OK. Enabled sanitization of rexml trees instead of strings. My timing tests seem to be erratic. Can't tell whether this is really faster. --- lib/chunks/engines.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/chunks/engines.rb b/lib/chunks/engines.rb index 4f11608b..474329a8 100644 --- a/lib/chunks/engines.rb +++ b/lib/chunks/engines.rb @@ -42,7 +42,8 @@ module Engines def mask require_dependency 'maruku' require_dependency 'maruku/ext/math' - html = Maruku.new(@content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), {:math_enabled => false}).to_html + html = sanitize_rexml(Maruku.new(@content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), + {:math_enabled => false}).to_html_tree) sanitize_xhtml(html.to_ncr) end end @@ -53,10 +54,8 @@ module Engines def mask require_dependency 'maruku' require_dependency 'maruku/ext/math' -# html = sanitize_rexml(Maruku.new(@content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), -# {:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}']}).to_html_tree) - html = sanitize_xhtml(Maruku.new(@content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), - {:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}']}).to_html.to_ncr) + html = sanitize_rexml(Maruku.new(@content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), + {:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}']}).to_html_tree) end end