mmarkdown 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b9fbbadc9018b179a5271852b8fab8bbc5fcfced
-  data.tar.gz: 0dcc595e0518aa5667cc6ac930405baf115761c6
+SHA256:
+  metadata.gz: b512b221fde7387c2dee72f53eed9c1618719187a083ff867f8c563eb38f8532
+  data.tar.gz: 05fcd60d8705c92dddcdd252f7c14353a9864d14198c6f2266919332e5d12810
 SHA512:
-  metadata.gz: 6af218b3d13dbb6742afdc89a573b83919a6e54fbc39554fe9015a5971cf853491bd1c158ed2e10c0bbec207ff6ccab1c999e30f815a476aeab10eda0efdfd18
-  data.tar.gz: 2de96ae84caca8516ac5c5209f20d85d2159a0e0eb7b5fffbf02d06d39537b36314801fe15c0be61a6b3ff0e3c4c0e87475fadf7681c227c4c748928f7fbc650
+  metadata.gz: 951f875085477a113dc83c51acf82a794ed745f8515bccbda355cc458b65c4d89bda06c684d010d59d319fefd73d4faa69874f93be0d0116d2ef9379655f94e0
+  data.tar.gz: 99941978d9207e35de27a6dfcf7d6a0144dcd39b88d1f12d013a6793a4ea08d76f4c19df5e149844a619bc2869134910f74d206e9fe19b5bdb96671ad7b75ae3

data/.gitignore

@@ -1,2 +1,2 @@
 pkg
-mmarkdown.gemspec
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://www.rubygems.org"
+gemspec

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/testtask'
+require 'bundler/gem_tasks'
 
 require "#{__dir__}/lib/mmarkdown"
 
@@ -11,89 +12,3 @@ Rake::TestTask.new('test') do |t|
   t.warning = false
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name          = "mmarkdown"
-    gem.summary       = "Markdown with MathML"
-    gem.author        = "Hiroyuki Tanaka"
-    gem.email         = "hryktnk@gmail.com"
-    gem.version       = MMarkdown::VERSION
-    gem.files         = `git ls-files`.split("\n")
-    gem.test_files    = `git ls-files -- test/*`.split("\n")
-    gem.licenses      = ["MIT License"]
-    gem.homepage      = "http://github.com/tanahiro/mmarkdown"
-    gem.add_dependency("redcarpet", "~> 3.0")
-    gem.add_dependency("math_ml",   "~> 0.14")
-    gem.add_development_dependency("nokogiri", "~> 1.0")
-    gem.add_development_dependency("jeweler",  "~> 2.0")
-    gem.description = <<-EOF
-Convert Markdown to HTML with MathML
-    EOF
-  end
-rescue LoadError
-  puts "Jeweler not installed"
-end
-
-require 'rdoc/task'
-require 'rdoc/generator/darkfish'
-
-#module RDoc::Generator::Markup
-#  alias :org_formatter :formatter
-#  def formatter
-#    org_formatter
-#
-#    @formatter.add_tag(:Math, "<math>", "</math>")
-#    @formatter
-#  end
-#end
-
-require 'rdoc'
-class RDoc::RDoc
-  alias_method :org_document, :document
-  def document options
-
-    m = RDoc::Markup.new
-    m.add_html("math", :MathML)
-    m.add_html("msup", :MathML_msup)
-    m.add_html("mi",   :MathML_mi)
-    m.add_html("mn",   :MathML_mn)
-    m.add_html("mo",   :MathML_mo)
-
-    h = RDoc::Markup::ToHtml.new(nil, m)
-    h.add_tag(:MathML,
-          "<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'>",
-          "</math>")
-    h.add_tag(:MathML_msup, "<msup>", "</msup>")
-    h.add_tag(:MathML_mi,   "<mi>",   "</mi>")
-    h.add_tag(:MathML_mn,   "<mn>",   "</mn>")
-    h.add_tag(:MathML_mo,   "<mo stretchy='false'>", "</mo>")
-
-    rdoc_options = load_options
-    rdoc_options.parse(options)
-    rdoc_options.formatter = h
-
-    org_document(rdoc_options)
-
-    #p @generator.store.rdoc
-
-    #str  = "<math>"
-    #str += "  <msup><mi>x</mi><mn>2</mn></msup>"
-    #str += "  <mo>+</mo>"
-    #str += "  <msup><mi>y</mi><mn>2</mn></msup>"
-    #str += "  <mo>=</mo>"
-    #str += "  <msup><mi>r</mi><mn>2</mn></msup>"
-    #str += "</math>\n"
-
-    #puts h.convert(str)
-
-  end
-end
-
-RDoc::Task.new do |rdoc|
-  rdoc.main = "Readme.md"
-  rdoc.rdoc_files.include("Readme.md", "lib/**/*.rb")
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "MMarkdown"
-end
-

