review 1.3.0 → 1.4.0

data/test/test_builder.rb

@@ -16,7 +16,8 @@ class BuidlerTest < Test::Unit::TestCase
 
   def setup
     @b = Builder.new
-    @b.bind(MockCompiler.new, nil, nil)
+    chap = ReVIEW::Book::Chapter.new(nil, nil, '-', nil)
+    @b.bind(MockCompiler.new, chap, nil)
   end
 
   def test_initialize
@@ -25,8 +26,9 @@ class BuidlerTest < Test::Unit::TestCase
 
   def test_bind
     b = Builder.new
+    chap = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load_default, nil, '-', nil)
     assert_nothing_raised do
-      b.bind(nil, nil, nil)
+      b.bind(nil, chap, nil)
     end
   end
 
@@ -37,7 +39,8 @@ class BuidlerTest < Test::Unit::TestCase
     end
 
     b = Builder.new
-    b.bind(nil, nil, nil)
+    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load_default, nil, '-', nil)
+    b.bind(nil, chapter, nil)
     assert_equal '', b.result
   end
 
@@ -79,8 +82,9 @@ class BuidlerTest < Test::Unit::TestCase
         [:puts,  "#{utf8_str}\n", "#{expect}\n"],
       ].each do |m, instr, expstr|
         b = Builder.new
-        b.bind(nil, nil, nil)
-        ReVIEW.book.config = params
+        chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load_default, nil, '-', nil)
+        b.bind(nil, chapter, nil)
+        chapter.book.config = params
         b.__send__(m, instr)
         if "".respond_to?(:encode)
           assert_equal expstr.encode("UTF-8"), b.result
@@ -128,9 +132,10 @@ class BuidlerTest < Test::Unit::TestCase
   end
 
   def test_convert_outencoding
-    ReVIEW.book.config = {'outencoding' => "EUC"}
+    book = ReVIEW::Book::Base.new(nil)
+    book.config = {'outencoding' => "EUC"}
     b = Builder.new
-    ret = b.convert_outencoding("a", ReVIEW.book.config["outencoding"])
+    ret = b.convert_outencoding("a", book.config["outencoding"])
     assert_equal "a", ret
   end
 

data/test/test_catalog.rb

@@ -28,13 +28,13 @@ ch02.re
     assert_equal("", sut.chaps)
   end
 
-  def test_postdef
+  def test_appendix
     sut = Catalog.new(yaml)
     exp =<<-EOS
 post01.re
 post02.re
     EOS
-    assert_equal(exp.chomp, sut.postdef)
+    assert_equal(exp.chomp, sut.appendix)
   end
 
   def test_chaps_with_parts
@@ -72,6 +72,15 @@ part2.re
                  sut.parts_with_chaps)
   end
 
+  def test_postdef
+    sut = Catalog.new(yaml)
+    exp =<<-EOS
+back01.re
+back02.re
+    EOS
+    assert_equal(exp.chomp, sut.postdef)
+  end
+
   private
   def yaml
     StringIO.new <<-EOS
@@ -84,10 +93,13 @@ CHAPS:
   - ch01.re
   - ch02.re
 
-POSTDEF:
+APPENDIX:
   - post01.re
   - post02.re
 
+POSTDEF:
+  - back01.re
+  - back02.re
     EOS
   end
 

data/test/test_catalog_converter_cmd.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+require 'tmpdir'
+require 'fileutils'
+require 'yaml'
+require 'rbconfig'
+
+load File.expand_path('../bin/review-catalog-converter', File.dirname(__FILE__))
+
+class CatalogConverterCmdTest < Test::Unit::TestCase
+  def test_parse_chaps
+    input = <<-EOS
+ch01.re
+ch02.re
+ch03.re
+    EOS
+
+    expected = <<-EOS
+CHAPS:
+  - ch01.re
+  - ch02.re
+  - ch03.re
+
+    EOS
+    assert_equal expected, parse_chaps(input)
+  end
+
+  def test_parse_chaps_empty
+    assert_equal "CHAPS:\n\n", parse_chaps("")
+    assert_equal "CHAPS:\n\n", parse_chaps(nil)
+  end
+
+  def test_parse_parts
+    parts = <<-EOS
+pt01
+pt02
+pt03
+    EOS
+
+    chaps = <<-EOS
+ch01.re
+
+ch02.re
+ch03.re
+
+ch04.re
+    EOS
+
+    expected = <<-EOS
+CHAPS:
+  - pt01:
+    - ch01.re
+  - pt02:
+    - ch02.re
+    - ch03.re
+  - pt03:
+    - ch04.re
+
+    EOS
+
+    assert_equal expected, parse_parts(parts, chaps)
+  end
+
+  def test_parse_parts_chaps_empty
+    assert_equal "CHAPS:\n\n", parse_parts("", "")
+    assert_equal "CHAPS:\n\n", parse_parts(nil, nil)
+  end
+
+  def test_parse_postdef
+    assert_equal "APPENDIX:\n\n", parse_postdef("", true)
+    assert_equal "POSTDEF:\n\n", parse_postdef("")
+    assert_equal "POSTDEF:\n\n", parse_postdef("", false)
+  end
+end

