md2review 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c0ddf09e6f474c1b87f8016216dda28b433398
-  data.tar.gz: 66d5359d6f229a870d3eccf6825e5e52e8295426
+  metadata.gz: e1044d852345e611794a38f4bc2cd8053f668c8a
+  data.tar.gz: 9f0343040dcb3e15a05ac4830b13a5eb828cf946
 SHA512:
-  metadata.gz: e0cd14e69907497db4368507a813d27d21a8cd327baf520e478cba27a3250b9a68c621f4f60a082ba98bcc88bd19087c7e037ed90965b531915dfb78feafcd81
-  data.tar.gz: 425c784ed78be28a3d2f1ab3face88160f6b1f806a83c644e7cb29301f3ed801c24b342633d3c21d7c0f863524fff3299c35c90c40e955bd76e8f7fc97b42a67
+  metadata.gz: a14a611b1e9349247fa8a66ac4e0357022754c0b879245a74caad1b8251571aebfdf8c253bd294f8f22536ef1710440ba135cb5f558d99e727add5ebc8dafb53
+  data.tar.gz: 1d2db2f93a8a6b47fc00d0c1006613b6d627d4732dea754635682cf222bd677b243d47b5d6ba63056af85fadcefadab3e312070c2d044d3bbc408781967ee904

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://api.travis-ci.org/takahashim/md2review.png)](https://travis-ci.org/takahashim/md2review)
 
-md2review is a converter from Markdown into ReVIEW.
+md2review is a CLI tool to convert from Markdown into Re:VIEW (http://reviewml.org/ ).
 This command uses Redcarpet gem to parse markdown.
 
 ## Installation

data/lib/md2review/version.rb

@@ -1,3 +1,3 @@
 module MD2ReVIEW
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

data/lib/redcarpet/render/review.rb

@@ -19,6 +19,21 @@ module Redcarpet
         @support_table_caption = render_extensions[:table_caption]
         @table_caption = nil
         @math = render_extensions[:math]
+        @math_buf = []
+      end
+
+      def preprocess(text)
+        counter = -1
+        if @math
+          while %r|\$\$(.+?)\$\$| =~ text
+            text.sub!(%r|\$\$(.+?)\$\$|) do
+              counter += 1
+              @math_buf[counter] = $1
+              "〓MATH:#{counter}:〓"
+            end
+          end
+        end
+        text
       end
 
       def normal_text(text)
@@ -26,7 +41,19 @@ module Redcarpet
       end
 
       def escape_inline(text)
-        text.gsub(/\}/){ '\\}' }
+        ## }  -> \}
+        ## \} -> \\\}
+        ## .}  -> .\}
+        text.gsub(/(.)?}/) do
+          if $1 == '\\'
+            replaced = '\\\\\\}'
+          elsif $1
+            replaced = $1 + '\\}'
+          else
+            replaced = '\\}'
+          end
+          replaced
+        end
       end
 
       def escape_href(text)
@@ -249,8 +276,8 @@ module Redcarpet
       def postprocess(text)
         text = text.gsub(%r|^[ \t]+(//image\[[^\]]+\]\[[^\]]+\]{$\n^//})|, '\1')
         if @math
-          while %r|\$\$(.+?)\$\$| =~ text
-            text.sub!(%r|\$\$(.+?)\$\$|){ "@<m>{" + $1.gsub(/}/, "\\}") + "}" }
+          while %r|〓MATH:(\d+):〓| =~ text
+            text.sub!(%r|〓MATH:(\d+):〓|){ "@<m>{" + escape_inline(@math_buf[$1.to_i]) + "}" }
           end
         end
         text + @links.map { |key, link| footnote_def(link, key) }.join

data/test/review_test.rb

@@ -179,6 +179,29 @@ EOB
     assert_equal %Q[\n\nその結果、@<m>{y=ax^2+bx+c}の式が得られます。\n\n], rd
   end
 
+  def test_multi_math
+    rd = render_with({}, "その結果、$$y=a_2x^2+b_2x+c_2$$の式が得られます。$$a_2$$は2次の係数、$$b_2$$は1次の係数、$$c_2$$は定数です。",{:math => true})
+    assert_equal %Q[\n\nその結果、@<m>{y=a_2x^2+b_2x+c_2}の式が得られます。@<m>{a_2}は2次の係数、@<m>{b_2}は1次の係数、@<m>{c_2}は定数です。\n\n], rd
+  end
+
+  def test_math2
+    rd = render_with({}, <<-'EOB',{:math => true})
+$$X = \{ {x_1}, \cdots ,{x_n} \}$$、$$m$$、$${\mu _X}$$、$$\sigma _X^2$$、$$\{ {\hat x_1}, \cdots ,{\hat x_n} \}$$
+
+$$\mathbf{W} = ({w_1}, \cdots ,{w_n})$$、$$\sqrt {w_1^2 + \cdots  + w_n^2} $$、$$\left| {w_1^{}} \right| + \left| {w_2^{}} \right| +  \cdots  + \left| {w_n^{}} \right|$$。
+EOB
+    assert_equal <<-'EOB', rd
+
+
+@<m>{X = \{ {x_1\}, \cdots ,{x_n\} \\\}}、@<m>{m}、@<m>{{\mu _X\}}、@<m>{\sigma _X^2}、@<m>{\{ {\hat x_1\}, \cdots ,{\hat x_n\} \\\}}
+
+
+
+@<m>{\mathbf{W\} = ({w_1\}, \cdots ,{w_n\})}、@<m>{\sqrt {w_1^2 + \cdots  + w_n^2\} }、@<m>{\left| {w_1^{\}\} \right| + \left| {w_2^{\}\} \right| +  \cdots  + \left| {w_n^{\}\} \right|}。
+
+EOB
+  end
+
   def test_no_math
     rd = render_with({}, "その結果、$$y=ax^2+bx+c$$の式が得られます。",{:math => false})
     assert_equal %Q[\n\nその結果、$$y=ax^2+bx+c$$の式が得られます。\n\n], rd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2review
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet