review 2.0.0.beta1 → 2.0.0

data/test/test_htmltoc.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'review/htmltoc'
+
+class HTMLTocTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_tocfilename
+    toc = HTMLToc.new("/var/tmp")
+    assert_equal "/var/tmp/toc-html.txt", toc.tocfilename
+  end
+
+  def test_encode_args
+    toc = HTMLToc.new("/var/tmp")
+    assert_equal "chaptype=pre", toc.encode_args({:chaptype => "pre"})
+    assert_equal "force_include=true,chaptype=body,properties=foo", toc.encode_args({:force_include => true, :chaptype => "body", "properties"=>"foo"})
+  end
+
+  def test_decode_args
+    toc = HTMLToc.new("/var/tmp")
+    assert_equal({:chaptype => "pre"}, toc.decode_args("chaptype=pre"))
+    assert_equal({:force_include => "true", :chaptype => "body",:properties=>"foo"}, toc.decode_args("force_include=true,chaptype=body,properties=foo"))
+  end
+
+end
+

data/test/test_i18n.rb

@@ -1,96 +1,154 @@
 # -*- coding: utf-8 -*-
 require 'test_helper'
-require 'review/i18n'
-
-require 'review/compiler'
-require 'review/book'
-require 'review/htmlbuilder'
+require 'review'
 require 'tmpdir'
 
 class I18nTest < Test::Unit::TestCase
   include ReVIEW
 
-  if RUBY_VERSION !~ /^1.8/  ## to avoid Travis error :-(
-    def test_load_locale_yml
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          file = File.join(dir, "locale.yml")
-          File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
-          I18n.setup
-          assert_equal "bar", I18n.t("foo")
-        end
+  def test_load_locale_yml
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "locale.yml")
+        File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+        I18n.setup
+        assert_equal "bar", I18n.t("foo")
       end
     end
+  end
 
-    def test_load_locale_yaml
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          file = File.join(dir, "locale.yaml")
-          File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+  def test_load_locale_yaml
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "locale.yaml")
+        File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+        assert_raise ReVIEW::ConfigError do
           I18n.setup
-          assert_equal "bar", I18n.t("foo")
         end
       end
     end
+  end
 
-    def test_load_foo_yaml
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          file = File.join(dir, "foo.yml")
-          File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
-          I18n.setup("ja","foo.yml")
-          assert_equal "bar", I18n.t("foo")
-        end
+  def test_load_foo_yaml
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "foo.yml")
+        File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+        I18n.setup("ja","foo.yml")
+        assert_equal "bar", I18n.t("foo")
       end
     end
+  end
 
-    def test_update_foo_yaml
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          file = File.join(dir, "foo.yml")
-          File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
-          i18n = ReVIEW::I18n.new("ja")
-          i18n.update_localefile(File.join(Dir.pwd, "foo.yml"))
-          assert_equal "bar", i18n.t("foo")
-        end
+  def test_update_foo_yaml
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "foo.yml")
+        File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+        i18n = ReVIEW::I18n.new("ja")
+        i18n.update_localefile(File.join(Dir.pwd, "foo.yml"))
+        assert_equal "bar", i18n.t("foo")
       end
     end
+  end
 
-    def test_update_foo_yaml_i18nclass
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          file = File.join(dir, "foo.yml")
-          File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
-          I18n.setup("ja", "foo.yml")
-          assert_equal "bar", I18n.t("foo")
-        end
+  def test_update_foo_yaml_i18nclass
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "foo.yml")
+        File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+        I18n.setup("ja", "foo.yml")
+        assert_equal "bar", I18n.t("foo")
       end
     end
+  end
+
+  def test_load_locale_yml_i18n
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "locale.yml")
+        File.open(file, "w"){|f| f.write("ja:\n  foo: \"bar\"\nen:\n  foo: \"buz\"\n")}
+        I18n.setup
+        assert_equal "bar", I18n.t("foo")
+        assert_equal "図", I18n.t("image")
+        I18n.setup("en")
+        assert_equal "buz", I18n.t("foo")
+        assert_equal "Figure ", I18n.t("image")
+      end
+    end
+  end
 
-    def test_load_locale_yml_i18n
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          file = File.join(dir, "locale.yml")
-          File.open(file, "w"){|f| f.write("ja:\n  foo: \"bar\"\nen:\n  foo: \"buz\"\n")}
+  def test_load_locale_invalid_yml
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "locale.yml")
+        File.open(file, "w"){|f| f.write("local: ja\nfoo: \"bar\"\n")}
+        assert_raises(ReVIEW::KeyError) do
           I18n.setup
-          assert_equal "bar", I18n.t("foo")
-          assert_equal "図", I18n.t("image")
-          I18n.setup("en")
-          assert_equal "buz", I18n.t("foo")
-          assert_equal "Figure ", I18n.t("image")
         end
       end
     end
+  end
 
-    def test_load_locale_invalid_yml
-      Dir.mktmpdir do |dir|
-        Dir.chdir(dir) do
-          file = File.join(dir, "locale.yml")
-          File.open(file, "w"){|f| f.write("local: ja\nfoo: \"bar\"\n")}
-          assert_raises(ReVIEW::KeyError) do
-            I18n.setup
-          end
-        end
+  def test_custom_format
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "locale.yml")
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pa章")}
+        I18n.setup("ja")
+        assert_equal "第a章", I18n.t("chapter", 1)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pA章")}
+        I18n.setup("ja")
+        assert_equal "第B章", I18n.t("chapter", 2)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pAW章")}
+        I18n.setup("ja")
+        assert_equal "第Ｂ章", I18n.t("chapter", 2)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%paW章")}
+        I18n.setup("ja")
+        assert_equal "第ｂ章", I18n.t("chapter", 2)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pR章")}
+        I18n.setup("ja")
+        assert_equal "第I章", I18n.t("chapter", 1)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pr章")}
+        I18n.setup("ja")
+        assert_equal "第ii章", I18n.t("chapter", 2)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pRW章")}
+        I18n.setup("ja")
+        assert_equal "第Ⅻ章", I18n.t("chapter", 12)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pJ章")}
+        I18n.setup("ja")
+        assert_equal "第二十七章", I18n.t("chapter", 27)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pdW章")}
+        I18n.setup("ja")
+        assert_equal "第１章", I18n.t("chapter", 1)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pdW章")}
+        I18n.setup("ja")
+        assert_equal "第27章", I18n.t("chapter", 27)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pDW章")}
+        I18n.setup("ja")
+        assert_equal "第１章", I18n.t("chapter", 1)
+
+        File.open(file, "w"){|f| f.write("locale: ja\nchapter: 第%pDW章")}
+        I18n.setup("ja")
+        assert_equal "第２７章", I18n.t("chapter", 27)
+
+        File.open(file, "w"){|f| f.write("locale: ja\npart: Part %pRW")}
+        I18n.setup("ja")
+        assert_equal "Part ０", I18n.t("part", 0)
+
+        File.open(file, "w"){|f| f.write("locale: ja\npart: 第%pJ部")}
+        I18n.setup("ja")
+        assert_equal "第一部", I18n.t("part", 1)
       end
     end
   end
@@ -136,13 +194,11 @@ class I18nTest < Test::Unit::TestCase
   def _setup_htmlbuilder
     I18n.setup "en"
     @builder = HTMLBuilder.new()
-    @config = {
-      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for HTMLBuilder
+    @config = ReVIEW::Configure[
+      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
+      "stylesheet" => nil, # for HTMLBuilder
       "ext" => ".re"
-    }
+    ]
     @book = Book::Base.new(".")
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -166,6 +222,14 @@ class I18nTest < Test::Unit::TestCase
     assert_equal "bar", i18n.t("foo")
   end
 
+  def test_ja_appendix_alphabet
+    i18n = I18n.new("ja")
+    i18n.update({"appendix" => "付録%pA"}, "ja")
+    assert_equal "付録A", i18n.t("appendix", 1)
+    assert_equal "付録B", i18n.t("appendix", 2)
+    assert_equal "付録C", i18n.t("appendix", 3)
+  end
+
   def test_i18n_error
     I18n.setup
     assert_raises NotImplementedError do

data/test/test_idgxmlbuilder.rb

@@ -14,9 +14,6 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @config = ReVIEW::Configure.values
     @config.merge!({
       "secnolevel" => 2,
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "nolf" => true,
       "tableopt" => "10"
     })
     @book = Book::Base.new(nil)
@@ -88,26 +85,48 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
 
   def test_inline_in_table
     actual = compile_block("//table{\n@<b>{1}\t@<i>{2}\n------------\n@<b>{3}\t@<i>{4}<>&\n//}\n")
-    assert_equal %Q|<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>|, actual
+    assert_equal %Q|<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.172"><b>1</b></td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172"><i>2</i></td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172"><b>3</b></td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172"><i>4</i>&lt;&gt;&amp;</td></tbody></table>|, actual
   end
 
   def test_inline_in_table_without_header
     actual = compile_block("//table{\n@<b>{1}\t@<i>{2}\n@<b>{3}\t@<i>{4}<>&\n//}\n")
