review 1.7.2 → 2.0.0.beta1

data/test/assets/test_template.tex

@@ -205,7 +205,7 @@
         
       \end{tabular}\par}%
     \vfill
-    {\large 2011-01-01 版\hspace{2zw} 発行\par}%
+    {\large 2011-01-01 version\hspace{2zw} 発行\par}%
 \vskip4zw\mbox{}
   \end{center}%
 \end{titlepage}

data/test/sample-book/src/config.yml

@@ -67,7 +67,6 @@ rights: (C) 2011 Masayoshi Takahashi
 # coverage: 内容の範囲や領域
 
 # htmlext: HTMLファイルの拡張子(省略した場合はhtml)
-htmlext: xhtml
 # CSSファイル(配列で複数指定可、yamlファイルおよびRe:VIEWファイルを置いたディレクトリにあること)
 stylesheet: ["style.css"]
 

data/test/test.re

@@ -1,7 +1,7 @@
 = 見出し
 以下を実行
 //emlist{
-./bin/review-compile --hdnumberingmode test.re --target=html
+./bin/review-compile --inencoding=UTF-8 --outencoding=UTF-8 --hdnumberingmode test.re --target=html
 }
 == 節１
 

data/test/test_book.rb

@@ -158,14 +158,14 @@ class BookTest < Test::Unit::TestCase
   def test_setParameter
     book = Book::Base.new(File.dirname(__FILE__))
     book.param = :test
-    assert_equal :test, book.param # old way
+    assert_equal :test, book.param  # old way
     assert_equal :test, book.config # new way
   end
 
   def test_setConfig
     book = Book::Base.new(File.dirname(__FILE__))
     book.config = :test
-    assert_equal :test, book.param # old way
+    assert_equal :test, book.param  # old way
     assert_equal :test, book.config # new way
   end
 
@@ -391,7 +391,7 @@ EOC
     end
 
     mktmpbookdir 'catalog.yml' => "APPENDIX:\n  - p01.re",
-                 'p01.re' => '= appendix' do |dir, book, files|
+                 'p01.re' => '= appendix'  do |dir, book, files|
       assert_equal 'appendix', book.appendix.chapters.first.title
       assert_equal 1, book.appendix.chapters.first.number
     end
@@ -399,7 +399,7 @@ EOC
 
   def test_postscripts
     mktmpbookdir 'catalog.yml' => "POSTDEF:\n  - b01.re",
-                 'b01.re' => '= back' do |dir, book, files|
+                 'b01.re' => '= back'  do |dir, book, files|
       assert_kind_of Book::Part, book.postscripts
       assert_equal 1, book.postscripts.chapters.size
       assert_equal 'back', book.postscripts.chapters.first.title

data/test/test_book_chapter.rb

@@ -3,6 +3,21 @@ require 'book_test_helper'
 class ChapterTest < Test::Unit::TestCase
   include BookTestHelper
 
+  def setup
+
+    if "".respond_to?(:encode)
+      @utf8_str = "あいうえお"
+      @eucjp_str = "あいうえお".encode("EUC-JP")
+      @sjis_str = "あいうえお".encode("Shift_JIS")
+      @jis_str = "あいうえお".encode("ISO-2022-JP")
+    else
+      @utf8_str = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a" # "あいうえお"
+      @eucjp_str = "\xa4\xa2\xa4\xa4\xa4\xa6\xa4\xa8\xa4\xaa"
+      @sjis_str = "\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8"
+      @jis_str = "\x1b\x24\x42\x24\x22\x24\x24\x24\x26\x24\x28\x24\x2a\x1b\x28\x42"
+    end
+  end
+
   def test_initialize
     ch = Book::Chapter.new(:book, :number, :name, '/foo/bar', :io)
     assert_equal :book, ch.book
@@ -67,6 +82,60 @@ class ChapterTest < Test::Unit::TestCase
     io = StringIO.new("=1\n=2\n")
     ch = Book::Chapter.new(book, nil, nil, nil, io)
     assert_equal '1', ch.title
+
+
+    [
+      ['EUC', @eucjp_str],
+      ['SJIS', @sjis_str],
+#      ['JIS', @jis_str],
+      ['XYZ', @eucjp_str],
+    ].each do |enc, instr|
+      io = StringIO.new("= #{instr}\n")
+      ch = Book::Chapter.new(book, nil, nil, nil, io)
+      book.config['inencoding'] = enc
+      assert_equal @utf8_str, ch.title
+      assert_equal @utf8_str, ch.instance_eval { @title }
+    end
+  end
+
+  def test_content
+    [
+      ['EUC', @eucjp_str],
+      ['SJIS', @sjis_str],
+      ['JIS', @jis_str],
+      ['XYZ', @eucjp_str],
+    ].each do |enc, instr|
+      tf = Tempfile.new('chapter_test')
+      book = Book::Base.new(nil)
+      begin
+        tf.print instr
+        tf.close
+
+        ch = Book::Chapter.new(book, nil, nil, tf.path)
+        book.config['inencoding'] = enc
+        assert_equal @utf8_str, ch.content
+        assert_equal @utf8_str, ch.instance_eval { @content }
+      ensure
+        tf.close(true)
+      end
+
+      tf1 = Tempfile.new('chapter_test1')
+      tf2 = Tempfile.new('chapter_test2')
+      begin
+        tf1.puts instr
+        tf1.puts instr
+        tf1.close
+        tf2.puts instr
+        tf1.close
+
+        ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2)
+        book.config['inencoding'] = enc
+        assert_equal "#{@utf8_str}\n#{@utf8_str}\n", ch.content # XXX: OK?
+      ensure
+        tf1.close(true)
+        tf2.close(true)
+      end
+    end
   end
 
   def test_lines
@@ -207,6 +276,7 @@ E
 
   def test_column_index
     book = Book::Base.new(nil)
+    book.config["inencoding"] = "utf-8"
     do_test_index(<<E, Book::ColumnIndex, :column_index, :column, :propagate => false)
 = dummy1
 ===[column]{abc} aaaa

data/test/test_book_part.rb

@@ -33,7 +33,7 @@ class PartTest < Test::Unit::TestCase
     assert_equal 0, part.volume.lines
 
     chs = []
-    tfs = [] ## prevent from removing Tempfile
+    tfs = []  ## prevent from removing Tempfile
     Tempfile.open('part_test') do |o|
       o.print "12345"
       chs << Book::Chapter.new(book, nil, nil, o.path)

data/test/test_builder.rb

@@ -44,16 +44,6 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal '', b.result
   end
 
-  def test_print_and_puts
-    b = Builder.new
-    assert_raises(NoMethodError) do # XXX: OK?
-      b.print ""
-    end
-    assert_raises(NoMethodError) do # XXX: OK?
-      b.puts ""
-    end
-  end
-
   def test_not_implemented_methods
     ex = NoMethodError # XXX: OK?
     [
@@ -70,24 +60,12 @@ class BuidlerTest < Test::Unit::TestCase
     end
   end
 
-  def test_compile_inline
-    text = "abc"
-    assert_equal [:text, text], @b.compile_inline(text)
-  end
-
-  def test_inline_ruby
-    def @b.compile_ruby(base,ruby)
-      [base,ruby]
-    end
-    str = @b.inline_ruby("foo,bar")
-    assert_equal str, ["foo","bar"]
-    str = @b.inline_ruby("foo\\,\\,,\\,bar,buz")
-    assert_equal str, ["foo,,",",bar,buz"]
-  end
-
-  def test_compile_inline_backslash
-    text = "abc\\d\\#a"
-    assert_equal [:text, text], @b.compile_inline(text)
+  def test_convert_outencoding
+    book = ReVIEW::Book::Base.new(nil)
+    book.config = {'outencoding' => "EUC"}
+    b = Builder.new
+    ret = b.convert_outencoding("a", book.config["outencoding"])
+    assert_equal "a", ret
   end
 
   class XBuilder < Builder

data/test/test_compiler.rb

@@ -4,43 +4,88 @@ require 'test_helper'
 require 'review/compiler'
 require 'review/book'
 require 'review/latexbuilder'
+require 'review/htmlbuilder'
 
 class CompilerTest < Test::Unit::TestCase
   include ReVIEW
 
   def setup
-    @builder = LATEXBuilder.new()
-    @c = Compiler.new(@builder)
+    @builder = HTMLBuilder.new()
+    @param = {
+      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
+      "subdirmode" => nil,
+      "stylesheet" => nil,  # for HTMLBuilder
+    }
+    ReVIEW.book.param = @param
+    @compiler = ReVIEW::Compiler.new(@builder)
+    @chapter = Book::Chapter.new(Book::Base.new(nil), 1, '-', nil, StringIO.new)
+    location = Location.new(nil, nil)
+    @builder.bind(@compiler, @chapter, location)
+
+    def @compiler.compile_command(name, args, lines, node)
+      args
+    end
+
   end
 
   def test_parse_args
-    args = @c.__send__(:parse_args, "[foo][bar]")
-    assert_equal ["foo","bar"], args
+    args = compile_blockelem("//dummy[foo][bar]\n", false)
+    assert_equal ["foo","bar"], args.parse_args(:doc,:doc)
   end
 
   def test_parse_args_with_brace1
-    args = @c.__send__(:parse_args, "[fo[\\][\\]o][bar]")
-    assert_equal ["fo[][]o","bar"], args
+    args = compile_blockelem("//dummy[fo[\\][\\]o][bar]", false)
+    assert_equal ["fo[][]o","bar"], args.parse_args(:doc, :doc)
   end
 
   def test_parse_args_with_brace2
-    args = @c.__send__(:parse_args, "[f\\]o\\]o][bar]")
-    assert_equal ["f]o]o","bar"], args
+    args = compile_blockelem("//dummy[f\\]o\\]o][bar]", false)
+    assert_equal ["f]o]o","bar"], args.parse_args(:doc, :doc)
   end
 
   def test_parse_args_with_backslash
-    args = @c.__send__(:parse_args, "[foo][bar\\buz]")
-    assert_equal ["foo","bar\\buz"], args
+    args = compile_blockelem("//dummy[foo][bar\\buz]", false)
+    assert_equal ["foo","bar\\buz"], args.parse_args(:doc, :doc)
   end
 
   def test_parse_args_with_backslash2
-    args = @c.__send__(:parse_args, "[foo][bar\\#\\[\\!]")
-    assert_equal ["foo","bar\\#\\[\\!"], args
+    args = compile_blockelem("//dummy[foo][bar\\#\\[\\!]", false)
+    assert_equal ["foo","bar\\#\\[\\!"], args.parse_args(:doc, :doc)
   end
 
   def test_parse_args_with_backslash3
-    args = @c.__send__(:parse_args, "[foo][bar\\\\buz]")
-    assert_equal ["foo","bar\\buz"], args
+    args = compile_blockelem("//dummy[foo][bar\\\\buz]", false)
+    assert_equal ["foo","bar\\buz"], args.parse_args(:doc, :doc)
+  end
+
+  def test_compile_inline
+    def @compiler.inline_ruby(*args)
+      return args
+    end
+    args = compile_inline("@<ruby>{abc}",false)
+    assert_equal "abc", args.content[0].content.to_doc
+  end
+
+  def test_inline_ruby
+#    def @compiler.inline_ruby(*args)
+#      return args
+#    end
+    args = compile_inline("@<ruby>{foo,bar}",false)
+    assert_equal "foo", args.content[0].content[0].to_doc
+    assert_equal "bar", args.content[0].content[1].to_doc
+    args = compile_inline("@<ruby>{foo\\,\\,,\\,bar\\,buz}", false)
+    assert_equal "foo,,", args.content[0].content[0].to_doc
+    assert_equal ",bar,buz", args.content[0].content[1].to_doc
+  end
+
+  def test_compile_inline_backslash
+    def @compiler.inline_dummy(*args)
+      return args
+    end
+    args = compile_inline("@<dummy>{abc\\d\\#a}", false)
+    assert_equal "abc\\d\\#a", args.content[0].content.to_doc
   end
 end
 

data/test/test_helper.rb

@@ -1,6 +1,53 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
 require 'test/unit'
 
+  def compile_document(str, force_to_s=true)
+    @compiler.setup_parser(str)
+    @compiler.parse("Document")
+    if force_to_s
+      @compiler.result.to_doc
+    else
+      @compiler.result
+    end
+  end
+
+  def compile_block(str, force_to_s=true)
+    @compiler.setup_parser(str)
+    @compiler.parse("Document")
+    if force_to_s
+      @compiler.result.to_doc
+    else
+      @compiler.result
+    end
+  end
+
+  def compile_inline(str, force_to_s=true)
+    @compiler.setup_parser(str)
+    @compiler.parse("Paragraph")
+    if force_to_s
+##      @compiler.result.map(&:to_doc).join
+      @compiler.result.to_doc
+    else
+      @compiler.result
+    end
+  end
+
+  def compile_blockelem(str, force_to_s=true)
+    @compiler.setup_parser(str)
+    @compiler.parse("BlockElement")
+    if force_to_s
+      @compiler.result.to_doc
+    else
+      @compiler.result
+    end
+  end
+
+  def compile_headline(str)
+    @compiler.setup_parser(str)
+    @compiler.parse("Headline")
+    @compiler.result.to_doc
+  end
+
 def touch_file(path)
   File.open(path, "w").close
   path
@@ -16,10 +63,6 @@ def prepare_samplebook(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)

data/test/test_htmlbuilder.rb

@@ -14,9 +14,10 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @builder = HTMLBuilder.new()
     @config = ReVIEW::Configure.values
     @config.merge!({
-      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
-      "stylesheet" => nil, # for HTMLBuilder
-      "htmlext" => "html",
+      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
+      "stylesheet" => nil,  # for HTMLBuilder
     })
     @book = Book::Base.new(".")
     @book.config = @config
@@ -58,7 +59,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a><span class="secno">1.1　</span>this is test.</h2>\n|, actual
+    assert_equal %Q|<h2 id="test"><a id="h1-1"></a><span class="secno">1.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_postdef_roman
@@ -80,7 +81,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="hI-1"></a><span class="secno">I.1　</span>this is test.</h2>\n|, actual
+    assert_equal %Q|<h2 id="test"><a id="hI-1"></a><span class="secno">I.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_postdef_alpha
@@ -102,7 +103,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="hA-1"></a><span class="secno">A.1　</span>this is test.</h2>\n|, actual
+    assert_equal %Q|<h2 id="test"><a id="hA-1"></a><span class="secno">A.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_without_secno
@@ -123,18 +124,18 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_headline_level2
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a><span class="secno">1.1　</span>this is test.</h2>\n|, actual
+    assert_equal %Q|<h2 id="test"><a id="h1-1"></a><span class="secno">1.1　</span>this is test.</h2>\n|, actual
   end
 
   def test_headline_level3
     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
+    assert_equal %Q|<h3 id="test"><a id="h1-0-1"></a>this is test.</h3>\n|, actual
   end
 
   def test_headline_level3_with_secno
     @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><span class="secno">1.0.1　</span>this is test.</h3>\n|, actual
+    assert_equal %Q|<h3 id="test"><a id="h1-0-1"></a><span class="secno">1.0.1　</span>this is test.</h3>\n|, actual
   end
 
   def test_label
@@ -319,7 +320,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q|<blockquote><p>foobar</p>\n<p>buz</p></blockquote>\n|, actual
+    assert_equal %Q|<blockquote><p>foobar</p>\n<p>buz</p>\n</blockquote>\n|, actual
   end
 
   def test_memo
@@ -479,7 +480,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @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&lt;i&gt;2&lt;/i&gt;\n</pre>\n</div>\n|, actual
+    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&lt;i&gt;2&lt;/i&gt;</pre>\n</div>\n|, actual
   end
 
   def test_list_pygments_lang
@@ -499,7 +500,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
                  %Q|<pre class=\"list\"><span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n| +
                  %Q|  (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">\|</span>i<span style=\"color: #666666\">\|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n| +
                  %Q|  <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n| +
-                 %Q|<span style=\"color: #008000; font-weight: bold\">end</span>\n| +
+                 %Q|<span style=\"color: #008000; font-weight: bold\">end</span>| +
                  %Q|</pre>\n| +
                  %Q|</div>\n|, actual
   end
@@ -517,36 +518,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @book.config["pygments"] = true
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_][]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
 
-    assert_equal "<div class=\"caption-code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class=\"list\">def foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n</pre>\n</div>\n", actual
-  end
-
-  def test_listnum
-    def @chapter.list(id)
-      Book::ListIndex::Item.new("samplelist",1)
-    end
-
-    @book.config["highlight"] = false
-    actual = compile_block(<<-EOS)
-//listnum[samplelist][this is @<b>{test}<&>_][ruby]{
-def foo(a1, a2=:test)
-  (1..3).times{|i| a.include?(:foo)}
-  return true
-end
-//}
-EOS
-
-    expected =<<-EOS
-<div class="code">
-<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
-<pre class="list"> 1: def foo(a1, a2=:test)
- 2:   (1..3).times{|i| a.include?(:foo)}
- 3:   return true
- 4: end
-</pre>
-</div>
-EOS
-
-    assert_equal expected, actual
+    assert_equal "<div class=\"caption-code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class=\"list\">def foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend</pre>\n</div>\n", actual
   end
 
   def test_listnum_pygments_lang
@@ -562,7 +534,7 @@ EOS
     @book.config["pygments"] = true
     actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_][ruby]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
 
