review 0.9.0 → 1.0.0

data/test/test_helper.rb

@@ -1,2 +1,10 @@
 $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
+

data/test/test_htmlbuilder.rb

@@ -71,9 +71,19 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<a href="http://github.com" class="link">http://github.com</a>|, ret
   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
+  end
+
   def test_inline_raw
     ret = @builder.inline_raw("@<tt>{inline}")
-    assert_equal %Q|@&lt;tt&gt;{inline}|, ret
+    assert_equal %Q|@<tt>{inline}|, ret
   end
 
   def test_inline_in_table
@@ -126,6 +136,11 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|test &#x2460; test2|, ret
   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
+  end
+
   def test_quote
     lines = ["foo", "bar", "","buz"]
     @builder.quote(lines)
@@ -149,11 +164,6 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<p class="flushright">foobar</p>\n<p class="flushright">buz</p>\n|, @builder.raw_result
   end
 
-  def test_raw
-    @builder.raw("<&>\\n")
-    assert_equal %Q|<&>\n|, @builder.raw_result
-  end
-
   def test_image
     def @chapter.image(id)
       item = ImageIndex::Item.new("sampleimg",1)
@@ -173,7 +183,17 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     @builder.image_image("sampleimg","sample photo","scale=1.2")
-    assert_equal %Q|<div 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
+    assert_equal %Q|<div 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
+  end
+
+  def test_image_with_metric2
+    def @chapter.image(id)
+      item = ImageIndex::Item.new("sampleimg",1)
+      item.instance_eval{@pathes=["./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 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
   end
 
   def test_indepimage
@@ -195,7 +215,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     @builder.indepimage("sampleimg",nil,nil)
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n|, @builder.raw_result
+    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n</div>\n|, @builder.raw_result
   end
 
   def test_indepimage_with_metric
@@ -206,7 +226,18 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     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" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, @builder.raw_result
+    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
+  end
+
+  def test_indepimage_with_metric2
+    def @chapter.image(id)
+      item = ImageIndex::Item.new("sampleimg",1)
+      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      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
   end
 
   def test_indepimage_without_caption_but_with_metric
@@ -217,7 +248,261 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     @builder.indepimage("sampleimg",nil,"scale=1.2")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n|, @builder.raw_result
+    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" width="120%" />\n</div>\n|, @builder.raw_result
+  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
+  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
+  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
   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
+  end
+
+  def test_bib
+    def @chapter.bibpaper(id)
+      BibpaperIndex::Item.new("samplebib",1,"sample bib")
+    end
+
+    assert_equal %Q|<a href="./bib.html#bib-samplebib">[1]</a>|, @builder.inline_bib("samplebib")
+  end
+
+  def test_bibpaper
+    def @chapter.bibpaper(id)
+      BibpaperIndex::Item.new("samplebib",1,"sample bib")
+    end
+
+    @builder.bibpaper(["a", "b"], "samplebib", "sample bib @<b>{bold}")
+    assert_equal %Q|<div>\n<a id=\"bib-samplebib\">\n[1] sample bib <b>bold</b>\n</a>\n<p>\na\nb\n</p>\n</div>\n|, @builder.raw_result
+  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]
+  end
+
+  def test_column_1
+    review =<<-EOS
+===[column] prev column
+
+inside prev column
+
+===[column] test
+
+inside column
+
+===[/column]
+EOS
+    expect =<<-EOS
+<div class="column">
+
+<h3><a id="h1-0-1" />prev column</h3>
+<p>inside prev column</p>
+</div>
+<div class="column">
+
+<h3><a id="h1-0-2" />test</h3>
+<p>inside column</p>
+</div>
+EOS
+    assert_equal expect, column_helper(review)
+  end
+
+  def test_column_2
+    review =<<-EOS
+===[column] test
+
+inside column
+
+=== next level
+EOS
+    expect =<<-EOS
+<div class="column">
+
+<h3><a id="h1-0-1" />test</h3>
+<p>inside column</p>
+</div>
+
+<h3><a id="h1-0-2" />next level</h3>
+EOS
+
+    assert_equal expect, column_helper(review)
+  end
+
+  def test_column_3
+    review =<<-EOS
+===[column] test
+
+inside column
+
+===[/column_dummy]
+EOS
+    assert_raise(ReVIEW::CompileError) do
+      column_helper(review)
+    end
+  end
+
+  def test_ul
+    src =<<-EOS
+  * AAA
+  * BBB
+EOS
+    expect = "<ul>\n<li>AAA</li>\n<li>BBB</li>\n</ul>\n"
+    ul_helper(src, expect)
+  end
+
+  def test_ul_cont
+    src =<<-EOS
+  * AAA
+    -AA
+  * BBB
+    -BB
+EOS
+    expect = "<ul>\n<li>AAA-AA</li>\n<li>BBB-BB</li>\n</ul>\n"
+    ul_helper(src, expect)
+  end
+
+  def test_ul_nest1
+    src =<<-EOS
+  * AAA
+  ** AA
+EOS
+
+    expect =<<-EOS
+<ul>
+<li>AAA<ul>
+<li>AA</li>
+</ul>
+</li>
+</ul>
+EOS
+    ul_helper(src, expect)
+  end
+
+  def test_ul_nest2
+    src =<<-EOS
+  * AAA
+  ** AA
+  * BBB
+  ** BB
+EOS
+
+    expect =<<-EOS
+<ul>
+<li>AAA<ul>
+<li>AA</li>
+</ul>
+</li>
+<li>BBB<ul>
+<li>BB</li>
+</ul>
+</li>
+</ul>
+EOS
+    ul_helper(src, expect)
+  end
+
+  def test_ul_nest3
+    src =<<-EOS
+  ** AAA
+  * AA
+  * BBB
+  ** BB
+EOS
+
+    expect =<<-EOS
+<ul>
+<li><ul>
+<li>AAA</li>
+</ul>
+</li>
+<li>AA</li>
+<li>BBB<ul>
+<li>BB</li>
+</ul>
+</li>
+</ul>
+EOS
+    ul_helper(src, expect)
+  end
+
+  def test_inline_raw0
+    assert_equal "normal", @builder.inline_raw("normal")
+  end
+
+  def test_inline_raw1
+    assert_equal "body", @builder.inline_raw("|html|body")
+  end
+
+  def test_inline_raw2
+    assert_equal "body", @builder.inline_raw("|html, latex|body")
+  end
+
+  def test_inline_raw3
+    assert_equal "", @builder.inline_raw("|idgxml, latex|body")
+  end
+
+  def test_inline_raw4
+    assert_equal "|html body", @builder.inline_raw("|html body")
+  end
+
+  def test_inline_raw5
+    assert_equal "nor\nmal", @builder.inline_raw("|html|nor\\nmal")
+  end
+
+  def test_block_raw0
+    @builder.raw("<>!\"\\n& ")
+    expect =<<-EOS
+<>!"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw1
+    @builder.raw("|html|<>!\"\\n& ")
+    expect =<<-EOS
+<>!"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw2
+    @builder.raw("|html, latex|<>!\"\\n& ")
+    expect =<<-EOS
+<>!\"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw3
+    @builder.raw("|latex, idgxml|<>!\"\\n& ")
+    expect =<<-EOS
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw4
+    @builder.raw("|html <>!\"\\n& ")
+    expect =<<-EOS
+|html <>!\"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
 end

data/test/test_i18n.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+require 'test_helper'
+require 'review/i18n'
+
+class I18nTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def test_ja
+    I18n.i18n "ja"
+    assert_equal I18n.t("image"), "図"
+    assert_equal I18n.t("table"), "表"
+    assert_equal I18n.t("chapter", 1), "第1章"
+    assert_equal I18n.t("etc"), "etc"
+  end
+
+  def test_ja_with_user_i18n
+    I18n.i18n "ja", {"image" => "ず"}
+    assert_equal I18n.t("image"), "ず"
+    assert_equal I18n.t("table"), "表"
+    assert_equal I18n.t("chapter", 1), "第1章"
+    assert_equal I18n.t("etc"), "etc"
+  end
+
+  def test_en
+    I18n.i18n "en"
+    assert_equal I18n.t("image"), "Figure "
+    assert_equal I18n.t("table"), "Table "
+    assert_equal I18n.t("chapter", 1), "Chapter 1"
+    assert_equal I18n.t("etc"), "etc"
+  end
+
+  def test_nil
+    I18n.i18n "nil"
+    assert_equal I18n.t("image"), "image"
+    assert_equal I18n.t("table"), "table"
+    assert_equal I18n.t("etc"), "etc"
+  end
+
+  def test_htmlbuilder
+    _setup_htmlbuilder
+    @builder.headline(1,"test","this is test.")
+    assert_equal %Q|<h1 id="test"><a id="h1" />Chapter 1. this is test.</h1>\n|, @builder.raw_result
+  end
+
+  def _setup_htmlbuilder
+    I18n.i18n "en"
+    @builder = HTMLBuilder.new()
+    @param = {
+      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
+      "stylesheet" => nil,  # for HTMLBuilder
+    }
+    ReVIEW.book.param = @param
+    @compiler = ReVIEW::Compiler.new(@builder)
+    @chapter = Chapter.new(nil, 1, '-', nil, StringIO.new)
+    location = Location.new(nil, nil)
+    @builder.bind(@compiler, @chapter, location)
+  end
+
+  def teardown
+    I18n.i18n "ja"
+  end
+end

data/test/test_idgxmlbuilder.rb

@@ -68,6 +68,11 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<a linkurl='http://github.com'>http://github.com</a>|, ret
   end
 
+  def test_inline_href
+    ret = @builder.inline_href("http://github.com, Git\\,Hub")
+    assert_equal %Q|<a linkurl='http://github.com'>Git,Hub</a>|, ret
+  end
+
   def test_inline_raw
     ret = @builder.inline_raw("@<tt>{inline}")
     assert_equal %Q|@<tt>{inline}|, ret
@@ -75,12 +80,12 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
 
   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|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>1</b></td><td aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>2</i></td><td aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>3</b></td><td aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>4</i>&lt;&gt;&amp;</td></tbody></table>|, @builder.raw_result
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>1</b></td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>2</i></td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>3</b></td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>4</i>&lt;&gt;&amp;</td></tbody></table>|, @builder.raw_result
   end
 
   def test_inline_in_table_without_header
     ret = @builder.table(["<b>1</b>\t<i>2</i>", "<b>3</b>\t<i>4</i>&lt;&gt;&amp;"])
-    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>1</b></td><td aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>2</i></td><td aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>3</b></td><td aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>4</i>&lt;&gt;&amp;</td></tbody></table>|, @builder.raw_result
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>1</b></td><td xyh="2,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>2</i></td><td xyh="1,2,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><b>3</b></td><td xyh="2,2,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.2450142450142"><i>4</i>&lt;&gt;&amp;</td></tbody></table>|, @builder.raw_result
   end
 
   def test_inline_in_table_without_cellwidth
@@ -210,6 +215,34 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><point><p>test1test1.5</p><p>test<i>2</i></p></point>|, @builder.raw_result
   end
 
+  def test_emlist
+    @builder.emlist(["test1", "test1.5", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><list type='emlist'><caption aid:pstyle='emlist-title'>this is <b>test</b>&lt;&amp;&gt;_</caption><pre>test1\ntest1.5\n\ntest<i>2</i>\n</pre></list>|, @builder.raw_result
+  end
+
+  def test_emlist_listinfo
+    @param["listinfo"] = true
+    @builder.emlist(["test1", "test1.5", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><list type='emlist'><caption aid:pstyle='emlist-title'>this is <b>test</b>&lt;&amp;&gt;_</caption><pre><listinfo line="1" begin="1">test1\n</listinfo><listinfo line="2">test1.5\n</listinfo><listinfo line="3">\n</listinfo><listinfo line="4" end="4">test<i>2</i>\n</listinfo></pre></list>|, @builder.raw_result
+  end
+
+  def test_list
+    def @chapter.list(id)
+      ListIndex::Item.new("samplelist",1)
+    end
+    @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><codelist><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption><pre>test1\ntest1.5\n\ntest<i>2</i>\n</pre></codelist>|, @builder.raw_result
+  end
+
+  def test_list_listinfo
+    def @chapter.list(id)
+      ListIndex::Item.new("samplelist",1)
+    end
+    @param["listinfo"] = true
+    @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><codelist><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption><pre><listinfo line="1" begin="1">test1\n</listinfo><listinfo line="2">test1.5\n</listinfo><listinfo line="3">\n</listinfo><listinfo line="4" end="4">test<i>2</i>\n</listinfo></pre></codelist>|, @builder.raw_result
+  end
+
   def test_insn
     @param["listinfo"] = true
     @builder.insn(["test1", "test1.5", "", "test<i>2</i>"], "this is @<b>{test}<&>_")
@@ -236,11 +269,6 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><p aid:pstyle="noindent" noindent='1'>foobar</p><p>foo2bar2</p>|, @builder.raw_result
   end
 
-  def test_raw
-    @builder.raw("<&>\\n")
-    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><&>\n|, @builder.raw_result
-  end
-
   def test_image
     def @chapter.image(id)
       item = ImageIndex::Item.new("sampleimg",1)
@@ -249,7 +277,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     end
 
     @builder.image_image("sampleimg","sample photo",nil)
-    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png"  /><caption>図1.1　sample photo</caption></img>|, @builder.raw_result
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" /><caption>図1.1　sample photo</caption></img>|, @builder.raw_result
   end
 
   def test_image_with_metric
@@ -263,6 +291,17 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" scale="1.2" /><caption>図1.1　sample photo</caption></img>|, @builder.raw_result
   end
 
+  def test_image_with_metric2
+    def @chapter.image(id)
+      item = ImageIndex::Item.new("sampleimg",1)
+      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item
+    end
+
+    @builder.image_image("sampleimg","sample photo","scale=1.2, html::class=\"sample\", latex::ignore=params, idgxml::ostyle=object")
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" scale="1.2" ostyle="object" /><caption>図1.1　sample photo</caption></img>|, @builder.raw_result
+  end
+
   def test_indepimage
     def @chapter.image(id)
       item = ImageIndex::Item.new("sampleimg",1)
@@ -271,7 +310,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     end
 
     @builder.indepimage("sampleimg","sample photo",nil)
-    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png"  /><caption>sample photo</caption></img>|, @builder.raw_result
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" /><caption>sample photo</caption></img>|, @builder.raw_result
   end
 
   def test_indepimage_without_caption
@@ -282,7 +321,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     end
 
     @builder.indepimage("sampleimg",nil,nil)
-    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png"  /></img>|, @builder.raw_result
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" /></img>|, @builder.raw_result
   end
 
   def test_indepimage_with_metric
@@ -296,6 +335,17 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" scale="1.2" /><caption>sample photo</caption></img>|, @builder.raw_result
   end
 
+  def test_indepimage_with_metric2
+    def @chapter.image(id)
+      item = ImageIndex::Item.new("sampleimg",1)
+      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item
+    end
+
+    @builder.indepimage("sampleimg","sample photo","scale=1.2, html::class=\"sample\", latex::ignore=params, idgxml::ostyle=\"object\"")
+    assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" scale="1.2" ostyle="object" /><caption>sample photo</caption></img>|, @builder.raw_result
+  end
+
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(id)
       item = ImageIndex::Item.new("sampleimg",1)
@@ -307,4 +357,212 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><img><Image href="file://images/chap1-sampleimg.png" scale="1.2" /></img>|, @builder.raw_result
   end
 
+  def column_helper(review)
+    chap_singleton = class << @chapter; self; end
+    chap_singleton.send(:define_method, :content) { review }
+    @compiler.compile(@chapter)
+  end
+
+  def test_column_1
+    review =<<-EOS
+===[column] prev column
+
+inside prev column
+
+===[column] test
+
+inside column
+
+===[/column]
+EOS
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><column><title aid:pstyle="column-title">prev column</title><p>inside prev column</p></column><column><title aid:pstyle="column-title">test</title><p>inside column</p></column></doc>
+EOS
+    assert_equal expect, column_helper(review)
+  end
+
+  def test_column_2
+    review =<<-EOS
+===[column] test
+
+inside column
+
+=== next level
+EOS
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><column><title aid:pstyle="column-title">test</title><p>inside column</p></column><title aid:pstyle=\"h3\">next level</title><?dtp level="3" section="next level"?></doc>
+EOS
+
+    assert_equal expect, column_helper(review)
+  end
+
+  def test_column_3
+    review =<<-EOS
+===[column] test
+
+inside column
+
+===[/column_dummy]
+EOS
+    assert_raise(ReVIEW::CompileError) do
+      column_helper(review)
+    end
+  end
+
+  def test_ul
+    src =<<-EOS
+  * AAA
+  * BBB
+EOS
+
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><ul><li aid:pstyle="ul-item">AAA</li><li aid:pstyle="ul-item">BBB</li></ul>
+EOS
+    ul_helper(src, expect.chomp)
+  end
+
+  def test_ul_cont
+    src =<<-EOS
+  * AAA
+    -AA
+  * BBB
+    -BB
+EOS
+
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><ul><li aid:pstyle="ul-item">AAA-AA</li><li aid:pstyle="ul-item">BBB-BB</li></ul>
+EOS
+    ul_helper(src, expect.chomp)
+  end
+
+  def test_ul_nest1
+    src =<<-EOS
+  * AAA
+  ** AA
+EOS
+
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><ul><li aid:pstyle="ul-item">AAA<ul2><li aid:pstyle="ul-item">AA</li></ul2></li></ul>
+EOS
+    ul_helper(src, expect.chomp)
+  end
+
+  def test_ul_nest2
+    src =<<-EOS
+  * AAA
+  ** AA
+  * BBB
+  ** BB
+EOS
+
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><ul><li aid:pstyle="ul-item">AAA<ul2><li aid:pstyle="ul-item">AA</li></ul2></li><li aid:pstyle="ul-item">BBB<ul2><li aid:pstyle="ul-item">BB</li></ul2></li></ul>
+EOS
+    ul_helper(src, expect.chomp)
+  end
+
+  def test_ul_nest3
+    src =<<-EOS
+  ** AAA
+  * AA
+  * BBB
+  ** BB
+EOS
+
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><ul><li aid:pstyle="ul-item"><ul2><li aid:pstyle="ul-item">AAA</li></ul2></li><li aid:pstyle="ul-item">AA</li><li aid:pstyle="ul-item">BBB<ul2><li aid:pstyle="ul-item">BB</li></ul2></li></ul>
+EOS
+    ul_helper(src, expect.chomp)
+  end
+
+  def test_ul_nest4
+    src =<<-EOS
+  * A
+  ** B
+  ** C
+  *** D
+  ** E
+  * F
+  ** G
+EOS
+
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><ul><li aid:pstyle="ul-item">A<ul2><li aid:pstyle="ul-item">B</li><li aid:pstyle="ul-item">C<ul3><li aid:pstyle="ul-item">D</li></ul3></li><li aid:pstyle="ul-item">E</li></ul2></li><li aid:pstyle="ul-item">F<ul2><li aid:pstyle="ul-item">G</li></ul2></li></ul>
+EOS
+    ul_helper(src, expect.chomp)
+  end
+
+  def test_inline_raw0
+    assert_equal "normal", @builder.inline_raw("normal")
+  end
+
+  def test_inline_raw1
+    assert_equal "body", @builder.inline_raw("|idgxml|body")
+  end
+
+  def test_inline_raw2
+    assert_equal "body", @builder.inline_raw("|idgxml, latex|body")
+  end
+
+  def test_inline_raw3
+    assert_equal "", @builder.inline_raw("|latex, html|body")
+  end
+
+  def test_inline_raw4
+    assert_equal "|idgxml body", @builder.inline_raw("|idgxml body")
+  end
+
+  def test_inline_raw5
+    assert_equal "nor\nmal", @builder.inline_raw("|idgxml|nor\\nmal")
+  end
+
+  def test_block_raw0
+    @builder.raw("<>!\"\\n& ")
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw1
+    @builder.raw("|idgxml|<>!\"\\n& ")
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw2
+    @builder.raw("|idgxml, latex|<>!\"\\n& ")
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/"><>!\"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw3
+    @builder.raw("|latex, html|<>!\"\\n& ")
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def test_block_raw4
+    @builder.raw("|idgxml <>!\"\\n& ")
+    expect =<<-EOS
+<?xml version="1.0" encoding="UTF-8"?>\n<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">|idgxml <>!\"
+& 
+EOS
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
 end