Sync to lastest Maruku. Tweak to CSS stylesheet.
This commit is contained in:
Jacques Distler
parent
b19e1e4f47
commit
ceb0931bb3
15 changed files with 290 additions and 98 deletions
108
lib/maruku/ext/math/mathml_engines/blahtex.rb
Normal file
108
lib/maruku/ext/math/mathml_engines/blahtex.rb
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
|
||||
require 'tempfile'
|
||||
require 'fileutils'
|
||||
require 'digest/md5'
|
||||
require 'pstore'
|
||||
|
||||
module MaRuKu; module Out; module HTML
|
||||
|
||||
PNG = Struct.new(:src,:depth,:height)
|
||||
|
||||
def convert_to_png_blahtex(kind, tex)
|
||||
begin
|
||||
FileUtils::mkdir_p MaRuKu::Globals[:html_png_dir]
|
||||
|
||||
# first, we check whether this image has already been processed
|
||||
md5sum = Digest::MD5.hexdigest(tex+" params: ")
|
||||
result_file = File.join(MaRuKu::Globals[:html_png_dir], md5sum+".txt")
|
||||
|
||||
if not File.exists?(result_file)
|
||||
tmp_in = Tempfile.new('maruku_blahtex')
|
||||
f = tmp_in.open
|
||||
f.write tex
|
||||
f.close
|
||||
|
||||
resolution = get_setting(:html_png_resolution)
|
||||
|
||||
options = "--png --use-preview-package --shell-dvipng 'dvipng -D #{resolution}' "
|
||||
options += ("--png-directory '%s'" % MaRuKu::Globals[:html_png_dir])
|
||||
|
||||
cmd = "blahtex #{options} < #{tmp_in.path} > #{result_file}"
|
||||
$stderr.puts "$ #{cmd}"
|
||||
system cmd
|
||||
tmp_in.delete
|
||||
|
||||
end
|
||||
|
||||
result = nil
|
||||
f = File.open(result_file)
|
||||
result = f.read
|
||||
f.close
|
||||
|
||||
|
||||
doc = Document.new(result, {:respect_whitespace =>:all})
|
||||
png = doc.root.elements[1]
|
||||
if png.name != 'png'
|
||||
maruku_error "Blahtex error: \n#{doc}"
|
||||
return nil
|
||||
end
|
||||
depth = png.elements['depth'] || (raise "No depth element in:\n #{doc}")
|
||||
height = png.elements['height'] || (raise "No height element in:\n #{doc}")
|
||||
md5 = png.elements['md5'] || (raise "No md5 element in:\n #{doc}")
|
||||
|
||||
depth = depth.text.to_f
|
||||
height = height.text.to_f # XXX check != 0
|
||||
md5 = md5.text
|
||||
|
||||
dir_url = MaRuKu::Globals[:html_png_url]
|
||||
return PNG.new("#{dir_url}#{md5}.png", depth, height)
|
||||
|
||||
rescue Exception => e
|
||||
maruku_error "Error: #{e}"
|
||||
end
|
||||
nil
|
||||
end
|
||||
|
||||
BlahtexCache = PStore.new("blahtex_cache.pstore")
|
||||
|
||||
def convert_to_mathml_blahtex(kind, tex)
|
||||
begin
|
||||
BlahtexCache.transaction do
|
||||
if BlahtexCache[tex].nil?
|
||||
tmp_in = Tempfile.new('maruku_blahtex')
|
||||
f = tmp_in.open
|
||||
f.write tex
|
||||
f.close
|
||||
tmp_out = Tempfile.new('maruku_blahtex')
|
||||
|
||||
options = "--mathml"
|
||||
cmd = "blahtex #{options} < #{tmp_in.path} > #{tmp_out.path}"
|
||||
$stderr.puts "$ #{cmd}"
|
||||
system cmd
|
||||
tmp_in.delete
|
||||
|
||||
result = nil
|
||||
File.open(tmp_out.path) do |f| result=f.read end
|
||||
puts result
|
||||
|
||||
BlahtexCache[tex] = result
|
||||
end
|
||||
|
||||
blahtex = BlahtexCache[tex]
|
||||
doc = Document.new(blahtex, {:respect_whitespace =>:all})
|
||||
mathml = doc.root.elements['mathml']
|
||||
if not mathml
|
||||
maruku_error "Blahtex error: \n#{doc}"
|
||||
return nil
|
||||
else
|
||||
return mathml
|
||||
end
|
||||
end
|
||||
|
||||
rescue Exception => e
|
||||
maruku_error "Error: #{e}"
|
||||
end
|
||||
nil
|
||||
end
|
||||
|
||||
end end end
|
||||
|
|
@ -1,14 +1,16 @@
|
|||
|
||||
module MaRuKu; module Out; module HTML
|
||||
|
||||
def convert_to_mathml_itex2mml(tex, method)
|
||||
def convert_to_mathml_itex2mml(kind, tex)
|
||||
begin
|
||||
if not $itex2mml_parser
|
||||
require 'itextomml'
|
||||
$itex2mml_parser = Itex2MML::Parser.new
|
||||
end
|
||||
|
||||
mathml = $itex2mml_parser.send(method, tex)
|
||||
itex_method = {:equation=>:block_filter,:inline=>:inline_filter}
|
||||
|
||||
mathml = $itex2mml_parser.send(itex_method[kind], tex)
|
||||
doc = Document.new(mathml, {:respect_whitespace =>:all}).root
|
||||
return doc
|
||||
rescue LoadError => e
|
||||
|
|
@ -23,13 +25,5 @@ module MaRuKu; module Out; module HTML
|
|||
end
|
||||
nil
|
||||
end
|
||||
|
||||
def to_html_inline_math_itex2mml
|
||||
convert_to_mathml_itex2mml(self.math, :inline_filter)
|
||||
end
|
||||
|
||||
def to_html_equation_itex2mml
|
||||
convert_to_mathml_itex2mml(self.math, :block_filter)
|
||||
end
|
||||
|
||||
end end end
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
module MaRuKu; module Out; module HTML
|
||||
|
||||
def to_html_inline_math_none
|
||||
def convert_to_mathml_none(kind, tex)
|
||||
# You can: either return a REXML::Element
|
||||
# return Element.new 'div'
|
||||
# or return an empty array on error
|
||||
# return []
|
||||
# or have a string parsed by REXML:
|
||||
tex = self.math
|
||||
tex.gsub!('&','&')
|
||||
tex = tex.gsub('&','&')
|
||||
mathml = "<code>#{tex}</code>"
|
||||
return Document.new(mathml).root
|
||||
end
|
||||
|
||||
def to_html_equation_none
|
||||
return to_html_inline_math_none
|
||||
def convert_to_png_none(kind, tex)
|
||||
return nil
|
||||
end
|
||||
|
||||
|
||||
end end end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
module MaRuKu; module Out; module HTML
|
||||
def convert_to_mathml_ritex(tex)
|
||||
|
||||
def convert_to_mathml_ritex(kind, tex)
|
||||
begin
|
||||
if not $ritex_parser
|
||||
require 'ritex'
|
||||
|
|
@ -20,15 +21,4 @@ module MaRuKu; module Out; module HTML
|
|||
nil
|
||||
end
|
||||
|
||||
def to_html_inline_math_ritex
|
||||
tex = self.math
|
||||
mathml = convert_to_mathml_ritex(tex)
|
||||
return mathml || []
|
||||
end
|
||||
|
||||
def to_html_equation_ritex
|
||||
tex = self.math
|
||||
mathml = convert_to_mathml_ritex(tex)
|
||||
return mathml || []
|
||||
end
|
||||
end end end
|
||||
|
|
|
|||
|
|
@ -1,33 +1,37 @@
|
|||
|
||||
=begin maruku_doc
|
||||
Extension: math
|
||||
Attribute: html_math_engine
|
||||
Scope: document, element
|
||||
Output: html
|
||||
Summary: Select the rendering engine for math.
|
||||
Summary: Select the rendering engine for MathML.
|
||||
Default: <?mrk Globals[:html_math_engine].to_s ?>
|
||||
|
||||
Select the rendering engine for math.
|
||||
|
||||
If you want to use your engine `foo`, then set:
|
||||
If you want to use your custom engine `foo`, then set:
|
||||
|
||||
HTML math engine: foo
|
||||
{:lang=markdown}
|
||||
|
||||
and then implement two functions:
|
||||
|
||||
def to_html_inline_math_foo
|
||||
# You can: either return a REXML::Element
|
||||
# return Element.new 'div'
|
||||
# or return an empty array on error
|
||||
# return []
|
||||
# or have a string parsed by REXML:
|
||||
tex = self.math
|
||||
tex.gsub!('&','&')
|
||||
mathml = "<code>#{tex}</code>"
|
||||
return Document.new(mathml).root
|
||||
def convert_to_mathml_foo(kind, tex)
|
||||
...
|
||||
end
|
||||
=end
|
||||
|
||||
def to_html_equation_foo
|
||||
=begin maruku_doc
|
||||
Extension: math
|
||||
Attribute: html_png_engine
|
||||
Scope: document, element
|
||||
Output: html
|
||||
Summary: Select the rendering engine for math.
|
||||
Default: <?mrk Globals[:html_math_engine].to_s ?>
|
||||
|
||||
Same thing as `html_math_engine`, only for PNG output.
|
||||
|
||||
def convert_to_png_foo(kind, tex)
|
||||
# same thing
|
||||
...
|
||||
end
|
||||
|
|
@ -37,16 +41,6 @@ and then implement two functions:
|
|||
|
||||
module MaRuKu; module Out; module HTML
|
||||
|
||||
def to_html_inline_math
|
||||
s = get_setting(:html_math_engine)
|
||||
method = "to_html_inline_math_#{s}".to_sym
|
||||
if self.respond_to? method
|
||||
self.send method || to_html_equation_none
|
||||
else
|
||||
puts "A method called #{method} should be defined."
|
||||
return []
|
||||
end
|
||||
end
|
||||
|
||||
def add_class_to(el, cl)
|
||||
el.attributes['class'] =
|
||||
|
|
@ -57,35 +51,112 @@ module MaRuKu; module Out; module HTML
|
|||
end
|
||||
end
|
||||
|
||||
def to_html_equation
|
||||
s = get_setting(:html_math_engine)
|
||||
method = "to_html_equation_#{s}".to_sym
|
||||
# Creates an xml Mathml document of self.math
|
||||
def render_mathml(kind, tex)
|
||||
engine = get_setting(:html_math_engine)
|
||||
method = "convert_to_mathml_#{engine}".to_sym
|
||||
if self.respond_to? method
|
||||
mathml = self.send(method) || to_html_equation_none
|
||||
div = create_html_element 'div'
|
||||
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
|
||||
div << mathml
|
||||
|
||||
source_div = Element.new 'div'
|
||||
add_class_to(source_div, 'maruku-eq-tex')
|
||||
code = to_html_equation_none
|
||||
code.attributes['style'] = 'display: none'
|
||||
source_div << code
|
||||
div << source_div
|
||||
div
|
||||
mathml = self.send(method, kind, tex)
|
||||
return mathml || convert_to_mathml_none(kind, tex)
|
||||
else
|
||||
puts "A method called #{method} should be defined."
|
||||
return []
|
||||
return convert_to_mathml_none(kind, tex)
|
||||
end
|
||||
end
|
||||
|
||||
# Creates an xml Mathml document of self.math
|
||||
def render_png(kind, tex)
|
||||
engine = get_setting(:html_png_engine)
|
||||
method = "convert_to_png_#{engine}".to_sym
|
||||
if self.respond_to? method
|
||||
return self.send(method, kind, tex)
|
||||
else
|
||||
puts "A method called #{method} should be defined."
|
||||
return nil
|
||||
end
|
||||
end
|
||||
|
||||
def pixels_per_ex
|
||||
if not $pixels_per_ex
|
||||
x = render_png(:inline, "x")
|
||||
$pixels_per_ex = x.height # + x.depth
|
||||
end
|
||||
$pixels_per_ex
|
||||
end
|
||||
|
||||
def adjust_png(png, use_depth)
|
||||
src = png.src
|
||||
|
||||
height_in_px = png.height
|
||||
depth_in_px = png.depth
|
||||
height_in_ex = height_in_px / pixels_per_ex
|
||||
depth_in_ex = depth_in_px / pixels_per_ex
|
||||
total_height_in_ex = height_in_ex + depth_in_ex
|
||||
style = ""
|
||||
style += "vertical-align: -#{depth_in_ex}ex;" if use_depth
|
||||
style += "height: #{total_height_in_ex}ex;"
|
||||
img = Element.new 'img'
|
||||
img.attributes['src'] = src
|
||||
img.attributes['style'] = style
|
||||
img.attributes['alt'] = "equation"
|
||||
img
|
||||
end
|
||||
|
||||
def to_html_inline_math
|
||||
mathml = render_mathml(:inline, self.math)
|
||||
png = render_png(:inline, self.math)
|
||||
|
||||
span = create_html_element 'span'
|
||||
add_class_to(span, 'maruku-inline')
|
||||
|
||||
if mathml
|
||||
add_class_to(mathml, 'maruku-mathml')
|
||||
span << mathml
|
||||
end
|
||||
|
||||
if png
|
||||
img = adjust_png(png, use_depth=true)
|
||||
add_class_to(img, 'maruku-png')
|
||||
span << img
|
||||
end
|
||||
span
|
||||
|
||||
end
|
||||
|
||||
def to_html_equation
|
||||
mathml = render_mathml(:equation, self.math)
|
||||
png = render_png(:equation, self.math)
|
||||
|
||||
div = create_html_element 'div'
|
||||
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
|
||||
add_class_to(mathml, 'maruku-mathml')
|
||||
div << mathml
|
||||
end
|
||||
|
||||
if png
|
||||
img = adjust_png(png, use_depth=false)
|
||||
add_class_to(img, 'maruku-png')
|
||||
div << img
|
||||
end
|
||||
|
||||
source_div = Element.new 'div'
|
||||
add_class_to(source_div, 'maruku-eq-tex')
|
||||
code = convert_to_mathml_none(:equation, self.math)
|
||||
code.attributes['style'] = 'display: none'
|
||||
source_div << code
|
||||
div << source_div
|
||||
div
|
||||
end
|
||||
|
||||
def to_html_eqref
|
||||
if eq = self.doc.eqid2eq[self.eqid]
|
||||
|
|
@ -97,7 +168,7 @@ module MaRuKu; module Out; module HTML
|
|||
a
|
||||
else
|
||||
maruku_error "Cannot find equation #{self.eqid.inspect}"
|
||||
Text.new "(#{self.eqid})"
|
||||
Text.new "(eq:#{self.eqid})"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue