review 2.1.0 → 2.2.0

data/test/test_i18n.rb

@@ -181,6 +181,23 @@ class I18nTest < Test::Unit::TestCase
     end
   end
 
+  def test_format_with_mismatched_number_of_arguments
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        file = File.join(dir, "locale.yml")
+
+        File.open(file, "w"){|f| f.write %Q|locale: ja\nformat_number_header: "%2$d"| }
+        I18n.setup("ja")
+        assert_equal "10", I18n.t("format_number_header", [1, 10])
+
+        File.open(file, "w"){|f| f.write %Q|locale: ja\nformat_number_header: "%2$d-%1$d"| }
+        I18n.setup("ja")
+        # ERROR: returns raw format
+        assert_equal "%2$d-%1$d", I18n.t("format_number_header", [1])
+      end
+    end
+  end
+
   def test_ja
     I18n.setup("ja")
     assert_equal "図", I18n.t("image")

data/test/test_idgxmlbuilder.rb

@@ -13,9 +13,9 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @builder = IDGXMLBuilder.new()
     @config = ReVIEW::Configure.values
     @config.merge!({
-      "secnolevel" => 2,
-      "tableopt" => "10"
-    })
+                     "secnolevel" => 2,
+                     "tableopt" => "10"
+                   })
     @book = Book::Base.new(nil)
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -114,6 +114,15 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
 
     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
