review 5.0.0 → 5.3.0

data/test/test_lineinput.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'lineinput'
+require 'review/lineinput'
 require 'tempfile'
 require 'stringio'
 
@@ -9,7 +9,7 @@ class LineInputTest < Test::Unit::TestCase
     li = LineInput.new(io)
     assert_equal 0, li.lineno
     assert !li.eof?
-    assert_equal "#<LineInput file=#{io.inspect} line=0>", li.inspect
+    assert_equal "#<ReVIEW::LineInput file=#{io.inspect} line=0>", li.inspect
   end
 
   def test_gets
@@ -40,21 +40,6 @@ class LineInputTest < Test::Unit::TestCase
     assert li.eof?
   end
 
-  def test_ungets
-    io = StringIO.new('abc')
-    li = LineInput.new(io)
-
-    line = li.gets
-    assert_equal line, li.ungets(line)
-    assert_equal 0, li.lineno
-    assert_equal line, li.gets
-
-    li.ungets('xyz')
-    assert_equal 0, li.lineno
-    li.ungets('xyz')
-    assert_equal(-1, li.lineno) # XXX: OK?
-  end
-
   def test_peek
     li = LineInput.new(StringIO.new)
     assert_equal nil, li.peek
@@ -71,33 +56,6 @@ class LineInputTest < Test::Unit::TestCase
     assert li.next?
   end
 
