review 1.3.0 → 1.4.0

data/test/test_inaobuilder.rb

@@ -8,13 +8,12 @@ class INAOBuidlerTest < Test::Unit::TestCase
   include BookTestHelper
 
   def setup
-    param = {
+    @param = {
       "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8",
       "stylesheet" => nil,  # for HTMLBuilder
     }
-    ReVIEW.book.config = param
   end
 
   def test_all

data/test/test_index.rb

@@ -27,5 +27,25 @@ class IndexTest < Test::Unit::TestCase
     assert_equal 'foo', item.id
     assert_equal 'bar\\a\\$buz', item.content
   end
+
+  def test_HeadelineIndex
+    src = <<-EOB
+= chap1
+== sec1-1
+== sec1-2
+=== sec1-2-1
+===[column] column1
+==== inside_column
+===[/column]
+===[column] column2
+=== sec1-2-2
+== sec1-3
+==== sec1-3-0-1
+    EOB
+    chap = Book::Chapter.new(nil, 1, '-', nil) # dummy
+    index = Book::HeadlineIndex.parse(src, chap)
+    assert_equal [2,2], index['sec1-2|sec1-2-2'].number
+    assert_equal "1.2.2", index.number('sec1-2|sec1-2-2')
+  end
 end
 

data/test/test_latexbuilder.rb

@@ -10,175 +10,177 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def setup
     @builder = LATEXBuilder.new()
-    @config = {
+    @config = ReVIEW::Configure.values
+    @config.merge!( {
       "secnolevel" => 2,    # for IDGXMLBuilder, EPUBBuilder
       "toclevel" => 2,
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8",
       "stylesheet" => nil,  # for EPUBBuilder
-    }
-    ReVIEW.book.config = @config
+    })
+    @book = Book::Base.new(nil)
+    @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
-    @chapter = Book::Chapter.new(Book::Base.new(nil), 1, 'chap1', nil, StringIO.new)
+    @chapter = Book::Chapter.new(@book, 1, 'chap1', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
   end
 
   def test_headline_level1
-    @builder.headline(1,"test","this is test.")
-    assert_equal %Q|\\chapter{this is test.}\n\\label{chap:chap1}\n|, @builder.result
+    actual = compile_block("={test} this is test.\n")
+    assert_equal %Q|\\chapter{this is test.}\n\\label{chap:chap1}\n|, actual
   end
 
   def test_headline_level1_without_secno
     @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
+    actual = compile_block("={test} this is test.\n")
+    assert_equal %Q|\\chapter*{this is test.}\n\\addcontentsline{toc}{chapter}{this is test.}\n\\label{chap:chap1}\n|, actual
   end
 
   def test_headline_level1_with_inlinetag
-    @builder.headline(1,"test","this @<b>{is} test.<&\"_>")
-    assert_equal %Q|\\chapter{this \\textbf{is} test.\\textless{}\\&\"\\textunderscore{}\\textgreater{}}\n\\label{chap:chap1}\n|, @builder.result
+    actual = compile_block("={test} this @<b>{is} test.<&\"_>\n")
+    assert_equal %Q|\\chapter{this \\textbf{is} test.\\textless{}\\&\"\\textunderscore{}\\textgreater{}}\n\\label{chap:chap1}\n|, actual
   end
 
   def test_headline_level2
-    @builder.headline(2,"test","this is test.")
-    assert_equal %Q|\\section{this is test.}\n\\label{sec:1-1}\n|, @builder.result
+    actual = compile_block("=={test} this is test.\n")
+    assert_equal %Q|\\section{this is test.}\n\\label{sec:1-1}\n|, actual
   end
 
   def test_headline_level3
-    @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\\subsection*{this is test.}\n\\label{sec:1-0-1}\n|, @builder.result
+    actual = compile_block("==={test} this is test.\n")
+    assert_equal %Q|\\subsection*{this is test.}\n\\label{sec:1-0-1}\n|, actual
   end
 
 
   def test_headline_level3_with_secno
     @config["secnolevel"] = 3
-    @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\\subsection{this is test.}\n\\label{sec:1-0-1}\n|, @builder.result
+    actual = compile_block("==={test} this is test.\n")
+    assert_equal %Q|\\subsection{this is test.}\n\\label{sec:1-0-1}\n|, actual
   end
 
   def test_label
-    @builder.label("label_test")
-    assert_equal %Q|\\label{label_test}\n|, @builder.result
+    actual = compile_block("//label[label_test]\n")
+    assert_equal %Q|\\label{label_test}\n|, actual
   end
 
   def test_href
-    ret = @builder.compile_inline('@<href>{http://github.com,GitHub}')
-    assert_equal %Q|\\href{http://github.com}{GitHub}|, ret
+    actual = compile_inline("@<href>{http://github.com,GitHub}")
+    assert_equal %Q|\\href{http://github.com}{GitHub}|, actual
   end
 
   def test_inline_href
-    ret = @builder.compile_inline('@<href>{http://github.com,Git\\,Hub}')
-    assert_equal %Q|\\href{http://github.com}{Git,Hub}|, ret
+    actual = compile_inline('@<href>{http://github.com,Git\\,Hub}')
+    assert_equal %Q|\\href{http://github.com}{Git,Hub}|, actual
   end
 
   def test_href_without_label
-    ret = @builder.compile_inline('@<href>{http://github.com}')
-    assert_equal %Q|\\url{http://github.com}|, ret
+    actual = compile_inline('@<href>{http://github.com}')
+    assert_equal %Q|\\url{http://github.com}|, actual
   end
 
   def test_href_with_underscore
-    ret = @builder.compile_inline('@<href>{http://example.com/aaa/bbb, AAA_BBB}')
-    assert_equal %Q|\\href{http://example.com/aaa/bbb}{AAA\\textunderscore{}BBB}|, ret
+    actual = compile_inline('@<href>{http://example.com/aaa/bbb, AAA_BBB}')
+    assert_equal %Q|\\href{http://example.com/aaa/bbb}{AAA\\textunderscore{}BBB}|, actual
   end
 
   def test_href_mailto
-    ret = @builder.compile_inline('@<href>{mailto:takahashim@example.com, takahashim@example.com}')
-    assert_equal %Q|\\href{mailto:takahashim@example.com}{takahashim@example.com}|, ret
+    actual = compile_inline('@<href>{mailto:takahashim@example.com, takahashim@example.com}')
+    assert_equal %Q|\\href{mailto:takahashim@example.com}{takahashim@example.com}|, actual
   end
 
   def test_inline_br
-    ret = @builder.inline_br("")
-    assert_equal %Q|\\\\\n|, ret
+    actual = compile_inline("@<br>{}")
+    assert_equal %Q|\\\\\n|, actual
   end
 
   def test_inline_br_with_other_strings
-    ret = @builder.compile_inline("abc@<br>{}def")
-    assert_equal %Q|abc\\\\\ndef|, ret
+    actual = compile_inline("abc@<br>{}def")
+    assert_equal %Q|abc\\\\\ndef|, actual
   end
 
   def test_inline_i
-    ret = @builder.compile_inline("abc@<i>{def}ghi")
-    assert_equal %Q|abc\\textit{def}ghi|, ret
+    actual = compile_inline("abc@<i>{def}ghi")
+    assert_equal %Q|abc\\textit{def}ghi|, actual
   end
 
   def test_inline_i_and_escape
-    ret = @builder.compile_inline("test @<i>{inline<&;\\ test} test2")
-    assert_equal %Q|test \\textit{inline\\textless{}\\&;\\reviewbackslash{} test} test2|, ret
+    actual = compile_inline("test @<i>{inline<&;\\ test} test2")
+    assert_equal %Q|test \\textit{inline\\textless{}\\&;\\reviewbackslash{} test} test2|, actual
   end
 
   def test_inline_dtp
-    ret = @builder.compile_inline("abc@<dtp>{def}ghi")
-    assert_equal %Q|abcghi|, ret
+    actual = compile_inline("abc@<dtp>{def}ghi")
+    assert_equal %Q|abcghi|, actual
   end
 
   def test_inline_code
-    ret = @builder.compile_inline("abc@<code>{def}ghi")
-    assert_equal %Q|abc\\texttt{def}ghi|, ret
+    actual = compile_inline("abc@<code>{def}ghi")
+    assert_equal %Q|abc\\texttt{def}ghi|, actual
   end
 
   def test_inline_raw
-    ret = @builder.compile_inline("@<raw>{@<tt>{inline!$%\\}}")
-    assert_equal "@<tt>{inline!$%}", ret
+    actual = compile_inline("@<raw>{@<tt>{inline!$%\\}}")
+    assert_equal "@<tt>{inline!$%}", actual
   end
 
   def test_inline_sup
-    ret = @builder.compile_inline("abc@<sup>{def}")
-    assert_equal %Q|abc\\textsuperscript{def}|, ret
+    actual = compile_inline("abc@<sup>{def}")
+    assert_equal %Q|abc\\textsuperscript{def}|, actual
   end
 
   def test_inline_sub
-    ret = @builder.compile_inline("abc@<sub>{def}")
-    assert_equal %Q|abc\\textsubscript{def}|, ret
+    actual = compile_inline("abc@<sub>{def}")
+    assert_equal %Q|abc\\textsubscript{def}|, actual
   end
 
   def test_inline_b
-    ret = @builder.compile_inline("abc@<b>{def}")
-    assert_equal %Q|abc\\textbf{def}|, ret
+    actual = compile_inline("abc@<b>{def}")
+    assert_equal %Q|abc\\textbf{def}|, actual
   end
 
   def test_inline_b_and_escape
-    ret = @builder.compile_inline("test @<b>{inline<&;\\ test} test2")
-    assert_equal %Q|test \\textbf{inline\\textless{}\\&;\\reviewbackslash{} test} test2|, ret
+    actual = compile_inline("test @<b>{inline<&;\\ test} test2")
+    assert_equal %Q|test \\textbf{inline\\textless{}\\&;\\reviewbackslash{} test} test2|, actual
   end
   def test_inline_em
-    ret = @builder.compile_inline("abc@<em>{def}")
-    assert_equal %Q|abc\\reviewem{def}|, ret
+    actual = compile_inline("abc@<em>{def}")
+    assert_equal %Q|abc\\reviewem{def}|, actual
   end
 
   def test_inline_strong
-    ret = @builder.compile_inline("abc@<strong>{def}")
-    assert_equal %Q|abc\\reviewstrong{def}|, ret
+    actual = compile_inline("abc@<strong>{def}")
+    assert_equal %Q|abc\\reviewstrong{def}|, actual
   end
 
   def test_inline_u
-    ret = @builder.compile_inline("abc@<u>{def}ghi")
-    assert_equal %Q|abc\\Underline{def}ghi|, ret
+    actual = compile_inline("abc@<u>{def}ghi")
+    assert_equal %Q|abc\\Underline{def}ghi|, actual
   end
 
   def test_inline_m
-    ret = @builder.compile_inline("abc@<m>{\\alpha^n = \inf < 2}ghi")
-    assert_equal "abc $\\alpha^n = inf < 2$ ghi", ret
+    actual = compile_inline("abc@<m>{\\alpha^n = \inf < 2}ghi")
+    assert_equal "abc $\\alpha^n = inf < 2$ ghi", actual
   end
 
   def test_inline_tt
-    ret = @builder.compile_inline("test @<tt>{inline test} test2")
-    assert_equal %Q|test \\texttt{inline test} test2|, ret
+    actual = compile_inline("test @<tt>{inline test} test2")
+    assert_equal %Q|test \\texttt{inline test} test2|, actual
   end
 
   def test_inline_tt_endash
-    ret = @builder.compile_inline("test @<tt>{in-line --test ---foo ----bar -----buz} --test2")
-    assert_equal %Q|test \\texttt{in{-}line {-}{-}test {-}{-}{-}foo {-}{-}{-}{-}bar {-}{-}{-}{-}{-}buz} {-}{-}test2|, ret
+    actual = compile_inline("test @<tt>{in-line --test ---foo ----bar -----buz} --test2")
+    assert_equal %Q|test \\texttt{in{-}line {-}{-}test {-}{-}{-}foo {-}{-}{-}{-}bar {-}{-}{-}{-}{-}buz} {-}{-}test2|, actual
   end
 
   def test_inline_tti
-    ret = @builder.compile_inline("test @<tti>{inline test} test2")
-    assert_equal %Q|test \\texttt{\\textit{inline test}} test2|, ret
+    actual = compile_inline("test @<tti>{inline test} test2")
+    assert_equal %Q|test \\texttt{\\textit{inline test}} test2|, actual
   end
 
   def test_inline_ttb
-    ret = @builder.compile_inline("test @<ttb>{inline test} test2")
-    assert_equal %Q|test \\texttt{\\textbf{inline test}} test2|, ret
+    actual = compile_inline("test @<ttb>{inline test} test2")
+    assert_equal %Q|test \\texttt{\\textbf{inline test}} test2|, actual
   end
 
   def test_inline_hd_chap
@@ -188,109 +190,94 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     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
+    actual = compile_inline("test @<hd>{chap1|test} test2")
+    assert_equal %Q|test 「1.1.1 te\\textunderscore{}st」 test2|, actual
   end
 
   def test_inline_ruby_comma
-    ret = @builder.compile_inline("@<ruby>{foo\\, bar\\, buz,フー・バー・バズ}")
-    assert_equal "\\ruby{foo, bar, buz}{フー・バー・バズ}", ret
+    actual = compile_inline("@<ruby>{foo\\, bar\\, buz,フー・バー・バズ}")
+    assert_equal "\\ruby{foo, bar, buz}{フー・バー・バズ}", actual
   end
 
   def test_inline_uchar
-    ret = @builder.compile_inline("test @<uchar>{2460} test2")
-    assert_equal %Q|test \\UTF{2460} test2|, ret
+    actual = compile_inline("test @<uchar>{2460} test2")
+    assert_equal %Q|test \\UTF{2460} test2|, actual
   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
+    actual = compile_inline("@<idx>{__TEST%$}, @<hidx>{__TEST%$}")
+    assert_equal %Q|\\textunderscore{}\\textunderscore{}TEST\\%\\textdollar{}\\index{__TEST%$}, \\index{__TEST%$}|, actual
   end
 
   def test_jis_x_0201_kana
-    ret = @builder.compile_inline("foo･ｶﾝｼﾞ､テスト")
-    assert_equal %Q|foo\\aj半角{・}\\aj半角{カ}\\aj半角{ン}\\aj半角{シ}\\aj半角{゛}\\aj半角{、}テスト|, ret
+    actual = compile_inline("foo･ｶﾝｼﾞ､テスト")
+    assert_equal %Q|foo\\aj半角{・}\\aj半角{カ}\\aj半角{ン}\\aj半角{シ}\\aj半角{゛}\\aj半角{、}テスト|, actual
   end
 
   def test_dlist
-    @builder.dl_begin
-    @builder.dt "foo"
-    @builder.dd ["foo.\n", "bar.\n"]
-    @builder.dl_end
-    assert_equal %Q|\n\\begin{description}\n\\item[foo] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n|, @builder.result
+    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    assert_equal %Q|\n\\begin{description}\n\\item[foo] \\mbox{} \\\\\nfoo.bar.\n\\end{description}\n|, actual
   end
 
   def test_dlist_with_bracket
-    @builder.dl_begin
-    @builder.dt "foo[bar]"
-    @builder.dd ["foo.\n", "bar.\n"]
-    @builder.dl_end
-    assert_equal %Q|\n\\begin{description}\n\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\\nfoo.\nbar.\n\\end{description}\n|, @builder.result
+    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
+    assert_equal %Q|\n\\begin{description}\n\\item[foo\\lbrack{}bar\\rbrack{}] \\mbox{} \\\\\nfoo.bar.\n\\end{description}\n|, actual
   end
 
   def test_cmd
-    lines = ["foo", "bar", "","buz"]
-    @builder.cmd(lines)
-    assert_equal %Q|\n\\begin{reviewcmd}\nfoo\nbar\n\nbuz\n\\end{reviewcmd}\n|, @builder.result
+    actual = compile_block("//cmd{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\begin{reviewcmd}\nfoo\nbar\n\nbuz\n\\end{reviewcmd}\n|, actual
   end
 
   def test_cmd_caption
-    lines = ["foo", "bar", "","buz"]
-    @builder.cmd(lines, "cap1")
-    assert_equal %Q|\n\\reviewcmdcaption{cap1}\n\\begin{reviewcmd}\nfoo\nbar\n\nbuz\n\\end{reviewcmd}\n|, @builder.result
+    actual = compile_block("//cmd[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\reviewcmdcaption{cap1}\n\\begin{reviewcmd}\nfoo\nbar\n\nbuz\n\\end{reviewcmd}\n|, actual
   end
 
   def test_emlist
-    lines = ["foo", "bar", "","buz"]
-    @builder.emlist(lines)
-    assert_equal %Q|\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, @builder.result
+    actual = compile_block("//emlist{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, actual
   end
 
   def test_emlist_caption
-    lines = ["foo", "bar", "","buz"]
-    @builder.emlist(lines, "cap1")
-    assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, @builder.result
+    actual = compile_block("//emlist[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, actual
   end
 
   def test_emlist_with_tab
-    lines = ["\tfoo", "\t\tbar", "","\tbuz"]
-    @builder.emlist(lines)
-    assert_equal %Q|\n\\begin{reviewemlist}\n        foo\n                bar\n\n        buz\n\\end{reviewemlist}\n|, @builder.result
+    actual = compile_block("//emlist{\n\tfoo\n\t\tbar\n\n\tbuz\n//}\n")
+    assert_equal %Q|\n\\begin{reviewemlist}\n        foo\n                bar\n\n        buz\n\\end{reviewemlist}\n|, actual
   end
 
   def test_emlist_with_tab4
-    lines = ["\tfoo", "\t\tbar", "","\tbuz"]
-    @builder.instance_eval{@tabwidth=4}
-    @builder.emlist(lines)
-    assert_equal %Q|\n\\begin{reviewemlist}\n    foo\n        bar\n\n    buz\n\\end{reviewemlist}\n|, @builder.result
+    @config["tabwidth"] = 4
+    actual = compile_block("//emlist{\n\tfoo\n\t\tbar\n\n\tbuz\n//}\n")
+    assert_equal %Q|\n\\begin{reviewemlist}\n    foo\n        bar\n\n    buz\n\\end{reviewemlist}\n|, actual
   end
 
   def test_quote
-    lines = ["foo", "bar", "","buz"]
-    @builder.quote(lines)
-    assert_equal %Q|\n\\begin{quote}\nfoobar\n\nbuz\n\\end{quote}\n|, @builder.result
+    actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\begin{quote}\nfoobar\n\nbuz\n\\end{quote}\n|, actual
   end
 
   def test_memo
-    @builder.memo(["test1", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
-    assert_equal %Q|\\begin{reviewminicolumn}\n\\reviewminicolumntitle{this is \\textbf{test}\\textless{}\\&\\textgreater{}\\textunderscore{}}\ntest1\n\ntest<i>2</i>\n\\end{reviewminicolumn}\n|, @builder.result
+    actual = compile_block("//memo[this is @<b>{test}<&>_]{\ntest1\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|\\begin{reviewminicolumn}\n\\reviewminicolumntitle{this is \\textbf{test}\\textless{}\\&\\textgreater{}\\textunderscore{}}\ntest1\n\ntest\\textit{2}\n\\end{reviewminicolumn}\n|, actual
   end
 
   def test_flushright
-    @builder.flushright(["foo", "bar", "","buz"])
-    assert_equal %Q|\n\\begin{flushright}\nfoobar\n\nbuz\n\\end{flushright}\n|, @builder.raw_result
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\begin{flushright}\nfoobar\n\nbuz\n\\end{flushright}\n|, actual
   end
 
   def test_centering
-    @builder.centering(["foo", "bar", "","buz"])
-    assert_equal %Q|\n\\begin{center}\nfoobar\n\nbuz\n\\end{center}\n|, @builder.raw_result
+    actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\begin{center}\nfoobar\n\nbuz\n\\end{center}\n|, actual
   end
 
   def test_noindent
-    @builder.noindent
-    @builder.paragraph(["foo", "bar"])
-    @builder.paragraph(["foo2", "bar2"])
-    assert_equal %Q|\\noindent\nfoo\nbar\n\nfoo2\nbar2\n|, @builder.raw_result
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    assert_equal %Q|\\noindent\nfoo\nbar\n\nfoo2\nbar2\n|, actual
   end
 
   def test_image
@@ -300,8 +287,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.image_image("sampleimg","sample photo",nil)
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, actual
   end
 
   def test_image_with_metric
@@ -311,8 +298,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.image_image("sampleimg","sample photo","scale=1.2")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, actual
   end
 
   def test_image_with_metric2
@@ -322,8 +309,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.image_image("sampleimg","sample photo","scale=1.2, html::class=\"sample\", latex::height=3cm")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,height=3cm]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,ignore=params]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, actual
   end
 
   def test_indepimage
@@ -333,8 +320,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg","sample photo",nil)
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
   end
 
   def test_indepimage_without_caption
@@ -345,8 +332,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     end
 
     # FIXME: indepimage's caption should not be with a counter.
-    @builder.indepimage("sampleimg",nil,nil)
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg]\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\end{reviewimage}\n|, actual
   end
 
   def test_indepimage_with_metric
@@ -356,8 +343,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg","sample photo","scale=1.2")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
   end
 
   def test_indepimage_with_metric2
@@ -367,8 +354,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg","sample photo","scale=1.2, latex::height=3cm, html::class=\"sample\"")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,height=3cm]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2, html::class=\"sample\",latex::ignore=params]\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,ignore=params]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
   end
 
   def test_indepimage_without_caption_but_with_metric
@@ -379,8 +366,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     end
 
     # FIXME: indepimage's caption should not be with a counter.
-    @builder.indepimage("sampleimg",nil,"scale=1.2")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\end{reviewimage}\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][][scale=1.2]\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\end{reviewimage}\n|, actual
   end
 
   def test_bib
@@ -388,7 +375,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
-    assert_equal "\\reviewbibref{[1]}{bib:samplebib}", @builder.inline_bib("samplebib")
+    assert_equal "\\reviewbibref{[1]}{bib:samplebib}", compile_inline("@<bib>{samplebib}")
   end
 
   def test_bibpaper
@@ -396,8 +383,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
-    @builder.bibpaper(["a", "b"], "samplebib", "sample bib @<b>{bold}")
-    assert_equal %Q|[1] sample bib \\textbf{bold}\n\\label{bib:samplebib}\n\nab\n\n|, @builder.raw_result
+    actual = compile_block("//bibpaper[samplebib][sample bib @<b>{bold}]{\na\nb\n//}\n")
+    assert_equal %Q|[1] sample bib \\textbf{bold}\n\\label{bib:samplebib}\n\nab\n\n|, actual
   end
 
   def test_bibpaper_without_body
@@ -405,14 +392,12 @@ class LATEXBuidlerTest < Test::Unit::TestCase
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
-    @builder.bibpaper([], "samplebib", "sample bib")
-    assert_equal %Q|[1] sample bib\n\\label{bib:samplebib}\n\n|, @builder.raw_result
+    actual = compile_block("//bibpaper[samplebib][sample bib]\n")
+    assert_equal %Q|[1] sample bib\n\\label{bib:samplebib}\n\n|, actual
   end
 
   def column_helper(review)
-    chap_singleton = class << @chapter; self; end
-    chap_singleton.send(:define_method, :content) { review }
-    @compiler.compile(@chapter)
+    compile_block(review)
   end
 
   def test_column_1
@@ -427,7 +412,7 @@ inside column
 
 ===[/column]
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{reviewcolumn}
 \\hypertarget{column:chap1:1}{}
@@ -448,7 +433,7 @@ inside column
 \\end{reviewcolumn}
 EOS
     @config["toclevel"] = 3
-    assert_equal expect, column_helper(review)
+    assert_equal expected, column_helper(review)
   end
 
   def test_column_2
@@ -459,7 +444,7 @@ inside column
 
 === next level
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{reviewcolumn}
 \\hypertarget{column:chap1:1}{}
@@ -474,7 +459,7 @@ inside column
 EOS
 
     @config["toclevel"] = 1
-    assert_equal expect, column_helper(review)
+    assert_equal expected, column_helper(review)
   end
 
   def test_column_3
@@ -495,14 +480,15 @@ EOS
   * AAA
   * BBB
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{itemize}
 \\item AAA
 \\item BBB
 \\end{itemize}
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_with_bracket
@@ -510,14 +496,15 @@ EOS
   * AAA
   * []BBB
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{itemize}
 \\item AAA
 \\item \\lbrack{}]BBB
 \\end{itemize}
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_cont
@@ -527,14 +514,15 @@ EOS
   * BBB
     -BB
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{itemize}
 \\item AAA{-}AA
 \\item BBB{-}BB
 \\end{itemize}
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_nest1
@@ -543,7 +531,7 @@ EOS
   ** AA
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{itemize}
 \\item AAA
@@ -554,7 +542,8 @@ EOS
 
 \\end{itemize}
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_nest3
@@ -565,7 +554,7 @@ EOS
   ** BB
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{itemize}
 \\item AAA
@@ -582,7 +571,8 @@ EOS
 
 \\end{itemize}
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ol
@@ -591,14 +581,15 @@ EOS
   3. BBB
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{enumerate}
 \\item AAA
 \\item BBB
 \\end{enumerate}
 EOS
-    ol_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ol_with_bracket
@@ -606,73 +597,74 @@ EOS
   1. AAA
   2. []BBB
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 
 \\begin{enumerate}
 \\item AAA
 \\item \\lbrack{}]BBB
 \\end{enumerate}
 EOS
-    builder_helper(src, expect, :compile_olist)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_inline_raw0
-    assert_equal "normal", @builder.inline_raw("normal")
+    assert_equal "normal", compile_inline("@<raw>{normal}")
   end
 
   def test_inline_raw1
-    assert_equal "body", @builder.inline_raw("|latex|body")
+    assert_equal "body", compile_inline("@<raw>{|latex|body}")
   end
 
   def test_inline_raw2
-    assert_equal "body", @builder.inline_raw("|html, latex|body")
+    assert_equal "body", compile_inline("@<raw>{|html, latex|body}")
   end
 
   def test_inline_raw3
-    assert_equal "", @builder.inline_raw("|idgxml, html|body")
+    assert_equal "", compile_inline("@<raw>{|idgxml, html|body}")
   end
 
   def test_inline_raw4
-    assert_equal "|latex body", @builder.inline_raw("|latex body")
+    assert_equal "|latex body", compile_inline("@<raw>{|latex body}")
   end
 
   def test_inline_raw5
-    assert_equal "nor\nmal", @builder.inline_raw("|latex|nor\\nmal")
+    assert_equal "nor\nmal", compile_inline("@<raw>{|latex|nor\\nmal}")
   end
 
   def test_inline_endash
-    ret = @builder.compile_inline("- -- --- ----")
-    assert_equal "{-} {-}{-} {-}{-}{-} {-}{-}{-}{-}", ret
+    actual = compile_inline("- -- --- ----")
+    assert_equal "{-} {-}{-} {-}{-}{-} {-}{-}{-}{-}", actual
   end
 
   def test_block_raw0
-    @builder.raw("<>!\"\\n& ")
-    expect = %Q(<>!\"\n& )
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[<>!\"\\n& ]\n")
+    expected = %Q(<>!\"\n& )
+    assert_equal expected, actual
   end
 
   def test_block_raw1
-    @builder.raw("|latex|<>!\"\\n& ")
-    expect = %Q(<>!\"\n& )
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[|latex|<>!\"\\n& ]\n")
+    expected = %Q(<>!\"\n& )
+    assert_equal expected, actual
   end
 
   def test_block_raw2
-    @builder.raw("|html, latex|<>!\"\\n& ")
-    expect = %Q(<>!\"\n& )
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[|html, latex|<>!\"\\n& ]\n")
+    expected = %Q(<>!\"\n& )
+    assert_equal expected, actual
   end
 
   def test_block_raw3
-    @builder.raw("|html, idgxml|<>!\"\\n& ")
-    expect = ''
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[|html, idgxml|<>!\"\\n& ]\n")
+    expected = ''
+    assert_equal expected, actual
   end
 
   def test_block_raw4
-    @builder.raw("|latex <>!\"\\n& ")
-    expect = %Q(|latex <>!\"\n& )
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[|latex <>!\"\\n& ]\n")
+    expected = %Q(|latex <>!\"\n& )
+    assert_equal expected, actual
   end
 
 end