review 3.2.0 → 5.1.0

data/test/test_latexbuilder_v2.rb

@@ -14,10 +14,10 @@ class LATEXBuidlerV2Test < Test::Unit::TestCase
       'secnolevel' => 2, # for IDGXMLBuilder, EPUBBuilder
       'toclevel' => 2,
       'stylesheet' => nil, # for EPUBBuilder
-      'image_scale2width' => false,
       'texcommand' => 'uplatex',
       'review_version' => '2.0'
     )
+    @config['pdfmaker']['image_scale2width'] = nil
     @book = Book::Base.new
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -221,12 +221,18 @@ EOS
 
   def test_inline_hd_chap
     def @chapter.headline_index
-      items = [Book::HeadlineIndex::Item.new('chap1|test', [1, 1], 'te_st')]
-      Book::HeadlineIndex.new(items, self)
+      item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')
+      idx = Book::HeadlineIndex.new(self)
+      idx.add_item(item)
+      idx
     end
 
     @config['secnolevel'] = 3
     actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test \reviewsecref{「1.1.1 te\\textunderscore{}st」}{sec:1-1-1} test2', actual
+
+    @config['chapterlink'] = nil
+    actual = compile_inline('test @<hd>{chap1|test} test2')
     assert_equal 'test 「1.1.1 te\\textunderscore{}st」 test2', actual
   end
 
@@ -251,9 +257,9 @@ EOS
   end
 
   def test_inline_idx_yomi
+    require 'nkf'
     begin
       require 'MeCab'
-      require 'nkf'
     rescue LoadError
       $stderr.puts 'skip test_inline_idx_yomi (cannot find MeCab)'
       return true
@@ -276,7 +282,7 @@ EOS
   end
 
   def test_dlist
-    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
     expected = <<-EOS
 
 \\begin{description}
@@ -289,7 +295,7 @@ EOS
   end
 
   def test_dlist_with_bracket
-    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
+    actual = compile_block(" : foo[bar]\n    foo.\n    bar.\n")
     expected = <<-EOS
 
 \\begin{description}
@@ -660,9 +666,11 @@ EOS
     expected = <<-EOS
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{this is \\textbf{test}\\textless{}\\&\\textgreater{}\\textunderscore{}}
+
 test1
 
 test\\textit{2}
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -719,7 +727,7 @@ EOS
 
   def test_image
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -737,7 +745,7 @@ EOS
 
   def test_image_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -755,12 +763,12 @@ EOS
 
   def test_image_with_metric_width
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    @config['image_scale2width'] = true
+    @config['pdfmaker']['image_scale2width'] = true
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
     expected = <<-EOS
 \\begin{reviewimage}%%sampleimg
@@ -774,7 +782,7 @@ EOS
 
   def test_image_with_metric2
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -792,12 +800,12 @@ EOS
 
   def test_image_with_metric2_width
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    @config['image_scale2width'] = true
+    @config['pdfmaker']['image_scale2width'] = true
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
     expected = <<-EOS
 \\begin{reviewimage}%%sampleimg
@@ -811,7 +819,7 @@ EOS
 
   def test_indepimage
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -828,7 +836,7 @@ EOS
 
   def test_indepimage_without_caption
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -845,7 +853,7 @@ EOS
 
   def test_indepimage_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -862,12 +870,12 @@ EOS
 
   def test_indepimage_with_metric_width
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    @config['image_scale2width'] = true
+    @config['pdfmaker']['image_scale2width'] = true
     actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
     expected = <<-EOS
 \\begin{reviewimage}%%sampleimg
@@ -880,7 +888,7 @@ EOS
 
   def test_indepimage_with_metric2
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -897,7 +905,7 @@ EOS
 
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -1008,7 +1016,7 @@ EOS
 
   def test_imgtable
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1, 'sample img')
+      item = Book::Index::Item.new('sampleimg', 1, 'sample img')
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -1029,7 +1037,7 @@ EOS
 
   def test_bib
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     assert_equal '\\reviewbibref{[1]}{bib:samplebib}', compile_inline('@<bib>{samplebib}')
@@ -1037,7 +1045,7 @@ EOS
 
   def test_bibpaper
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     actual = compile_block("//bibpaper[samplebib][sample bib @<b>{bold}]{\na\nb\n//}\n")
@@ -1053,7 +1061,7 @@ EOS
 
   def test_bibpaper_without_body
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     actual = compile_block("//bibpaper[samplebib][sample bib]\n")
@@ -1283,13 +1291,17 @@ EOS
     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
@@ -1297,13 +1309,17 @@ EOS
     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
@@ -1311,13 +1327,17 @@ EOS
     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
@@ -1325,13 +1345,17 @@ EOS
     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
@@ -1339,13 +1363,17 @@ EOS
     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
@@ -1353,13 +1381,17 @@ EOS
     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
@@ -1367,13 +1399,17 @@ EOS
     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
@@ -1381,13 +1417,17 @@ EOS
     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
@@ -1424,24 +1464,24 @@ EOS
 
   def test_inline_imgref
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1, 'sample photo')
+      item = Book::Index::Item.new('sampleimg', 1, 'sample photo')
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    actual = compile_block "@<imgref>{sampleimg}\n"
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = "\n\\reviewimageref{1.1}{image:chap1:sampleimg}「sample photo」\n"
     assert_equal expected, actual
   end
 
   def test_inline_imgref2
     def @chapter.image(_id)
-      item = Book::NumberlessImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    actual = compile_block "@<imgref>{sampleimg}\n"
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = "\n\\reviewimageref{1.1}{image:chap1:sampleimg}\n"
     assert_equal expected, actual
   end
@@ -1504,18 +1544,18 @@ EOS
   end
 
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<img>{n}\n" }
+    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" }
+    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" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
     assert_equal ':1: error: unknown headline: n', e.message
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
       assert_equal ":1: error: unknown #{name}: n", e.message
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
       assert_equal ':1: error: key not found: "n"', e.message
     end
   end
@@ -1580,7 +1620,7 @@ EOS
     end
 
     def @chapter.image(_id)
-      item = Book::NumberlessImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end

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