review 1.2.0 → 1.3.0

data/test/test_idgxmlbuilder.rb

@@ -11,14 +11,14 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
 
   def setup
     @builder = IDGXMLBuilder.new()
-    @param = {
+    @config = {
       "secnolevel" => 2,
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8",
       "nolf" => true,
       "tableopt" => "10"
     }
-    ReVIEW.book.param = @param
+    ReVIEW.book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(Book::Base.new(nil), 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -31,7 +31,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level1_without_secno
-    @param["secnolevel"] = 0
+    @config["secnolevel"] = 0
     @builder.headline(1,"test","this is test.")
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><title id="test" aid:pstyle="h1">this is test.</title><?dtp level="1" section="this is test."?>|, @builder.raw_result
   end
@@ -48,7 +48,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
 
 
   def test_headline_level3_with_secno
-    @param["secnolevel"] = 3
+    @config["secnolevel"] = 3
     @builder.headline(3,"test","this is test.")
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><title id="test" aid:pstyle="h3">1.0.1　this is test.</title><?dtp level="3" section="1.0.1　this is test."?>|, @builder.raw_result
   end
@@ -94,17 +94,17 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_inline_in_table_without_cellwidth
-    @param["tableopt"] = nil
+    @config["tableopt"] = nil
     ret = @builder.table(["<b>1</b>\t<i>2</i>", "------------", "<b>3</b>\t<i>4</i>&lt;&gt;&amp;"])
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><table><tbody><tr type="header"><b>1</b>\t<i>2</i></tr><tr type="lastline"><b>3</b>\t<i>4</i>&lt;&gt;&amp;</tr></tbody></table>|, @builder.raw_result
-    @param["tableopt"] = 10
+    @config["tableopt"] = 10
   end
 
   def test_inline_in_table_without_header_and_cellwidth
-    @param["tableopt"] = nil
+    @config["tableopt"] = nil
     ret = @builder.table(["<b>1</b>\t<i>2</i>", "<b>3</b>\t<i>4</i>&lt;&gt;&amp;"])
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><table><tbody><tr><b>1</b>\t<i>2</i></tr><tr type="lastline"><b>3</b>\t<i>4</i>&lt;&gt;&amp;</tr></tbody></table>|, @builder.raw_result
-    @param["tableopt"] = 10
+    @config["tableopt"] = 10
   end
 
   def test_inline_br
@@ -172,9 +172,9 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
 
   def test_quote_deprecated
     lines = ["foo","","buz"]
-    ReVIEW.book.param["deprecated-blocklines"] = true
+    ReVIEW.book.config["deprecated-blocklines"] = true
     @builder.quote(lines)
-    ReVIEW.book.param["deprecated-blocklines"] = nil
+    ReVIEW.book.config["deprecated-blocklines"] = nil
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><quote>foo\n\nbuz</quote>|, @builder.raw_result
   end
 
@@ -194,9 +194,9 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_term_deprecated
-    ReVIEW.book.param["deprecated-blocklines"] = true
+    ReVIEW.book.config["deprecated-blocklines"] = true
     @builder.term(["test1", "test1.5", "", "test<i>2</i>"])
-    ReVIEW.book.param["deprecated-blocklines"] = nil
+    ReVIEW.book.config["deprecated-blocklines"] = nil
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><term>test1\ntest1.5\n\ntest<i>2</i></term>|, @builder.raw_result
   end
 
@@ -226,7 +226,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_emlist_listinfo
-    @param["listinfo"] = true
+    @config["listinfo"] = true
     @builder.emlist(["test1", "test1.5", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><list type='emlist'><caption aid:pstyle='emlist-title'>this is <b>test</b>&lt;&amp;&gt;_</caption><pre><listinfo line="1" begin="1">test1\n</listinfo><listinfo line="2">test1.5\n</listinfo><listinfo line="3">\n</listinfo><listinfo line="4" end="4">test<i>2</i>\n</listinfo></pre></list>|, @builder.raw_result
   end
@@ -254,22 +254,22 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     def @chapter.list(id)
       Book::ListIndex::Item.new("samplelist",1)
     end
-    @param["listinfo"] = true
+    @config["listinfo"] = true
     @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><codelist><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption><pre><listinfo line="1" begin="1">test1\n</listinfo><listinfo line="2">test1.5\n</listinfo><listinfo line="3">\n</listinfo><listinfo line="4" end="4">test<i>2</i>\n</listinfo></pre></codelist>|, @builder.raw_result
   end
 
   def test_insn
-    @param["listinfo"] = true
+    @config["listinfo"] = true
     @builder.insn(["test1", "test1.5", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
-    @param["listinfo"] = nil
+    @config["listinfo"] = nil
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><insn><floattitle type="insn">this is <b>test</b>&lt;&amp;&gt;_</floattitle><listinfo line="1" begin="1">test1\n</listinfo><listinfo line="2">test1.5\n</listinfo><listinfo line="3">\n</listinfo><listinfo line="4" end="4">test<i>2</i>\n</listinfo></insn>|, @builder.raw_result
   end
 
   def test_box
-    @param["listinfo"] = true
+    @config["listinfo"] = true
     @builder.box(["test1", "test1.5", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
-    @param["listinfo"] = nil
+    @config["listinfo"] = nil
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><box><caption aid:pstyle="box-title">this is <b>test</b>&lt;&amp;&gt;_</caption><listinfo line="1" begin="1">test1\n</listinfo><listinfo line="2">test1.5\n</listinfo><listinfo line="3">\n</listinfo><listinfo line="4" end="4">test<i>2</i>\n</listinfo></box>|, @builder.raw_result
   end
 
@@ -293,7 +293,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_image
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -304,7 +304,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_image_with_metric
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -315,7 +315,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_image_with_metric2
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -326,7 +326,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_indepimage
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -337,7 +337,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_indepimage_without_caption
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -348,7 +348,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_indepimage_with_metric
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -359,7 +359,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_indepimage_with_metric2
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -370,7 +370,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -398,7 +398,7 @@ inside column
 EOS
     expect =<<-EOS
 <?xml version="1.0" encoding="UTF-8"?>
-<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><column><title aid:pstyle="column-title">prev column</title><p>inside prev column</p></column><column><title aid:pstyle="column-title">test</title><p>inside column</p></column></doc>
+<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><column id="column-1"><title aid:pstyle="column-title">prev column</title><p>inside prev column</p></column><column id="column-2"><title aid:pstyle="column-title">test</title><p>inside column</p></column></doc>
 EOS
     assert_equal expect, column_helper(review)
   end
@@ -413,7 +413,7 @@ inside column
 EOS
     expect =<<-EOS
 <?xml version="1.0" encoding="UTF-8"?>
-<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><column><title aid:pstyle="column-title">test</title><p>inside column</p></column><title aid:pstyle=\"h3\">next level</title><?dtp level="3" section="next level"?></doc>
+<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><column id="column-1"><title aid:pstyle="column-title">test</title><p>inside column</p></column><title aid:pstyle=\"h3\">next level</title><?dtp level="3" section="next level"?></doc>
 EOS
 
     assert_equal expect, column_helper(review)
@@ -557,45 +557,31 @@ EOS
 
   def test_block_raw0
     @builder.raw("<>!\"\\n& ")
-    expect =<<-EOS
-<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!"
-& 
-EOS
+    expect = %Q(<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw1
     @builder.raw("|idgxml|<>!\"\\n& ")
-    expect =<<-EOS
-<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!"
-& 
-EOS
+    expect = %Q(<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw2
     @builder.raw("|idgxml, latex|<>!\"\\n& ")
-    expect =<<-EOS
-<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!\"
-& 
-EOS
+    expect = %Q(<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw3
     @builder.raw("|latex, html|<>!\"\\n& ")
-    expect =<<-EOS
-<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">
-EOS
+    expect = %Q(<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">)
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw4
     @builder.raw("|idgxml <>!\"\\n& ")
-    expect =<<-EOS
-<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">|idgxml <>!\"
-& 
-EOS
+    expect = %Q(<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">|idgxml <>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 

data/test/test_image_finder.rb

@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+require 'test_helper'
+require 'review'
+require 'review/book/image_finder'
+require 'fileutils'
+
+class ImageFinderTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+  end
+
+  def test_find_path_pattern1
+    dir = Dir.mktmpdir
+    begin
+      path = dir+"/builder/ch01/foo.jpg"
+      FileUtils.mkdir_p(File.dirname(path))
+      FileUtils.touch(path)
+
+      finder = ReVIEW::Book::ImageFinder.new(dir, "ch01", "builder", [".jpg"])
+      assert_equal(path, finder.find_path("foo"))
+    ensure
+      FileUtils.remove_entry_secure dir
+    end
+  end
+
+  def test_find_path_pattern2
+    dir = Dir.mktmpdir
+    begin
+      path = dir+"/builder/ch01-foo.jpg"
+      FileUtils.mkdir_p(File.dirname(path))
+      FileUtils.touch(path)
+
+      finder = ReVIEW::Book::ImageFinder.new(dir, "ch01", "builder", [".jpg"])
+      assert_equal(path, finder.find_path("foo"))
+    ensure
+      FileUtils.remove_entry_secure dir
+    end
+  end
+
+  def test_find_path_pattern3
+    dir = Dir.mktmpdir
+    begin
+      path = dir+"/builder/foo.jpg"
+      FileUtils.mkdir_p(File.dirname(path))
+      FileUtils.touch(path)
+
+      finder = ReVIEW::Book::ImageFinder.new(dir, "ch01", "builder", [".jpg"])
+      assert_equal(path, finder.find_path("foo"))
+    ensure
+      FileUtils.remove_entry_secure dir
+    end
+  end
+
+  def test_find_path_pattern4
+    dir = Dir.mktmpdir
+    begin
+      path = dir+"/ch01/foo.jpg"
+      FileUtils.mkdir_p(File.dirname(path))
+      FileUtils.touch(path)
+
+      finder = ReVIEW::Book::ImageFinder.new(dir, "ch01", "builder", [".jpg"])
+      assert_equal(path, finder.find_path("foo"))
+    ensure
+      FileUtils.remove_entry_secure dir
+    end
+  end
+
+  def test_find_path_pattern5
+    dir = Dir.mktmpdir
+    begin
+      path = dir+"/ch01-foo.jpg"
+      FileUtils.mkdir_p(File.dirname(path))
+      FileUtils.touch(path)
+
+      finder = ReVIEW::Book::ImageFinder.new(dir, "ch01", "builder", [".jpg"])
+      assert_equal(path, finder.find_path("foo"))
+    ensure
+      FileUtils.remove_entry_secure dir
+    end
+  end
+end

data/test/test_inaobuilder.rb

@@ -14,7 +14,7 @@ class INAOBuidlerTest < Test::Unit::TestCase
       "outencoding" => "UTF-8",
       "stylesheet" => nil,  # for HTMLBuilder
     }
-    ReVIEW.book.param = param
+    ReVIEW.book.config = param
   end
 
   def test_all

data/test/test_latexbuilder.rb

@@ -10,16 +10,16 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def setup
     @builder = LATEXBuilder.new()
-    @param = {
+    @config = {
       "secnolevel" => 2,    # for IDGXMLBuilder, EPUBBuilder
       "toclevel" => 2,
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8",
       "stylesheet" => nil,  # for EPUBBuilder
     }
-    ReVIEW.book.param = @param
+    ReVIEW.book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
-    @chapter = Book::Chapter.new(nil, 1, 'chap1', nil, StringIO.new)
+    @chapter = Book::Chapter.new(Book::Base.new(nil), 1, 'chap1', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
   end
@@ -30,7 +30,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level1_without_secno
-    @param["secnolevel"] = 0
+    @config["secnolevel"] = 0
     @builder.headline(1,"test","this is test.")
     assert_equal %Q|\\chapter*{this is test.}\n\\addcontentsline{toc}{chapter}{this is test.}\n\\label{chap:chap1}\n|, @builder.result
   end
@@ -42,19 +42,19 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_headline_level2
     @builder.headline(2,"test","this is test.")
-    assert_equal %Q|\\section{this is test.}\n|, @builder.result
+    assert_equal %Q|\\section{this is test.}\n\\label{sec:1-1}\n|, @builder.result
   end
 
   def test_headline_level3
     @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\\subsection*{this is test.}\n|, @builder.result
+    assert_equal %Q|\\subsection*{this is test.}\n\\label{sec:1-0-1}\n|, @builder.result
   end
 
 
   def test_headline_level3_with_secno
-    @param["secnolevel"] = 3
+    @config["secnolevel"] = 3
     @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\\subsection{this is test.}\n|, @builder.result
+    assert_equal %Q|\\subsection{this is test.}\n\\label{sec:1-0-1}\n|, @builder.result
   end
 
   def test_label
@@ -97,11 +97,6 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|abc\\\\\ndef|, ret
   end
 
-  def test_inline_u
-    ret = @builder.compile_inline("abc@<u>{def}ghi")
-    assert_equal %Q|abc\\Underline{def}ghi|, ret
-  end
-
   def test_inline_i
     ret = @builder.compile_inline("abc@<i>{def}ghi")
     assert_equal %Q|abc\\textit{def}ghi|, ret
@@ -192,6 +187,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       Book::HeadlineIndex.new(items, self)
     end
 
+    @config["secnolevel"] = 3
     ret = @builder.compile_inline("test @<hd>{chap1|test} test2")
     assert_equal %Q|test 「1.1.1 te\\textunderscore{}st」 test2|, ret
   end
@@ -206,6 +202,11 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|test \\UTF{2460} test2|, ret
   end
 
+  def test_inline_idx
+    ret = @builder.compile_inline("@<idx>{__TEST%$}, @<hidx>{__TEST%$}")
+    assert_equal %Q|\\textunderscore{}\\textunderscore{}TEST\\%\\textdollar{}\\index{__TEST%$}, \\index{__TEST%$}|, ret
+  end
+
   def test_jis_x_0201_kana
     ret = @builder.compile_inline("foo･ｶﾝｼﾞ､テスト")
     assert_equal %Q|foo\\aj半角{・}\\aj半角{カ}\\aj半角{ン}\\aj半角{シ}\\aj半角{゛}\\aj半角{、}テスト|, ret
@@ -295,7 +296,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_image
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -306,7 +307,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_image_with_metric
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -317,7 +318,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_image_with_metric2
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -328,7 +329,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_indepimage
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -339,7 +340,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_indepimage_without_caption
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -351,7 +352,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_indepimage_with_metric
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -362,7 +363,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_indepimage_with_metric2
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -373,7 +374,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -429,19 +430,24 @@ EOS
     expect =<<-EOS
 
 \\begin{reviewcolumn}
+\\hypertarget{column:chap1:1}{}
 \\reviewcolumnhead{}{prev column}
+\\addcontentsline{toc}{subsection}{prev column}
 
 inside prev column
 
 \\end{reviewcolumn}
 
 \\begin{reviewcolumn}
+\\hypertarget{column:chap1:2}{}
 \\reviewcolumnhead{}{test}
+\\addcontentsline{toc}{subsection}{test}
 
 inside column
 
 \\end{reviewcolumn}
 EOS
+    @config["toclevel"] = 3
     assert_equal expect, column_helper(review)
   end
 
@@ -456,6 +462,7 @@ EOS
     expect =<<-EOS
 
 \\begin{reviewcolumn}
+\\hypertarget{column:chap1:1}{}
 \\reviewcolumnhead{}{test}
 
 inside column
@@ -463,8 +470,10 @@ inside column
 \\end{reviewcolumn}
 
 \\subsection*{next level}
+\\label{sec:1-0-1}
 EOS
 
+    @config["toclevel"] = 1
     assert_equal expect, column_helper(review)
   end
 
@@ -638,44 +647,31 @@ EOS
 
   def test_block_raw0
     @builder.raw("<>!\"\\n& ")
-    expect =<<-EOS
-<>!"
-& 
-EOS
+    expect = %Q(<>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw1
     @builder.raw("|latex|<>!\"\\n& ")
-    expect =<<-EOS
-<>!"
-& 
-EOS
+    expect = %Q(<>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw2
     @builder.raw("|html, latex|<>!\"\\n& ")
-    expect =<<-EOS
-<>!\"
-& 
-EOS
+    expect = %Q(<>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw3
     @builder.raw("|html, idgxml|<>!\"\\n& ")
-    expect =<<-EOS
-EOS
+    expect = ''
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw4
     @builder.raw("|latex <>!\"\\n& ")
-    expect =<<-EOS
-|latex <>!\"
-& 
-EOS
+    expect = %Q(|latex <>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end