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

Tweak from Ari Stern

Browse source 
Match Maruku Revision 184: change wrapper for embedded TeX in display equation from
a <div> to a <span>.
This commit is contained in:
Jacques Distler 2008-10-23 22:44:53 -05:00
parent 0fdb13b257
commit e48b000c11
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/unit/page_renderer_test.rb
View file

@ -80,8 +80,8 @@ class PageRendererTest < Test::Unit::TestCase
%{<div class='maruku-equation'><math class='maruku-mathml' display='block' } + %{<div class='maruku-equation'><math class='maruku-mathml' display='block' } +
%{xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi><mo stretchy='false'>} + %{xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi><mo stretchy='false'>} +
%{(</mo><mi>x</mi><mo stretchy='false'>)</mo><semantics><annotation-xml encoding='SVG1.1'>} + %{(</mo><mi>x</mi><mo stretchy='false'>)</mo><semantics><annotation-xml encoding='SVG1.1'>} +
%{<svg/></annotation-xml></semantics></math><div class='maruku-eq-tex'><code style='display: none;'>} + %{<svg/></annotation-xml></semantics></math><span class='maruku-eq-tex'><code style='display: none;'>} +
%{\\sin(x) \\begin{svg}<svg/>\\end{svg}</code></div></div>}, %{\\sin(x) \\begin{svg}<svg/>\\end{svg}</code></span></div>},
"$$\\sin(x) \\begin{svg}<svg/>\\end{svg}$$") "$$\\sin(x) \\begin{svg}<svg/>\\end{svg}$$")
code_block = [ code_block = [
@ -115,7 +115,7 @@ class PageRendererTest < Test::Unit::TestCase
%{<p>ecuasi\303\263n</p>\n<div class='maruku-equation'><math class='maruku-mathml' } + %{<p>ecuasi\303\263n</p>\n<div class='maruku-equation'><math class='maruku-mathml' } +
%{display='block' xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi>} + %{display='block' xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi>} +
%{<mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math>} + %{<mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math>} +
%{<div class='maruku-eq-tex'><code style='display: none;'>\\sin(x)</code></div></div>}, %{<span class='maruku-eq-tex'><code style='display: none;'>\\sin(x)</code></span></div>},
"ecuasi\303\263n\n$$\\sin(x)$$") "ecuasi\303\263n\n$$\\sin(x)$$")
assert_markup_parsed_as( assert_markup_parsed_as(

31
vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb vendored
View file

@ -104,7 +104,6 @@ module MaRuKu; module Out; module HTML
if mathml if mathml
add_class_to(mathml, 'maruku-mathml') add_class_to(mathml, 'maruku-mathml')
return mathml return mathml
# span << mathml
end end
if png if png
@ -122,15 +121,6 @@ module MaRuKu; module Out; module HTML
div = create_html_element 'div' div = create_html_element 'div'
add_class_to(div, 'maruku-equation') add_class_to(div, 'maruku-equation')
if self.label # then numerate
span = Element.new 'span'
span.attributes['class'] = 'maruku-eq-number'
num = self.num
span << Text.new("(#{num})")
div << span
div.attributes['id'] = "eq:#{self.label}"
end
if mathml if mathml
add_class_to(mathml, 'maruku-mathml') add_class_to(mathml, 'maruku-mathml')
div << mathml div << mathml
@ -142,12 +132,21 @@ module MaRuKu; module Out; module HTML
div << img div << img
end end
source_div = Element.new 'div' source_span = Element.new 'span'
add_class_to(source_div, 'maruku-eq-tex') add_class_to(source_span, 'maruku-eq-tex')
code = convert_to_mathml_none(:equation, self.math.strip) code = convert_to_mathml_none(:equation, self.math.strip)
code.attributes['style'] = 'display: none' code.attributes['style'] = 'display: none'
source_div << code source_span << code
div << source_div div << source_span
if self.label # then numerate
span = Element.new 'span'
span.attributes['class'] = 'maruku-eq-number'
num = self.num
span << Text.new("(#{num})")
div << span
div.attributes['id'] = "eq:#{self.label}"
end
div div
end end