-  def test_gets_if
-    io = StringIO.new
-    li = LineInput.new(io)
-    assert_equal nil, li.gets_if(//)
-
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    assert_equal "abc\n", li.gets_if(//)
-    assert_equal nil, li.gets_if(/^X/)
-    assert_equal nil, li.gets_if(/^g/)
-    assert_equal "def\n", li.gets_if(/^d/)
-  end
-
-  def test_gets_unless
-    io = StringIO.new
-    li = LineInput.new(io)
-    assert_equal nil, li.gets_unless(//)
-
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    assert_equal nil, li.gets_unless(//)
-    assert_equal "abc\n", li.gets_unless(/^X/)
-    assert_equal nil, li.gets_unless(/^d/)
-  end
-
   def test_each
     content = "abc\ndef\nghi"
     io = StringIO.new(content)
@@ -112,17 +70,9 @@ class LineInputTest < Test::Unit::TestCase
     io = StringIO.new("abc\ndef\nghi")
     li = LineInput.new(io)
 
-    li.while_match(/^[ad]/) {}
-    assert_equal 2, li.lineno
-    assert_equal 'ghi', li.gets
-  end
-
-  def test_getlines_while
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    buf = li.getlines_while(/^[ad]/)
-    assert_equal ["abc\n", "def\n"], buf
+    li.while_match(/^[ad]/) do
+      # skip
+    end
     assert_equal 2, li.lineno
     assert_equal 'ghi', li.gets
   end
@@ -131,47 +81,24 @@ class LineInputTest < Test::Unit::TestCase
     io = StringIO.new("abc\ndef\nghi")
     li = LineInput.new(io)
 
-    li.until_match(/^[^a]/) {}
-    assert_equal 1, li.lineno
-    assert_equal "def\n", li.gets
-  end
-
-  def test_getlines_until
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    buf = li.getlines_until(/^[^a]/)
-    assert_equal ["abc\n"], buf
+    li.until_match(/^[^a]/) do
+      # skip
+    end
     assert_equal 1, li.lineno
     assert_equal "def\n", li.gets
   end
 
-  def test_until_terminator
-    io = StringIO.new("abc\n//}\ndef\nghi\n//}\njkl\nmno")
-    li = LineInput.new(io)
-
-    data = ''
-    li.until_terminator(%r<\A//\}>) { |l| data << l }
-    assert_equal "abc\n", data
-    assert_equal 2, li.lineno
-
-    data = ''
-    li.until_terminator(%r<\A//\}>) { |l| data << l }
-    assert_equal "def\nghi\n", data
-    assert_equal 5, li.lineno
-
-    data = ''
-    li.until_terminator(%r<\A//\}>) { |l| data << l }
-    assert_equal "jkl\nmno", data
-    assert_equal 8, li.lineno
-  end
-
-  def test_until_terminator2
-    io = StringIO.new("abc\ndef\n//}\nghi\n//}")
-    li = LineInput.new(io)
-
-    data = li.getblock(%r<\A//\}>)
-    assert_equal ["abc\n", "def\n"], data
-    assert_equal 3, li.lineno
+  def test_invalid_control_sequence
+    0.upto(31) do |n|
+      content = n.chr
+      io = StringIO.new(content)
+      li = ReVIEW::LineInput.new(io)
+      if [9, 10, 13].include?(n) # TAB, LF, CR
+        assert_equal content, li.gets
+      else
+        e = assert_raise(ReVIEW::SyntaxError) { li.gets }
+        assert_match(/found invalid control/, e.message)
+      end
+    end
   end
 end

data/test/test_markdownbuilder.rb

@@ -106,6 +106,48 @@ EOS
     assert_equal %Q(test <span class="red">コメント</span> test2), actual
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<sup>(1)</sup>
+
+(1) bar
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_inline_hd_chap
+    def @chapter.headline_index
+      item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')
+      idx = Book::HeadlineIndex.new(self)
+      idx.add_item(item)
+      idx
+    end
+
+    @config['secnolevel'] = 2
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="#h1-1-1">「te_st」</a> test2', actual
+
+    actual = compile_inline('test @<hd>{test} test2')
+    assert_equal 'test <a href="#h1-1-1">「te_st」</a> test2', actual
+
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="#h1-1-1">「1.1.1 te_st」</a> test2', actual
+
+    @config['chapterlink'] = nil
+    @config['secnolevel'] = 2
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test 「te_st」 test2', actual
+
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test 「1.1.1 te_st」 test2', actual
+  end
+
   def test_ul_nest1
     src = <<-EOS
   * AAA

data/test/test_pdfmaker.rb

@@ -167,6 +167,25 @@ class PDFMakerTest < Test::Unit::TestCase
     end
   end
 
+  def test_template_content_with_invalid_localconfig
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        Dir.mkdir('layouts')
+        File.write(File.join('layouts', 'config-local.tex.erb'), %q(<%= not_existed_method %>\n))
+        @maker.basedir = Dir.pwd
+        @maker.erb_config
+        @maker.instance_eval do
+          def error!(msg)
+            msg
+          end
+        end
+        error_msg = @maker.template_content
+        assert_match(/template or configuration error:/, error_msg)
+        assert_match(/undefined local variable or method `not_existed_method'/, error_msg)
+      end
+    end
+  end
+
   def test_gettemplate_with_backmatter
     @config.merge!(
       'backcover' => 'backcover.tex',
@@ -261,4 +280,75 @@ class PDFMakerTest < Test::Unit::TestCase
               '2012年1月31日 ver 1.2.1発行']
     assert_equal expect, history
   end
+
+  def test_box_setting_is_defined
+    %w[column note memo tip info warning important caution notice].each do |name|
+      @config['pdfmaker']['boxsetting'] = {
+        name => { 'style' => 'simplebox' }
+      }
+      assert !ReVIEW::LaTeXBox.new.tcbox(@config).empty?
+    end
+    @config['pdfmaker']['boxsetting'] = {
+      'invalid' => { 'style' => 'simplebox' }
+    }
+    assert ReVIEW::LaTeXBox.new.tcbox(@config).empty?
+  end
+
+  def test_box_setting_options
+    @config['pdfmaker']['boxsetting'] = {
+      'note' => { 'style' => 'simplebox' },
+      'important' => { 'style' => 'simplebox', 'options' => 'colback=blue,arc=3mm' },
+      'caution' => { 'style' => 'squarecaptionbox', 'options_with_caption' => 'attach boxed title to top bottom' }
+    }
+
+    expected = <<-EOS
+\\renewenvironment{reviewnote}[1][]{%
+  \\csdef{rv@tmp@withcaption}{true}
+  \\notblank{##1}{
+    \\begin{rv@simplebox@caption}{##1}[]
+   }{
+    \\csundef{rv@tmp@withcaption}
+    \\begin{rv@simplebox@nocaption}[]
+   }
+}{
+  \\ifcsdef{rv@tmp@withcaption}{
+    \\end{rv@simplebox@caption}
+  }{
+    \\end{rv@simplebox@nocaption}
+  }
+}
+\\renewenvironment{reviewimportant}[1][]{%
+  \\csdef{rv@tmp@withcaption}{true}
+  \\notblank{##1}{
+    \\begin{rv@simplebox@caption}{##1}[colback=blue,arc=3mm]
+   }{
+    \\csundef{rv@tmp@withcaption}
+    \\begin{rv@simplebox@nocaption}[colback=blue,arc=3mm]
+   }
+}{
+  \\ifcsdef{rv@tmp@withcaption}{
+    \\end{rv@simplebox@caption}
+  }{
+    \\end{rv@simplebox@nocaption}
+  }
+}
+\\renewenvironment{reviewcaution}[1][]{%
+  \\csdef{rv@tmp@withcaption}{true}
+  \\notblank{##1}{
+    \\begin{rv@squarecaptionbox@caption}{##1}[attach boxed title to top bottom]
+   }{
+    \\csundef{rv@tmp@withcaption}
+    \\begin{rv@squarecaptionbox@nocaption}[]
+   }
+}{
+  \\ifcsdef{rv@tmp@withcaption}{
+    \\end{rv@squarecaptionbox@caption}
+  }{
+    \\end{rv@squarecaptionbox@nocaption}
+  }
+}
+EOS
+    actual = ReVIEW::LaTeXBox.new.tcbox(@config)
+    assert_equal expected, actual
+  end
 end

data/test/test_pdfmaker_cmd.rb

@@ -5,14 +5,14 @@ require 'yaml'
 require 'rbconfig'
 require 'open3'
 
-REVIEW_PDFMAKER = File.expand_path('../bin/review-pdfmaker', File.dirname(__FILE__))
+REVIEW_PDFMAKER = File.expand_path('../bin/review-pdfmaker', __dir__)
 
 class PDFMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
-    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+    ENV['RUBYLIB'] = File.expand_path('../lib', __dir__)
   end
 
   def teardown

data/test/test_plaintextbuilder.rb

@@ -14,6 +14,8 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     @config['language'] = 'ja'
     @book = Book::Base.new
     @book.config = @config
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -90,9 +92,16 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     assert_equal "\n", actual
   end
 
-  def test_inline_i
-    actual = compile_inline('test @<i>{inline test} test2')
-    assert_equal 'test inline test test2', actual
+  def test_inline_asis
+    %w[i b tti ttb bou ami u strong em code ins tcy].each do |tag|
+      actual = compile_inline("test @<#{tag}>{inline test} test2")
+      assert_equal 'test inline test test2', actual
+    end
+  end
+
+  def test_inline_del
+    actual = compile_inline('test @<del>{inline test} test2')
+    assert_equal 'test  test2', actual
   end
 
   def test_inline_i_and_escape
@@ -100,11 +109,6 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     assert_equal 'test inline<&;\\ test test2', actual
   end
 
-  def test_inline_b
-    actual = compile_inline('test @<b>{inline test} test2')
-    assert_equal 'test inline test test2', actual
-  end
-
   def test_inline_b_and_escape
     actual = compile_inline('test @<b>{inline<&;\\ test} test2')
     assert_equal 'test inline<&;\\ test test2', actual
@@ -115,16 +119,6 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     assert_equal 'test inline test test2}', actual
   end
 
-  def test_inline_tti
-    actual = compile_inline('test @<tti>{inline test} test2')
-    assert_equal 'test inline test test2', actual
-  end
-
-  def test_inline_ttb
-    actual = compile_inline('test @<ttb>{inline test} test2')
-    assert_equal 'test inline test test2', actual
-  end
-
   def test_inline_uchar
     actual = compile_inline('test @<uchar>{2460} test2')
     assert_equal 'test ① test2', actual
@@ -477,10 +471,10 @@ EOS
 
   def test_empty_table
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
-    assert_equal ':2: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
 
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
-    assert_equal ':3: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_inline_table
@@ -699,8 +693,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -716,8 +710,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -732,8 +726,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -768,20 +762,42 @@ EOS
     assert_equal %Q(\\sin\n1^{2}\n\n), actual
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+(1)
+(1) bar
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
-    assert_equal ':1: error: unknown image: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
-    assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
-    assert_equal ':1: error: unknown headline: n', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
+    assert_match(/unknown image: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<endnote>{n}\n") }
+    assert_match(/unknown endnote: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
+    assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ":1: error: unknown #{name}: n", e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/unknown #{name}: n/, @log_io.string)
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ':1: error: key not found: "n"', e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 
@@ -899,7 +915,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ":1: error: //endchild is shown, but any opened //beginchild doesn't exist", e.message
+    assert_equal ":1: //endchild is shown, but any opened //beginchild doesn't exist", e.message
   end
 
   def test_nest_error_close1
@@ -907,7 +923,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -925,7 +941,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -945,7 +961,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul