use common Builder#table on each builders.

kmuto · Aug 19, 2019 · a1b7f79 · a1b7f79
1 parent 53bf209
commit a1b7f79
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 56 deletions.
diff --git a/lib/review/htmlbuilder.rb b/lib/review/htmlbuilder.rb
@@ -642,22 +642,12 @@ def image_header(id, caption)
     end
 
     def table(lines, id = nil, caption = nil)
-      sepidx, rows = parse_table_rows(lines)
       if id
         puts %Q(<div id="#{normalize_id(id)}" class="table">)
       else
         puts %Q(<div class="table">)
       end
-      begin
-        if caption.present?
-          table_header(id, caption)
-        end
-      rescue KeyError
-        error "no such table: #{id}"
-      end
-      table_begin(rows.first.size)
-      table_rows(sepidx, rows)
-      table_end
+      super(lines, id, caption)
       puts '</div>'
     end
 

diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
@@ -593,18 +593,6 @@ def indepimage(lines, id, caption = nil, metric = nil)
 
     alias_method :numberlessimage, :indepimage
 
-    def table(lines, id = nil, caption = nil)
-      sepidx, rows = parse_table_rows(lines)
-      begin
-        table_header(id, caption) if caption.present?
-      rescue KeyError
-        error "no such table: #{id}"
-      end
-      table_begin(rows.first.size)
-      table_rows(sepidx, rows)
-      table_end
-    end
-
     def table_rows(sepidx, rows)
       if sepidx
         sepidx.times do

diff --git a/lib/review/markdownbuilder.rb b/lib/review/markdownbuilder.rb
@@ -246,18 +246,6 @@ def cmd(lines)
       puts '```'
     end
 
-    def table(lines, id = nil, caption = nil)
-      sepidx, rows = parse_table_rows(lines)
-      begin
-        table_header(id, caption) unless caption.nil?
-      rescue KeyError
-        error "no such table: #{id}"
-      end
-      table_begin(rows.first.size)
-      table_rows(sepidx, rows)
-      table_end
-    end
-
     def table_rows(sepidx, rows)
       if sepidx
         sepidx.times do

diff --git a/lib/review/plaintextbuilder.rb b/lib/review/plaintextbuilder.rb
@@ -220,18 +220,11 @@ def texequation(lines, id = nil, caption = '')
       blank
     end
 
-    def table(lines, id = nil, caption = nil)
-      sepidx, rows = parse_table_rows(lines)
-      blank
-
-      begin
-        table_header(id, caption) if caption.present?
-      rescue KeyError
-        error "no such table: #{id}"
+    def table(lines, id = nil, caption = nil, noblank = nil)
+      unless noblank
+        blank
       end
-      table_begin(rows.first.size)
-      table_rows(sepidx, rows)
-      table_end
+      super(lines, id, caption)
     end
 
     def table_header(id, caption)

diff --git a/lib/review/topbuilder.rb b/lib/review/topbuilder.rb
@@ -200,18 +200,9 @@ def texequation(lines, id = nil, caption = '')
     end
 
     def table(lines, id = nil, caption = nil)
-      sepidx, rows = parse_table_rows(lines)
       blank
       puts "◆→開始:#{@titles['table']}←◆"
-
-      begin
-        table_header(id, caption) if caption.present?
-      rescue KeyError
-        error "no such table: #{id}"
-      end
-      table_begin(rows.first.size)
-      table_rows(sepidx, rows)
-      table_end
+      super(lines, id, caption, true)
     end
 
     def th(str)