+
+    actual = compile_block("//tsize[|idgxml|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
+
+    actual = compile_block("//tsize[|idgxml,html|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
+
+    actual = compile_block("//tsize[|html|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="9.448">A</td><td xyh="2,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="9.448">B</td><td xyh="3,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="9.448">C</td></tbody></table>|, actual
   end
 
   def test_customize_mmtopt
@@ -244,6 +253,11 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<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>|, actual
   end
 
+  def test_emlistnum
+    actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<list type='emlistnum'><caption aid:pstyle='emlistnum-title'>this is <b>test</b>&lt;&amp;&gt;_</caption><pre><span type='lineno'> 1: </span>test1\n<span type='lineno'> 2: </span>test1.5\n<span type='lineno'> 3: </span>\n<span type='lineno'> 4: </span>test<i>2</i>\n</pre></list>|, actual
+  end
+
   def test_emlist_listinfo
     @config["listinfo"] = true
     actual = compile_block("//emlist[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
@@ -269,6 +283,22 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<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>|, actual
   end
 
+  def test_listnum
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<codelist><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption><pre><span type='lineno'> 1: </span>test1\n<span type='lineno'> 2: </span>test1.5\n<span type='lineno'> 3: </span>\n<span type='lineno'> 4: </span>test<i>2</i>\n</pre></codelist>|, actual
+  end
+
+  def test_listnum_linenum
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    actual = compile_block("//firstlinenum[100]\n//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<codelist><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption><pre><span type='lineno'>100: </span>test1\n<span type='lineno'>101: </span>test1.5\n<span type='lineno'>102: </span>\n<span type='lineno'>103: </span>test<i>2</i>\n</pre></codelist>|, actual
+  end
+
   def test_list_listinfo
     def @chapter.list(id)
       Book::ListIndex::Item.new("samplelist",1)
@@ -292,6 +322,12 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<box><caption aid:pstyle="box-title">this is <b>test</b>&lt;&amp;&gt;_</caption><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></box>|, actual
   end
 
+  def test_box_non_listinfo
+    @config["listinfo"] = nil
+    actual = compile_block("//box[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<box><caption aid:pstyle="box-title">this is <b>test</b>&lt;&amp;&gt;_</caption>test1\ntest1.5\n\ntest<i>2</i>\n</box>|, actual
+  end
+
   def test_flushright
     actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q|<p align='right'>foobar</p><p align='right'>buz</p>|, actual
@@ -445,6 +481,34 @@ EOS
     end
   end
 
+  def test_column_ref
+    review =<<-EOS
+===[column]{foo} test
+
+inside column
+
+=== next level
+
+this is @<column>{foo}.
+EOS
+    expected =<<-EOS.chomp
+<column id="column-1"><title aid:pstyle="column-title">test</title><?dtp level="9" section="test"?><p>inside column</p></column><title aid:pstyle="h3">next level</title><?dtp level="3" section="next level"?><p>this is コラム「test」.</p>
+EOS
+
+    assert_equal expected, column_helper(review)
+  end
+
+  def test_column_in_aother_chapter_ref
+    def @chapter.column_index
+      items = [Book::ColumnIndex::Item.new("chap1|column", 1, "column_cap")]
+      Book::ColumnIndex.new(items)
+    end
+
+    actual = compile_inline("test @<column>{chap1|column} test2")
+    expected = "test コラム「column_cap」 test2"
+    assert_equal expected, actual
+  end
+
   def test_ul
     src =<<-EOS
   * AAA
@@ -626,4 +690,25 @@ EOS
     assert_equal expected.chomp, actual
   end
 
+  def test_comment
+    actual = compile_block("//comment[コメント]")
+    assert_equal %Q||, actual
+  end
+
+  def test_comment_for_draft
+    @config["draft"] = true
+    actual = compile_block("//comment[コメント]")
+    assert_equal %Q|<msg>コメント</msg>|, actual
+  end
+
+  def test_inline_comment
+    actual = compile_inline("test @<comment>{コメント} test2")
+    assert_equal %Q|test  test2|, actual
+  end
+
+  def test_inline_comment_for_draft
+    @config["draft"] = true
+    actual = compile_inline("test @<comment>{コメント} test2")
+    assert_equal %Q|test <msg>コメント</msg> test2|, actual
+  end
 end

data/test/test_image_finder.rb

@@ -79,4 +79,22 @@ class ImageFinderTest < Test::Unit::TestCase
       FileUtils.remove_entry_secure dir
     end
   end
+
+  def test_find_path_dir_symlink
+    dir = Dir.mktmpdir
+    begin
+      path_src = dir+"/src"
+      path_dst = dir+"/ch01"
+      FileUtils.mkdir_p(path_src)
+      FileUtils.symlink(path_src, path_dst)
+      path_srcimg = path_src+"/foo.jpg"
+      path_dstimg = path_dst+"/foo.jpg"
+      FileUtils.touch(path_srcimg)
+
+      finder = ReVIEW::Book::ImageFinder.new(dir, "ch01", "builder", [".jpg"])
+      assert_equal(path_dstimg, finder.find_path("foo"))
+    ensure
+      FileUtils.remove_entry_secure dir
+    end
+  end
 end

data/test/test_index.rb

@@ -13,6 +13,7 @@ class IndexTest < Test::Unit::TestCase
     assert_equal 'foo', item.id
     assert_equal 'bar', item.content
   end
+
   def test_footnote_index_with_escape
     fn = Book::FootnoteIndex.parse(['//footnote[foo][bar[\]buz]'])
     items = fn.to_a
@@ -20,6 +21,7 @@ class IndexTest < Test::Unit::TestCase
     assert_equal 'foo', item.id
     assert_equal 'bar[]buz', item.content
   end
+
   def test_footnote_index_with_escape2
     fn = Book::FootnoteIndex.parse(['//footnote[foo][bar\\a\\$buz]'])
     items = fn.to_a

data/test/test_latexbuilder.rb

@@ -11,13 +11,13 @@ class LATEXBuidlerTest < Test::Unit::TestCase
   def setup
     @builder = LATEXBuilder.new()
     @config = ReVIEW::Configure.values
-    @config.merge!( {
-      "secnolevel" => 2, # for IDGXMLBuilder, EPUBBuilder
-      "toclevel" => 2,
-      "stylesheet" => nil, # for EPUBBuilder
-      "image_scale2width" => false,
-      "texcommand" => "uplatex"
-    })
+    @config.merge!({
+                     "secnolevel" => 2, # for IDGXMLBuilder, EPUBBuilder
+                     "toclevel" => 2,
+                     "stylesheet" => nil, # for EPUBBuilder
+                     "image_scale2width" => false,
+                     "texcommand" => "uplatex"
+                   })
     @book = Book::Base.new(nil)
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -144,6 +144,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     actual = compile_inline("test @<b>{inline<&;\\ test} test2")
     assert_equal %Q|test \\textbf{inline\\textless{}\\&;\\reviewbackslash{} test} test2|, actual
   end
+
   def test_inline_em
     actual = compile_inline("abc@<em>{def}")
     assert_equal %Q|abc\\reviewem{def}|, actual
@@ -164,6 +165,13 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal "abc $\\alpha^n = inf < 2$ ghi", actual
   end
 
+  def test_inline_m2
+    ## target text: @<m>{X = \{ {x_1\},{x_2\}, \cdots ,{x_n\} \\\}}
+    actual = compile_inline('@<m>{X = \\{ {x_1\\},{x_2\\}, \\cdots ,{x_n\\} \\\\\\}}')
+    ## expected text: $X = \{ {x_1},{x_2}, \cdots ,{x_n} \}$
+    assert_equal ' $X = \\{ {x_1},{x_2}, \\cdots ,{x_n} \\}$ ', actual
+  end
+
   def test_inline_tt
     actual = compile_inline("test @<tt>{inline test} test2")
     assert_equal %Q|test \\texttt{inline test} test2|, actual
@@ -207,7 +215,25 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_inline_idx
     actual = compile_inline("@<idx>{__TEST%$}, @<hidx>{__TEST%$}")
-    assert_equal %Q|\\textunderscore{}\\textunderscore{}TEST\\%\\textdollar{}\\index{__TEST%$}, \\index{__TEST%$}|, actual
+    assert_equal %Q|\\textunderscore{}\\textunderscore{}TEST\\%\\textdollar{}\\index{__TEST%$@\\textunderscore{}\\textunderscore{}TEST\\%\\textdollar{}}, \\index{__TEST%$@\\textunderscore{}\\textunderscore{}TEST\\%\\textdollar{}}|, actual
+  end
+
+  def test_inline_idx_yomi
+    begin
+      require 'MeCab'
+      require 'nkf'
+    rescue LoadError
+      $stderr.puts "skip test_inline_idx_yomi (cannot find MeCab)"
+      return true
+    end
+    tmpdir = Dir.mktmpdir
+    File.write("#{tmpdir}/sample.dic", "強運\tはーどらっく\n")
+    @book.config["pdfmaker"]["makeindex"] = true
+    @book.config["pdfmaker"]["makeindex_dic"] = "#{tmpdir}/sample.dic"
+    @builder.setup_index
+    actual = compile_inline("@<hidx>{漢字}@<hidx>{強運}@<hidx>{項目@1<<>>項目@2}")
+    FileUtils.remove_entry_secure(tmpdir)
+    assert_equal %Q|\\index{かんじ@漢字}\\index{はーどらっく@強運}\\index{こうもく"@1@項目"@1!こうもく"@2@項目"@2}|, actual
   end
 
   def test_jis_x_0201_kana
@@ -311,6 +337,11 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     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_linenum
+    actual = compile_block("//firstlinenum[100]\n//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\\begin{reviewlist}\n100: class Foo\n101:   def foo\n102:     bar\n103: \n104:     buz\n105:   end\n106: end\n\\end{reviewlist}\n|, actual
+  end
+
   def test_listnum_lst
     @book.config["highlight"] = {}
     @book.config["highlight"]["latex"] = "listings"
@@ -318,6 +349,25 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\\begin{reviewlistnumlst}[caption={ruby},language={}]\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n\\end{reviewlistnumlst}\n|, actual
   end
 
+  def test_listnum_lst_linenum
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    actual = compile_block("//firstlinenum[100]\n//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
+    assert_equal %Q|\\begin{reviewlistnumlst}[caption={ruby},language={},firstnumber=100]\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n\\end{reviewlistnumlst}\n|, actual
+  end
+
+  def test_source
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\\reviewsourcecaption{foo/bar/test.rb}\n\\begin{reviewsource}\nfoo\nbar\n\nbuz\n\\end{reviewsource}\n|, actual
+  end
+
+  def test_source_lst
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\\begin{reviewsourcelst}[title={foo/bar/test.rb},language={}]\nfoo\nbar\n\nbuz\n\\end{reviewsourcelst}\n|, actual
+  end
+
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q|\n\\begin{quote}\nfoobar\n\nbuz\n\\end{quote}\n|, actual
@@ -475,6 +525,23 @@ class LATEXBuidlerTest < Test::Unit::TestCase
                  actual
   end
 
+  def test_customize_cellwidth
+    actual = compile_block("//tsize[2,3,5]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q(\\begin{reviewtable}{|p{2mm}|p{3mm}|p{5mm}|}\n\\hline\n\\reviewth{A} & B & C \\\\  \\hline\n\\end{reviewtable}\n), actual
+
+    actual = compile_block("//tsize[|latex,html|2,3,5]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q(\\begin{reviewtable}{|p{2mm}|p{3mm}|p{5mm}|}\n\\hline\n\\reviewth{A} & B & C \\\\  \\hline\n\\end{reviewtable}\n), actual
+
+    actual = compile_block("//tsize[|html|2,3,5]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q(\\begin{reviewtable}{|l|l|l|}\n\\hline\n\\reviewth{A} & B & C \\\\  \\hline\n\\end{reviewtable}\n), actual
+
+    actual = compile_block("//tsize[|latex|2,3,5]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q(\\begin{reviewtable}{|p{2mm}|p{3mm}|p{5mm}|}\n\\hline\n\\reviewth{A} & B & C \\\\  \\hline\n\\end{reviewtable}\n), actual
+
+    actual = compile_block("//tsize[|latex||p{5mm}|cr|]\n//table{\nA\tB\tC\n//}\n")
+    assert_equal %Q(\\begin{reviewtable}{|p{5mm}|cr|}\n\\hline\n\\reviewth{A} & B & C \\\\  \\hline\n\\end{reviewtable}\n), actual
+  end
+
   def test_imgtable
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1, 'sample img')
@@ -849,4 +916,25 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_comment
+    actual = compile_block("//comment[コメント]")
+    assert_equal %Q||, actual
+  end
+
+  def test_comment_for_draft
+    @config["draft"] = true
+    actual = compile_block("//comment[コメント]")
+    assert_equal %Q|\\pdfcomment{コメント}\n|, actual
+  end
+
+  def test_inline_comment
+    actual = compile_inline("test @<comment>{コメント} test2")
+    assert_equal %Q|test  test2|, actual
+  end
+
+  def test_inline_comment_for_draft
+    @config["draft"] = true
+    actual = compile_inline("test @<comment>{コメント} test2")
+    assert_equal %Q|test \\pdfcomment{コメント} test2|, actual
+  end
 end

data/test/test_makerhelper.rb

@@ -38,11 +38,11 @@ class MakerHelperTest < Test::Unit::TestCase
   end
 
   def test_copy_images_to_dir_convert
-    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM && (`convert -version` rescue nil)
       touch_file("#{@tmpdir1}/foo.eps")
 
       image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
-                                                 :convert => {:eps => :png})
+                                                   :convert => {:eps => :png})
 
       assert File.exist?("#{@tmpdir2}/foo.eps.png"), "EPS to PNG conversion failed"
       assert image_files.include?("#{@tmpdir1}/foo.eps.png")

data/test/test_markdownbuilder.rb

@@ -46,6 +46,17 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_inline_comment
+    actual = compile_inline("test @<comment>{コメント} test2")
+    assert_equal %Q|test  test2|, actual
+  end
+
+  def test_inline_comment_for_draft
+    @config["draft"] = true
+    actual = compile_inline("test @<comment>{コメント} test2")
+    assert_equal %Q|test <span class="red">コメント</span> test2|, actual
+  end
+
   def test_ul_nest1
     src =<<-EOS
   * AAA
@@ -62,7 +73,6 @@ EOS
     assert_equal "```shell-session\nlineA\nlineB\n```\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
@@ -79,6 +89,17 @@ EOS
     assert_equal %Q|<dl>\n<dt>title</dt>\n<dd>body</dd>\n<dt>title2</dt>\n<dd>body2</dd>\n</dl>\n|, actual
   end
 
+  def test_comment
+    actual = compile_block("//comment[コメント]")
+    assert_equal %Q||, actual
+  end
+
+  def test_comment_for_draft
+    @config["draft"] = true
+    actual = compile_block("//comment[コメント]")
+    assert_equal %Q|<div class="red">コメント</div>\n|, actual
+  end
+
   def test_list
     actual = compile_block(<<-EOS)
 //list[name][caption]{

data/test/test_md2inaobuilder.rb

@@ -57,11 +57,6 @@ BBB
     EOS
   end
 
-  def test_comment
-    actual = compile_block("//comment{\nHello, world!\n//}\n")
-    assert_equal "<span class=\"red\">\nHello, world!\n</span>\n", actual
-  end
-
   def test_ruby_mono
     actual = compile_block("@<ruby>{謳,うた}い文句")
     assert_equal "　<span class='monoruby'>謳(うた)</span>い文句\n\n", actual

data/test/test_pdfmaker.rb

@@ -85,8 +85,8 @@ class PDFMakerTest < Test::Unit::TestCase
 
   def test_make_authors
     @config.merge!({"aut"=>["テスト太郎","テスト次郎"],
-            "csl"=>["監修三郎"],
-            "trl"=>["翻訳四郎","翻訳五郎",]})
+                    "csl"=>["監修三郎"],
+                    "trl"=>["翻訳四郎","翻訳五郎",]})
     Dir.mktmpdir do |dir|
       authors = @maker.make_authors
       assert_equal("テスト太郎、テスト次郎　著 \\\\\n監修三郎　監修 \\\\\n翻訳四郎、翻訳五郎　訳",
@@ -104,16 +104,16 @@ class PDFMakerTest < Test::Unit::TestCase
 
   def test_make_okuduke
     @config.merge!({
-      "aut"=>["テスト太郎","テスト次郎"],
-      "csl"=>["監修三郎"],
-      "trl"=>["翻訳四郎","翻訳五郎"],
-      "dsr"=>["デザイン六郎"],
-      "ill"=>["イラスト七郎","イラスト八郎"],
-      "cov"=>["表紙九郎"],
-      "edt"=>["編集十郎"],
-      "pbl"=>"テスト出版",
-      "prt"=>"テスト印刷",
-    })
+                     "aut"=>["テスト太郎","テスト次郎"],
+                     "csl"=>["監修三郎"],
+                     "trl"=>["翻訳四郎","翻訳五郎"],
+                     "dsr"=>["デザイン六郎"],
+                     "ill"=>["イラスト七郎","イラスト八郎"],
+                     "cov"=>["表紙九郎"],
+                     "edt"=>["編集十郎"],
+                     "pbl"=>"テスト出版",
+                     "prt"=>"テスト印刷",
+                   })
     Dir.mktmpdir do |dir|
       okuduke = @maker.make_colophon
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\n翻　訳 & 翻訳四郎、翻訳五郎 \\\\\nデザイン & デザイン六郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n表　紙 & 表紙九郎 \\\\\n編　集 & 編集十郎 \\\\\n発行所 & テスト出版 \\\\\n印刷所 & テスト印刷 \\\\\n",
@@ -124,13 +124,13 @@ class PDFMakerTest < Test::Unit::TestCase
 
   def test_make_okuduke_dojin
     @config.merge!({
-      "aut"=>["テスト太郎","テスト次郎"],
-      "csl"=>["監修三郎"],
-      "ill"=>["イラスト七郎","イラスト八郎"],
-      "pbl"=>"テスト出版",
-      "prt"=>"テスト印刷",
-      "contact"=>"tarou@example.jp",
-    })
+                     "aut"=>["テスト太郎","テスト次郎"],
+                     "csl"=>["監修三郎"],
+                     "ill"=>["イラスト七郎","イラスト八郎"],
+                     "pbl"=>"テスト出版",
+                     "prt"=>"テスト印刷",
+                     "contact"=>"tarou@example.jp",
+                   })
     Dir.mktmpdir do |dir|
       I18n.update({"prt" => "印刷所"},"ja")
       okuduke = @maker.make_colophon
@@ -150,10 +150,10 @@ class PDFMakerTest < Test::Unit::TestCase
 
   def test_gettemplate_with_backmatter
     @config.merge!({
-      "backcover"=>"backcover.html",
-      "profile"=>"profile.html",
-      "advfile"=>"advfile.html",
-    })
+                     "backcover"=>"backcover.html",
+                     "profile"=>"profile.html",
+                     "advfile"=>"advfile.html",
+                   })
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         profile = "\\thispagestyle{empty}\\chapter*{Profile}\nsome profile\n"
@@ -189,9 +189,9 @@ class PDFMakerTest < Test::Unit::TestCase
     @config["pht"] = ["Mrs.Smith"]
     @config.merge!({"language" => "ja",
                     "history" => [[
-                                    "2011-08-03 v1.0.0版発行",
-                                    "2012-02-15 v1.1.0版発行",
-                                  ]] })
+                      "2011-08-03 v1.0.0版発行",
+                      "2012-02-15 v1.1.0版発行",
+                    ]] })
     history = @maker.make_history_list
     expect = ["2011年8月3日　v1.0.0版発行",
               "2012年2月15日　v1.1.0版発行"]
