diff options
| author | Pepijn Van Eeckhoudt <pepijn@vaneeckhoudt.net> | 2014-05-17 21:54:56 +0200 |
|---|---|---|
| committer | Pepijn Van Eeckhoudt <pepijn@vaneeckhoudt.net> | 2015-10-18 20:01:47 +0200 |
| commit | 6ed3edfa7775ae724bc4f910bb2454248ea95f9f (patch) | |
| tree | 174aefd4f26ef7bcae70e7b928e54f4fb42d13ba | |
| parent | e9f908f4c6c344fa0cc07c7d0793b42546dca0e6 (diff) | |
Add asciimath to mathml converter to support asciimath in docbook converter
| -rw-r--r-- | asciidoctor.gemspec | 2 | ||||
| -rw-r--r-- | lib/asciidoctor/converter/docbook5.rb | 6 | ||||
| -rw-r--r-- | test/blocks_test.rb | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/asciidoctor.gemspec b/asciidoctor.gemspec index 576f2bb3..be5a8922 100644 --- a/asciidoctor.gemspec +++ b/asciidoctor.gemspec @@ -30,9 +30,11 @@ A fast, open source text processor and publishing toolchain, written in Ruby, fo #s.extra_rdoc_files = %w(CHANGELOG.adoc LICENSE.adoc README.adoc) s.extra_rdoc_files = %w(LICENSE.adoc) + # asciimath is needed for testing AsciiMath in DocBook backend # erubis is needed for testing use of alternative eRuby impls # tilt, slim and haml are needed for testing custom templates # coderay is needed for testing syntax highlighting + s.add_development_dependency 'asciimath', '~> 1.0.1' s.add_development_dependency 'coderay', '~> 1.1.0' s.add_development_dependency 'cucumber', '~> 1.3.1' s.add_development_dependency 'erubis', '~> 2.7.0' diff --git a/lib/asciidoctor/converter/docbook5.rb b/lib/asciidoctor/converter/docbook5.rb index ab2ceee6..6c487207 100644 --- a/lib/asciidoctor/converter/docbook5.rb +++ b/lib/asciidoctor/converter/docbook5.rb @@ -256,9 +256,11 @@ module Asciidoctor if node.style == 'latexmath' equation_data = %(<alt><![CDATA[#{equation}]]></alt> <mediaobject><textobject><phrase></phrase></textobject></mediaobject>) - # asciimath + elsif node.style == 'asciimath' && (!(defined? @asciimath_loaded) ? + (@asciimath_loaded = Helpers.require_library 'asciimath', true, :warn) : @asciimath_loaded) + equation_data = ::AsciiMath.parse(equation).to_mathml 'mml:', 'xmlns:mml' => 'http://www.w3.org/1998/Math/MathML' else - # DocBook backends can't handle AsciiMath, so output raw expression in text object + # Unsupported math style, so output raw expression in text object equation_data = %(<mediaobject><textobject><phrase><![CDATA[#{equation}]]></phrase></textobject></mediaobject>) end if node.title? diff --git a/test/blocks_test.rb b/test/blocks_test.rb index 6b5b8179..5d6f3a7d 100644 --- a/test/blocks_test.rb +++ b/test/blocks_test.rb @@ -1285,11 +1285,9 @@ x+b/(2a)<+-sqrt((b^2)/(4a^2)-c/a) ++++ EOS - expect = <<-'EOS' -<informalequation> -<mediaobject><textobject><phrase><![CDATA[x+b/(2a)<+-sqrt((b^2)/(4a^2)-c/a)]]></phrase></textobject></mediaobject> -</informalequation> - EOS + expect = %(<informalequation> +<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mi>x</mml:mi><mml:mo>+</mml:mo><mml:mfrac><mml:mi>b</mml:mi><mml:mrow><mml:mn>2</mml:mn><mml:mi>a</mml:mi></mml:mrow></mml:mfrac><mml:mo><</mml:mo><mml:mo>±</mml:mo><mml:msqrt><mml:mrow><mml:mfrac><mml:msup><mml:mi>b</mml:mi><mml:mn>2</mml:mn></mml:msup><mml:mrow><mml:mn>4</mml:mn><mml:msup><mml:mi>a</mml:mi><mml:mn>2</mml:mn></mml:msup></mml:mrow></mml:mfrac><mml:mo>−</mml:mo><mml:mfrac><mml:mi>c</mml:mi><mml:mi>a</mml:mi></mml:mfrac></mml:mrow></mml:msqrt></mml:math> +</informalequation>) output = render_embedded_string input, :backend => :docbook assert_equal expect.strip, output.strip |