-    assert_equal %Q|<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>|, actual
+    assert_equal %Q|<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.172"><b>1</b></td><td xyh="2,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172"><i>2</i></td><td xyh="1,2,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172"><b>3</b></td><td xyh="2,2,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172"><i>4</i>&lt;&gt;&amp;</td></tbody></table>|, actual
   end
 
   def test_inline_in_table_without_cellwidth
     @config["tableopt"] = nil
     actual = compile_block("//table{\n@<b>{1}\t@<i>{2}\n------------\n@<b>{3}\t@<i>{4}<>&\n//}\n")
     assert_equal %Q|<table><tbody><tr type="header"><b>1</b>\t<i>2</i></tr><tr type="lastline"><b>3</b>\t<i>4</i>&lt;&gt;&amp;</tr></tbody></table>|, actual
-    @config["tableopt"] = 10
   end
 
   def test_inline_in_table_without_header_and_cellwidth
     @config["tableopt"] = nil
     actual = compile_block("//table{\n@<b>{1}\t@<i>{2}\n@<b>{3}\t@<i>{4}<>&\n//}\n")
     assert_equal %Q|<table><tbody><tr><b>1</b>\t<i>2</i></tr><tr type="lastline"><b>3</b>\t<i>4</i>&lt;&gt;&amp;</tr></tbody></table>|, actual