-    assert_equal "<div class=\"code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<div class=\"highlight\" style=\"background: #f8f8f8\"><pre style=\"line-height: 125%\"><span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">1</span> <span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">2</span>   (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">|</span>i<span style=\"color: #666666\">|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">3</span>   <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">4</span> <span style=\"color: #008000; font-weight: bold\">end</span>\n</pre></div>\n</div>\n", actual
+    assert_equal "<div class=\"code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<div class=\"highlight\" style=\"background: #f8f8f8\"><pre style=\"line-height: 125%\"><span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">1</span> <span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">2</span>   (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">|</span>i<span style=\"color: #666666\">|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">3</span>   <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">4</span> <span style=\"color: #008000; font-weight: bold\">end</span>\n</pre></div></div>", actual
   end
 
   def test_listnum_pygments_lang_without_lang
@@ -580,7 +552,7 @@ EOS
     @book.config["highlight"]["lang"] = "ruby"
     actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
 
-    assert_equal "<div class=\"code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<div class=\"highlight\" style=\"background: #f8f8f8\"><pre style=\"line-height: 125%\"><span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">1</span> <span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">2</span>   (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">|</span>i<span style=\"color: #666666\">|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">3</span>   <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">4</span> <span style=\"color: #008000; font-weight: bold\">end</span>\n</pre></div>\n</div>\n", actual
+    assert_equal "<div class=\"code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<div class=\"highlight\" style=\"background: #f8f8f8\"><pre style=\"line-height: 125%\"><span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">1</span> <span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">2</span>   (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">|</span>i<span style=\"color: #666666\">|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">3</span>   <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">4</span> <span style=\"color: #008000; font-weight: bold\">end</span>\n</pre></div></div>", actual
   end
 
 