data/Readme.md

@@ -1,29 +1,5 @@
 # MMarkdown
-Markdown with math equations as MathML
-
-## Markdown with Equations
-LaTeX style equations in the areas surrounded by <code>\\(</code> and
-<code>\\)</code> are converted to inline equations.
-
-    \( x^2 + y^2 = r^2 \)
-generates
-
-    <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'>
-      <msup>
-        <mi>x</mi><mn>2</mn></msup>
-        <mo stretchy='false'>+</mo>
-        <msup><mi>y</mi><mn>2</mn></msup>
-        <mo stretchy='false'>=</mo><msup>
-        <mi>r</mi><mn>2</mn>
-      </msup>
-    </math>
-
-and shown as
-<math>
-  <msup><mi>x</mi><mn>2</mn></msup>
-  <mo>+</mo><msup><mi>y</mi><mn>2</mn></msup>
-  <mo>=</mo><msup><mi>r</mi><mn>2</mn></msup>
-</math>
+Markdown with math equations
 
 ## Install
     gem install mmarkdown
@@ -32,7 +8,6 @@ and shown as
     mmarkdown <file.md>
 
 ----
-
 ## Author
 Hiroyuki Tanaka
 

data/bin/mmarkdown

@@ -4,8 +4,11 @@
 
 require 'optparse'
 
-root = "#{__dir__}/.."
-require "#{root}/lib/mmarkdown"
+libdir = "#{__dir__}/../lib"
+$LOAD_PATH.unshift(libdir)
+
+require 'mmarkdown'
+require 'mmarkdown/version'
 
 options = {}
 

data/lib/mmarkdown.rb

@@ -1,110 +1,14 @@
-require "math_ml/string"
-require "redcarpet"
+require "#{__dir__}/mmarkdown/mmarkdown"
 
-require "#{__dir__}/mmarkdown/version"
-
-class MMarkdown
-  def self.load_file filename
-    str = File.open(filename).read
-
-    return self.new(str)
-  end
-
-  def initialize md_string, title: nil, style: nil, footer: nil
-    @md_mathml = equations_to_mathml(md_string)
-
-    @md_mathml.gsub!(/%%.*$/, '')
-
-    parse_extensions = {no_intra_emphasis: true,
-                        tables: true,
-                        fenced_code_blocks: true,
-                        autolink: true,
-                        disable_indented_code_blocks: false,
-                        superscript: true,
-                        underline: true,
-                        highlight: true,
-                        footnotes: true}
-
-    render_extensions = {with_toc_data: true}
-
-    render = Redcarpet::Render::HTML.new(render_extensions)
-
-    @md = Redcarpet::Markdown.new(render, parse_extensions).render(@md_mathml)
-
-    if title or style or footer
-      @header  = "<!DOCTYPE html>\n"
-      @header += "<html>\n"
-      @header += "<head>\n"
-
-      if title
-        @header += "  <title>" + title + "</title>\n"
-      end
-
-      if style
-        style_str = "  <style type=\"text/css\">\n"
-        File.open(style).each_line {|line|
-          style_str += ("    " + line)
-        }
-
-        @header += style_str
-        @header += "  </style>\n"
-      end
-
-      @header += "</head>\n"
-      @header += "<body>\n"
-
-      @footer = ""
-      if footer
-        @footer += "<footer>\n"
-        @footer += File.open(footer).read
-        @footer += "</footer>\n"
-      end
-      @footer += "</body>\n</html>\n"
-    end
-  end
-
-  ##
-  # Converts equations to MathML format
-  def equations_to_mathml string
-    equations = []
-
-    string_mathml = string.clone
-    string.scan(/\\\[(.*?)\\\]/) {|m|
-      string_mathml.gsub!("\\[" + m.first + "\\]", m.first.to_mathml(true).to_s)
-    }
-
-    string.scan(/\\\((.*?)\\\)/) {|m|
-      string_mathml.gsub!("\\(" + m.first + "\\)", m.first.to_mathml.to_s)
-    }
-
-    return string_mathml
+module MMarkdown
+  def new md_string, opts = {}
+    return MMarkdown.new(md_string, opts)
   end