-    @config["tableopt"] = 10
+  end
+
+  def test_customize_cellwidth
+    actual = compile_block("//tsize[2,3,5]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q|<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="3"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">A</td><td xyh="2,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="8.503">B</td><td xyh="3,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">C</td></tbody></table>|, actual
+
+    actual = compile_block("//tsize[2,3]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q|<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="3"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">A</td><td xyh="2,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="8.503">B</td><td xyh="3,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">C</td></tbody></table>|, actual
+
+    actual = compile_block("//tsize[2]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q|<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="3"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">A</td><td xyh="2,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="11.338">B</td><td xyh="3,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="11.338">C</td></tbody></table>|, actual
+  end
+
+  def test_customize_mmtopt
+    actual = compile_block("//table{\nA\n//}\n")
+    assert_equal %Q|<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="1"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="28.345">A</td></tbody></table>|, actual
+
+    @config["pt_to_mm_unit"] = 0.3514
+    actual = compile_block("//table{\nA\n//}\n")
+    assert_equal %Q|<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="1"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="28.458">A</td></tbody></table>|, actual
+
+    @config["pt_to_mm_unit"] = "0.3514"
+    actual = compile_block("//table{\nA\n//}\n")
+    assert_equal %Q|<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="1"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="28.458">A</td></tbody></table>|, actual
   end
 
   def test_inline_br
@@ -170,45 +189,44 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<quote><p>foobar</p><p>buz</p></quote>|, actual
   end
 
-  def test_quote_deprecated
-    @book.config["deprecated-blocklines"] = true
-    actual = compile_block("//quote{\nfoo\n\nbuz\n//}\n")
-    @book.config["deprecated-blocklines"] = nil
-    assert_equal %Q|<quote>foo\n\nbuz</quote>|, actual
-  end
+  def test_major_blocks
+    actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
+    expected = %Q(<note><p>A</p><p>B</p></note><note><title aid:pstyle='note-title'>caption</title><p>A</p></note>)
+    assert_equal expected, actual
 
-  ## XXX block content should be escaped.
-  def test_note
-    actual = compile_block("//note[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q|<note><title aid:pstyle='note-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1test1.5</p><p>test<i>2</i></p></note>|, actual
-  end
+    actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
+    expected = %Q(<memo><p>A</p><p>B</p></memo><memo><title aid:pstyle='memo-title'>caption</title><p>A</p></memo>)
+    assert_equal expected, actual
 
-  ## XXX block content should be escaped.
-  def test_memo
-    actual = compile_block("//memo[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q|<memo><title aid:pstyle='memo-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1test1.5</p><p>test<i>2</i></p></memo>|, actual
-  end
+    actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
+    expected = %Q(<info><p>A</p><p>B</p></info><info><title aid:pstyle='info-title'>caption</title><p>A</p></info>)
+    assert_equal expected, actual
 
-  def test_term
-    actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q|<term><p>test1test1.5</p><p>test<i>2</i></p></term>|, actual
-  end
+    actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
+    expected = %Q(<important><p>A</p><p>B</p></important><important><title aid:pstyle='important-title'>caption</title><p>A</p></important>)
+    assert_equal expected, actual
 
-  def test_term_deprecated
-    @book.config["deprecated-blocklines"] = true
-    actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    @book.config["deprecated-blocklines"] = nil
-    assert_equal %Q|<term>test1test1.5\n\ntest<i>2</i></term>|, actual
-  end
+    actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
+    expected = %Q(<caution><p>A</p><p>B</p></caution><caution><title aid:pstyle='caution-title'>caption</title><p>A</p></caution>)
+    assert_equal expected, actual
+
+    # notice uses special tag notice-t if it includes caption
+    actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
+    expected = %Q(<notice><p>A</p><p>B</p></notice><notice-t><title aid:pstyle='notice-title'>caption</title><p>A</p></notice-t>)
+    assert_equal expected, actual
 
-  def test_notice
-    actual = compile_block("//notice[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q|<notice-t><title aid:pstyle='notice-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1test1.5</p><p>test<i>2</i></p></notice-t>|, actual
+    actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
+    expected = %Q(<warning><p>A</p><p>B</p></warning><warning><title aid:pstyle='warning-title'>caption</title><p>A</p></warning>)
+    assert_equal expected, actual
+
+    actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
+    expected = %Q(<tip><p>A</p><p>B</p></tip><tip><title aid:pstyle='tip-title'>caption</title><p>A</p></tip>)
+    assert_equal expected, actual
   end
 
-  def test_notice_without_caption
-    actual = compile_block("//notice{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q|<notice><p>test1test1.5</p><p>test<i>2</i></p></notice>|, actual
+  def test_term
+    actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<term><p>test1test1.5</p><p>test<i>2</i></p></term>|, actual
   end
 
   def test_point
@@ -607,4 +625,5 @@ EOS
     expected = %Q(|idgxml <>!\"\n& )
     assert_equal expected.chomp, actual
   end
+
 end

data/test/test_latexbuilder.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'test_helper'
-require 'review/book'
 require 'review/compiler'
+require 'review/book'
 require 'review/latexbuilder'
 require 'review/i18n'
 
@@ -12,11 +12,11 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     @builder = LATEXBuilder.new()
     @config = ReVIEW::Configure.values
     @config.merge!( {
-      "secnolevel" => 2,    # for IDGXMLBuilder, EPUBBuilder
+      "secnolevel" => 2, # for IDGXMLBuilder, EPUBBuilder
       "toclevel" => 2,
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for EPUBBuilder
+      "stylesheet" => nil, # for EPUBBuilder
+      "image_scale2width" => false,
+      "texcommand" => "uplatex"
     })
     @book = Book::Base.new(nil)
     @book.config = @config
@@ -156,7 +156,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_inline_u
     actual = compile_inline("abc@<u>{def}ghi")
-    assert_equal %Q|abc\\Underline{def}ghi|, actual
+    assert_equal %Q|abc\\reviewunderline{def}ghi|, actual
   end
 
   def test_inline_m
@@ -211,8 +211,10 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   end
 
   def test_jis_x_0201_kana
+    # uplatex can handle half-width kana natively
     actual = compile_inline("foo･ｶﾝｼﾞ､テスト")
-    assert_equal %Q|foo\\aj半角{・}\\aj半角{カ}\\aj半角{ン}\\aj半角{シ}\\aj半角{゛}\\aj半角{、}テスト|, actual
+    assert_equal %Q|foo･ｶﾝｼﾞ､テスト|, actual
+    # assert_equal %Q|foo\\aj半角{・}\\aj半角{カ}\\aj半角{ン}\\aj半角{シ}\\aj半角{゛}\\aj半角{、}テスト|, actual
   end
 
   def test_dlist
@@ -279,9 +281,34 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\begin{reviewemlist}\n    foo\n        bar\n\n    buz\n\\end{reviewemlist}\n|, actual
   end
 
+  def test_emlistnum_caption
+    actual = compile_block("//emlistnum[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\n 1: foo\n 2: bar\n 3: \n 4: buz\n\\end{reviewemlist}\n|, actual
+  end
+
+  def test_list
+    actual = compile_block("//list[id1][cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\\reviewlistcaption{リスト1.1: cap1}\n\\begin{reviewlist}\nfoo\nbar\n\nbuz\n\\end{reviewlist}\n|, actual
+  end
+
+  def test_list_lst
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    actual = compile_block("//list[id1][cap1][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    assert_equal %Q|\\begin{reviewlistlst}[caption={cap1},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewlistlst}\n|, actual
+  end
+
+  def test_list_lst_with_lang
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    @book.config["highlight"]["lang"] = "sql"
+    actual = compile_block("//list[id1][cap1]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    assert_equal %Q|\\begin{reviewlistlst}[caption={cap1},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewlistlst}\n|, actual
+  end
+
   def test_listnum
     actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
-    assert_equal %Q|\\reviewlistcaption{リスト1.1: ruby}\n\\reviewlistcaption{ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual
+    assert_equal %Q|\\reviewlistcaption{リスト1.1: ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual
   end
 
   def test_listnum_lst
@@ -313,7 +340,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_noindent
     actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
-    assert_equal %Q|\\noindent\nfoobar\n\nfoo2bar2\n|, actual
+    assert_equal %Q|\\noindent\nfoo\nbar\n\nfoo2\nbar2\n|, actual
   end
 
   def test_image
@@ -338,6 +365,18 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, actual
   end
 
+  def test_image_with_metric_width
+    def @chapter.image(id)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+      item
+    end
+
+    @config["image_scale2width"] = true
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=1.2\\maxwidth]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, actual
+  end
+
   def test_image_with_metric2
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
@@ -349,25 +388,26 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2,ignore=params]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, actual
   end
 
-  def test_indepimage
+  def test_image_with_metric2_width
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
-    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
-    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
+    @config["image_scale2width"] = true
+    actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=1.2\\maxwidth,ignore=params]{./images/chap1-sampleimg.png}\n\\caption{sample photo}\n\\label{image:chap1:sampleimg}\n\\end{reviewimage}\n|, actual
   end
 
-  def test_indepimage_esc
+  def test_indepimage
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
-    actual = compile_block("//indepimage[sean_2_10][sample photo][]\n")
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
     assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
   end
 
@@ -394,6 +434,18 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
   end
 
+  def test_indepimage_with_metric_width
+    def @chapter.image(id)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+      item
+    end
+
+    @config["image_scale2width"] = true
+    actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=1.2\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
+  end
+
   def test_indepimage_with_metric2
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
@@ -417,6 +469,31 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[scale=1.2]{./images/chap1-sampleimg.png}\n\\end{reviewimage}\n|, actual
   end
 
+  def test_table
+    actual = compile_block("//table{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    assert_equal "\\begin{reviewtable}{|l|l|}\n\\hline\n\\reviewth{aaa} & \\reviewth{bbb} \\\\  \\hline\nccc & ddd\\textless{}\\textgreater{}\\& \\\\  \\hline\n\\end{reviewtable}\n",
+                 actual
+  end
+
+  def test_imgtable
+    def @chapter.image(id)
+      item = Book::ImageIndex::Item.new("sampleimg",1, 'sample img')
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+      item
+    end
+
+    actual = compile_block("//imgtable[sampleimg][test for imgtable]{\n//}\n")
+
+    assert_equal "\\begin{table}[h]\n"+
+                 "\\reviewimgtablecaption{test for imgtable}\n"+
+                 "\\label{table:chap1:sampleimg}\n"+
+                 "\\begin{reviewimage}\n"+
+                 "\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n"+
+                 "\\end{reviewimage}\n"+
+                 "\\end{table}\n",
+                 actual
+  end
+
   def test_bib
     def @chapter.bibpaper(id)
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
@@ -467,6 +544,7 @@ EOS
 \\addcontentsline{toc}{subsection}{prev column}
 
 inside prev column
+
 \\end{reviewcolumn}
 
 \\begin{reviewcolumn}
@@ -475,6 +553,7 @@ inside prev column
 \\addcontentsline{toc}{subsection}{test}
 
 inside column
+
 \\end{reviewcolumn}
 EOS
     @config["toclevel"] = 3
@@ -496,7 +575,9 @@ EOS
 \\reviewcolumnhead{}{test}
 
 inside column
+
 \\end{reviewcolumn}
+
 \\subsection*{next level}
 \\label{sec:1-0-1}
 EOS
@@ -582,6 +663,7 @@ EOS
 \\begin{itemize}
 \\item AA
 \\end{itemize}
+
 \\end{itemize}
 EOS
     actual = compile_block(src)
@@ -604,11 +686,13 @@ EOS
 \\begin{itemize}
 \\item AA
 \\end{itemize}
+
 \\item BBB
 
 \\begin{itemize}
 \\item BB
 \\end{itemize}
+
 \\end{itemize}
 EOS
     actual = compile_block(src)
@@ -648,6 +732,40 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_major_blocks
+    actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
+    expected = %Q(\\begin{reviewminicolumn}\nA\n\nB\n\\end{reviewminicolumn}\n\\begin{reviewminicolumn}\n\\reviewminicolumntitle{caption}\nA\n\\end{reviewminicolumn}\n)
+    assert_equal expected, actual
+  end
+
   def test_inline_raw0
     assert_equal "normal", compile_inline("@<raw>{normal}")
   end