Merge pull request #55 from kmuto/captionemptydiv

handle empty div

README.md

@@ -57,6 +57,10 @@ GNU General Public License Version 2
 - [@takahashim](https://github.com/takahashim)
 
 ## Changelog
+### 1.4.0
+- Fix an error when empty div block is received.
+- Introduce '--strip-emptydev' to strip empty block `//{-//}`, produced by TeX file.
+
 ### 1.3.0
 - Fix "attempt to index global 'first' (a nil value)" error in a docx file.
 

lib/pandoc2review.rb

@@ -29,6 +29,10 @@ def main
         end
       end
 
+      if @stripemptydev
+        args += ['-M', "stripemptydev:true"]
+      end
+
       if @heading
         args += ["--shift-heading-level-by=#{@heading}"]
       end
@@ -48,9 +52,10 @@ def parse_args
     @heading = nil
     @disableeaw = nil
     @hideraw = nil
+    @stripemptydev = nil
     opts = OptionParser.new
     opts.banner = 'Usage: pandoc2review [option] file [file ...]'
-    opts.version = '1.3'
+    opts.version = '1.4'
 
     opts.on('--help', 'Prints this message and quit.') do
       puts opts.help
@@ -65,6 +70,9 @@ def parse_args
     opts.on('--hideraw', "Hide raw inline/block with no review format specified.") do
       @hideraw = true
     end
+    opts.on('--strip-emptydev', "Strip <div> without any id or class") do
+      @stripemptydev = true
+    end
 
     opts.parse!(ARGV)
     if ARGV.size != 1

lua/filters.lua

@@ -102,6 +102,7 @@ local function caption_div(div)
   local caption = div.attributes.caption
 
   if ((#div.content == 1) and
+      (div.content[1].content) and
       (#div.content[1].content == 1) and
       (div.content[1].content[1].tag == "Math") and
       (div.identifier)) then

lua/review.lua

@@ -522,7 +522,11 @@ function Div(s, attr)
   local classes = attr_classes(attr)
 
   if next(classes) == nil then
-    return "//{\n" .. s .. "\n//}"
+    if metadata.stripemptydev then
+      return s
+    else
+      return "//{\n" .. s .. "\n//}"
+    end
   end
 
   if classes["review-internal"] then

pandoc2review.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "pandoc2review"
-  spec.version       = "1.3.0"
+  spec.version       = "1.4.0"
   spec.authors       = ["Kenshi Muto"]
   spec.email         = ["[email protected]"]
   spec.license       = "GPL-2.0"

test/test_helper.rb

@@ -2,8 +2,8 @@
 require 'fileutils'
 require 'open3'
 
-def pandoc(src, opts: nil, err: nil)
-  args = 'pandoc -t lua/review.lua --lua-filter=lua/filters.lua -f markdown-auto_identifiers-smart+east_asian_line_breaks'
+def pandoc(src, opts: nil, err: nil, override_args: nil)
+  args = override_args || 'pandoc -t lua/review.lua --lua-filter=lua/filters.lua -f markdown-auto_identifiers-smart+east_asian_line_breaks'
   p2r = Pandoc2ReVIEW.new
   if opts
     args += ' ' + opts

test/test_reviewlua.rb

@@ -1127,6 +1127,40 @@ def test_block_texequation
     assert_equal expected, pandoc(src)
   end
 
+  def test_latex_block
+    src = <<-EOB
+\\begin{table}
+  \\caption{テスト}
+  \\label{tbl:test}
+  \\begin{tabular}{|c||c|} \\hline
+      a & b \\hline
+  \\end{tabular}
+\\end{table}
+EOB
+
+    expected = <<-EOB
+//{
+//table[table1][テスト]{
+
+--------------
+@<dtp>{table align=center}a\t@<dtp>{table align=center}b
+//}
+//}
+EOB
+
+    assert_equal expected, pandoc(src, override_args: 'pandoc -t lua/review.lua --lua-filter=lua/filters.lua -f latex')
+
+    expected = <<-EOB
+//table[table1][テスト]{
+
+--------------
+@<dtp>{table align=center}a\t@<dtp>{table align=center}b
+//}
+EOB
+
+    assert_equal expected, pandoc(src, override_args: 'pandoc -t lua/review.lua --lua-filter=lua/filters.lua -f latex', opts: '-M stripemptydev:true')
+  end
+
   def test_table
     src = <<-EOB
   Right     Left     Center     Default