@@ -598,7 +570,7 @@ EOS
     end
     @book.config["pygments"] = true
     actual = compile_block("//emlist[][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
-    assert_equal "<div class=\"emlist-code\">\n<pre class=\"emlist\"><span style=\"color: #008000; font-weight: bold\">SELECT</span> <span style=\"color: #008000; font-weight: bold\">COUNT</span>(<span style=\"color: #666666\">*</span>) <span style=\"color: #008000; font-weight: bold\">FROM</span> tests <span style=\"color: #008000; font-weight: bold\">WHERE</span> tests.<span style=\"color: #008000; font-weight: bold\">no</span> <span style=\"color: #666666\">&gt;</span> <span style=\"color: #666666\">10</span> <span style=\"color: #008000; font-weight: bold\">AND</span> test.name <span style=\"color: #008000; font-weight: bold\">LIKE</span> <span style=\"color: #BA2121\">&#39;ABC%&#39;</span>\n</pre>\n</div>\n", actual
+    assert_equal "<div class=\"emlist-code\">\n<pre class=\"emlist\"><span style=\"color: #008000; font-weight: bold\">SELECT</span> <span style=\"color: #008000; font-weight: bold\">COUNT</span>(<span style=\"color: #666666\">*</span>) <span style=\"color: #008000; font-weight: bold\">FROM</span> tests <span style=\"color: #008000; font-weight: bold\">WHERE</span> tests.<span style=\"color: #008000; font-weight: bold\">no</span> <span style=\"color: #666666\">&gt;</span> <span style=\"color: #666666\">10</span> <span style=\"color: #008000; font-weight: bold\">AND</span> test.name <span style=\"color: #008000; font-weight: bold\">LIKE</span> <span style=\"color: #BA2121\">&#39;ABC%&#39;</span></pre>\n</div>\n", actual
   end
 
   def test_emlist_caption
@@ -611,19 +583,6 @@ EOS
     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_emlistnum
-    @book.config["highlight"] = false
-    actual = compile_block("//emlistnum{\nlineA\nlineB\n//}\n")
-    expected =<<-EOS
-<div class="emlistnum-code">
-<pre class="emlist"> 1: lineA
- 2: lineB
-</pre>
-</div>
-EOS
-    assert_equal expected, actual
-  end
-
   def test_emlist_with_4tab
     @config["tabwidth"] = 4
     actual = compile_block("//emlist{\n\tlineA\n\t\tlineB\n\tlineC\n//}\n")
@@ -643,7 +602,7 @@ EOS
     end
     @book.config["pygments"] = true
     actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
-    assert_equal "<div class=\"cmd-code\">\n<pre class=\"cmd\"><span style=\"color: #888888\">lineA</span>\n<span style=\"color: #888888\">lineB</span>\n</pre>\n</div>\n", actual
+    assert_equal "<div class=\"cmd-code\">\n<pre class=\"cmd\"><span style=\"color: #888888\">lineA</span>\n<span style=\"color: #888888\">lineB</span></pre>\n</div>\n", actual
   end
 
   def test_cmd_caption
@@ -667,22 +626,13 @@ EOS
     assert_equal %Q|<a href="bib.html#bib-id_sample_3Dbib">[1]</a>|, compile_inline("@<bib>{sample=bib}")
   end
 
-  def test_bib_htmlext
-    def @chapter.bibpaper(id)
-      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
-    end
-
-    @config["htmlext"] = "xhtml"
-    assert_equal %Q|<a href="bib.xhtml#bib-samplebib">[1]</a>|, compile_inline("@<bib>{samplebib}")
-  end
-
   def test_bibpaper
     def @chapter.bibpaper(id)
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
     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
+    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-samplebib\">[1]</a> sample bib <b>bold</b>\n<p>ab</p>\n</div>\n|, actual
   end
 
   def test_bibpaper_normalized
@@ -691,7 +641,7 @@ EOS
     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
+    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-id_sample_3Dbib\">[1]</a> sample bib <b>bold</b>\n<p>ab</p>\n</div>\n|, actual
   end
 
   def test_bibpaper_with_anchor
@@ -700,7 +650,7 @@ EOS
     end
 
     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
+    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>\n</div>\n|, actual
   end
 
   def column_helper(review)
@@ -748,7 +698,6 @@ EOS
 <h3><a id="column-1"></a>test</h3>
 <p>inside column</p>
 </div>
-
 <h3><a id="h1-0-1"></a>next level</h3>
 EOS
 
@@ -784,7 +733,6 @@ EOS
 <h3 id="foo"><a id="column-1"></a>test</h3>
 <p>inside column</p>
 </div>
-
 <h3><a id="h1-0-1"></a>next level</h3>
 <p>this is コラム「test」.</p>
 EOS
@@ -941,6 +889,70 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_ul_in_note
+    src =<<-EOS
+//note{
+
+aaaa
+bbb
+
+ * A
+ * B
+//}
+EOS
+
+    expected =<<-EOS
+<div class=\"note\">
+<p>aaaabbb</p>
+<ul>
+<li>A</li>
+<li>B</li>
+</ul>
+</div>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_ul_in_note_and_emlist
+    src =<<-EOS
+//note{
+
+aaaa
+bbb
+
+//emlist{
+abc
+ddd
+ * A
+ * B
+//}
+
+ * A
+ * B
+//}
+EOS
+
+    expected =<<-EOS
+<div class=\"note\">
+<p>aaaabbb</p>
+<div class="emlist-code">
+<pre class="emlist">abc
+ddd
+ * A
+ * B
+</pre>
+</div>
+<ul>
+<li>A</li>
+<li>B</li>
+</ul>
+</div>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
   def test_ol
     src =<<-EOS
   3. AAA
@@ -1030,4 +1042,23 @@ EOS
 EOS
     assert_equal expected, actual
   end
+
+
+  ## inline nesting tests
+  def test_href_nest
+    actual = compile_inline("@<href>{http://github.com,@<b>{G}itHub}")
+    assert_equal %Q|<a href="http://github.com" class="link"><b>G</b>itHub</a>|, actual
+  end
+
+  def test_inline_tti_nest
+    actual = compile_inline("test @<tt>{aa@<i>{inline test}bb} test2")
+    assert_equal %Q|test <tt>aa<i>inline test</i>bb</tt> test2|, actual
+  end
+
+  def test_inline_ttib_nest
+    actual = compile_inline("test @<tt>{aa@<i>{inline @<b>{te}st}bb} test2")
+    assert_equal %Q|test <tt>aa<i>inline <b>te</b>st</i>bb</tt> test2|, actual
+  end
+
+
 end