@@ -204,9 +204,9 @@ class PDFMakerTest < Test::Unit::TestCase
     @config["pht"] = ["Mrs.Smith"]
     @config.merge!({"language" => "ja",
                     "history" => [[
-                                    "2011-08-03",
-                                    "2012-02-15",
-                                  ]] })
+                      "2011-08-03",
+                      "2012-02-15",
+                    ]] })
     history = @maker.make_history_list
     expect = ["2011年8月3日　初版第1刷　発行",
               "2012年2月15日　初版第2刷　発行"]
@@ -219,13 +219,13 @@ class PDFMakerTest < Test::Unit::TestCase
     @config["pht"] = ["Mrs.Smith"]
     @config.merge!({"language" => "ja",
                     "history" => [[
-                                    "2011-08-03",
-                                    "2012-02-15",
-                                  ],[
-                                    "2012-10-01",
-                                  ],[
-                                    "2013-03-01",
-                                  ]] })
+                      "2011-08-03",
+                      "2012-02-15",
+                    ],[
+                      "2012-10-01",
+                    ],[
+                      "2013-03-01",
+                    ]] })
     history = @maker.make_history_list
     expect = ["2011年8月3日　初版第1刷　発行",
               "2012年2月15日　初版第2刷　発行",
@@ -234,4 +234,22 @@ class PDFMakerTest < Test::Unit::TestCase
     assert_equal expect, history
   end
 
+  def test_colophon_history_freeformat
+    @config["aut"] = ["Mr.Smith"]
+    @config["pbl"] = ["BLUEPRINT"]
+    @config["pht"] = ["Mrs.Smith"]
+    @config.merge!({"language" => "ja",
+                    "history" => [[
+                      "2011年8月3日 ver 1.1.0発行",
+                    ],[
+                      "2011年10月12日 ver 1.2.0発行",
+                    ],[
+                      "2012年1月31日 ver 1.2.1発行",
+                    ]] })
+    history = @maker.make_history_list
+    expect = ["2011年8月3日 ver 1.1.0発行",
+              "2011年10月12日 ver 1.2.0発行",
+              "2012年1月31日 ver 1.2.1発行"]
+    assert_equal expect, history
+  end
 end