review 3.2.0 → 5.1.0

data/test/test_update.rb

@@ -14,13 +14,13 @@ class UpdateTest < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf @tmpdir
+    FileUtils.rm_rf(@tmpdir)
   end
 
   def test_broken_yml
     File.write(File.join(@tmpdir, 'test.yml'), "invalid: [,]\n")
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     assert_match(/test\.yml is broken\. Ignored\./, io.string)
   end
@@ -62,9 +62,9 @@ EOT
       File.write(File.join(@tmpdir, fname), '')
 
       io = StringIO.new
-      @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+      @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
       assert_raise(ApplicationError) { @u.check_old_catalogs(@tmpdir) }
-      assert_match(/review\-catalog\-converter/, io.string)
+      assert_match(/review-catalog-converter/, io.string)
 
       File.unlink(File.join(@tmpdir, fname))
     end
@@ -75,7 +75,7 @@ EOT
     File.write(File.join(@tmpdir, 'layouts/layout.tex.erb'), '')
 
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     assert_raise(ApplicationError) { @u.check_own_files(@tmpdir) }
     assert_match(%r{There is custom layouts/layout\.tex\.erb file}, io.string)
   end
@@ -84,47 +84,56 @@ EOT
     File.write(File.join(@tmpdir, 'review-ext.rb'), '')
 
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.check_own_files(@tmpdir)
-    assert_match(/There is review\-ext\.rb file/, io.string)
+    assert_match(/There is review-ext\.rb file/, io.string)
   end
 
   def test_update_version_older
     File.write(File.join(@tmpdir, 'config.yml'), "review_version: 2.0\n")
 
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_version
-    assert_match(/Update 'review_version' to '3.0'/, io.string)
-    assert_equal 'review_version: 3.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
+    assert_match(/Update 'review_version' to '5.0'/, io.string)
+    assert_equal 'review_version: 5.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
+
+    File.write(File.join(@tmpdir, 'config.yml'), "review_version: 3.0\n")
+
+    io = StringIO.new
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
+    @u.parse_ymls(@tmpdir)
+    @u.update_version
+    assert_match(/Update 'review_version' to '5.0'/, io.string)
+    assert_equal 'review_version: 5.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
   def test_update_version_current
-    File.write(File.join(@tmpdir, 'config.yml'), "review_version: 3.0\n")
+    File.write(File.join(@tmpdir, 'config.yml'), "review_version: 5.0\n")
 
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_version
     assert_equal '', io.string
-    assert_equal 'review_version: 3.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
+    assert_equal 'review_version: 5.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
   def test_update_version_newer
     File.write(File.join(@tmpdir, 'config.yml'), "review_version: 99.0\n")
 
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_version
-    assert_match(/Update 'review_version' to '3.0'/, io.string)
+    assert_match(/Update 'review_version' to '5.0'/, io.string)
     assert_equal 'review_version: 99.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
   def test_update_rakefile
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.update_rakefile(@tmpdir)
     assert_equal '', io.string
     assert_equal true, File.exist?(File.join(@tmpdir, 'Rakefile'))
@@ -133,7 +142,7 @@ EOT
 
   def test_update_rakefile_same
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.update_rakefile(@tmpdir)
     @u.update_rakefile(@tmpdir)
     assert_equal '', io.string
@@ -143,10 +152,10 @@ EOT
 
   def test_update_rakefile_different
     File.write(File.join(@tmpdir, 'Rakefile'), '')
-    FileUtils.mkdir_p File.join(@tmpdir, 'lib/tasks')
+    FileUtils.mkdir_p(File.join(@tmpdir, 'lib/tasks'))
     File.write(File.join(@tmpdir, 'lib/tasks/review.rake'), '')
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.update_rakefile(@tmpdir)
     assert_match(/Rakefile will be overridden with/, io.string)
     assert_match(%r{lib/tasks/review\.rake will be overridden}, io.string)
@@ -157,7 +166,7 @@ EOT
   def test_update_epub_version_older
     File.write(File.join(@tmpdir, 'config.yml'), "epubversion: 2\nhtmlversion: 4\n")
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_epub_version
     assert_match(/Update 'epubversion'/, io.string)
@@ -172,7 +181,7 @@ EOT
   def test_update_epub_version_current
     File.write(File.join(@tmpdir, 'config.yml'), "epubversion: 3\nhtmlversion: 5\n")
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_epub_version
     assert_equal '', io.string