data/test/test_epubmaker.rb

@@ -190,7 +190,7 @@ EOT
 
   def stage3
     # add more items
-    @producer.contents << Content.new({"file" => "ch01.html", "title" => "CH01", "level" => 1})
+    @producer.contents << Content.new({"file" => "ch01.html", "title" => "CH01<>&\"", "level" => 1})
     @producer.contents << Content.new({"file" => "ch02.html", "title" => "CH02", "level" => 1})
     @producer.contents << Content.new({"file" => "ch02.html#S1", "title" => "CH02.1", "level" => 2})
     @producer.contents << Content.new({"file" => "ch02.html#S1.1", "title" => "CH02.1.1", "level" => 3})
@@ -214,7 +214,7 @@ EOT
   def test_stage3_add_various_items
     stage3
     expect = [
-              Content.new("ch01.html", "ch01-html", "application/xhtml+xml", "CH01", 1),
+              Content.new("ch01.html", "ch01-html", "application/xhtml+xml", "CH01<>&\"", 1),
               Content.new("ch02.html", "ch02-html", "application/xhtml+xml", "CH02", 1),
               Content.new("ch02.html#S1", "ch02-html#S1","html#s1","CH02.1", 2),
               Content.new("ch02.html#S1.1", "ch02-html#S1-1", "1", "CH02.1.1", 3),
@@ -306,7 +306,7 @@ EOT
     </navPoint>
     <navPoint id="nav-2" playOrder="2">
       <navLabel>
-        <text>CH01</text>
+        <text>CH01&lt;&gt;&amp;&quot;</text>
       </navLabel>
       <content src="ch01.html"/>
     </navPoint>
@@ -404,7 +404,7 @@ EOT
 <body>
   <h1 class="toc-title">Table of Contents</h1>
 
-<ul class="toc-h1"><li><a href="ch01.html">CH01</a></li>
+<ul class="toc-h1"><li><a href="ch01.html">CH01&lt;&gt;&amp;&quot;</a></li>
 <li><a href="ch02.html">CH02</a>
 <ul class="toc-h2"><li><a href="ch02.html#S1">CH02.1</a></li>
 <li><a href="ch02.html#S2">CH02.2</a></li>
@@ -436,7 +436,7 @@ EOT
 <body>
   <h1 class="toc-title">Table of Contents</h1>
 <ul class="toc-h1">
-<li><a href="ch01.html">CH01</a></li>
+<li><a href="ch01.html">CH01&lt;&gt;&amp;&quot;</a></li>
 <li><a href="ch02.html">CH02</a></li>
 <li><a href="ch02.html#S1">CH02.1</a></li>
 <li><a href="ch02.html#S2">CH02.2</a></li>

data/test/test_helper.rb

@@ -1,27 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
 require 'test/unit'
 
-def ul_helper(src, expect)
-  io = StringIO.new(src)
-  li = LineInput.new(io)
-  @compiler.__send__(:compile_ulist, li)
-  assert_equal expect, @builder.raw_result
-end
-
-def ol_helper(src, expect)
-  io = StringIO.new(src)
-  li = LineInput.new(io)
-  @compiler.__send__(:compile_olist, li)
-  assert_equal expect, @builder.raw_result
-end
-
-def builder_helper(src, expect, method_sym)
-  io = StringIO.new(src)
-  li = LineInput.new(io)
-  @compiler.__send__(method_sym, li)
-  assert_equal expect, @builder.raw_result
-end
-
 def touch_file(path)
   File.open(path, "w").close
   path
@@ -32,3 +11,35 @@ def prepare_samplebook(srcdir)
   FileUtils.cp_r(Dir.glob(samplebook_dir + "/*"), srcdir)
   YAML.load(File.open(srcdir + "/config.yml"))
 end
+
+def compile_inline(text)
+  @builder.compile_inline(text)
+end
+
+def compile_block(text)
+  method_name = "compile_block_#{@builder.target_name}"
+  if !self.respond_to?(method_name, true)
+    method_name = "compile_block_default"
+  end
+  self.__send__(method_name, text)
+end
+
+def compile_block_default(text)
+  @chapter.content = text
+  @compiler.compile(@chapter)
+end
+
+def compile_block_html(text)
+  @chapter.content = text
+  matched = @compiler.compile(@chapter).match(/<body>\n(.+)<\/body>/m)
+  if matched && matched.size > 1
+    matched[1]
+  else
+    ""
+  end
+end
+
+def compile_block_idgxml(text)
+  @chapter.content = text
+  @compiler.compile(@chapter).gsub(/.*<doc xmlns:aid="http:\/\/ns.adobe.com\/AdobeInDesign\/4.0\/">/m,"").gsub(/<\/doc>\n/, "")
+end

data/test/test_htmlbuilder.rb

@@ -18,15 +18,16 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       "outencoding" => "UTF-8",
       "stylesheet" => nil,  # for HTMLBuilder
     })
-    ReVIEW.book.config = @config
+    @book = Book::Base.new(".")
+    @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
-    @chapter = Book::Chapter.new(Book::Base.new(nil), 1, '-', nil, StringIO.new)
+    @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
   end
 
   def test_xmlns_ops_prefix_epub3