+  module_function :new
 
-  ##
-  # Returns list of table of contetns
-  def toc_html nesting_level = 3
-    render_toc = Redcarpet::Render::HTML_TOC.new(nesting_level: nesting_level)
-    toc_html = Redcarpet::Markdown.new(render_toc).render(@md_mathml)
-
-    return toc_html
-  end
-
-  ##
-  # Returns HTML
-  def to_str
-    str = ""
-    if @header
-      str += @header
-    end
-
-    str += @md.to_str
-
-    if @footer
-      str += @footer
-    end
-
-    return str
+  def load_file filename
+    return MMarkdown.load_file(filename)
   end
-  alias :to_html :to_str
+  module_function :load_file
 end
 

data/lib/mmarkdown/helper.rb

@@ -0,0 +1,26 @@
+module MMarkdown
+  module Helper
+    def to_kramdown_math_block str
+      str_kr = str.clone
+
+      str.scan(/(\s*\\\[\s*)(.*?)(\s*\\\]\s*)/) {|m|
+        str_kr.gsub!(m.join,
+                  "\n\n$$\n" + m[1]  + "\n$$\n\n")
+      }
+
+      return str_kr
+    end
+
+    def to_kramdown_math_inline str
+      str_kr = str.clone
+
+      str.scan(/(\\\(\s*)(.*?)(\s*\\\))/) {|m|
+        str_kr.gsub!(m.join,
+                  "$$ " + m[1]  + " $$")
+      }
+
+      return str_kr
+    end
+  end
+end
+

data/lib/mmarkdown/mmarkdown.rb

@@ -0,0 +1,109 @@
+require "kramdown"
+require "#{__dir__}/helper"
+require "#{__dir__}/toc_html_converter"
+
+module MMarkdown
+  class MMarkdown
+    include Helper
+
+    def self.load_file filename
+      str = File.open(filename).read
+
+      return self.new(str)
+    end
+
+    def initialize md_string, title: nil, style: nil, footer: nil
+      ## Math equation
+      @mmd = convert_math_boundaries(md_string)
+
+      ## Comment out
+      @mmd.gsub!(/%%.*$/, '')
+
+      @md = Kramdown::Document.new(@mmd, math_engine: "itex2mml")
+
+      if title or style or footer
+        @header  = "<!DOCTYPE html>\n"
+        @header += "<html>\n"
+        @header += "<head>\n"
+
+        if title
+          @header += "  <title>" + title + "</title>\n"
+        end
+
+        if style
+          style_str = "  <style type=\"text/css\">\n"
+          File.open(style).each_line {|line|
+            style_str += ("    " + line)
+          }
+
+          @header += style_str
+          @header += "  </style>\n"
+        end
+
+        @header += "</head>\n"
+        @header += "<body>\n"
+
+        @footer = ""
+        if footer
+          @footer += "<footer>\n"
+          @footer += File.open(footer).read
+          @footer += "</footer>\n"
+        end
+        @footer += "</body>\n</html>\n"
+      end
+    end
+
+    ##
+    # Converts Math boundaries for Kramdown
+    def convert_math_boundaries string
+      string_mathml = string.clone
+
+      ## Block equation
+      string_mathml = to_kramdown_math_block(string_mathml)
+
+      ## Inline equation
+      string_mathml = to_kramdown_math_inline(string_mathml)
+
+      return string_mathml
+    end
+
+    ##
+    # Returns list of table of contetns
+    def toc_html nesting_level = 3
+      toc = @md.to_toc
+      toc_array = []
+      toc_to_array(toc, toc_array, nesting_level)
+
+      return Kramdown::Converter::Html.convert_toc(toc_array)
+    end
+
+    ##
+    # Returns HTML
+    def to_str
+      str = ""
+      if @header
+        str += @header
+      end
+
+      str += @md.to_html
+
+      if @footer
+        str += @footer
+      end
+
+      return str
+    end
+    alias :to_html :to_str
+
+    def toc_to_array toc, ary, nesting_level
+      toc.children.each do |t|
+        ary << [t.value.options[:level], t.attr[:id], t.value.children]
+
+        if t.value.options[:level] < nesting_level
+          toc_to_array(t, ary, nesting_level)
+        end
+      end
+    end
+  end
+end
+

