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 2010-11-27 00:45:16 -06:00
parent 8d7381bb54 f914a40fa9
commit 5918d4c26e
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/unit/page_renderer_test.rb
View file

@ -208,6 +208,12 @@ END_THM
%{<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math></p>}, %{<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math></p>},
"ecuasi\303\263n $\\sin(x)$") "ecuasi\303\263n $\\sin(x)$")
assert_markup_parsed_as(
%{<div class='maruku-equation'><math class='maruku-mathml' display='block' xmlns='http://w} +
%{ww.w3.org/1998/Math/MathML'><mo>⋅</mo><mi>p</mi></math><span class='maruku-eq-tex'><code} +
%{ style='display: none;'>\\cdot\np</code></span></div>},
"$$\\cdot\np$$")
end end
def test_ial_in_lists def test_ial_in_lists

2
vendor/plugins/maruku/lib/maruku/ext/math/parsing.rb vendored
View file

@ -58,6 +58,8 @@ MaRuKu::In::Markdown.register_block_extension(
end end
opening, tex = first.scan(EquationStart).first opening, tex = first.scan(EquationStart).first
# ensure newline at end of first line of equation isn't swallowed
tex << "\n"
numerate = doc.get_setting(:math_numbered).include?(opening) numerate = doc.get_setting(:math_numbered).include?(opening)
label = nil label = nil
loop do loop do