-    ReVIEW.book.config["epubversion"] = 3
+    @book.config["epubversion"] = 3
     assert_equal "epub", @builder.xmlns_ops_prefix
   end
 
@@ -35,184 +36,179 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level1
-    @builder.headline(1,"test","this is test.")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this is test.</h1>\n|, @builder.raw_result
+    actual = compile_block("={test} this is test.\n")
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this is test.</h1>\n|, actual
   end
 
   def test_headline_level1_postdef
     @chapter.instance_eval do
-      def on_POSTDEF?
+      def on_APPENDIX?
         true
       end
     end
-    @builder.headline(1,"test","this is test.")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録1　this is test.</h1>\n|, @builder.raw_result
+    actual = compile_block("={test} this is test.\n")
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録1　this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef
     @chapter.instance_eval do
-      def on_POSTDEF?
+      def on_APPENDIX?
         true
       end
     end
-    @builder.headline(2,"test","this is test.")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>1.1　this is test.</h2>\n|, @builder.raw_result
+    actual = compile_block("=={test} this is test.\n")
+    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>1.1　this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_postdef_roman
     @chapter.book.config["appendix_format"] = "roman"
     @chapter.instance_eval do
-      def on_POSTDEF?
+      def on_APPENDIX?
         true
       end
     end
-    @builder.headline(1,"test","this is test.")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録I　this is test.</h1>\n|, @builder.raw_result
+    actual = compile_block("={test} this is test.\n")
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録I　this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef_roman
     @chapter.book.config["appendix_format"] = "roman"
     @chapter.instance_eval do
-      def on_POSTDEF?
+      def on_APPENDIX?
         true
       end
     end
-    @builder.headline(2,"test","this is test.")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>I.1　this is test.</h2>\n|, @builder.raw_result
+    actual = compile_block("=={test} this is test.\n")
+    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>I.1　this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_postdef_alpha
     @chapter.book.config["appendix_format"] = "alpha"
     @chapter.instance_eval do
-      def on_POSTDEF?
+      def on_APPENDIX?
         true
       end
     end
-    @builder.headline(1,"test","this is test.")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録A　this is test.</h1>\n|, @builder.raw_result
+    actual = compile_block("={test} this is test.\n")
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録A　this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef_alpha
     @chapter.book.config["appendix_format"] = "alpha"
     @chapter.instance_eval do
-      def on_POSTDEF?
+      def on_APPENDIX?
         true
       end
     end
-    @builder.headline(2,"test","this is test.")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>A.1　this is test.</h2>\n|, @builder.raw_result
+    actual = compile_block("=={test} this is test.\n")
+    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>A.1　this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_without_secno
-    ReVIEW.book.config["secnolevel"] = 0
-    @builder.headline(1,"test","this is test.")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>this is test.</h1>\n|, @builder.raw_result
+    @book.config["secnolevel"] = 0
+    actual = compile_block("={test} this is test.\n")
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>this is test.</h1>\n|, actual
   end
 
   def test_headline_level1_with_tricky_id
-    @builder.headline(1,"123 あ_;","this is test.")
-    assert_equal %Q|<h1 id="id_123-_E3_81_82___3B"><a id="h1"></a>第1章　this is test.</h1>\n|, @builder.raw_result
+    actual = compile_block("={123 あ_;} this is test.\n")
+    assert_equal %Q|<h1 id="id_123-_E3_81_82___3B"><a id="h1"></a>第1章　this is test.</h1>\n|, actual
   end
 
   def test_headline_level1_with_inlinetag
-    @builder.headline(1,"test","this @<b>{is} test.<&\">")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this <b>is</b> test.&lt;&amp;&quot;&gt;</h1>\n|, @builder.raw_result
+    actual = compile_block("={test} this @<b>{is} test.<&\">\n")
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this <b>is</b> test.&lt;&amp;&quot;&gt;</h1>\n|, actual
   end
 
   def test_headline_level2
-    @builder.headline(2,"test","this is test.")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>1.1　this is test.</h2>\n|, @builder.raw_result
+    actual = compile_block("=={test} this is test.\n")
+    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>1.1　this is test.</h2>\n|, actual
   end
 
   def test_headline_level3
-    @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>this is test.</h3>\n|, @builder.raw_result
+    actual = compile_block("==={test} this is test.\n")
+    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>this is test.</h3>\n|, actual
   end
 
   def test_headline_level3_with_secno
-    ReVIEW.book.config["secnolevel"] = 3
-    @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>1.0.1　this is test.</h3>\n|, @builder.raw_result
+    @book.config["secnolevel"] = 3
+    actual = compile_block("==={test} this is test.\n")
+    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>1.0.1　this is test.</h3>\n|, actual
   end
 
   def test_label
-    @builder.label("label_test")
-    assert_equal %Q|<a id="label_test"></a>\n|, @builder.raw_result
+    actual = compile_block("//label[label_test]\n")
+    assert_equal %Q|<a id="label_test"></a>\n|, actual
   end
 
   def test_label_with_tricky_id