@@ -186,7 +195,7 @@ EOT
   def test_update_epub_version_newer
     File.write(File.join(@tmpdir, 'config.yml'), "epubversion: 99\nhtmlversion: 99\n")
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_epub_version
     assert_equal '', io.string
@@ -200,7 +209,7 @@ EOT
   def test_update_locale_older
     File.write(File.join(@tmpdir, 'locale.yml'), %Q(locale: en\nchapter_quote: "'%s'"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_locale
     assert_match(/'chapter_quote' now takes 2 values/, io.string)
@@ -214,7 +223,7 @@ EOT
   def test_update_locale_current
     File.write(File.join(@tmpdir, 'locale.yml'), %Q(locale: en\nchapter_quote: "'%s...%s'"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_locale
     assert_equal '', io.string
@@ -228,7 +237,7 @@ EOT
   def test_update_tex_parameters_jsbook_to_review_jsbook
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["jsbook", "a5j,11pt,landscape,oneside,twoside,vartwoside,onecolumn,twocolumn,titlepage,notitlepage,openright,openany,leqno,fleqn,disablejfam,draft,final,mingoth,winjis,jis,papersize,english,report,jslogo,nojslogo,uplatex,nomag,usemag,nomag*,tombow,tombo,mentuke,autodetect-engine"]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_parameters
     assert_match(/By default it is migrated to/, io.string)
@@ -242,7 +251,7 @@ EOT
   def test_update_tex_parameters_jsbook_to_review_jsbook_invalid
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["jsbook", "a5paper,invalid"]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_parameters
     assert_match(/couldn't be converted fully/, io.string)
@@ -256,7 +265,7 @@ EOT
   def test_update_tex_parameters_review_jsbook
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["review-jsbook", ""]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_parameters
     assert_equal '', io.string
@@ -269,7 +278,7 @@ EOT
   def test_update_tex_parameters_review_jsbook_obsoletekey
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["review-jsbook", "Q=13.5, H=20, W=40, L=34, head=20mm, gutter=20mm"]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_parameters
     cont = <<EOT
@@ -281,7 +290,7 @@ EOT
   def test_update_tex_parameters_review_jlreq
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["review-jlreq", ""]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_parameters
     assert_equal '', io.string
@@ -294,7 +303,7 @@ EOT
   def test_update_tex_parameters_review_jsbook_review_jlreq
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["review-jsbook", ""]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.specified_template = 'review-jlreq'
     @u.update_tex_parameters
@@ -308,7 +317,7 @@ EOT
   def test_update_tex_parameters_unknownclass
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["unknown", ""]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_parameters
     assert_match(/unknown class/, io.string)
@@ -321,7 +330,7 @@ EOT
   def test_update_tex_parameters_jsbook_unknownclass
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["jsbook", ""]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.specified_template = 'unknown'
     @u.update_tex_parameters
@@ -335,7 +344,7 @@ EOT
   def test_update_tex_parameters_jsbook_to_review_jlreq
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texdocumentclass: ["jsbook", "a5j,11pt,landscape,oneside,twoside,onecolumn,twocolumn,titlepage,notitlepage,openright,openany,leqno,fleqn,draft,final,report,uplatex,nomag,usemag,nomag*,tombow,tombo,mentuke,autodetect-engine"]\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.specified_template = 'review-jlreq'
     @u.update_tex_parameters
@@ -349,7 +358,7 @@ EOT
 
   def test_update_stys_new
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.update_tex_stys('review-jsbook', @tmpdir)
     assert_equal '', io.string
     assert_equal true, File.exist?(File.join(@tmpdir, 'sty/review-base.sty'))
@@ -359,7 +368,7 @@ EOT
 
   def test_update_stys_new_custom
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.update_tex_stys('review-jsbook', @tmpdir)
     assert_equal '', io.string
     File.write(File.join(@tmpdir, 'sty/review-custom.sty'), "% MY CUSTOM\n")
@@ -370,26 +379,26 @@ EOT
 
   def test_update_stys_modified
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.update_tex_stys('review-jsbook', @tmpdir)
     cont = File.read(File.join(@tmpdir, 'sty/review-base.sty'))
 
     File.write(File.join(@tmpdir, 'sty/review-base.sty'), "% MODIFIED\n")
     @u.update_tex_stys('review-jsbook', @tmpdir)
-    assert_match(/review\-base\.sty will be overridden/, io.string)
+    assert_match(/review-base\.sty will be overridden/, io.string)
     assert_equal cont, File.read(File.join(@tmpdir, 'sty/review-base.sty'))
   end
 
   def test_update_tex_command
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texcommand: "/Program Files/up-latex --shell-escape -v"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_command
     assert_match(/has options/, io.string)
     cont = <<EOT
 texcommand: "/Program Files/up-latex"
-texoptions: "-interaction=nonstopmode -file-line-error --shell-escape -v"
+texoptions: "-interaction=nonstopmode -file-line-error -halt-on-error --shell-escape -v"
 EOT
     assert_equal cont, File.read(File.join(@tmpdir, 'config.yml'))
   end
@@ -397,7 +406,7 @@ EOT
   def test_update_tex_command_noopt
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texcommand: "/Program Files/up-latex"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_command
     assert_equal '', io.string
@@ -410,7 +419,7 @@ EOT
   def test_update_tex_command_withopt
     File.write(File.join(@tmpdir, 'config.yml'), %Q(texcommand: "/Program Files/up-latex --shell-escape -v"\ntexoptions: "-myopt"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_tex_command
     assert_match(/has options/, io.string)
@@ -424,7 +433,7 @@ EOT
   def test_update_dvi_command
     File.write(File.join(@tmpdir, 'config.yml'), %Q(dvicommand: "/Program Files/dvi-pdfmx -q --quiet"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_dvi_command
     assert_match(/has options/, io.string)
@@ -438,7 +447,7 @@ EOT
   def test_update_dvi_command_noopt
     File.write(File.join(@tmpdir, 'config.yml'), %Q(dvicommand: "/Program Files/dvi-pdfmx"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_dvi_command
     assert_equal '', io.string
@@ -451,7 +460,7 @@ EOT
   def test_update_dvi_command_withopt
     File.write(File.join(@tmpdir, 'config.yml'), %Q(dvicommand: "/Program Files/dvi-pdfmx -q --quiet"\ndvioptions: "-myopt"\n))
     io = StringIO.new
-    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.instance_eval { @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_dvi_command
     assert_match(/has options/, io.string)

data/test/test_webtocprinter.rb

@@ -11,7 +11,7 @@ class WEBTOCPrinterTest < Test::Unit::TestCase
   end
 
   def test_webtocprinter_null
-    dummy_book = ReVIEW::Book::Base.load
+    dummy_book = ReVIEW::Book::Base.new
     # chap = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
     str = WEBTOCPrinter.book_to_string(dummy_book)
     expect = <<-EOB
@@ -28,15 +28,15 @@ CHAPS:
   - ch1.re
   - ch2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    mktmpbookdir('catalog.yml' => catalog_yml,
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
+                 'ch2.re' => "= ch. 2\n\n222\n") do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
 <li><a href="index.html">TOP</a></li>
-<li><a href="ch1.html">1 ch. 1</a></li>
-<li><a href="ch2.html">2 ch. 2</a></li>
+<li><a href="ch1.html">第1章　ch. 1</a></li>
+<li><a href="ch2.html">第2章　ch. 2</a></li>
 </ul>
 EOB
       assert_equal expect, str
@@ -51,23 +51,19 @@ CHAPS:
   - part2:
     - ch2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    mktmpbookdir('catalog.yml' => catalog_yml,
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
+                 'ch2.re' => "= ch. 2\n\n222\n") do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
 <li><a href="index.html">TOP</a></li>
-<li>I part1
-<ul>
-<li><a href="ch1.html">1 ch. 1</a></li>
-</ul>
-</li>
-<li>II part2
-<ul>
-<li><a href="ch2.html">2 ch. 2</a></li>
-</ul>
-</li>
+<li>第I部　part1
+<ul><li><a href="ch1.html">第1章　ch. 1</a></li>
+</ul></li>
+<li>第II部　part2
+<ul><li><a href="ch2.html">第2章　ch. 2</a></li>
+</ul></li>
 </ul>
 EOB
       assert_equal expect, str
@@ -82,25 +78,21 @@ CHAPS:
   - p2.re:
     - ch2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    mktmpbookdir('catalog.yml' => catalog_yml,
                  'p1.re' => "= This is PART1\n\np111\n",
                  'p2.re' => "= This is PART2\n\np111\n",
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
+                 'ch2.re' => "= ch. 2\n\n222\n") do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
 <li><a href="index.html">TOP</a></li>
-<li><a href="p1.html">I This is PART1</a>
-<ul>
-<li><a href="ch1.html">1 ch. 1</a></li>
-</ul>
-</li>
-<li><a href="p2.html">II This is PART2</a>
-<ul>
-<li><a href="ch2.html">2 ch. 2</a></li>
-</ul>
-</li>
+<li><a href="p1.html">第I部　This is PART1</a>
+<ul><li><a href="ch1.html">第1章　ch. 1</a></li>
+</ul></li>
+<li><a href="p2.html">第II部　This is PART2</a>
+<ul><li><a href="ch2.html">第2章　ch. 2</a></li>
+</ul></li>
 </ul>
 EOB
       assert_equal expect, str
@@ -124,7 +116,7 @@ POSTDEF:
   - post1.re
   - post2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    mktmpbookdir('catalog.yml' => catalog_yml,
                  'pre1.re' => "= PRE1\n\npre111\n",
                  'pre2.re' => "= PRE2\n\npre222\n",
                  'app1.re' => "= APP1\n\napp111\n",
@@ -134,28 +126,68 @@ EOB
                  'post1.re' => "= POST1\n\npo111\n",
                  'post2.re' => "= POST2\n\npo222\n",
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
+                 'ch2.re' => "= ch. 2\n\n222\n") do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
 <li><a href="index.html">TOP</a></li>
 <li><a href="pre1.html">PRE1</a></li>
 <li><a href="pre2.html">PRE2</a></li>
-<li><a href="part1.html">I PART1</a>
-<ul>
-<li><a href="ch1.html">1 ch. 1</a></li>
-</ul>
-</li>
-<li><a href="part2.html">II PART2</a>
-<ul>
-<li><a href="ch2.html">2 ch. 2</a></li>
-</ul>
-</li>
-<li><a href="app1.html">APP1</a></li>
-<li><a href="app2.html">APP2</a></li>
+<li><a href="part1.html">第I部　PART1</a>
+<ul><li><a href="ch1.html">第1章　ch. 1</a></li>
+</ul></li>
+<li><a href="part2.html">第II部　PART2</a>
+<ul><li><a href="ch2.html">第2章　ch. 2</a></li>
+</ul></li>
+<li><a href="app1.html">付録A　APP1</a></li>
+<li><a href="app2.html">付録B　APP2</a></li>
 <li><a href="post1.html">POST1</a></li>
 <li><a href="post2.html">POST2</a></li>
 </ul>
+EOB
+      assert_equal expect, str
+    end
+  end
+
+  def test_webtocprinter_nochapter
+    catalog_yml = <<-EOB
+CHAPS:
+EOB
+    mktmpbookdir('catalog.yml' => catalog_yml) do |_dir, book, _files|
+      str = WEBTOCPrinter.book_to_string(book)
+      expect = <<-EOB
+<ul class="book-toc">
+<li><a href="index.html">TOP</a></li>
+</ul>
+EOB
+      assert_equal expect, str
+    end
+  end
+
+  def test_webtocprinter_noheadline
+    catalog_yml = <<-EOB
+CHAPS:
+  - ch1.re
+  - ch2.re
+  - ch3.re
+  - ch4.re
+EOB
+    mktmpbookdir('catalog.yml' => catalog_yml,
+                 'ch1.re' => "A\n",
+                 'ch2.re' => "B\n\n= C\n== D\n",
+                 'ch3.re' => "//emlist{\nLIST\n//}\n",
+                 'ch4.re' => "==[column] E\n\n= F") do |_dir, book, _files|
+      str = WEBTOCPrinter.book_to_string(book)
+      expect = <<-EOB
+<ul class="book-toc">
+<li><a href="index.html">TOP</a></li>
+<li><a href="ch1.html">-</a></li>
+<li><a href="ch2.html">-</a></li>
+<li><a href="ch2.html">第2章　C</a></li>
+<li><a href="ch3.html">-</a></li>
+<li><a href="ch4.html">-</a></li>
+<li><a href="ch4.html">第4章　F</a></li>
+</ul>
 EOB
       assert_equal expect, str
     end