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

This commit is contained in:
Jacques Distler 2009-03-10 00:17:35 -05:00
commit 0b29f5bb94

View file

@ -208,8 +208,6 @@ END_THM
end end
def test_have_latest_itex2mml def test_have_latest_itex2mml
# set_web_property :markup, :markdownMML
assert_markup_parsed_as( assert_markup_parsed_as(
%{<p>equation <math class='maruku-mathml' } + %{<p>equation <math class='maruku-mathml' } +
%{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} + %{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
@ -217,6 +215,28 @@ END_THM
"equation $A \\invamp B$") "equation $A \\invamp B$")
end end
def test_blahtex
if Kernel::system('blahtex --help > /dev/null 2>&1')
set_web_property :markup, :markdownPNG
re = Regexp.new(
%{<p>equation <span class='maruku-inline'><img alt='\\$a\\\\sin\\(\\\\theta\\)\\$' } +
%{class='maruku-png' src='\.\./files/pngs/\\w+\.png' style='vertical-align: -0\.5} +
%{55555555555556ex; height: 2\.22222222222222ex;'/></span></p>})
assert_match_markup_parsed_as(re, 'equation $a\sin(\theta)$')
re = Regexp.new(
%{<div class='maruku-equation'><img alt='\\$a\\\\sin\\(\\\\theta\\)\\$' } +
%{class='maruku-png' src='\.\./files/pngs/\\w+\.png' style='height: 2\.22222222} +
%{222222ex;'/><span class='maruku-eq-tex'><code style='display: none;'>a\\\\sin} +
%{\\(\\\\theta\\)<\/code><\/span><\/div>})
assert_match_markup_parsed_as(re, '$$a\sin(\theta)$$')
else
print "\nBlahTeX not found ... skipping.\n"
end
end
def test_markdown_hyperlink_with_slash def test_markdown_hyperlink_with_slash
# in response to a bug, see http://dev.instiki.org/attachment/ticket/177 # in response to a bug, see http://dev.instiki.org/attachment/ticket/177
set_web_property :markup, :markdown set_web_property :markup, :markdown