-    @builder.label("123 あ_;")
-    assert_equal %Q|<a id="id_123-_E3_81_82___3B"></a>\n|, @builder.raw_result
+    actual = compile_block("//label[123 あ_;]\n")
+    assert_equal %Q|<a id="id_123-_E3_81_82___3B"></a>\n|, actual
   end
 
   def test_href
-    ret = @builder.compile_href("http://github.com", "GitHub")
-    assert_equal %Q|<a href="http://github.com" class="link">GitHub</a>|, ret
+    actual = compile_inline("@<href>{http://github.com,GitHub}")
+    assert_equal %Q|<a href="http://github.com" class="link">GitHub</a>|, actual
   end
 
   def test_href_without_label
-    ret = @builder.compile_href("http://github.com",nil)
-    assert_equal %Q|<a href="http://github.com" class="link">http://github.com</a>|, ret
+    actual = compile_inline("@<href>{http://github.com}")
+    assert_equal %Q|<a href="http://github.com" class="link">http://github.com</a>|, actual
   end
 
   def test_inline_href
-    ret = @builder.inline_href("http://github.com, Git\\,Hub")
-    assert_equal %Q|<a href="http://github.com" class="link">Git,Hub</a>|, ret
-  end
-
-  def test_inline_href_without_label
-    ret = @builder.inline_href("http://github.com")
-    assert_equal %Q|<a href="http://github.com" class="link">http://github.com</a>|, ret
+    actual = compile_inline("@<href>{http://github.com,Git\\,Hub}")
+    assert_equal %Q|<a href="http://github.com" class="link">Git,Hub</a>|, actual
   end
 
   def test_inline_raw
-    ret = @builder.inline_raw("@<tt>{inline}")
-    assert_equal %Q|@<tt>{inline}|, ret
+    actual = compile_inline("@<raw>{@<tt>{inline\\}}")
+    assert_equal %Q|@<tt>{inline}|, actual
   end
 
   def test_inline_in_table
-    ret = @builder.table(["<b>1</b>\t<i>2</i>", "------------", "<b>3</b>\t<i>4</i>&lt;&gt;&amp;"])
-    assert_equal %Q|<div class="table">\n<table>\n<tr><th><b>1</b></th><th><i>2</i></th></tr>\n<tr><td><b>3</b></td><td><i>4</i>&lt;&gt;&amp;</td></tr>\n</table>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//table{\n@<b>{1}\t@<i>{2}\n------------\n@<b>{3}\t@<i>{4}<>&\n//}\n")
+    assert_equal %Q|<div class="table">\n<table>\n<tr><th><b>1</b></th><th><i>2</i></th></tr>\n<tr><td><b>3</b></td><td><i>4</i>&lt;&gt;&amp;</td></tr>\n</table>\n</div>\n|, actual
   end
 
   def test_inline_br
-    ret = @builder.inline_br("")
-    assert_equal %Q|<br />|, ret
+    actual = compile_inline("@<br>{}")
+    assert_equal %Q|<br />|, actual
   end
 
   def test_inline_i
-    ret = @builder.compile_inline("test @<i>{inline test} test2")
-    assert_equal %Q|test <i>inline test</i> test2|, ret
+    actual = compile_inline("test @<i>{inline test} test2")
+    assert_equal %Q|test <i>inline test</i> test2|, actual
   end
 
   def test_inline_i_and_escape
-    ret = @builder.compile_inline("test @<i>{inline<&;\\ test} test2")
-    assert_equal %Q|test <i>inline&lt;&amp;;\\ test</i> test2|, ret
+    actual = compile_inline("test @<i>{inline<&;\\ test} test2")
+    assert_equal %Q|test <i>inline&lt;&amp;;\\ test</i> test2|, actual
   end
 
   def test_inline_b
-    ret = @builder.compile_inline("test @<b>{inline test} test2")
-    assert_equal %Q|test <b>inline test</b> test2|, ret
+    actual = compile_inline("test @<b>{inline test} test2")
+    assert_equal %Q|test <b>inline test</b> test2|, actual
   end
 
   def test_inline_b_and_escape
-    ret = @builder.compile_inline("test @<b>{inline<&;\\ test} test2")
-    assert_equal %Q|test <b>inline&lt;&amp;;\\ test</b> test2|, ret
+    actual = compile_inline("test @<b>{inline<&;\\ test} test2")
+    assert_equal %Q|test <b>inline&lt;&amp;;\\ test</b> test2|, actual
   end
 
   def test_inline_tt
-    ret = @builder.compile_inline("test @<tt>{inline test} test2")
-    assert_equal %Q|test <tt>inline test</tt> test2|, ret
+    actual = compile_inline("test @<tt>{inline test} test2")
+    assert_equal %Q|test <tt>inline test</tt> test2|, actual
   end
 
   def test_inline_tti
-    ret = @builder.compile_inline("test @<tti>{inline test} test2")
-    assert_equal %Q|test <tt><i>inline test</i></tt> test2|, ret
+    actual = compile_inline("test @<tti>{inline test} test2")
+    assert_equal %Q|test <tt><i>inline test</i></tt> test2|, actual
   end
 
   def test_inline_ttb
