From 2fc12690fe015d5b13f42de8867762f73f2453a8 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Sun, 5 Apr 2020 22:15:33 +0900
Subject: [PATCH 01/16] add column-style
 note,memo,tip,info,warning,important,caution,notice. Closes: #1493

---
 lib/review/htmlbuilder.rb      | 15 +++++++++++++++
 lib/review/idgxmlbuilder.rb    | 15 +++++++++++++++
 lib/review/latexbuilder.rb     | 27 +++++++++++++++++++++++++++
 lib/review/plaintextbuilder.rb | 13 +++++++++++++
 lib/review/topbuilder.rb       | 23 +++++++++++++++++++++++
 5 files changed, 93 insertions(+)

diff --git a/lib/review/htmlbuilder.rb b/lib/review/htmlbuilder.rb
index 42704b410..49d0bb25e 100644
--- a/lib/review/htmlbuilder.rb
+++ b/lib/review/htmlbuilder.rb
@@ -312,6 +312,21 @@ def note(lines, caption = nil)
       captionblock('note', lines, caption)
     end
 
+    %w[note memo tip info warning important caution notice].each do |name|
+      class_eval %Q(
+        def #{name}_begin(_level, _label, caption = nil)
+          puts %Q(<div class="#{name}">)
+          if caption.present?
+            puts %Q(<p class="caption">\#{compile_inline(caption)}</p>)
+          end
+        end
+
+        def #{name}_end(_level)
+          puts '</div>'
+        end
+      )
+    end
+
     def ul_begin
       puts '<ul>'
     end
diff --git a/lib/review/idgxmlbuilder.rb b/lib/review/idgxmlbuilder.rb
index ddadbcd4f..f5c58e0ba 100644
--- a/lib/review/idgxmlbuilder.rb
+++ b/lib/review/idgxmlbuilder.rb
@@ -1025,6 +1025,21 @@ def expert(lines)
       captionblock('expert', lines, nil)
     end
 
+    %w[note memo tip info warning important caution notice].each do |name|
+      class_eval %Q(
+        def #{name}_begin(_level, _label, caption = nil)
+          print "<#{name}>"
+          if caption.present?
+            puts %Q(<title aid:pstyle='#{name}-title'>\#{compile_inline(caption)}</title>)
+          end
+        end
+
+        def #{name}_end(_level)
+          print "</#{name}>"
+        end
+      )
+    end
+
     def syntaxblock(type, lines, caption)
       captionstr = nil
       if caption.present?
diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
index 10d14793a..39f3f283d 100644
--- a/lib/review/latexbuilder.rb
+++ b/lib/review/latexbuilder.rb
@@ -212,6 +212,33 @@ def column_end(_level)
       @doc_status[:column] = nil
     end
 
+    def common_block_begin(type, _level, _label, caption = nil)
+      print "\\begin{review#{type}}"
+
+      @doc_status[:caption] = true
+      if caption.present?
+        print "[#{compile_inline(caption)}]"
+      end
+      puts
+      @doc_status[:caption] = nil
+    end
+
+    def common_block_end(type, _level)
+      puts "\\end{review#{type}}"
+    end
+
+    %w[note memo tip info warning important caution notice].each do |name|
+      class_eval %Q(
+        def #{name}_begin(level, label, caption = nil)
+          common_block_begin('#{name}', level, label, caption)
+        end
+
+        def #{name}_end(level)
+          common_block_end('#{name}', level)
+        end
+      )
+    end
+
     def captionblock(type, lines, caption)
       if @book.config.check_version('2', exception: false)
         type = 'minicolumn'
diff --git a/lib/review/plaintextbuilder.rb b/lib/review/plaintextbuilder.rb
index ed537e1db..79ed688a3 100644
--- a/lib/review/plaintextbuilder.rb
+++ b/lib/review/plaintextbuilder.rb
@@ -578,6 +578,19 @@ def warning(lines, caption = nil)
 
     alias_method :box, :insn
 
+    %w[note memo tip info warning important caution notice].each do |name|
+      class_eval %Q(
+        def #{name}_begin(_level, _label, caption = nil)
+          blank
+          puts compile_inline(caption)
+        end
+
+        def #{name}_end(_level)
+          blank
+        end
+      )
+    end
+
     def indepimage(_lines, _id, caption = nil, _metric = nil)
       blank
       puts "図　#{compile_inline(caption)}" if caption.present?
diff --git a/lib/review/topbuilder.rb b/lib/review/topbuilder.rb
index ad65c0eb5..f0e5f07e5 100644
--- a/lib/review/topbuilder.rb
+++ b/lib/review/topbuilder.rb
@@ -444,6 +444,29 @@ def common_column_end(type)
       blank
     end
 
+    def common_block_begin(type, _level, _label, caption = nil)
+      blank
+      puts "◆→開始:#{@titles[type]}←◆"
+      puts '■' + compile_inline(caption) if caption.present?
+    end
+
+    def common_block_end(type, _level)
+      puts "◆→終了:#{@titles[type]}←◆"
+      blank
+    end
+
+    %w[note memo tip info warning important caution notice].each do |name|
+      class_eval %Q(
+        def #{name}_begin(level, label, caption = nil)
+          common_block_begin('#{name}', level, label, caption)
+        end
+
+        def #{name}_end(level)
+          common_block_end('#{name}', level)
+        end
+      )
+    end
+
     def indepimage(_lines, id, caption = nil, metric = nil)
       metrics = parse_metric('top', metric)
       metrics = " #{metrics}" if metrics.present?

From 4caf7ffbed48f1cf4f909adbc356b0a86563b3d9 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Sun, 21 Jun 2020 21:59:48 +0900
Subject: [PATCH 02/16] disallow nested mini-columns

---
 lib/review/builder.rb          | 19 ++++++++++++++++++-
 lib/review/htmlbuilder.rb      |  4 ++++
 lib/review/idgxmlbuilder.rb    | 11 +++++++++++
 lib/review/latexbuilder.rb     |  4 ++++
 lib/review/plaintextbuilder.rb | 12 ++++++++++++
 lib/review/topbuilder.rb       |  3 +++
 6 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/lib/review/builder.rb b/lib/review/builder.rb
index 5e4c37627..57805e704 100644
--- a/lib/review/builder.rb
+++ b/lib/review/builder.rb
@@ -544,9 +544,26 @@ def captionblock(_type, _lines, _caption, _specialstyle = nil)
     CAPTION_TITLES.each do |name|
       class_eval %Q(
         def #{name}(lines, caption = nil)
+          check_nested_minicolumn
           captionblock("#{name}", lines, caption)
         end
-      ), __FILE__, __LINE__ - 4
+
+        def #{name}_begin(_level, _label, caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
+          puts compile_inline(caption)
+        end
+
+        def #{name}_end(_level)
+          @doc_status[:minicolumn] = nil
+        end
+      )
+    end
+
+    def check_nested_minicolumn
+      if @doc_status[:minicolumn]
+        error "#{@location}: nested mini-column is not allowed"
+      end
     end
 
     def graph(lines, id, command, caption = '')
diff --git a/lib/review/htmlbuilder.rb b/lib/review/htmlbuilder.rb
index 49d0bb25e..a7aed3ca4 100644
--- a/lib/review/htmlbuilder.rb
+++ b/lib/review/htmlbuilder.rb
@@ -228,6 +228,7 @@ def sup_end(_level)
     end
 
     def captionblock(type, lines, caption)
+      check_nested_minicolumn
       puts %Q(<div class="#{type}">)
       if caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
@@ -315,6 +316,8 @@ def note(lines, caption = nil)
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
         def #{name}_begin(_level, _label, caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
           puts %Q(<div class="#{name}">)
           if caption.present?
             puts %Q(<p class="caption">\#{compile_inline(caption)}</p>)
@@ -323,6 +326,7 @@ def #{name}_begin(_level, _label, caption = nil)
 
         def #{name}_end(_level)
           puts '</div>'
+          @doc_status[:minicolumn] = nil
         end
       )
     end
diff --git a/lib/review/idgxmlbuilder.rb b/lib/review/idgxmlbuilder.rb
index f5c58e0ba..05bc4a5a3 100644
--- a/lib/review/idgxmlbuilder.rb
+++ b/lib/review/idgxmlbuilder.rb
@@ -942,18 +942,22 @@ def captionblock(type, lines, caption, specialstyle = nil)
     end
 
     def note(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('note', lines, caption)
     end
 
     def memo(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('memo', lines, caption)
     end
 
     def tip(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('tip', lines, caption)
     end
 
     def info(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('info', lines, caption)
     end
 
@@ -966,6 +970,7 @@ def best(lines, caption = nil)
     end
 
     def important(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('important', lines, caption)
     end
 
@@ -974,10 +979,12 @@ def security(lines, caption = nil)
     end
 
     def caution(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('caution', lines, caption)
     end
 
     def warning(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('warning', lines, caption)
     end
 
@@ -990,6 +997,7 @@ def link(lines, caption = nil)
     end
 
     def notice(lines, caption = nil)
+      check_nested_minicolumn
       if caption
         captionblock('notice-t', lines, caption, 'notice-title')
       else
@@ -1028,6 +1036,8 @@ def expert(lines)
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
         def #{name}_begin(_level, _label, caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
           print "<#{name}>"
           if caption.present?
             puts %Q(<title aid:pstyle='#{name}-title'>\#{compile_inline(caption)}</title>)
@@ -1036,6 +1046,7 @@ def #{name}_begin(_level, _label, caption = nil)
 
         def #{name}_end(_level)
           print "</#{name}>"
+          @doc_status[:minicolumn] = nil
         end
       )
     end
diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
index 39f3f283d..0573f02b8 100644
--- a/lib/review/latexbuilder.rb
+++ b/lib/review/latexbuilder.rb
@@ -213,6 +213,8 @@ def column_end(_level)
     end
 
     def common_block_begin(type, _level, _label, caption = nil)
+      check_nested_minicolumn
+      @doc_status[:minicolumn] = type
       print "\\begin{review#{type}}"
 
       @doc_status[:caption] = true
@@ -225,6 +227,7 @@ def common_block_begin(type, _level, _label, caption = nil)
 
     def common_block_end(type, _level)
       puts "\\end{review#{type}}"
+      @doc_status[:minicolumn] = nil
     end
 
     %w[note memo tip info warning important caution notice].each do |name|
@@ -240,6 +243,7 @@ def #{name}_end(level)
     end
 
     def captionblock(type, lines, caption)
+      check_nested_minicolumn
       if @book.config.check_version('2', exception: false)
         type = 'minicolumn'
       end
diff --git a/lib/review/plaintextbuilder.rb b/lib/review/plaintextbuilder.rb
index 79ed688a3..fa573f95b 100644
--- a/lib/review/plaintextbuilder.rb
+++ b/lib/review/plaintextbuilder.rb
@@ -501,18 +501,22 @@ def centering(lines)
     end
 
     def note(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('note', lines, caption)
     end
 
     def memo(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('memo', lines, caption)
     end
 
     def tip(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('tip', lines, caption)
     end
 
     def info(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('info', lines, caption)
     end
 
@@ -521,10 +525,12 @@ def planning(lines, caption = nil)
     end
 
     def best(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('best', lines, caption)
     end
 
     def important(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('important', lines, caption)
     end
 
@@ -533,6 +539,7 @@ def security(lines, caption = nil)
     end
 
     def caution(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('caution', lines, caption)
     end
 
@@ -545,6 +552,7 @@ def link(lines, caption = nil)
     end
 
     def notice(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('notice', lines, caption)
     end
 
@@ -573,6 +581,7 @@ def insn(lines, caption = nil)
     end
 
     def warning(lines, caption = nil)
+      check_nested_minicolumn
       base_parablock('warning', lines, caption)
     end
 
@@ -581,12 +590,15 @@ def warning(lines, caption = nil)
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
         def #{name}_begin(_level, _label, caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
           blank
           puts compile_inline(caption)
         end
 
         def #{name}_end(_level)
           blank
+          @doc_status[:minicolumn] = nil
         end
       )
     end
diff --git a/lib/review/topbuilder.rb b/lib/review/topbuilder.rb
index f0e5f07e5..36e51369e 100644
--- a/lib/review/topbuilder.rb
+++ b/lib/review/topbuilder.rb
@@ -458,11 +458,14 @@ def common_block_end(type, _level)
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
         def #{name}_begin(level, label, caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
           common_block_begin('#{name}', level, label, caption)
         end
 
         def #{name}_end(level)
           common_block_end('#{name}', level)
+          @doc_status[:minicolumn] = nil
         end
       )
     end

From d59ae623d94d189204545638c628ac71f3109f2b Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Mon, 22 Jun 2020 19:29:24 +0900
Subject: [PATCH 03/16] test units

---
 lib/review/plaintextbuilder.rb |   4 +-
 test/test_htmlbuilder.rb       | 150 +++++++++++++++++++++++++++++
 test/test_idgxmlbuilder.rb     | 120 +++++++++++++++++++++++
 test/test_latexbuilder.rb      | 147 ++++++++++++++++++++++++++++
 test/test_plaintextbuilder.rb  | 137 ++++++++++++++++++++++++++
 test/test_topbuilder.rb        | 171 +++++++++++++++++++++++++++++++++
 6 files changed, 728 insertions(+), 1 deletion(-)

diff --git a/lib/review/plaintextbuilder.rb b/lib/review/plaintextbuilder.rb
index fa573f95b..7d2e21d60 100644
--- a/lib/review/plaintextbuilder.rb
+++ b/lib/review/plaintextbuilder.rb
@@ -593,7 +593,9 @@ def #{name}_begin(_level, _label, caption = nil)
           check_nested_minicolumn
           @doc_status[:minicolumn] = '#{name}'
           blank
-          puts compile_inline(caption)
+          if caption.present?
+            puts compile_inline(caption)
+          end
         end
 
         def #{name}_end(_level)
diff --git a/test/test_htmlbuilder.rb b/test/test_htmlbuilder.rb
index 91813358d..635fa482e 100644
--- a/test/test_htmlbuilder.rb
+++ b/test/test_htmlbuilder.rb
@@ -2452,6 +2452,156 @@ def test_major_blocks
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+===[#{type}] #{type}1
+
+===[/#{type}]
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<p class="caption">#{type}1</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}2</p>
+<p></p>
+</div>
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}] #{type}2
+
+==[/#{type}]
+
+===[#{type}] #{type}3
+
+===[/#{type}]
+
+====[#{type}] #{type}4
+
+====[/#{type}]
+
+=====[#{type}] #{type}5
+
+=====[/#{type}]
+
+======[#{type}] #{type}6
+
+======[/#{type}]
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<p class="caption">#{type}2</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}3</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}4</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}5</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}6</p>
+</div>
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}]
+
+ * A
+
+ 1. B
+
+==[/#{type}]
+
+===[#{type}] OMITEND1
+
+//emlist{
+LIST
+//}
+
+==[#{type}] OMITEND2
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<ul>
+<li>A</li>
+</ul>
+<ol>
+<li>B</li>
+</ol>
+</div>
+<div class="#{type}">
+<p class="caption">OMITEND1</p>
+<div class="emlist-code">
+<pre class="emlist">LIST
+</pre>
+</div>
+</div>
+<div class="#{type}">
+<p class="caption">OMITEND2</p>
+</div>
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+//#{type}{
+//}
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[#{type}]
+
+===[/#{type}]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[note]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
   def test_comment
     actual = compile_block('//comment[コメント]')
     assert_equal '', actual
diff --git a/test/test_idgxmlbuilder.rb b/test/test_idgxmlbuilder.rb
index cac822da6..3f8a4ad35 100644
--- a/test/test_idgxmlbuilder.rb
+++ b/test/test_idgxmlbuilder.rb
@@ -324,6 +324,126 @@ def test_major_blocks
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+===[#{type}] #{type}1
+
+===[/#{type}]
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      if type == 'notice' # exception pattern
+        expected = <<-EOS.chomp
+<#{type}><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}><#{type}-t><title aid:pstyle='#{type}-title'>#{type}2</title><p></p></#{type}-t>
+EOS
+      else
+        expected = <<-EOS.chomp
+<#{type}><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}2</title><p></p></#{type}>
+EOS
+      end
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}] #{type}2
+
+==[/#{type}]
+
+===[#{type}] #{type}3
+
+===[/#{type}]
+
+====[#{type}] #{type}4
+
+====[/#{type}]
+
+=====[#{type}] #{type}5
+
+=====[/#{type}]
+
+======[#{type}] #{type}6
+
+======[/#{type}]
+EOS
+
+      expected = <<-EOS.chomp
+<#{type}><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}3</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}4</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}5</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}6</title></#{type}>
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}]
+
+ * A
+
+ 1. B
+
+==[/#{type}]
+
+===[#{type}] OMITEND1
+
+//emlist{
+LIST
+//}
+
+==[#{type}] OMITEND2
+EOS
+
+      expected = <<-EOS.chomp
+<#{type}><ul><li aid:pstyle="ul-item">A</li></ul><ol><li aid:pstyle="ol-item" olnum="1" num="1">B</li></ol></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND1</title><list type='emlist'><pre>LIST
+</pre></list></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND2</title></#{type}>
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+//#{type}{
+//}
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[#{type}]
+
+===[/#{type}]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[note]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
   def test_term
     actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal '<term><p>test1test1.5</p><p>test<i>2</i></p></term>', actual
diff --git a/test/test_latexbuilder.rb b/test/test_latexbuilder.rb
index d728d438d..f31c40fe9 100644
--- a/test/test_latexbuilder.rb
+++ b/test/test_latexbuilder.rb
@@ -1974,6 +1974,153 @@ def test_major_blocks
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+===[#{type}] #{type}1
+
+===[/#{type}]
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+\\begin{review#{type}}[#{type}1]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}2]
+
+\\end{review#{type}}
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}] #{type}2
+
+==[/#{type}]
+
+===[#{type}] #{type}3
+
+===[/#{type}]
+
+====[#{type}] #{type}4
+
+====[/#{type}]
+
+=====[#{type}] #{type}5
+
+=====[/#{type}]
+
+======[#{type}] #{type}6
+
+======[/#{type}]
+EOS
+
+      expected = <<-EOS
+\\begin{review#{type}}[#{type}2]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}3]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}4]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}5]
+\\end{review#{type}}
+\\begin{review#{type}}[#{type}6]
+\\end{review#{type}}
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}]
+
+ * A
+
+ 1. B
+
+==[/#{type}]
+
+===[#{type}] OMITEND1
+
+//emlist{
+LIST
+//}
+
+==[#{type}] OMITEND2
+EOS
+
+      expected = <<-EOS
+\\begin{review#{type}}
+
+\\begin{itemize}
+\\item A
+\\end{itemize}
+
+\\begin{enumerate}
+\\item B
+\\end{enumerate}
+
+\\end{review#{type}}
+\\begin{review#{type}}[OMITEND1]
+
+\\begin{reviewlistblock}
+\\begin{reviewemlist}
+LIST
+\\end{reviewemlist}
+\\end{reviewlistblock}
+
+\\end{review#{type}}
+\\begin{review#{type}}[OMITEND2]
+\\end{review#{type}}
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+//#{type}{
+//}
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[#{type}]
+
+===[/#{type}]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[note]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
   def test_inline_raw0
     assert_equal 'normal', compile_inline('@<raw>{normal}')
   end
diff --git a/test/test_plaintextbuilder.rb b/test/test_plaintextbuilder.rb
index e27497cfa..961facbd6 100644
--- a/test/test_plaintextbuilder.rb
+++ b/test/test_plaintextbuilder.rb
@@ -596,6 +596,143 @@ def test_major_blocks
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+===[#{type}] #{type}1
+
+===[/#{type}]
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+#{type}1
+
+#{type}2
+
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}] #{type}2
+
+==[/#{type}]
+
+===[#{type}] #{type}3
+
+===[/#{type}]
+
+====[#{type}] #{type}4
+
+====[/#{type}]
+
+=====[#{type}] #{type}5
+
+=====[/#{type}]
+
+======[#{type}] #{type}6
+
+======[/#{type}]
+EOS
+
+      expected = <<-EOS
+#{type}2
+
+#{type}3
+
+#{type}4
+
+#{type}5
+
+#{type}6
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}]
+
+ * A
+
+ 1. B
+
+==[/#{type}]
+
+===[#{type}] OMITEND1
+
+//emlist{
+LIST
+//}
+
+==[#{type}] OMITEND2
+EOS
+
+      expected = <<-EOS
+headline is empty.
+
+A
+
+1　B
+
+OMITEND1
+
+LIST
+
+OMITEND2
+
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+//#{type}{
+//}
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[#{type}]
+
+===[/#{type}]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[note]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
   def test_image
     def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1)
diff --git a/test/test_topbuilder.rb b/test/test_topbuilder.rb
index 97e2ad7ad..1dd583c14 100644
--- a/test/test_topbuilder.rb
+++ b/test/test_topbuilder.rb
@@ -735,6 +735,177 @@ def test_major_blocks
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    titles = {
+      'note' => 'ノート',
+      'memo' => 'メモ',
+      'important' => '重要',
+      'info' => '情報',
+      'notice' => '注意',
+      'caution' => '警告',
+      'warning' => '危険',
+      'tip' => 'TIP'
+    }
+
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+===[#{type}] #{type}1
+
+===[/#{type}]
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}1
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}2
+
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}] #{type}2
+
+==[/#{type}]
+
+===[#{type}] #{type}3
+
+===[/#{type}]
+
+====[#{type}] #{type}4
+
+====[/#{type}]
+
+=====[#{type}] #{type}5
+
+=====[/#{type}]
+
+======[#{type}] #{type}6
+
+======[/#{type}]
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}2
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}3
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}4
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}5
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}6
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+==[#{type}]
+
+ * A
+
+ 1. B
+
+==[/#{type}]
+
+===[#{type}] OMITEND1
+
+//emlist{
+LIST
+//}
+
+==[#{type}] OMITEND2
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+
+●	A
+
+1	B
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND1
+
+◆→開始:インラインリスト←◆
+LIST
+◆→終了:インラインリスト←◆
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND2
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+//#{type}{
+//}
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[#{type}]
+
+===[/#{type}]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+==[#{type}]
+
+===[note]
+
+==[/#{type}]
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/: nested mini\-column is not allowed/, e.message)
+    end
+  end
+
   def test_image
     def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1)

From a09ccc6a8a5f51a470b562b20dbdb593d044b2c1 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Mon, 22 Jun 2020 21:43:24 +0900
Subject: [PATCH 04/16] add documentation about block mini-column

---
 doc/format.ja.md | 16 ++++++++++++++--
 doc/format.md    | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/doc/format.ja.md b/doc/format.ja.md
index 34834fd7b..47bec2727 100644
--- a/doc/format.ja.md
+++ b/doc/format.ja.md
@@ -2,7 +2,7 @@
 
 Re:VIEW フォーマットの文法について解説します。Re:VIEW フォーマットはアスキー社（現カドカワ）の EWB を基本としながら、一部に RD や各種 Wiki の文法を取り入れて簡素化しています。
 
-このドキュメントは、Re:VIEW 3.0 に基づいています。
+このドキュメントは、Re:VIEW 4.2 に基づいています。
 
 ## 段落
 
@@ -255,7 +255,6 @@ puts "hello world!"
 //}
 ```
 
-
 ### ソースコード専用の引用
 
 ソースコードを引用するには次のように記述します。
@@ -503,6 +502,19 @@ complexmatrixという識別子に基づく画像ファイルが貼り込まれ
 
 内容には、空行で区切って複数の段落を記述可能です。
 
+Re:VIEW 4.2 以降では、箇条書きや図表・リストを含める必要があるときのために、コラムに類似する記法で囲み記事を表現することもできます。
+
+```
+===[note] ノート
+
+箇条書きを含むノートです。
+
+ 1. 箇条書き1
+ 2. 箇条書き2
+
+===[/note]
+```
+
 ## 脚注
 
 脚注は「`//footnote`」を使って記述します。
diff --git a/doc/format.md b/doc/format.md
index 88842cc9c..69995f576 100644
--- a/doc/format.md
+++ b/doc/format.md
@@ -4,7 +4,7 @@ The document is a brief guide for Re:VIEW markup syntax.
 
 Re:VIEW is based on EWB of ASCII (now KADOKAWA), influenced RD and other Wiki system's syntax.
 
-This document explains about the format of Re:VIEW 3.0.
+This document explains about the format of Re:VIEW 4.2.
 
 
 ## Paragraph
@@ -532,6 +532,19 @@ Some block commands are used for short column.
 
 The content is like paragraph; separated by empty lines.
 
+From Re:VIEW 4.2, it is also possible to express a short column in a notation similar to a column.
+
+```
+===[note] NOTE
+
+With ordered itemize.
+
+ 1. item1
+ 2. item2
+
+===[/note]
+```
+
 ## Footnotes
 
 You can use `//footnote` to write footnotes.

From f294b66114f13f525e74bf78fb88f965bdca3898 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Sun, 28 Jun 2020 10:54:58 +0900
Subject: [PATCH 05/16] introduce large block notation

usage:

```
///note{

//emlist{
p "Hello, world!"
//}

 * foo
 * bar

///}
```
---
 lib/review/builder.rb          |  1 +
 lib/review/compiler.rb         | 38 ++++++++++++++++++++
 lib/review/htmlbuilder.rb      |  4 +--
 lib/review/idgxmlbuilder.rb    |  4 +--
 lib/review/latexbuilder.rb     | 12 +++----
 lib/review/plaintextbuilder.rb |  4 +--
 lib/review/topbuilder.rb       |  8 ++---
 test/test_htmlbuilder.rb       | 62 ++++++++++++++++++---------------
 test/test_idgxmlbuilder.rb     | 60 +++++++++++++++++---------------
 test/test_latexbuilder.rb      | 60 +++++++++++++++++---------------
 test/test_plaintextbuilder.rb  | 63 ++++++++++++++++++----------------
 test/test_topbuilder.rb        | 61 +++++++++++++++++---------------
 12 files changed, 224 insertions(+), 153 deletions(-)

diff --git a/lib/review/builder.rb b/lib/review/builder.rb
index 57805e704..23023e433 100644
--- a/lib/review/builder.rb
+++ b/lib/review/builder.rb
@@ -84,6 +84,7 @@ def bind(compiler, chapter, location)
 
     def builder_init_file
       @sec_counter = SecCounter.new(5, @chapter)
+      @doc_status = {}
     end
     private :builder_init_file
 
diff --git a/lib/review/compiler.rb b/lib/review/compiler.rb
index 6e070d9a4..53ed96f42 100644
--- a/lib/review/compiler.rb
+++ b/lib/review/compiler.rb
@@ -238,6 +238,9 @@ def do_compile
       f = LineInput.new(StringIO.new(@chapter.content))
       @builder.bind(self, @chapter, Location.new(@chapter.basename, f))
 
+      ## in large block, such as note/info/alert...
+      @large_block_name = nil
+
       tagged_section_init
       while f.next?
         case f.peek
@@ -257,6 +260,14 @@ def do_compile
         when %r{\A//\}}
           f.gets
           error 'block end seen but not opened'
+        when %r|\A///([a-z]+)(:?\[.*\])?{\s*$|
+          name = $1
+          line = f.gets
+          args = parse_args(line.sub(%r{\A///[a-z]+}, '').rstrip.chomp('{'), name)
+          compile_large_block_begin(name, *args)
+        when %r(\A///}\s*$)
+          _line = f.gets
+          compile_large_block_end
         when %r{\A//[a-z]+}
           # @command_name_stack.push(name) ## <- move into read_command() to use name
           name, args, lines = read_command(f)
@@ -287,6 +298,33 @@ def do_compile
       close_all_tagged_section
     end
 
+    def compile_large_block_begin(name, caption = nil)
+      mid = "#{name}_begin"
+      unless @strategy.respond_to?(mid)
+        error "strategy does not support large block: #{name}"
+      end
+
+      if @large_block_name
+        error "large block cannot be nested: #{name}"
+        return
+      end
+      @large_block_name = name
+
+      @strategy.__send__(mid, caption)
+    end
+
+    def compile_large_block_end
+      unless @large_block_name
+        error "large block is not used: #{name}"
+        return
+      end
+      name = @large_block_name
+
+      mid = "#{name}_end"
+      @strategy.__send__(mid)
+      @large_block_name = nil
+    end
+
     def compile_headline(line)
       @headline_indexs ||= [@chapter.number.to_i - 1]
       m = /\A(=+)(?:\[(.+?)\])?(?:\{(.+?)\})?(.*)/.match(line)
diff --git a/lib/review/htmlbuilder.rb b/lib/review/htmlbuilder.rb
index a7aed3ca4..6c8ffa45a 100644
--- a/lib/review/htmlbuilder.rb
+++ b/lib/review/htmlbuilder.rb
@@ -315,7 +315,7 @@ def note(lines, caption = nil)
 
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
-        def #{name}_begin(_level, _label, caption = nil)
+        def #{name}_begin(caption = nil)
           check_nested_minicolumn
           @doc_status[:minicolumn] = '#{name}'
           puts %Q(<div class="#{name}">)
@@ -324,7 +324,7 @@ def #{name}_begin(_level, _label, caption = nil)
           end
         end
 
-        def #{name}_end(_level)
+        def #{name}_end
           puts '</div>'
           @doc_status[:minicolumn] = nil
         end
diff --git a/lib/review/idgxmlbuilder.rb b/lib/review/idgxmlbuilder.rb
index 05bc4a5a3..396e477f5 100644
--- a/lib/review/idgxmlbuilder.rb
+++ b/lib/review/idgxmlbuilder.rb
@@ -1035,7 +1035,7 @@ def expert(lines)
 
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
-        def #{name}_begin(_level, _label, caption = nil)
+        def #{name}_begin(caption = nil)
           check_nested_minicolumn
           @doc_status[:minicolumn] = '#{name}'
           print "<#{name}>"
@@ -1044,7 +1044,7 @@ def #{name}_begin(_level, _label, caption = nil)
           end
         end
 
-        def #{name}_end(_level)
+        def #{name}_end
           print "</#{name}>"
           @doc_status[:minicolumn] = nil
         end
diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
index 0573f02b8..31df2d00c 100644
--- a/lib/review/latexbuilder.rb
+++ b/lib/review/latexbuilder.rb
@@ -212,7 +212,7 @@ def column_end(_level)
       @doc_status[:column] = nil
     end
 
-    def common_block_begin(type, _level, _label, caption = nil)
+    def common_block_begin(type, caption = nil)
       check_nested_minicolumn
       @doc_status[:minicolumn] = type
       print "\\begin{review#{type}}"
@@ -225,19 +225,19 @@ def common_block_begin(type, _level, _label, caption = nil)
       @doc_status[:caption] = nil
     end
 
-    def common_block_end(type, _level)
+    def common_block_end(type)
       puts "\\end{review#{type}}"
       @doc_status[:minicolumn] = nil
     end
 
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
-        def #{name}_begin(level, label, caption = nil)
-          common_block_begin('#{name}', level, label, caption)
+        def #{name}_begin(caption = nil)
+          common_block_begin('#{name}', caption)
         end
 
-        def #{name}_end(level)
-          common_block_end('#{name}', level)
+        def #{name}_end
+          common_block_end('#{name}')
         end
       )
     end
diff --git a/lib/review/plaintextbuilder.rb b/lib/review/plaintextbuilder.rb
index 7d2e21d60..bfc68db3b 100644
--- a/lib/review/plaintextbuilder.rb
+++ b/lib/review/plaintextbuilder.rb
@@ -589,7 +589,7 @@ def warning(lines, caption = nil)
 
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
-        def #{name}_begin(_level, _label, caption = nil)
+        def #{name}_begin(caption = nil)
           check_nested_minicolumn
           @doc_status[:minicolumn] = '#{name}'
           blank
@@ -598,7 +598,7 @@ def #{name}_begin(_level, _label, caption = nil)
           end
         end
 
-        def #{name}_end(_level)
+        def #{name}_end
           blank
           @doc_status[:minicolumn] = nil
         end
diff --git a/lib/review/topbuilder.rb b/lib/review/topbuilder.rb
index 36e51369e..d99f8fb2b 100644
--- a/lib/review/topbuilder.rb
+++ b/lib/review/topbuilder.rb
@@ -457,14 +457,14 @@ def common_block_end(type, _level)
 
     %w[note memo tip info warning important caution notice].each do |name|
       class_eval %Q(
-        def #{name}_begin(level, label, caption = nil)
+        def #{name}_begin(caption = nil)
           check_nested_minicolumn
           @doc_status[:minicolumn] = '#{name}'
-          common_block_begin('#{name}', level, label, caption)
+          common_block_begin('#{name}', nil, nil, caption)
         end
 
-        def #{name}_end(level)
-          common_block_end('#{name}', level)
+        def #{name}_end
+          common_block_end('#{name}', nil)
           @doc_status[:minicolumn] = nil
         end
       )
diff --git a/test/test_htmlbuilder.rb b/test/test_htmlbuilder.rb
index 635fa482e..f34a7e0c4 100644
--- a/test/test_htmlbuilder.rb
+++ b/test/test_htmlbuilder.rb
@@ -2455,9 +2455,9 @@ def test_major_blocks
   def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       src = <<-EOS
-===[#{type}] #{type}1
+///#{type}[#{type}1]{
 
-===[/#{type}]
+///}
 
 //#{type}[#{type}2]{
 //}
@@ -2475,25 +2475,25 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}] #{type}2
+///#{type}[#{type}2]{
 
-==[/#{type}]
+///}
 
-===[#{type}] #{type}3
+///#{type}[#{type}3]{
 
-===[/#{type}]
+///}
 
-====[#{type}] #{type}4
+///#{type}[#{type}4]{
 
-====[/#{type}]
+///}
 
-=====[#{type}] #{type}5
+///#{type}[#{type}5]{
 
-=====[/#{type}]
+///}
 
-======[#{type}] #{type}6
+///#{type}[#{type}6]{
 
-======[/#{type}]
+///}
 EOS
 
       expected = <<-EOS
@@ -2516,21 +2516,24 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
  * A
 
  1. B
 
-==[/#{type}]
+///}
 
-===[#{type}] OMITEND1
+///#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-==[#{type}] OMITEND2
+///}
+
+///#{type}[OMITEND2]{
+///}
 EOS
 
       expected = <<-EOS
@@ -2559,13 +2562,14 @@ def test_minicolumn_blocks
 
   def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
 //#{type}{
 //}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
       assert_match(/: nested mini\-column is not allowed/, e.message)
@@ -2574,31 +2578,35 @@ def test_minicolumn_blocks_nest_error1
 
   def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[#{type}]
+///#{type}{
 
-===[/#{type}]
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
   def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[note]
+///note{
 
-==[/#{type}]
+///}
+
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_idgxmlbuilder.rb b/test/test_idgxmlbuilder.rb
index 3f8a4ad35..1a0a6d142 100644
--- a/test/test_idgxmlbuilder.rb
+++ b/test/test_idgxmlbuilder.rb
@@ -327,9 +327,9 @@ def test_major_blocks
   def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       src = <<-EOS
-===[#{type}] #{type}1
+///#{type}[#{type}1]{
 
-===[/#{type}]
+///}
 
 //#{type}[#{type}2]{
 //}
@@ -347,25 +347,25 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}] #{type}2
+///#{type}[#{type}2]{
 
-==[/#{type}]
+///}
 
-===[#{type}] #{type}3
+///#{type}[#{type}3]{
 
-===[/#{type}]
+///}
 
-====[#{type}] #{type}4
+///#{type}[#{type}4]{
 
-====[/#{type}]
+///}
 
-=====[#{type}] #{type}5
+///#{type}[#{type}5]{
 
-=====[/#{type}]
+///}
 
-======[#{type}] #{type}6
+///#{type}[#{type}6]{
 
-======[/#{type}]
+///}
 EOS
 
       expected = <<-EOS.chomp
@@ -374,21 +374,23 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
  * A
 
  1. B
 
-==[/#{type}]
+///}
 
-===[#{type}] OMITEND1
+///#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-==[#{type}] OMITEND2
+///}
+///#{type}[OMITEND2]{
+///}
 EOS
 
       expected = <<-EOS.chomp
@@ -401,13 +403,14 @@ def test_minicolumn_blocks
 
   def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
 //#{type}{
 //}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
       assert_match(/: nested mini\-column is not allowed/, e.message)
@@ -416,31 +419,34 @@ def test_minicolumn_blocks_nest_error1
 
   def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[#{type}]
+///#{type}{
 
-===[/#{type}]
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
   def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[note]
+///note{
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_latexbuilder.rb b/test/test_latexbuilder.rb
index f31c40fe9..ea42a5ab5 100644
--- a/test/test_latexbuilder.rb
+++ b/test/test_latexbuilder.rb
@@ -1977,9 +1977,9 @@ def test_major_blocks
   def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       src = <<-EOS
-===[#{type}] #{type}1
+///#{type}[#{type}1]{
 
-===[/#{type}]
+///}
 
 //#{type}[#{type}2]{
 //}
@@ -1995,25 +1995,25 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}] #{type}2
+///#{type}[#{type}2]{
 
-==[/#{type}]
+///}
 
-===[#{type}] #{type}3
+///#{type}[#{type}3]{
 
-===[/#{type}]
+///}
 
-====[#{type}] #{type}4
+///#{type}[#{type}4]{
 
-====[/#{type}]
+///}
 
-=====[#{type}] #{type}5
+///#{type}[#{type}5]{
 
-=====[/#{type}]
+///}
 
-======[#{type}] #{type}6
+///#{type}[#{type}6]{
 
-======[/#{type}]
+///}
 EOS
 
       expected = <<-EOS
@@ -2031,21 +2031,23 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
  * A
 
  1. B
 
-==[/#{type}]
+///}
 
-===[#{type}] OMITEND1
+///#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-==[#{type}] OMITEND2
+///}
+///#{type}[OMITEND2]{
+///}
 EOS
 
       expected = <<-EOS
@@ -2078,13 +2080,14 @@ def test_minicolumn_blocks
 
   def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
 //#{type}{
 //}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
       assert_match(/: nested mini\-column is not allowed/, e.message)
@@ -2093,31 +2096,34 @@ def test_minicolumn_blocks_nest_error1
 
   def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[#{type}]
+///#{type}{
 
-===[/#{type}]
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
   def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[note]
+///note{
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_plaintextbuilder.rb b/test/test_plaintextbuilder.rb
index 961facbd6..5c0b9dbce 100644
--- a/test/test_plaintextbuilder.rb
+++ b/test/test_plaintextbuilder.rb
@@ -598,10 +598,11 @@ def test_major_blocks
 
   def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-===[#{type}] #{type}1
+///#{type}[#{type}1]{
 
-===[/#{type}]
+///}
 
 //#{type}[#{type}2]{
 //}
@@ -617,25 +618,25 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}] #{type}2
+///#{type}[#{type}2]{
 
-==[/#{type}]
+///}
 
-===[#{type}] #{type}3
+///#{type}[#{type}3]{
 
-===[/#{type}]
+///}
 
-====[#{type}] #{type}4
+///#{type}[#{type}4]{
 
-====[/#{type}]
+///}
 
-=====[#{type}] #{type}5
+///#{type}[#{type}5]{
 
-=====[/#{type}]
+///}
 
-======[#{type}] #{type}6
+///#{type}[#{type}6]{
 
-======[/#{type}]
+///}
 EOS
 
       expected = <<-EOS
@@ -653,26 +654,26 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
  * A
 
  1. B
 
-==[/#{type}]
+///}
 
-===[#{type}] OMITEND1
+///#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-==[#{type}] OMITEND2
+///}
+///#{type}[OMITEND2]{
+///}
 EOS
 
       expected = <<-EOS
-headline is empty.
-
 A
 
 1　B
@@ -690,13 +691,14 @@ def test_minicolumn_blocks
 
   def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
 //#{type}{
 //}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
       assert_match(/: nested mini\-column is not allowed/, e.message)
@@ -705,31 +707,34 @@ def test_minicolumn_blocks_nest_error1
 
   def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[#{type}]
+///#{type}{
 
-===[/#{type}]
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
   def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[note]
+///note{
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_topbuilder.rb b/test/test_topbuilder.rb
index 1dd583c14..985fd1c20 100644
--- a/test/test_topbuilder.rb
+++ b/test/test_topbuilder.rb
@@ -748,10 +748,11 @@ def test_minicolumn_blocks
     }
 
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-===[#{type}] #{type}1
+///#{type}[#{type}1]{
 
-===[/#{type}]
+///}
 
 //#{type}[#{type}2]{
 //}
@@ -771,25 +772,25 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}] #{type}2
+///#{type}[#{type}2]{
 
-==[/#{type}]
+///}
 
-===[#{type}] #{type}3
+///#{type}[#{type}3]{
 
-===[/#{type}]
+///}
 
-====[#{type}] #{type}4
+///#{type}[#{type}4]{
 
-====[/#{type}]
+///}
 
-=====[#{type}] #{type}5
+///#{type}[#{type}5]{
 
-=====[/#{type}]
+///}
 
-======[#{type}] #{type}6
+///#{type}[#{type}6]{
 
-======[/#{type}]
+///}
 EOS
 
       expected = <<-EOS
@@ -817,21 +818,23 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
  * A
 
  1. B
 
-==[/#{type}]
+///}
 
-===[#{type}] OMITEND1
+///#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-==[#{type}] OMITEND2
+///}
+///#{type}[OMITEND2]{
+///}
 EOS
 
       expected = <<-EOS
@@ -863,13 +866,14 @@ def test_minicolumn_blocks
 
   def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
 //#{type}{
 //}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
       assert_match(/: nested mini\-column is not allowed/, e.message)
@@ -878,31 +882,34 @@ def test_minicolumn_blocks_nest_error1
 
   def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[#{type}]
+///#{type}{
 
-===[/#{type}]
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 
   def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
       src = <<-EOS
-==[#{type}]
+///#{type}{
 
-===[note]
+///note{
+///}
 
-==[/#{type}]
+///}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/large block cannot be nested:/, e.message)
     end
   end
 

From 7bd2a889ce9e6d33c1136ed0212baf2e641370b7 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Sun, 28 Jun 2020 20:13:05 +0900
Subject: [PATCH 06/16] WIP

---
 lib/review/builder.rb         |  8 ++++
 lib/review/compiler.rb        | 82 ++++++++++++++++++++--------------
 lib/review/idgxmlbuilder.rb   | 15 +++++--
 test/test_htmlbuilder.rb      | 63 +++++++++++++-------------
 test/test_idgxmlbuilder.rb    | 83 ++++++++++++++++++++---------------
 test/test_latexbuilder.rb     | 63 +++++++++++++-------------
 test/test_plaintextbuilder.rb | 63 +++++++++++++-------------
 test/test_topbuilder.rb       | 63 +++++++++++++-------------
 8 files changed, 240 insertions(+), 200 deletions(-)

diff --git a/lib/review/builder.rb b/lib/review/builder.rb
index 23023e433..011143928 100644
--- a/lib/review/builder.rb
+++ b/lib/review/builder.rb
@@ -567,6 +567,14 @@ def check_nested_minicolumn
       end
     end
 
+    def in_minicolumn?
+      @doc_status[:minicolumn]
+    end
+
+    def minicolumn_block_name?(name)
+      CAPTION_TITLES.include?(name)
+    end
+
     def graph(lines, id, command, caption = '')
       c = target_name
       dir = File.join(@book.imagedir, c)
diff --git a/lib/review/compiler.rb b/lib/review/compiler.rb
index 53ed96f42..9cf1668a7 100644
--- a/lib/review/compiler.rb
+++ b/lib/review/compiler.rb
@@ -238,8 +238,8 @@ def do_compile
       f = LineInput.new(StringIO.new(@chapter.content))
       @builder.bind(self, @chapter, Location.new(@chapter.basename, f))
 
-      ## in large block, such as note/info/alert...
-      @large_block_name = nil
+      ## in minicolumn, such as note/info/alert...
+      @minicolumn_name = nil
 
       tagged_section_init
       while f.next?
@@ -258,28 +258,34 @@ def do_compile
           warn 'Definition list starting with `:` is deprecated. It should start with ` : `.'
           compile_dlist(f)
         when %r{\A//\}}
-          f.gets
-          error 'block end seen but not opened'
-        when %r|\A///([a-z]+)(:?\[.*\])?{\s*$|
-          name = $1
-          line = f.gets
-          args = parse_args(line.sub(%r{\A///[a-z]+}, '').rstrip.chomp('{'), name)
-          compile_large_block_begin(name, *args)
-        when %r(\A///}\s*$)
-          _line = f.gets
-          compile_large_block_end
+          if in_minicolumn?
+            _line = f.gets
+            compile_minicolumn_end
+          else
+            f.gets
+            error 'block end seen but not opened'
+          end
         when %r{\A//[a-z]+}
-          # @command_name_stack.push(name) ## <- move into read_command() to use name
-          name, args, lines = read_command(f)
-          syntax = syntax_descriptor(name)
-          unless syntax
-            error "unknown command: //#{name}"
-            compile_unknown_command(args, lines)
+          line = f.peek
+          matched = line =~ %r|\A//([a-z]+)(:?\[.*\])?{\s*$|
+          if matched && minicolumn_block_name?($1)
+            line = f.gets
+            name = $1
+            args = parse_args(line.sub(%r{\A//[a-z]+}, '').rstrip.chomp('{'), name)
+            compile_minicolumn_begin(name, *args)
+          else
+            # @command_name_stack.push(name) ## <- move into read_command() to use name
+            name, args, lines = read_command(f)
+            syntax = syntax_descriptor(name)
+            unless syntax
+              error "unknown command: //#{name}"
+              compile_unknown_command(args, lines)
+              @command_name_stack.pop
+              next
+            end
+            compile_command(syntax, args, lines)
             @command_name_stack.pop
-            next
           end
-          compile_command(syntax, args, lines)
-          @command_name_stack.pop
         when %r{\A//}
           line = f.gets
           warn "`//' seen but is not valid command: #{line.strip.inspect}"
@@ -298,31 +304,31 @@ def do_compile
       close_all_tagged_section
     end
 
-    def compile_large_block_begin(name, caption = nil)
+    def compile_minicolumn_begin(name, caption = nil)
       mid = "#{name}_begin"
-      unless @strategy.respond_to?(mid)
-        error "strategy does not support large block: #{name}"
+      unless @builder.respond_to?(mid)
+        error "strategy does not support minicolumn: #{name}"
       end
 
-      if @large_block_name
-        error "large block cannot be nested: #{name}"
+      if @minicolumn_name
+        error "minicolumn cannot be nested: #{name}"
         return
       end
-      @large_block_name = name
+      @minicolumn_name = name
 
-      @strategy.__send__(mid, caption)
+      @builder.__send__(mid, caption)
     end
 
-    def compile_large_block_end
-      unless @large_block_name
-        error "large block is not used: #{name}"
+    def compile_minicolumn_end
+      unless @minicolumn_name
+        error "minicolumn is not used: #{name}"
         return
       end
-      name = @large_block_name
+      name = @minicolumn_name
 
       mid = "#{name}_end"
-      @strategy.__send__(mid)
-      @large_block_name = nil
+      @builder.__send__(mid)
+      @minicolumn_name = nil
     end
 
     def compile_headline(line)
@@ -638,6 +644,14 @@ def compile_inline(str)
       @builder.nofunc_text(str)
     end
 
+    def in_minicolumn?
+      @builder.in_minicolumn?
+    end
+
+    def minicolumn_block_name?(name)
+      @builder.minicolumn_block_name?(name)
+    end
+
     def warn(msg)
       @builder.warn msg
     end
diff --git a/lib/review/idgxmlbuilder.rb b/lib/review/idgxmlbuilder.rb
index 396e477f5..2a085f1ac 100644
--- a/lib/review/idgxmlbuilder.rb
+++ b/lib/review/idgxmlbuilder.rb
@@ -1037,15 +1037,24 @@ def expert(lines)
       class_eval %Q(
         def #{name}_begin(caption = nil)
           check_nested_minicolumn
-          @doc_status[:minicolumn] = '#{name}'
-          print "<#{name}>"
+          if '#{name}' == 'notice' && caption.present?
+            @doc_status[:minicolumn] = '#{name}-t'
+            print "<#{name}-t>"
+          else
+            @doc_status[:minicolumn] = '#{name}'
+            print "<#{name}>"
+          end
           if caption.present?
             puts %Q(<title aid:pstyle='#{name}-title'>\#{compile_inline(caption)}</title>)
           end
         end
 
         def #{name}_end
-          print "</#{name}>"
+          if '#{name}' == 'notice' && @doc_status[:minicolumn] == 'notice-t'
+            print "</#{name}-t>"
+          else
+            print "</#{name}>"
+          end
           @doc_status[:minicolumn] = nil
         end
       )
diff --git a/test/test_htmlbuilder.rb b/test/test_htmlbuilder.rb
index f34a7e0c4..8d1dc39fe 100644
--- a/test/test_htmlbuilder.rb
+++ b/test/test_htmlbuilder.rb
@@ -2455,9 +2455,9 @@ def test_major_blocks
   def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       src = <<-EOS
-///#{type}[#{type}1]{
+//#{type}[#{type}1]{
 
-///}
+//}
 
 //#{type}[#{type}2]{
 //}
@@ -2469,31 +2469,30 @@ def test_minicolumn_blocks
 </div>
 <div class="#{type}">
 <p class="caption">#{type}2</p>
-<p></p>
 </div>
 EOS
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}[#{type}2]{
+//#{type}[#{type}2]{
 
-///}
+//}
 
-///#{type}[#{type}3]{
+//#{type}[#{type}3]{
 
-///}
+//}
 
-///#{type}[#{type}4]{
+//#{type}[#{type}4]{
 
-///}
+//}
 
-///#{type}[#{type}5]{
+//#{type}[#{type}5]{
 
-///}
+//}
 
-///#{type}[#{type}6]{
+//#{type}[#{type}6]{
 
-///}
+//}
 EOS
 
       expected = <<-EOS
@@ -2516,24 +2515,24 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}{
+//#{type}{
 
  * A
 
  1. B
 
-///}
+//}
 
-///#{type}[OMITEND1]{
+//#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-///}
+//}
 
-///#{type}[OMITEND2]{
-///}
+//#{type}[OMITEND2]{
+//}
 EOS
 
       expected = <<-EOS
@@ -2564,15 +2563,15 @@ def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
 //#{type}{
 //}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -2580,16 +2579,16 @@ def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///#{type}{
+//#{type}{
 
-///}
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -2597,16 +2596,16 @@ def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///note{
+//note{
 
-///}
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_idgxmlbuilder.rb b/test/test_idgxmlbuilder.rb
index 1a0a6d142..3494a6682 100644
--- a/test/test_idgxmlbuilder.rb
+++ b/test/test_idgxmlbuilder.rb
@@ -327,9 +327,9 @@ def test_major_blocks
   def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       src = <<-EOS
-///#{type}[#{type}1]{
+//#{type}[#{type}1]{
 
-///}
+//}
 
 //#{type}[#{type}2]{
 //}
@@ -337,66 +337,79 @@ def test_minicolumn_blocks
 
       if type == 'notice' # exception pattern
         expected = <<-EOS.chomp
-<#{type}><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}><#{type}-t><title aid:pstyle='#{type}-title'>#{type}2</title><p></p></#{type}-t>
+<#{type}-t><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}-t>
 EOS
       else
         expected = <<-EOS.chomp
-<#{type}><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}2</title><p></p></#{type}>
+<#{type}><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}>
 EOS
       end
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}[#{type}2]{
+//#{type}[#{type}2]{
 
-///}
+//}
 
-///#{type}[#{type}3]{
+//#{type}[#{type}3]{
 
-///}
+//}
 
-///#{type}[#{type}4]{
+//#{type}[#{type}4]{
 
-///}
+//}
 
-///#{type}[#{type}5]{
+//#{type}[#{type}5]{
 
-///}
+//}
 
-///#{type}[#{type}6]{
+//#{type}[#{type}6]{
 
-///}
+//}
 EOS
 
-      expected = <<-EOS.chomp
+      if type == 'notice' # exception pattern
+        expected = <<-EOS.chomp
+<#{type}-t><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}3</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}4</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}5</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}6</title></#{type}-t>
+EOS
+      else
+        expected = <<-EOS.chomp
 <#{type}><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}3</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}4</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}5</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}6</title></#{type}>
 EOS
+      end
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}{
+//#{type}{
 
  * A
 
  1. B
 
-///}
+//}
 
-///#{type}[OMITEND1]{
+//#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-///}
-///#{type}[OMITEND2]{
-///}
+//}
+//#{type}[OMITEND2]{
+//}
 EOS
 
-      expected = <<-EOS.chomp
+      if type == 'notice' # exception pattern
+        expected = <<-EOS.chomp
+<#{type}><ul><li aid:pstyle="ul-item">A</li></ul><ol><li aid:pstyle="ol-item" olnum="1" num="1">B</li></ol></#{type}><#{type}-t><title aid:pstyle='#{type}-title'>OMITEND1</title><list type='emlist'><pre>LIST
+</pre></list></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>OMITEND2</title></#{type}-t>
+EOS
+      else
+        expected = <<-EOS.chomp
 <#{type}><ul><li aid:pstyle="ul-item">A</li></ul><ol><li aid:pstyle="ol-item" olnum="1" num="1">B</li></ol></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND1</title><list type='emlist'><pre>LIST
 </pre></list></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND2</title></#{type}>
 EOS
+      end
       assert_equal expected, compile_block(src)
     end
   end
@@ -405,15 +418,15 @@ def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
 //#{type}{
 //}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -421,16 +434,16 @@ def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///#{type}{
+//#{type}{
 
-///}
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -438,15 +451,15 @@ def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///note{
-///}
+//note{
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_latexbuilder.rb b/test/test_latexbuilder.rb
index ea42a5ab5..df50336ea 100644
--- a/test/test_latexbuilder.rb
+++ b/test/test_latexbuilder.rb
@@ -1977,9 +1977,9 @@ def test_major_blocks
   def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       src = <<-EOS
-///#{type}[#{type}1]{
+//#{type}[#{type}1]{
 
-///}
+//}
 
 //#{type}[#{type}2]{
 //}
@@ -1989,31 +1989,30 @@ def test_minicolumn_blocks
 \\begin{review#{type}}[#{type}1]
 \\end{review#{type}}
 \\begin{review#{type}}[#{type}2]
-
 \\end{review#{type}}
 EOS
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}[#{type}2]{
+//#{type}[#{type}2]{
 
-///}
+//}
 
-///#{type}[#{type}3]{
+//#{type}[#{type}3]{
 
-///}
+//}
 
-///#{type}[#{type}4]{
+//#{type}[#{type}4]{
 
-///}
+//}
 
-///#{type}[#{type}5]{
+//#{type}[#{type}5]{
 
-///}
+//}
 
-///#{type}[#{type}6]{
+//#{type}[#{type}6]{
 
-///}
+//}
 EOS
 
       expected = <<-EOS
@@ -2031,23 +2030,23 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}{
+//#{type}{
 
  * A
 
  1. B
 
-///}
+//}
 
-///#{type}[OMITEND1]{
+//#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-///}
-///#{type}[OMITEND2]{
-///}
+//}
+//#{type}[OMITEND2]{
+//}
 EOS
 
       expected = <<-EOS
@@ -2082,15 +2081,15 @@ def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
 //#{type}{
 //}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -2098,16 +2097,16 @@ def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///#{type}{
+//#{type}{
 
-///}
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -2115,15 +2114,15 @@ def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///note{
-///}
+//note{
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_plaintextbuilder.rb b/test/test_plaintextbuilder.rb
index 5c0b9dbce..9ea10bf6c 100644
--- a/test/test_plaintextbuilder.rb
+++ b/test/test_plaintextbuilder.rb
@@ -600,9 +600,9 @@ def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}[#{type}1]{
+//#{type}[#{type}1]{
 
-///}
+//}
 
 //#{type}[#{type}2]{
 //}
@@ -613,30 +613,29 @@ def test_minicolumn_blocks
 
 #{type}2
 
-
 EOS
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}[#{type}2]{
+//#{type}[#{type}2]{
 
-///}
+//}
 
-///#{type}[#{type}3]{
+//#{type}[#{type}3]{
 
-///}
+//}
 
-///#{type}[#{type}4]{
+//#{type}[#{type}4]{
 
-///}
+//}
 
-///#{type}[#{type}5]{
+//#{type}[#{type}5]{
 
-///}
+//}
 
-///#{type}[#{type}6]{
+//#{type}[#{type}6]{
 
-///}
+//}
 EOS
 
       expected = <<-EOS
@@ -654,23 +653,23 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}{
+//#{type}{
 
  * A
 
  1. B
 
-///}
+//}
 
-///#{type}[OMITEND1]{
+//#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-///}
-///#{type}[OMITEND2]{
-///}
+//}
+//#{type}[OMITEND2]{
+//}
 EOS
 
       expected = <<-EOS
@@ -693,15 +692,15 @@ def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
 //#{type}{
 //}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -709,16 +708,16 @@ def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///#{type}{
+//#{type}{
 
-///}
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -726,15 +725,15 @@ def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///note{
-///}
+//note{
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
diff --git a/test/test_topbuilder.rb b/test/test_topbuilder.rb
index 985fd1c20..a8d62fd77 100644
--- a/test/test_topbuilder.rb
+++ b/test/test_topbuilder.rb
@@ -750,9 +750,9 @@ def test_minicolumn_blocks
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}[#{type}1]{
+//#{type}[#{type}1]{
 
-///}
+//}
 
 //#{type}[#{type}2]{
 //}
@@ -765,32 +765,31 @@ def test_minicolumn_blocks
 
 ◆→開始:#{titles[type]}←◆
 ■#{type}2
-
 ◆→終了:#{titles[type]}←◆
 
 EOS
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}[#{type}2]{
+//#{type}[#{type}2]{
 
-///}
+//}
 
-///#{type}[#{type}3]{
+//#{type}[#{type}3]{
 
-///}
+//}
 
-///#{type}[#{type}4]{
+//#{type}[#{type}4]{
 
-///}
+//}
 
-///#{type}[#{type}5]{
+//#{type}[#{type}5]{
 
-///}
+//}
 
-///#{type}[#{type}6]{
+//#{type}[#{type}6]{
 
-///}
+//}
 EOS
 
       expected = <<-EOS
@@ -818,23 +817,23 @@ def test_minicolumn_blocks
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
-///#{type}{
+//#{type}{
 
  * A
 
  1. B
 
-///}
+//}
 
-///#{type}[OMITEND1]{
+//#{type}[OMITEND1]{
 
 //emlist{
 LIST
 //}
 
-///}
-///#{type}[OMITEND2]{
-///}
+//}
+//#{type}[OMITEND2]{
+//}
 EOS
 
       expected = <<-EOS
@@ -868,15 +867,15 @@ def test_minicolumn_blocks_nest_error1
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
 //#{type}{
 //}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/: nested mini\-column is not allowed/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -884,16 +883,16 @@ def test_minicolumn_blocks_nest_error2
     %w[note memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///#{type}{
+//#{type}{
 
-///}
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 
@@ -901,15 +900,15 @@ def test_minicolumn_blocks_nest_error3
     %w[memo tip info warning important caution notice].each do |type|
       @builder.doc_status.clear
       src = <<-EOS
-///#{type}{
+//#{type}{
 
-///note{
-///}
+//note{
+//}
 
-///}
+//}
 EOS
       e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/large block cannot be nested:/, e.message)
+      assert_match(/minicolumn cannot be nested:/, e.message)
     end
   end
 

From 9b66e8e41df103e2b4540f64e6b3ea85ec300001 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Thu, 23 Jul 2020 21:11:49 +0900
Subject: [PATCH 07/16] fix rubocop

---
 lib/review/builder.rb          | 2 +-
 lib/review/htmlbuilder.rb      | 2 +-
 lib/review/idgxmlbuilder.rb    | 2 +-
 lib/review/latexbuilder.rb     | 2 +-
 lib/review/plaintextbuilder.rb | 2 +-
 lib/review/topbuilder.rb       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/review/builder.rb b/lib/review/builder.rb
index 011143928..3200bd739 100644
--- a/lib/review/builder.rb
+++ b/lib/review/builder.rb
@@ -558,7 +558,7 @@ def #{name}_begin(_level, _label, caption = nil)
         def #{name}_end(_level)
           @doc_status[:minicolumn] = nil
         end
-      )
+      ), __FILE__, __LINE__ - 15
     end
 
     def check_nested_minicolumn
diff --git a/lib/review/htmlbuilder.rb b/lib/review/htmlbuilder.rb
index 6c8ffa45a..ef2decb4b 100644
--- a/lib/review/htmlbuilder.rb
+++ b/lib/review/htmlbuilder.rb
@@ -328,7 +328,7 @@ def #{name}_end
           puts '</div>'
           @doc_status[:minicolumn] = nil
         end
-      )
+      ), __FILE__, __LINE__ - 14
     end
 
     def ul_begin
diff --git a/lib/review/idgxmlbuilder.rb b/lib/review/idgxmlbuilder.rb
index 2a085f1ac..672c034ab 100644
--- a/lib/review/idgxmlbuilder.rb
+++ b/lib/review/idgxmlbuilder.rb
@@ -1057,7 +1057,7 @@ def #{name}_end
           end
           @doc_status[:minicolumn] = nil
         end
-      )
+      ), __FILE__, __LINE__ - 23
     end
 
     def syntaxblock(type, lines, caption)
diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
index 31df2d00c..a8c2a5c90 100644
--- a/lib/review/latexbuilder.rb
+++ b/lib/review/latexbuilder.rb
@@ -239,7 +239,7 @@ def #{name}_begin(caption = nil)
         def #{name}_end
           common_block_end('#{name}')
         end
-      )
+      ), __FILE__, __LINE__ - 8
     end
 
     def captionblock(type, lines, caption)
diff --git a/lib/review/plaintextbuilder.rb b/lib/review/plaintextbuilder.rb
index bfc68db3b..0a2c8e350 100644
--- a/lib/review/plaintextbuilder.rb
+++ b/lib/review/plaintextbuilder.rb
@@ -602,7 +602,7 @@ def #{name}_end
           blank
           @doc_status[:minicolumn] = nil
         end
-      )
+      ), __FILE__, __LINE__ - 14
     end
 
     def indepimage(_lines, _id, caption = nil, _metric = nil)
diff --git a/lib/review/topbuilder.rb b/lib/review/topbuilder.rb
index d99f8fb2b..d6f6d526f 100644
--- a/lib/review/topbuilder.rb
+++ b/lib/review/topbuilder.rb
@@ -467,7 +467,7 @@ def #{name}_end
           common_block_end('#{name}', nil)
           @doc_status[:minicolumn] = nil
         end
-      )
+      ), __FILE__, __LINE__ - 11
     end
 
     def indepimage(_lines, id, caption = nil, metric = nil)

From 071b1273bb155c2d68b7ce70497a90889e235543 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Fri, 24 Jul 2020 11:41:58 +0900
Subject: [PATCH 08/16] fix xxx_begin and xxx_end

---
 lib/review/builder.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/review/builder.rb b/lib/review/builder.rb
index 3200bd739..1571d7699 100644
--- a/lib/review/builder.rb
+++ b/lib/review/builder.rb
@@ -549,13 +549,15 @@ def #{name}(lines, caption = nil)
           captionblock("#{name}", lines, caption)
         end
 
-        def #{name}_begin(_level, _label, caption = nil)
+        def #{name}_begin(caption = nil)
           check_nested_minicolumn
           @doc_status[:minicolumn] = '#{name}'
-          puts compile_inline(caption)
+          if caption
+            puts compile_inline(caption)
+          end
         end
 
-        def #{name}_end(_level)
+        def #{name}_end
           @doc_status[:minicolumn] = nil
         end
       ), __FILE__, __LINE__ - 15

From 1e8775236c88cc4ba08e33494ed314e0be0035a1 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Fri, 24 Jul 2020 11:42:27 +0900
Subject: [PATCH 09/16] use CAPTION_TITLES

---
 lib/review/htmlbuilder.rb      | 2 +-
 lib/review/idgxmlbuilder.rb    | 2 +-
 lib/review/latexbuilder.rb     | 2 +-
 lib/review/plaintextbuilder.rb | 2 +-
 lib/review/topbuilder.rb       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/review/htmlbuilder.rb b/lib/review/htmlbuilder.rb
index ef2decb4b..d533e6432 100644
--- a/lib/review/htmlbuilder.rb
+++ b/lib/review/htmlbuilder.rb
@@ -313,7 +313,7 @@ def note(lines, caption = nil)
       captionblock('note', lines, caption)
     end
 
-    %w[note memo tip info warning important caution notice].each do |name|
+    CAPTION_TITLES.each do |name|
       class_eval %Q(
         def #{name}_begin(caption = nil)
           check_nested_minicolumn
diff --git a/lib/review/idgxmlbuilder.rb b/lib/review/idgxmlbuilder.rb
index 672c034ab..4c117f10f 100644
--- a/lib/review/idgxmlbuilder.rb
+++ b/lib/review/idgxmlbuilder.rb
@@ -1033,7 +1033,7 @@ def expert(lines)
       captionblock('expert', lines, nil)
     end
 
-    %w[note memo tip info warning important caution notice].each do |name|
+    CAPTION_TITLES.each do |name|
       class_eval %Q(
         def #{name}_begin(caption = nil)
           check_nested_minicolumn
diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
index a8c2a5c90..f7f2adceb 100644
--- a/lib/review/latexbuilder.rb
+++ b/lib/review/latexbuilder.rb
@@ -230,7 +230,7 @@ def common_block_end(type)
       @doc_status[:minicolumn] = nil
     end
 
-    %w[note memo tip info warning important caution notice].each do |name|
+    CAPTION_TITLES.each do |name|
       class_eval %Q(
         def #{name}_begin(caption = nil)
           common_block_begin('#{name}', caption)
diff --git a/lib/review/plaintextbuilder.rb b/lib/review/plaintextbuilder.rb
index 0a2c8e350..0e134b868 100644
--- a/lib/review/plaintextbuilder.rb
+++ b/lib/review/plaintextbuilder.rb
@@ -587,7 +587,7 @@ def warning(lines, caption = nil)
 
     alias_method :box, :insn
 
-    %w[note memo tip info warning important caution notice].each do |name|
+    CAPTION_TITLES.each do |name|
       class_eval %Q(
         def #{name}_begin(caption = nil)
           check_nested_minicolumn
diff --git a/lib/review/topbuilder.rb b/lib/review/topbuilder.rb
index d6f6d526f..67942a305 100644
--- a/lib/review/topbuilder.rb
+++ b/lib/review/topbuilder.rb
@@ -455,7 +455,7 @@ def common_block_end(type, _level)
       blank
     end
 
-    %w[note memo tip info warning important caution notice].each do |name|
+    CAPTION_TITLES.each do |name|
       class_eval %Q(
         def #{name}_begin(caption = nil)
           check_nested_minicolumn

From 7ed0420b2fc18f84932a35858768a347dcfff152 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Fri, 24 Jul 2020 11:42:39 +0900
Subject: [PATCH 10/16] define minicolumn in Markdown and ReST

---
 lib/review/markdownbuilder.rb | 18 ++++++++++++++++++
 lib/review/rstbuilder.rb      | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/lib/review/markdownbuilder.rb b/lib/review/markdownbuilder.rb
index c56395ff5..6ed8ccc7a 100644
--- a/lib/review/markdownbuilder.rb
+++ b/lib/review/markdownbuilder.rb
@@ -159,6 +159,24 @@ def captionblock(type, lines, caption, _specialstyle = nil)
       puts '</div>'
     end
 
+    CAPTION_TITLES.each do |name|
+      class_eval %Q(
+        def #{name}_begin(caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
+          puts %Q(<div class="#{name}">)
+          if caption.present?
+            puts %Q(<p class="caption">\#{compile_inline(caption)}</p>)
+          end
+        end
+
+        def #{name}_end
+          puts '</div>'
+          @doc_status[:minicolumn] = nil
+        end
+      ), __FILE__, __LINE__ - 8
+    end
+
     def hr
       puts '----'
     end
diff --git a/lib/review/rstbuilder.rb b/lib/review/rstbuilder.rb
index fc128c467..2206a2f72 100644
--- a/lib/review/rstbuilder.rb
+++ b/lib/review/rstbuilder.rb
@@ -582,6 +582,24 @@ def centering(lines)
       base_parablock('centering', lines, nil)
     end
 
+    CAPTION_TITLES.each do |name|
+      class_eval %Q(
+        def #{name}_begin(caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
+          puts ".. #{name}::"
+          blank
+          puts "   " + compile_inline(caption).to_s unless caption.nil?
+          print "   "
+        end
+
+        def #{name}_end
+          blank
+          @doc_status[:minicolumn] = nil
+        end
+      ), __FILE__, __LINE__ - 14
+    end
+
     def note(lines, caption = nil)
       base_parablock('note', lines, caption)
     end

From e713058cdf114c6ea5c254d57c9a35e43356bf70 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Wed, 26 Aug 2020 02:58:54 +0900
Subject: [PATCH 11/16] update docs

---
 doc/format.ja.md | 9 +++++----
 doc/format.md    | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/format.ja.md b/doc/format.ja.md
index 7225cdebb..7c64bbcf3 100644
--- a/doc/format.ja.md
+++ b/doc/format.ja.md
@@ -2,7 +2,7 @@
 
 Re:VIEW フォーマットの文法について解説します。Re:VIEW フォーマットはアスキー社（現カドカワ）の EWB を基本としながら、一部に RD や各種 Wiki の文法を取り入れて簡素化しています。
 
-このドキュメントは、Re:VIEW 4.2 に基づいています。
+このドキュメントは、Re:VIEW 5.0 に基づいています。
 
 ## 段落
 
@@ -255,6 +255,7 @@ puts "hello world!"
 //}
 ```
 
+
 ### ソースコード専用の引用
 
 ソースコードを引用するには次のように記述します。
@@ -502,17 +503,17 @@ complexmatrixという識別子に基づく画像ファイルが貼り込まれ
 
 内容には、空行で区切って複数の段落を記述可能です。
 
-Re:VIEW 4.2 以降では、箇条書きや図表・リストを含める必要があるときのために、コラムに類似する記法で囲み記事を表現することもできます。
+Re:VIEW 5.0 以降では、囲み記事に箇条書きや図表・リストを含めることもできます。
 
 ```
-===[note] ノート
+//note{
 
 箇条書きを含むノートです。
 
  1. 箇条書き1
  2. 箇条書き2
 
-===[/note]
+//}
 ```
 
 ## 脚注
diff --git a/doc/format.md b/doc/format.md
index e26cab159..58f31ec07 100644
--- a/doc/format.md
+++ b/doc/format.md
@@ -4,7 +4,7 @@ The document is a brief guide for Re:VIEW markup syntax.
 
 Re:VIEW is based on EWB of ASCII (now KADOKAWA), influenced RD and other Wiki system's syntax.
 
-This document explains about the format of Re:VIEW 4.2.
+This document explains about the format of Re:VIEW 5.0.
 
 
 ## Paragraph
@@ -532,17 +532,17 @@ Some block commands are used for short column.
 
 The content is like paragraph; separated by empty lines.
 
-From Re:VIEW 4.2, it is also possible to express a short column in a notation similar to a column.
+From Re:VIEW 5.0, it is also possible to include itemize, figures and tables in short columns.
 
 ```
-===[note] NOTE
+//note{
 
 With ordered itemize.
 
  1. item1
  2. item2
 
-===[/note]
+//}
 ```
 
 ## Footnotes

From 361afdd87ede91a731c22f2f737244f799ac94c1 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Wed, 26 Aug 2020 03:09:39 +0900
Subject: [PATCH 12/16] fix rubocop

---
 lib/review/builder.rb         | 2 +-
 lib/review/markdownbuilder.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/review/builder.rb b/lib/review/builder.rb
index 695657a96..bce9350e4 100644
--- a/lib/review/builder.rb
+++ b/lib/review/builder.rb
@@ -563,7 +563,7 @@ def #{name}_begin(caption = nil)
         def #{name}_end
           @doc_status[:minicolumn] = nil
         end
-      ), __FILE__, __LINE__ - 15
+      ), __FILE__, __LINE__ - 17
     end
 
     def check_nested_minicolumn
diff --git a/lib/review/markdownbuilder.rb b/lib/review/markdownbuilder.rb
index 6ed8ccc7a..8a156d44d 100644
--- a/lib/review/markdownbuilder.rb
+++ b/lib/review/markdownbuilder.rb
@@ -174,7 +174,7 @@ def #{name}_end
           puts '</div>'
           @doc_status[:minicolumn] = nil
         end
-      ), __FILE__, __LINE__ - 8
+      ), __FILE__, __LINE__ - 14
     end
 
     def hr

From 2a6712fce087066a5c802775ee24f146b9d9a2b4 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Sat, 29 Aug 2020 20:12:29 +0900
Subject: [PATCH 13/16] LATEXBuilder: support Re:VIEW 2.0 format

---
 lib/review/latexbuilder.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
index 89fa4ae3b..0d0c48aef 100644
--- a/lib/review/latexbuilder.rb
+++ b/lib/review/latexbuilder.rb
@@ -214,18 +214,33 @@ def column_end(_level)
 
     def common_block_begin(type, caption = nil)
       check_nested_minicolumn
+      if @book.config.check_version('2', exception: false)
+        type = 'minicolumn'
+      end
+
       @doc_status[:minicolumn] = type
       print "\\begin{review#{type}}"
 
       @doc_status[:caption] = true
+      if @book.config.check_version('2', exception: false)
+        puts
+        if caption.present?
+          puts "\\reviewminicolumntitle{#{compile_inline(caption)}}"
+        end
+      else
       if caption.present?
         print "[#{compile_inline(caption)}]"
       end
       puts
+      end
       @doc_status[:caption] = nil
     end
 
     def common_block_end(type)
+      if @book.config.check_version('2', exception: false)
+        type = 'minicolumn'
+      end
+
       puts "\\end{review#{type}}"
       @doc_status[:minicolumn] = nil
     end

From 9565744194353bb1d0c1185b7144f51a2f5d4445 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Sat, 26 Sep 2020 18:54:10 +0900
Subject: [PATCH 14/16] fix indent by rubocop

---
 lib/review/latexbuilder.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/review/latexbuilder.rb b/lib/review/latexbuilder.rb
index dc3c4fe8d..4f92c407e 100644
--- a/lib/review/latexbuilder.rb
+++ b/lib/review/latexbuilder.rb
@@ -228,10 +228,10 @@ def common_block_begin(type, caption = nil)
           puts "\\reviewminicolumntitle{#{compile_inline(caption)}}"
         end
       else
-      if caption.present?
-        print "[#{compile_inline(caption)}]"
-      end
-      puts
+        if caption.present?
+          print "[#{compile_inline(caption)}]"
+        end
+        puts
       end
       @doc_status[:caption] = nil
     end

From 6dc52e1d02187b0dfd5ab2db7194731f43727bef Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Sat, 26 Sep 2020 19:05:09 +0900
Subject: [PATCH 15/16] markdown: paragraph separator should be empty line

---
 lib/review/markdownbuilder.rb | 2 +-
 test/test_markdownbuilder.rb  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/review/markdownbuilder.rb b/lib/review/markdownbuilder.rb
index c56395ff5..d7b3d8421 100644
--- a/lib/review/markdownbuilder.rb
+++ b/lib/review/markdownbuilder.rb
@@ -155,7 +155,7 @@ def captionblock(type, lines, caption, _specialstyle = nil)
       puts %Q(<div class="#{type}">)
       puts %Q(<p class="caption">#{compile_inline(caption)}</p>) if caption.present?
       blocked_lines = split_paragraph(lines)
-      puts blocked_lines.join("\n")
+      puts blocked_lines.join("\n\n")
       puts '</div>'
     end
 
diff --git a/test/test_markdownbuilder.rb b/test/test_markdownbuilder.rb
index eb3c76ac5..60b559bdd 100644
--- a/test/test_markdownbuilder.rb
+++ b/test/test_markdownbuilder.rb
@@ -48,6 +48,7 @@ def test_memo
 <div class="memo">
 <p class="caption">this is **test**<&>_</p>
 test1
+
 test*2*
 </div>
 EOS

From 3d4acf16b746f66821074a8dc6051d23e77c73d9 Mon Sep 17 00:00:00 2001
From: takahashim <maki@rubycolor.org>
Date: Sat, 26 Sep 2020 21:22:05 +0900
Subject: [PATCH 16/16] fix testcases; add (redundant) empty lines

---
 test/test_latexbuilder.rb    | 34 ++++++++++++++++++++++++++++++++++
 test/test_latexbuilder_v2.rb | 34 ++++++++++++++++++++++++++++++++++
 test/test_markdownbuilder.rb |  1 +
 test/test_rstbuilder.rb      | 26 +++++++++++++++++++++++++-
 4 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/test/test_latexbuilder.rb b/test/test_latexbuilder.rb
index 8f6285ba5..28191242a 100644
--- a/test/test_latexbuilder.rb
+++ b/test/test_latexbuilder.rb
@@ -904,9 +904,11 @@ def test_memo
     actual = compile_block("//memo[this is @<b>{test}<&>_]{\ntest1\n\ntest@<i>{2}\n//}\n")
     expected = <<-EOS
 \\begin{reviewmemo}[this is \\reviewbold{test}\\textless{}\\&\\textgreater{}\\textunderscore{}]
+
 test1
 
 test\\reviewit{2}
+
 \\end{reviewmemo}
 EOS
     assert_equal expected, actual
@@ -1899,12 +1901,16 @@ def test_major_blocks
     actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewnote}
+
 A
 
 B
+
 \\end{reviewnote}
 \\begin{reviewnote}[caption]
+
 A
+
 \\end{reviewnote}
 EOS
     assert_equal expected, actual
@@ -1912,12 +1918,16 @@ def test_major_blocks
     actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewmemo}
+
 A
 
 B
+
 \\end{reviewmemo}
 \\begin{reviewmemo}[caption]
+
 A
+
 \\end{reviewmemo}
 EOS
     assert_equal expected, actual
@@ -1925,12 +1935,16 @@ def test_major_blocks
     actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewinfo}
+
 A
 
 B
+
 \\end{reviewinfo}
 \\begin{reviewinfo}[caption]
+
 A
+
 \\end{reviewinfo}
 EOS
     assert_equal expected, actual
@@ -1938,12 +1952,16 @@ def test_major_blocks
     actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewimportant}
+
 A
 
 B
+
 \\end{reviewimportant}
 \\begin{reviewimportant}[caption]
+
 A
+
 \\end{reviewimportant}
 EOS
     assert_equal expected, actual
@@ -1951,12 +1969,16 @@ def test_major_blocks
     actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewcaution}
+
 A
 
 B
+
 \\end{reviewcaution}
 \\begin{reviewcaution}[caption]
+
 A
+
 \\end{reviewcaution}
 EOS
     assert_equal expected, actual
@@ -1964,12 +1986,16 @@ def test_major_blocks
     actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewnotice}
+
 A
 
 B
+
 \\end{reviewnotice}
 \\begin{reviewnotice}[caption]
+
 A
+
 \\end{reviewnotice}
 EOS
     assert_equal expected, actual
@@ -1977,12 +2003,16 @@ def test_major_blocks
     actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewwarning}
+
 A
 
 B
+
 \\end{reviewwarning}
 \\begin{reviewwarning}[caption]
+
 A
+
 \\end{reviewwarning}
 EOS
     assert_equal expected, actual
@@ -1990,12 +2020,16 @@ def test_major_blocks
     actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewtip}
+
 A
 
 B
+
 \\end{reviewtip}
 \\begin{reviewtip}[caption]
+
 A
+
 \\end{reviewtip}
 EOS
     assert_equal expected, actual
diff --git a/test/test_latexbuilder_v2.rb b/test/test_latexbuilder_v2.rb
index 1509315dc..a71dccf7a 100644
--- a/test/test_latexbuilder_v2.rb
+++ b/test/test_latexbuilder_v2.rb
@@ -666,9 +666,11 @@ def test_memo
     expected = <<-EOS
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{this is \\textbf{test}\\textless{}\\&\\textgreater{}\\textunderscore{}}
+
 test1
 
 test\\textit{2}
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1289,13 +1291,17 @@ def test_major_blocks
     actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1303,13 +1309,17 @@ def test_major_blocks
     actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1317,13 +1327,17 @@ def test_major_blocks
     actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1331,13 +1345,17 @@ def test_major_blocks
     actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1345,13 +1363,17 @@ def test_major_blocks
     actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1359,13 +1381,17 @@ def test_major_blocks
     actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1373,13 +1399,17 @@ def test_major_blocks
     actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1387,13 +1417,17 @@ def test_major_blocks
     actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
diff --git a/test/test_markdownbuilder.rb b/test/test_markdownbuilder.rb
index 60b559bdd..6305e8b68 100644
--- a/test/test_markdownbuilder.rb
+++ b/test/test_markdownbuilder.rb
@@ -50,6 +50,7 @@ def test_memo
 test1
 
 test*2*
+
 </div>
 EOS
     assert_equal expected, actual
diff --git a/test/test_rstbuilder.rb b/test/test_rstbuilder.rb
index 862e5c5ea..b1326ebcb 100644
--- a/test/test_rstbuilder.rb
+++ b/test/test_rstbuilder.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'review/compiler'
 require 'review/book'
-require 'review/topbuilder'
+require 'review/rstbuilder'
 require 'review/i18n'
 
 class RSTBuidlerTest < Test::Unit::TestCase
@@ -327,13 +327,16 @@ def test_major_blocks
 .. note::
 
    A
+
 B
 
+
 .. note::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -342,13 +345,16 @@ def test_major_blocks
 .. memo::
 
    A
+
 B
 
+
 .. memo::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -357,13 +363,16 @@ def test_major_blocks
 .. info::
 
    A
+
 B
 
+
 .. info::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -372,13 +381,16 @@ def test_major_blocks
 .. important::
 
    A
+
 B
 
+
 .. important::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -387,13 +399,16 @@ def test_major_blocks
 .. caution::
 
    A
+
 B
 
+
 .. caution::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -402,13 +417,16 @@ def test_major_blocks
 .. notice::
 
    A
+
 B
 
+
 .. notice::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -417,13 +435,16 @@ def test_major_blocks
 .. warning::
 
    A
+
 B
 
+
 .. warning::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -432,13 +453,16 @@ def test_major_blocks
 .. tip::
 
    A
+
 B
 
+
 .. tip::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
   end