data/lib/mmarkdown/toc_html_converter.rb

@@ -0,0 +1,14 @@
+require 'kramdown/converter/html'
+
+module Kramdown
+  module Converter
+    class Html
+      def self.convert_toc toc, option = {}
+        converter = new(Element.new(:root), ::Kramdown::Options.merge(option))
+        toc_tree = converter.generate_toc_tree(toc, :ul, {})
+        return converter.convert(toc_tree, 0)
+      end
+    end
+  end
+end
+

data/lib/mmarkdown/version.rb

@@ -1,8 +1,8 @@
 
-class MMarkdown
+module MMarkdown
   VERSION_MAJOR    = 0
-  VERSION_MINOR    = 1
-  VERSION_REVISION = 0
+  VERSION_MINOR    = 2
+  VERSION_REVISION = 1
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_REVISION}"
 end

data/mmarkdown.gemspec

@@ -0,0 +1,24 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "mmarkdown/version"
+
+Gem::Specification.new do |spec|
+  spec.name     = "mmarkdown"
+  spec.version  = MMarkdown::VERSION
+  spec.authors  = ["Hiroyuki Tanaka"]
+  spec.email    = ["hryktnk@gmail.com"]
+  spec.summary  = "Kramdown based markdown parser and HTML generator"
+  spec.description = "Kramdown based markdown to HTML tool with math rendering"
+  spec.homepage = "https://github.com/tanahiro/mmarkdown"
+  spec.licenses = ["MIT"]
+
+  spec.files = `git ls-files`.split("\n")
+  spec.executables = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "kramdown", "~> 1.0"
+  spec.add_dependency "itextomml", "~> 1.0"
+
+  spec.add_development_dependency "nokogiri", "~> 1.8"
+end
+

data/test/test.html

@@ -3,78 +3,75 @@
 <p>This is a test data</p>
 
 <h2 id="equation">Equation</h2>
-
-<p>This is an equation. <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msup><mi>x</mi><mn>2</mn></msup><mo stretchy='false'>+</mo><msup><mi>y</mi><mn>2</mn></msup><mo stretchy='false'>=</mo><msup><mi>r</mi><mn>2</mn></msup></math>,
-(<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>x</mi><mo stretchy='false'>=</mo><mi>r</mi><mi>cos</mi><mi>&theta;</mi></math> and <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>y</mi><mo stretchy='false'>=</mo><mi>r</mi><mi>sin</mi><mi>&theta;</mi></math>).</p>
+<p>This is an equation. <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msup><mi>x</mi> <mn>2</mn></msup><mo>+</mo><msup><mi>y</mi> <mn>2</mn></msup><mo>=</mo><msup><mi>r</mi> <mn>2</mn></msup></mrow><annotation encoding='application/x-tex'>x^2 + y^2 = r^2</annotation></semantics></math>,
+(<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><mi>x</mi><mo>=</mo><mi>r</mi><mi>cos</mi><mi>&theta;</mi></mrow><annotation encoding='application/x-tex'>x = r \cos \theta</annotation></semantics></math> and <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><mi>y</mi><mo>=</mo><mi>r</mi><mi>sin</mi><mi>&theta;</mi></mrow><annotation encoding='application/x-tex'>y = r \sin \theta</annotation></semantics></math>).</p>
 
 <p>And this is the second
-<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msup><mi>sin</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>+</mo><msup><mi>cos</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>=</mo><mn>1</mn></math>.</p>
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msup><mi>sin</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>+</mo><msup><mi>cos</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>=</mo><mn>1</mn></mrow><annotation encoding='application/x-tex'>\sin^2 \theta + \cos^2 \theta = 1</annotation></semantics></math>.</p>
+
+<p>日本語の後の数式 <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msubsup><mo lspace="thinmathspace" rspace="thinmathspace">&Sum;</mo> <mrow><mi>i</mi><mo>=</mo><mn>0</mn></mrow> <mi>N</mi></msubsup><msub><mi>x</mi> <mi>i</mi></msub></mrow><annotation encoding='application/x-tex'>\sum_{i = 0}^{N} x_i</annotation></semantics></math></p>
 