-    ret = @builder.compile_inline("test @<ttb>{inline test} test2")
-    assert_equal %Q|test <tt><b>inline test</b></tt> test2|, ret
+    actual = compile_inline("test @<ttb>{inline test} test2")
+    assert_equal %Q|test <tt><b>inline test</b></tt> test2|, actual
   end
 
   def test_inline_hd_chap
@@ -222,32 +218,32 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     @config["secnolevel"] = 2
-    ret = @builder.compile_inline("test @<hd>{chap1|test} test2")
-    assert_equal %Q|test 「te_st」 test2|, ret
+    actual = compile_inline("test @<hd>{chap1|test} test2")
+    assert_equal %Q|test 「te_st」 test2|, actual
 
     @config["secnolevel"] = 3
-    ret = @builder.compile_inline("test @<hd>{chap1|test} test2")
-    assert_equal %Q|test 「1.1.1 te_st」 test2|, ret
+    actual = compile_inline("test @<hd>{chap1|test} test2")
+    assert_equal %Q|test 「1.1.1 te_st」 test2|, actual
   end
 
   def test_inline_uchar
-    ret = @builder.compile_inline("test @<uchar>{2460} test2")
-    assert_equal %Q|test &#x2460; test2|, ret
+    actual = compile_inline("test @<uchar>{2460} test2")
+    assert_equal %Q|test &#x2460; test2|, actual
   end
 
   def test_inline_ruby
-    ret = @builder.compile_inline("@<ruby>{粗雑,クルード}と思われているなら@<ruby>{繊細,テクニカル}にやり、繊細と思われているなら粗雑にやる。")
-    assert_equal "<ruby><rb>粗雑</rb><rp>（</rp><rt>クルード</rt><rp>）</rp></ruby>と思われているなら<ruby><rb>繊細</rb><rp>（</rp><rt>テクニカル</rt><rp>）</rp></ruby>にやり、繊細と思われているなら粗雑にやる。", ret
+    actual = compile_inline("@<ruby>{粗雑,クルード}と思われているなら@<ruby>{繊細,テクニカル}にやり、繊細と思われているなら粗雑にやる。")
+    assert_equal "<ruby><rb>粗雑</rb><rp>（</rp><rt>クルード</rt><rp>）</rp></ruby>と思われているなら<ruby><rb>繊細</rb><rp>（</rp><rt>テクニカル</rt><rp>）</rp></ruby>にやり、繊細と思われているなら粗雑にやる。", actual
   end
 
   def test_inline_ruby_comma
-    ret = @builder.compile_inline("@<ruby>{foo\\, bar\\, buz,フー・バー・バズ}")
-    assert_equal "<ruby><rb>foo, bar, buz</rb><rp>（</rp><rt>フー・バー・バズ</rt><rp>）</rp></ruby>", ret
+    actual = compile_inline("@<ruby>{foo\\, bar\\, buz,フー・バー・バズ}")
+    assert_equal "<ruby><rb>foo, bar, buz</rb><rp>（</rp><rt>フー・バー・バズ</rt><rp>）</rp></ruby>", actual
   end
 
   def test_inline_ref
-    ret = @builder.compile_inline("@<ref>{外部参照<>&}")
-    assert_equal %Q|<a target='外部参照&lt;&gt;&amp;'>「●●　外部参照&lt;&gt;&amp;」</a>|, ret
+    actual = compile_inline("@<ref>{外部参照<>&}")
+    assert_equal %Q|<a target='外部参照&lt;&gt;&amp;'>「●●　外部参照&lt;&gt;&amp;」</a>|, actual
   end
 
   def test_inline_mathml
@@ -258,37 +254,35 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       return true
     end
     @config["mathml"] = true
-    ret = @builder.compile_inline("@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}")
+    actual = compile_inline("@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}")
     @config["mathml"] = nil
-    assert_equal "<span class=\"equation\"><math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mfrac><mrow><mo stretchy='false'>-</mo><mi>b</mi><mo stretchy='false'>&#xb1;</mo><msqrt><mrow><msup><mi>b</mi><mn>2</mn></msup><mo stretchy='false'>-</mo><mn>4</mn><mi>a</mi><mi>c</mi></mrow></msqrt></mrow><mrow><mn>2</mn><mi>a</mi></mrow></mfrac></math></span>", ret
+    assert_equal "<span class=\"equation\"><math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mfrac><mrow><mo stretchy='false'>-</mo><mi>b</mi><mo stretchy='false'>&#xb1;</mo><msqrt><mrow><msup><mi>b</mi><mn>2</mn></msup><mo stretchy='false'>-</mo><mn>4</mn><mi>a</mi><mi>c</mi></mrow></msqrt></mrow><mrow><mn>2</mn><mi>a</mi></mrow></mfrac></math></span>", actual
   end
 
   def test_quote
-    lines = ["foo", "bar", "","buz"]
-    @builder.quote(lines)
-    assert_equal %Q|<blockquote><p>foobar</p>\n<p>buz</p></blockquote>\n|, @builder.raw_result
+    actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|<blockquote><p>foobar</p>\n<p>buz</p></blockquote>\n|, actual
   end
 
   def test_memo
