deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Jacques Distler 2011-08-08 01:55:44 -05:00
commit 6005297cfe
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/chunks/engines.rb
View file

@ -41,16 +41,16 @@ module Engines
class Markdown < AbstractEngine class Markdown < AbstractEngine
def mask def mask
@content.as_utf8 text = @content.as_utf8.to_str.delete("\r").to_utf8
# If the request is for S5, call Maruku accordingly (without math) # If the request is for S5, call Maruku accordingly (without math)
if @content.options[:mode] == :s5 if @content.options[:mode] == :s5
my_content = Maruku.new(@content.delete("\r").to_utf8, my_content = Maruku.new(text,
{:math_enabled => false, :content_only => true, {:math_enabled => false, :content_only => true,
:author => @content.options[:engine_opts][:author], :author => @content.options[:engine_opts][:author],
:title => @content.options[:engine_opts][:title]}) :title => @content.options[:engine_opts][:title]})
@content.options[:renderer].s5_theme = my_content.s5_theme @content.options[:renderer].s5_theme = my_content.s5_theme
else else
html = Maruku.new(@content.delete("\r").to_utf8, {:math_enabled => false}).to_html html = Maruku.new(text, {:math_enabled => false}).to_html
html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1') html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
end end
@ -59,10 +59,10 @@ module Engines
class MarkdownMML < AbstractEngine class MarkdownMML < AbstractEngine
def mask def mask
@content.as_utf8 text = @content.as_utf8.to_str.delete("\r").to_utf8
# If the request is for S5, call Maruku accordingly # If the request is for S5, call Maruku accordingly
if @content.options[:mode] == :s5 if @content.options[:mode] == :s5
my_content = Maruku.new(@content.delete("\r").to_utf8, my_content = Maruku.new(text,
{:math_enabled => true, {:math_enabled => true,
:math_numbered => ['\\[','\\begin{equation}'], :math_numbered => ['\\[','\\begin{equation}'],
:content_only => true, :content_only => true,
@ -71,8 +71,10 @@ module Engines
@content.options[:renderer].s5_theme = my_content.s5_theme @content.options[:renderer].s5_theme = my_content.s5_theme
my_content.to_s5 my_content.to_s5
else else
(t = Time.now; nil) (t = Time.now; nil)
html = Maruku.new(@content.delete("\r").to_utf8, puts "text is #{text.class}"
puts "text responds to concat_with_safety" if text.respond_to?(:concat_with_safety)
html = Maruku.new(text,
{:math_enabled => true, {:math_enabled => true,
:math_numbered => ['\\[','\\begin{equation}']}).to_html :math_numbered => ['\\[','\\begin{equation}']}).to_html
(ApplicationController.logger.info("Maruku took " + (Time.now-t).to_s + " seconds."); nil) (ApplicationController.logger.info("Maruku took " + (Time.now-t).to_s + " seconds."); nil)
@ -83,10 +85,10 @@ module Engines
class MarkdownPNG < AbstractEngine class MarkdownPNG < AbstractEngine
def mask def mask
@content.as_utf8 text = @content.as_utf8.to_str.delete("\r").to_utf8
# If the request is for S5, call Maruku accordingly # If the request is for S5, call Maruku accordingly
if @content.options[:mode] == :s5 if @content.options[:mode] == :s5
my_content = Maruku.new(@content.delete("\r").to_utf8, my_content = Maruku.new(text,
{:math_enabled => true, {:math_enabled => true,
:math_numbered => ['\\[','\\begin{equation}'], :math_numbered => ['\\[','\\begin{equation}'],
:html_math_output_mathml => false, :html_math_output_mathml => false,
@ -100,7 +102,7 @@ module Engines
@content.options[:renderer].s5_theme = my_content.s5_theme @content.options[:renderer].s5_theme = my_content.s5_theme
my_content.to_s5 my_content.to_s5
else else
html = Maruku.new(@content.delete("\r").to_utf8, html = Maruku.new(text,
{:math_enabled => true, {:math_enabled => true,
:math_numbered => ['\\[','\\begin{equation}'], :math_numbered => ['\\[','\\begin{equation}'],
:html_math_output_mathml => false, :html_math_output_mathml => false,