-<p>日本語の後の数式 <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msubsup><mo stretchy='false'>&sum;</mo><mrow><mi>i</mi><mo stretchy='false'>=</mo><mn>0</mn></mrow><mrow><mi>N</mi></mrow></msubsup><msub><mi>x</mi><mi>i</mi></msub></math></p>
+<p>Block style</p>
 
-<p>Block style
-<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><msubsup><mo stretchy='false'>&int;</mo><mrow><mo stretchy='false'>-</mo><mn>&infin;</mn></mrow><mrow><mn>&infin;</mn></mrow></msubsup><mi>f</mi><mfenced open='(' close=')'><mrow><mi>x</mi></mrow></mfenced><mspace width='0.167em' /><mi>d</mi><mi>x</mi></math></p>
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><semantics><mrow><msubsup><mo>&Integral;</mo> <mrow><mo lspace="verythinmathspace" rspace="0em">&minus;</mo><mn>&infin;</mn></mrow> <mn>&infin;</mn></msubsup><mi>f</mi><mrow><mo>(</mo><mi>x</mi><mo>)</mo></mrow><mspace width="thinmathspace"/><mi>dx</mi></mrow><annotation encoding='application/x-tex'>\int_{&#x2d;\infty}^{\infty} f \left( x \right) \, dx</annotation></semantics></math>
 
-<p>Same equation again <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msup><mi>sin</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>+</mo><msup><mi>cos</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>=</mo><mn>1</mn></math>.</p>
+<p>Same equation again <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msup><mi>sin</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>+</mo><msup><mi>cos</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>=</mo><mn>1</mn></mrow><annotation encoding='application/x-tex'>\sin^2 \theta + \cos^2 \theta = 1</annotation></semantics></math>.</p>
 
 <p>vector:
-<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mover><mrow><mi>x</mi></mrow><mo>&rightarrow;</mo></mover><mo stretchy='false'>+</mo><mover><mrow><mi>y</mi></mrow><mo>&rightarrow;</mo></mover><mo stretchy='false'>=</mo><mover><mrow><mi>p</mi></mrow><mo>&rightarrow;</mo></mover></math></p>
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><mover><mi>x</mi><mo stretchy="false">&rightarrow;</mo></mover><mo>+</mo><mover><mi>y</mi><mo stretchy="false">&rightarrow;</mo></mover><mo>=</mo><mover><mi>p</mi><mo stretchy="false">&rightarrow;</mo></mover></mrow><annotation encoding='application/x-tex'>\vec{x} + \vec{y} = \vec{p}</annotation></semantics></math></p>
 
 <h2 id="markdown">Markdown</h2>
-
 <p><em>italic</em></p>
 
-<p><u>underline</u></p>
-
 <p><strong>bold</strong></p>
 
 <p><strong><em>bold italic</em></strong></p>
 
 <h3 id="list">List</h3>
-
 <ul>
-<li>item1</li>
-<li>item2
-
-<ul>
-<li>nested item2-1</li>
-<li>nested item2-2</li>
-</ul></li>
+  <li>item1</li>
+  <li>item2
+    <ul>
+      <li>nested item2-1</li>
+      <li>nested item2-2</li>
+    </ul>
+  </li>
 </ul>
 
 <ol>
-<li>item3</li>
-<li>item4</li>
+  <li>item3</li>
+  <li>item4</li>
 </ol>
 
 <h3 id="quote">Quote</h3>
-
 <blockquote>
-<p>quote</p>
+  <p>quote</p>
 </blockquote>
 
 <h3 id="table">Table</h3>
 
-<table><thead>
-<tr>
-<th style="text-align: left">head1</th>
-<th style="text-align: center">head2</th>
-<th style="text-align: right">head3</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">item</td>
-<td style="text-align: center">item</td>
-<td style="text-align: right">item</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th style="text-align: left">head1</th>
+      <th style="text-align: center">head2</th>
+      <th style="text-align: right">head3</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="text-align: left">item</td>
+      <td style="text-align: center">item</td>
+      <td style="text-align: right">item</td>
+    </tr>
+  </tbody>
+</table>
 
 <h3 id="syntax-highlight">Syntax highlight</h3>
-
-<pre><code class="ruby">a = [1, 2, 3]
+<pre><code class="language-ruby">a = [1, 2, 3]
 a.reduce(0, :+)
 </code></pre>
 
 <h3 id="link">Link</h3>
-
 <p><a href="http://google.com">google</a></p>
+

data/test/test.mmd

@@ -22,8 +22,6 @@ vector:
 ## Markdown
 *italic*
 
-_underline_
-
 **bold**
 
 ***bold italic***
@@ -41,15 +39,16 @@ _underline_
 > quote
 
 ### Table
-|head1 | head2 | head3 |
-|:-----|:-----:|------:|
-|item  | item  | item  |
+
+| head1 | head2 | head3 |
+|:------|:-----:|------:|
+| item  | item  | item  |
 
 ### Syntax highlight
-``` ruby
+~~~ruby
 a = [1, 2, 3]
 a.reduce(0, :+)
-```
+~~~
 
 ### Link
 [google](http://google.com)

data/test/test_helper.rb

@@ -0,0 +1,34 @@
+require 'minitest/autorun'
+
+require "#{__dir__}/../lib/mmarkdown/helper"
+
+class MMarkdownHelperTest < MiniTest::Test
+  include MMarkdown::Helper
+
+  def test_to_kramdown_math_block
+    expected = "\n\n$$\n" +
+      %q"\int_{-\infty}^{\infty} f \left( x \right) \, dx" +
+      "\n$$\n\n"
+
+    str = %q"\[ \int_{-\infty}^{\infty} f \left( x \right) \, dx \]"
+    assert_equal(expected, to_kramdown_math_block(str))
+
+    str = "\n" +
+      %q"\[ \int_{-\infty}^{\infty} f \left( x \right) \, dx \]" +
+      "\n"
+    assert_equal(expected, to_kramdown_math_block(str))
+
+    str = "\n\\[\n" +
+      %q"\int_{-\infty}^{\infty} f \left( x \right) \, dx" +
+      "\n\\]\n"
+    assert_equal(expected, to_kramdown_math_block(str))
+  end
+
+  def test_to_kramdown_math_inline
+    expected = "$$ x^2 + y^2 = r^2 $$"
+
+    str = %q"\( x^2 + y^2 = r^2 \)"
+    assert_equal(expected, to_kramdown_math_inline(str))
+  end
+end
+

data/test/test_mmarkdown.rb

@@ -34,41 +34,27 @@ class MMarkdownTest < MiniTest::Test
     mmarkdown = MMarkdown.new(md_string)
     toc_actual = mmarkdown.toc_html
 
+    toc_expected = nil
     toc_expected = <<EOF
-<ul>
-<li>
-<a href="#test">Test</a>
-<ul>
-<li>
-<a href="#equation">Equation</a>
-</li>
-<li>
-<a href="#markdown">Markdown</a>
-<ul>
-<li>
-<a href="#list">List</a>
-</li>
-<li>
-<a href="#quote">Quote</a>
-</li>
-<li>
-<a href="#table">Table</a>
-</li>
-<li>
-<a href="#syntax-highlight">Syntax highlight</a>
-</li>
-<li>
-<a href="#link">Link</a>
-</li>
-</ul>
-</li>
-</ul>
-</li>
+<ul id="markdown-toc">
+  <li><a href="#test" id="markdown-toc-test">Test</a>    <ul>
+      <li><a href="#equation" id="markdown-toc-equation">Equation</a></li>
+      <li><a href="#markdown" id="markdown-toc-markdown">Markdown</a>        <ul>
+          <li><a href="#list" id="markdown-toc-list">List</a></li>
+          <li><a href="#quote" id="markdown-toc-quote">Quote</a></li>
+          <li><a href="#table" id="markdown-toc-table">Table</a></li>
+          <li><a href="#syntax-highlight" id="markdown-toc-syntax-highlight">Syntax highlight</a></li>
+          <li><a href="#link" id="markdown-toc-link">Link</a></li>
+        </ul>
+      </li>
+    </ul>
+  </li>
 </ul>
 EOF
 
     assert_equal(toc_expected, toc_actual)
 
   end
+
 end
 

data/test/test_with_title.html

@@ -13,81 +13,78 @@
 <p>This is a test data</p>
 
 <h2 id="equation">Equation</h2>
-
-<p>This is an equation. <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msup><mi>x</mi><mn>2</mn></msup><mo stretchy='false'>+</mo><msup><mi>y</mi><mn>2</mn></msup><mo stretchy='false'>=</mo><msup><mi>r</mi><mn>2</mn></msup></math>,
-(<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>x</mi><mo stretchy='false'>=</mo><mi>r</mi><mi>cos</mi><mi>&theta;</mi></math> and <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>y</mi><mo stretchy='false'>=</mo><mi>r</mi><mi>sin</mi><mi>&theta;</mi></math>).</p>
+<p>This is an equation. <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msup><mi>x</mi> <mn>2</mn></msup><mo>+</mo><msup><mi>y</mi> <mn>2</mn></msup><mo>=</mo><msup><mi>r</mi> <mn>2</mn></msup></mrow><annotation encoding='application/x-tex'>x^2 + y^2 = r^2</annotation></semantics></math>,
+(<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><mi>x</mi><mo>=</mo><mi>r</mi><mi>cos</mi><mi>&theta;</mi></mrow><annotation encoding='application/x-tex'>x = r \cos \theta</annotation></semantics></math> and <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><mi>y</mi><mo>=</mo><mi>r</mi><mi>sin</mi><mi>&theta;</mi></mrow><annotation encoding='application/x-tex'>y = r \sin \theta</annotation></semantics></math>).</p>
 
 <p>And this is the second
-<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msup><mi>sin</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>+</mo><msup><mi>cos</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>=</mo><mn>1</mn></math>.</p>
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msup><mi>sin</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>+</mo><msup><mi>cos</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>=</mo><mn>1</mn></mrow><annotation encoding='application/x-tex'>\sin^2 \theta + \cos^2 \theta = 1</annotation></semantics></math>.</p>
+
+<p>日本語の後の数式 <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msubsup><mo lspace="thinmathspace" rspace="thinmathspace">&Sum;</mo> <mrow><mi>i</mi><mo>=</mo><mn>0</mn></mrow> <mi>N</mi></msubsup><msub><mi>x</mi> <mi>i</mi></msub></mrow><annotation encoding='application/x-tex'>\sum_{i = 0}^{N} x_i</annotation></semantics></math></p>
 
-<p>日本語の後の数式 <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msubsup><mo stretchy='false'>&sum;</mo><mrow><mi>i</mi><mo stretchy='false'>=</mo><mn>0</mn></mrow><mrow><mi>N</mi></mrow></msubsup><msub><mi>x</mi><mi>i</mi></msub></math></p>
+<p>Block style</p>
 
-<p>Block style
-<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><msubsup><mo stretchy='false'>&int;</mo><mrow><mo stretchy='false'>-</mo><mn>&infin;</mn></mrow><mrow><mn>&infin;</mn></mrow></msubsup><mi>f</mi><mfenced open='(' close=')'><mrow><mi>x</mi></mrow></mfenced><mspace width='0.167em' /><mi>d</mi><mi>x</mi></math></p>
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><semantics><mrow><msubsup><mo>&Integral;</mo> <mrow><mo lspace="verythinmathspace" rspace="0em">&minus;</mo><mn>&infin;</mn></mrow> <mn>&infin;</mn></msubsup><mi>f</mi><mrow><mo>(</mo><mi>x</mi><mo>)</mo></mrow><mspace width="thinmathspace"/><mi>dx</mi></mrow><annotation encoding='application/x-tex'>\int_{&#x2d;\infty}^{\infty} f \left( x \right) \, dx</annotation></semantics></math>
 
-<p>Same equation again <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><msup><mi>sin</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>+</mo><msup><mi>cos</mi><mn>2</mn></msup><mi>&theta;</mi><mo stretchy='false'>=</mo><mn>1</mn></math>.</p>
+<p>Same equation again <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><msup><mi>sin</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>+</mo><msup><mi>cos</mi> <mn>2</mn></msup><mi>&theta;</mi><mo>=</mo><mn>1</mn></mrow><annotation encoding='application/x-tex'>\sin^2 \theta + \cos^2 \theta = 1</annotation></semantics></math>.</p>
 
 <p>vector:
-<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mover><mrow><mi>x</mi></mrow><mo>&rightarrow;</mo></mover><mo stretchy='false'>+</mo><mover><mrow><mi>y</mi></mrow><mo>&rightarrow;</mo></mover><mo stretchy='false'>=</mo><mover><mrow><mi>p</mi></mrow><mo>&rightarrow;</mo></mover></math></p>
+<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow><mover><mi>x</mi><mo stretchy="false">&rightarrow;</mo></mover><mo>+</mo><mover><mi>y</mi><mo stretchy="false">&rightarrow;</mo></mover><mo>=</mo><mover><mi>p</mi><mo stretchy="false">&rightarrow;</mo></mover></mrow><annotation encoding='application/x-tex'>\vec{x} + \vec{y} = \vec{p}</annotation></semantics></math></p>
 
 <h2 id="markdown">Markdown</h2>
-
 <p><em>italic</em></p>
 
-<p><u>underline</u></p>
-
 <p><strong>bold</strong></p>
 
 <p><strong><em>bold italic</em></strong></p>
 
 <h3 id="list">List</h3>
-
 <ul>
-<li>item1</li>
-<li>item2
-
-<ul>
-<li>nested item2-1</li>
-<li>nested item2-2</li>
-</ul></li>
+  <li>item1</li>
+  <li>item2
+    <ul>
+      <li>nested item2-1</li>
+      <li>nested item2-2</li>
+    </ul>
+  </li>
 </ul>
 
 <ol>
-<li>item3</li>
-<li>item4</li>
+  <li>item3</li>
+  <li>item4</li>
 </ol>
 
 <h3 id="quote">Quote</h3>
-
 <blockquote>
-<p>quote</p>
+  <p>quote</p>
 </blockquote>
 
 <h3 id="table">Table</h3>
 
-<table><thead>
-<tr>
-<th style="text-align: left">head1</th>
-<th style="text-align: center">head2</th>
-<th style="text-align: right">head3</th>
-</tr>
-</thead><tbody>
-<tr>
-<td style="text-align: left">item</td>
-<td style="text-align: center">item</td>
-<td style="text-align: right">item</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th style="text-align: left">head1</th>
+      <th style="text-align: center">head2</th>
+      <th style="text-align: right">head3</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="text-align: left">item</td>
+      <td style="text-align: center">item</td>
+      <td style="text-align: right">item</td>
+    </tr>
+  </tbody>
+</table>
 
 <h3 id="syntax-highlight">Syntax highlight</h3>
-
-<pre><code class="ruby">a = [1, 2, 3]
+<pre><code class="language-ruby">a = [1, 2, 3]
 a.reduce(0, :+)
 </code></pre>
 
 <h3 id="link">Link</h3>
-
 <p><a href="http://google.com">google</a></p>
+
 <footer>
 footer test
 </footer>

metadata

@@ -1,51 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: mmarkdown
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hiroyuki Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: math_ml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: itextomml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,42 +39,48 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-description: |
-  Convert Markdown to HTML with MathML
-email: hryktnk@gmail.com
+        version: '1.8'
+description: Kramdown based markdown to HTML tool with math rendering
+email:
+- hryktnk@gmail.com
 executables:
 - mmarkdown
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
 - Rakefile
 - Readme.md
 - bin/mmarkdown
 - lib/mmarkdown.rb
+- lib/mmarkdown/helper.rb
+- lib/mmarkdown/mmarkdown.rb
+- lib/mmarkdown/toc_html_converter.rb
 - lib/mmarkdown/version.rb
+- mmarkdown.gemspec
 - test/footer.html
 - test/test.css
 - test/test.html
 - test/test.mmd
+- test/test_helper.rb
 - test/test_mmarkdown.rb
 - test/test_with_title.html
-homepage: http://github.com/tanahiro/mmarkdown
+homepage: https://github.com/tanahiro/mmarkdown
 licenses:
-- MIT License
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -106,14 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Markdown with MathML
-test_files:
-- test/footer.html
-- test/test.css
-- test/test.html
-- test/test.mmd
-- test/test_mmarkdown.rb
-- test/test_with_title.html
+summary: Kramdown based markdown parser and HTML generator
+test_files: []