-    @builder.memo(["test1", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
-    assert_equal %Q|<div class="memo">\n<p class="caption">this is <b>test</b>&lt;&amp;&gt;_</p>\n<p>test1</p>\n<p>test<i>2</i></p>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//memo[this is @<b>{test}<&>_]{\ntest1\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<div class="memo">\n<p class="caption">this is <b>test</b>&lt;&amp;&gt;_</p>\n<p>test1</p>\n<p>test<i>2</i></p>\n</div>\n|, actual
   end
 
   def test_noindent
     @builder.noindent
-    @builder.paragraph(["foo", "bar"])
-    @builder.paragraph(["foo2", "bar2"])
-    assert_equal %Q|<p class="noindent">foobar</p>\n<p>foo2bar2</p>\n|, @builder.raw_result
+    actual = compile_block("foo\nbar\n\nfoo2\nbar2\n")
+    assert_equal %Q|<p class="noindent">foobar</p>\n<p>foo2bar2</p>\n|, actual
   end
 
   def test_flushright
-    @builder.flushright(["foo", "bar", "", "buz"])
-    assert_equal %Q|<p class="flushright">foobar</p>\n<p class="flushright">buz</p>\n|, @builder.raw_result
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|<p class="flushright">foobar</p>\n<p class="flushright">buz</p>\n|, actual
   end
 
   def test_centering
-    @builder.centering(["foo", "bar", "", "buz"])
-    assert_equal %Q|<p class="center">foobar</p>\n<p class="center">buz</p>\n|, @builder.raw_result
+    actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|<p class="center">foobar</p>\n<p class="center">buz</p>\n|, actual
   end
 
   def test_image
@@ -298,8 +292,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.image_image("sampleimg","sample photo",nil)
-    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
+    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_image_with_metric
@@ -309,8 +303,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.image_image("sampleimg","sample photo","scale=1.2")
-    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
+    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_image_with_metric2
@@ -319,8 +313,9 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
-    @builder.image_image("sampleimg","sample photo","scale=1.2,html::class=sample,latex::ignore=params")
-    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" class="sample" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\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|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" class="sample" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_image_with_tricky_id
@@ -330,8 +325,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.image_image("123 あ_;","sample photo",nil)
-    assert_equal %Q|<div id="id_123-_E3_81_82___3B" class="image">\n<img src="images/chap1-123 あ_;.png" alt="sample photo" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//image[123 あ_;][sample photo]{\n//}\n")
+    assert_equal %Q|<div id="id_123-_E3_81_82___3B" class="image">\n<img src="images/chap1-123 あ_;.png" alt="sample photo" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_indepimage
@@ -341,8 +336,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg","sample photo",nil)
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
+    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_indepimage_without_caption
@@ -352,8 +347,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg",nil,nil)
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n</div>\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg]\n")
+    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n</div>\n|, actual
   end
 
   def test_indepimage_with_metric
@@ -363,8 +358,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg","sample photo","scale=1.2")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
+    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_indepimage_with_metric2
@@ -374,8 +369,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg","sample photo","scale=1.2, html::class=\"sample\",latex::ignore=params")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" class="sample" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2, html::class=\"sample\",latex::ignore=params]\n")
+    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" width="120%" class="sample" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_indepimage_without_caption_but_with_metric
@@ -385,17 +380,26 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       item
     end
 
-    @builder.indepimage("sampleimg",nil,"scale=1.2")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" width="120%" />\n</div>\n|, @builder.raw_result
+    actual = compile_block("//indepimage[sampleimg][][scale=1.2]\n")
+    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" width="120%" />\n</div>\n|, actual
+  end
+
+  def test_dlist
+    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    assert_equal %Q|<dl>\n<dt>foo</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
+  end
+
+  def test_dlist_with_bracket
+    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
+    assert_equal %Q|<dl>\n<dt>foo[bar]</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
   end
 
   def test_list
     def @chapter.list(id)
       Book::ListIndex::Item.new("samplelist",1)
     end
-    @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
-
-    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n|, actual
   end
 
   def test_list_pygments
@@ -407,41 +411,41 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     rescue LoadError
       return true
     end
-    ReVIEW.book.config["pygments"] = true
-    @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
+    @book.config["pygments"] = true
+    actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
 
-    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<span style="color: #008000; font-weight: bold">&lt;i&gt;</span>2<span style="color: #008000; font-weight: bold">&lt;/i&gt;</span>\n</pre>\n</div>\n|, @builder.raw_result
+    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<span style="color: #008000; font-weight: bold">&lt;i&gt;</span>2<span style="color: #008000; font-weight: bold">&lt;/i&gt;</span>\n</pre>\n</div>\n|, actual
   end
 
   def test_emlist
-    @builder.emlist(["lineA","lineB"])
-    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//emlist{\nlineA\nlineB\n//}\n")
+    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, actual
   end
 
   def test_emlist_caption
-    @builder.emlist(["lineA","lineB"],"cap1")
-    assert_equal %Q|<div class="emlist-code">\n<p class="caption">cap1</p>\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    assert_equal %Q|<div class="emlist-code">\n<p class="caption">cap1</p>\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, actual
   end
 
   def test_emlist_with_tab
-    @builder.emlist(["\tlineA","\t\tlineB","\tlineC"])
-    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">        lineA\n                lineB\n        lineC\n</pre>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//emlist{\n\tlineA\n\t\tlineB\n\tlineC\n//}\n")
+    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">        lineA\n                lineB\n        lineC\n</pre>\n</div>\n|, actual
   end
 
   def test_emlist_with_4tab
-    @builder.instance_eval{@tabwidth=4}
-    @builder.emlist(["\tlineA","\t\tlineB","\tlineC"])
-    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">    lineA\n        lineB\n    lineC\n</pre>\n</div>\n|, @builder.raw_result
+    @config["tabwidth"] = 4
+    actual = compile_block("//emlist{\n\tlineA\n\t\tlineB\n\tlineC\n//}\n")
+    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">    lineA\n        lineB\n    lineC\n</pre>\n</div>\n|, actual
   end
 
   def test_cmd
-    @builder.cmd(["lineA","lineB"])
-    assert_equal %Q|<div class="cmd-code">\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
+    assert_equal %Q|<div class="cmd-code">\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n|, actual
   end
 
   def test_cmd_caption
-    @builder.cmd(["lineA","lineB"], "cap1")
-    assert_equal %Q|<div class="cmd-code">\n<p class="caption">cap1</p>\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n|, @builder.raw_result
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    assert_equal %Q|<div class="cmd-code">\n<p class="caption">cap1</p>\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n|, actual
   end
 
   def test_bib
@@ -449,7 +453,15 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
-    assert_equal %Q|<a href="./bib.html#bib-samplebib">[1]</a>|, @builder.inline_bib("samplebib")
+    assert_equal %Q|<a href="bib.html#bib-samplebib">[1]</a>|, compile_inline("@<bib>{samplebib}")
+  end
+
+  def test_bib_noramlized
+    def @chapter.bibpaper(id)
+      Book::BibpaperIndex::Item.new("sampleb=ib",1,"sample bib")
+    end
+
+    assert_equal %Q|<a href="bib.html#bib-id_sample_3Dbib">[1]</a>|, compile_inline("@<bib>{sample=bib}")
   end
 
   def test_bibpaper
@@ -457,8 +469,17 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
-    @builder.bibpaper(["a", "b"], "samplebib", "sample bib @<b>{bold}")
-    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-samplebib\">[1]</a> sample bib <b>bold</b>\n<p>ab</p></div>\n|, @builder.raw_result
+    actual = compile_block("//bibpaper[samplebib][sample bib @<b>{bold}]{\na\nb\n//}\n")
+    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-samplebib\">[1]</a> sample bib <b>bold</b>\n<p>ab</p></div>\n|, actual
+  end
+
+  def test_bibpaper_normalized
+    def @chapter.bibpaper(id)
+      Book::BibpaperIndex::Item.new("sample=bib",1,"sample bib")
+    end
+
+    actual = compile_block("//bibpaper[sample=bib][sample bib @<b>{bold}]{\na\nb\n//}\n")
+    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-id_sample_3Dbib\">[1]</a> sample bib <b>bold</b>\n<p>ab</p></div>\n|, actual
   end
 
   def test_bibpaper_with_anchor
@@ -466,14 +487,12 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
-    @builder.bibpaper(["a", "b"], "samplebib", "sample bib @<href>{http://example.jp}")
-    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-samplebib\">[1]</a> sample bib <a href=\"http://example.jp\" class=\"link\">http://example.jp</a>\n<p>ab</p></div>\n|, @builder.raw_result
+    actual = compile_block("//bibpaper[samplebib][sample bib @<href>{http://example.jp}]{\na\nb\n//}\n")
+    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-samplebib\">[1]</a> sample bib <a href=\"http://example.jp\" class=\"link\">http://example.jp</a>\n<p>ab</p></div>\n|, actual
   end
 
   def column_helper(review)
-    chap_singleton = class << @chapter; self; end
-    chap_singleton.send(:define_method, :content) { review }
-    @compiler.compile(@chapter).match(/<body>\n(.+)<\/body>/m)[1]
+    compile_block(review)
   end
 
   def test_column_1
@@ -488,7 +507,7 @@ inside column
 
 ===[/column]
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 <div class="column">
 
 <h3><a id="column-1"></a>prev column</h3>
@@ -500,7 +519,7 @@ EOS
 <p>inside column</p>
 </div>
 EOS
-    assert_equal expect, column_helper(review)
+    assert_equal expected, column_helper(review)
   end
 
   def test_column_2
@@ -511,7 +530,7 @@ inside column
 
 === next level
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 <div class="column">
 
 <h3><a id="column-1"></a>test</h3>
@@ -521,7 +540,7 @@ EOS
 <h3><a id="h1-0-1"></a>next level</h3>
 EOS
 
-    assert_equal expect, column_helper(review)
+    assert_equal expected, column_helper(review)
   end
 
   def test_column_3
@@ -547,7 +566,7 @@ inside column
 
 this is @<column>{foo}.
 EOS
-    expect =<<-EOS
+    expected =<<-EOS
 <div class="column">
 
 <h3 id="foo"><a id="column-1"></a>test</h3>
@@ -558,7 +577,7 @@ EOS
 <p>this is test.</p>
 EOS
 
-    assert_equal expect, column_helper(review)
+    assert_equal expected, column_helper(review)
   end
 
 
@@ -567,8 +586,9 @@ EOS
   * AAA
   * BBB
 EOS
-    expect = "<ul>\n<li>AAA</li>\n<li>BBB</li>\n</ul>\n"
-    ul_helper(src, expect)
+    expected = "<ul>\n<li>AAA</li>\n<li>BBB</li>\n</ul>\n"
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_cont
@@ -578,8 +598,9 @@ EOS
   * BBB
     -BB
 EOS
-    expect = "<ul>\n<li>AAA-AA</li>\n<li>BBB-BB</li>\n</ul>\n"
-    ul_helper(src, expect)
+    expected = "<ul>\n<li>AAA-AA</li>\n<li>BBB-BB</li>\n</ul>\n"
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_nest1
@@ -588,7 +609,7 @@ EOS
   ** AA
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 <ul>
 <li>AAA<ul>
 <li>AA</li>
@@ -596,7 +617,8 @@ EOS
 </li>
 </ul>
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_nest2
@@ -607,7 +629,7 @@ EOS
   ** BB
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 <ul>
 <li>AAA<ul>
 <li>AA</li>
@@ -619,7 +641,8 @@ EOS
 </li>
 </ul>
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_nest3
@@ -630,7 +653,7 @@ EOS
   ** BB
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 <ul>
 <li><ul>
 <li>AAA</li>
@@ -643,7 +666,8 @@ EOS
 </li>
 </ul>
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_nest4
@@ -655,7 +679,7 @@ EOS
   ** BB
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 <ul>
 <li>A<ul>
 <li>AA<ul>
@@ -670,7 +694,8 @@ EOS
 </li>
 </ul>
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ul_nest5
@@ -682,7 +707,7 @@ EOS
   ** BB
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 <ul>
 <li>A<ul>
 <li>AA<ul>
@@ -700,7 +725,8 @@ EOS
 </li>
 </ul>
 EOS
-    ul_helper(src, expect)
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 
   def test_ol
@@ -709,86 +735,87 @@ EOS
   3. BBB
 EOS
 
-    expect =<<-EOS
+    expected =<<-EOS
 <ol>
 <li>AAA</li>
 <li>BBB</li>
 </ol>
 EOS
-    ol_helper(src, expect)
+    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("|html|body")
+    assert_equal "body", compile_inline("@<raw>{|html|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, latex|body")
+    assert_equal "", compile_inline("@<raw>{|idgxml, latex|body}")
   end
 
   def test_inline_raw4
-    assert_equal "|html body", @builder.inline_raw("|html body")
+    assert_equal "|html body", compile_inline("@<raw>{|html body}")
   end
 
   def test_inline_raw5
-    assert_equal "nor\nmal", @builder.inline_raw("|html|nor\\nmal")
+    assert_equal "nor\nmal", compile_inline("@<raw>{|html|nor\\nmal}")
   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("|html|<>!\"\\n& ")
-    expect = %Q(<>!\"\n& )
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[|html|<>!\"\\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("|latex, idgxml|<>!\"\\n& ")
-    expect = ''
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[|latex, idgxml|<>!\"\\n& ]\n")
+    expected = ''
+    assert_equal expected, actual
   end
 
   def test_block_raw4
-    @builder.raw("|html <>!\"\\n& ")
-    expect = %Q(|html <>!\"\n& )
-    assert_equal expect.chomp, @builder.raw_result
+    actual = compile_block("//raw[|html <>!\"\\n& ]\n")
+    expected = %Q(|html <>!\"\n& )
+    assert_equal expected, actual
   end
 
   def test_inline_fn
     fn = Book::FootnoteIndex.parse(['//footnote[foo][bar\\a\\$buz]'])
     @chapter.instance_eval{@footnote_index=fn}
-    @builder.footnote("foo",'bar\\a\\$buz')
-    expect =<<-'EOS'
+    actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
+    expected =<<-'EOS'
 <div class="footnote" id="fn-foo"><p class="footnote">[<a href="#fnb-foo">*1</a>] bar\a\$buz</p></div>
 EOS
-    assert_equal expect, @builder.raw_result
+    assert_equal expected, actual
   end
 
   def test_inline_fn_with_tricky_id
     fn = Book::FootnoteIndex.parse(['//footnote[123 あ_;][bar\\a\\$buz]'])
     @chapter.instance_eval{@footnote_index=fn}
-    @builder.footnote("123 あ_;",'bar\\a\\$buz')
-    expect =<<-'EOS'
+    actual = compile_block("//footnote[123 あ_;][bar\\a\\$buz]\n")
+    expected =<<-'EOS'
 <div class="footnote" id="fn-id_123-_E3_81_82___3B"><p class="footnote">[<a href="#fnb-id_123-_E3_81_82___3B">*1</a>] bar\a\$buz</p></div>
 EOS
-    assert_equal expect, @builder.raw_result
+    assert_equal expected, actual
   end
 end