review 4.1.0 → 4.2.0

data/test/test_pdfmaker.rb

@@ -149,6 +149,23 @@ class PDFMakerTest < Test::Unit::TestCase
     end
   end
 
+  def test_template_content_with_localconfig
+    @config['mycustom'] = { 'value' => '#_TEST_' }
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        Dir.mkdir('layouts')
+        File.write(File.join('layouts', 'config-local.tex.erb'), %q(\def\customvalue{<%= escape(@config['mycustom']['value']) %>}) + "\n")
+        @maker.basedir = Dir.pwd
+        @maker.erb_config
+        tmpl = @maker.template_content
+        expect = File.read(File.join(assets_dir, 'test_template.tex'))
+        expect.gsub!(/\\def\\review@reviewversion{[^\}]+}/, "\\def\\review@reviewversion{#{ReVIEW::VERSION}}")
+        expect.sub!("\\makeatother\n", '\&' + "%% BEGIN: config-local.tex.erb\n\\def\\customvalue{\\#\\textunderscore{}TEST\\textunderscore{}}\n%% END: config-local.tex.erb\n")
+        assert_equal(expect, tmpl)
+      end
+    end
+  end
+
   def test_gettemplate_with_backmatter
     @config.merge!(
       'backcover' => 'backcover.tex',

data/test/test_plaintextbuilder.rb

@@ -249,6 +249,17 @@ EOS
 foo
 bar
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+foo
+bar
+
+リスト1.1　this is test<&>_
+
 EOS
     assert_equal expected, actual
   end
@@ -264,6 +275,17 @@ EOS
  1: foo
  2: bar
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+ 1: foo
+ 2: bar
+
+リスト1.1　this is test<&>_
+
 EOS
     assert_equal expected, actual
   end
@@ -277,6 +299,18 @@ bar
 
 buz
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+foo
+bar
+
+buz
+foo/bar/test.rb
+
 EOS
     assert_equal expected, actual
   end
@@ -308,6 +342,16 @@ FOO
 foo
 bar
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+foo
+bar
+FOO
+
 EOS
     assert_equal expected, actual
   end
@@ -327,6 +371,16 @@ cap1
 lineA
 lineB
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+lineA
+lineB
+cap1
+
 EOS
     assert_equal expected, actual
   end
@@ -348,6 +402,16 @@ cap1
 lineA
 lineB
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+lineA
+lineB
+cap1
+
 EOS
     assert_equal expected, actual
   end
@@ -359,6 +423,16 @@ this is test<&>_
  1: foo
  2: bar
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+ 1: foo
+ 2: bar
+this is test<&>_
+
 EOS
     assert_equal expected, actual
   end
@@ -387,6 +461,16 @@ EOS
 aaa\tbbb
 ccc\tddd<>&
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+aaa\tbbb
+ccc\tddd<>&
+
+表1.1　FOO
 EOS
     assert_equal expected, actual
   end
@@ -521,6 +605,10 @@ EOS
 
     actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
     assert_equal %Q(図1.1　sample photo\n\n), actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
+    assert_equal %Q(図1.1　sample photo\n\n), actual
   end
 
   def test_image_with_metric
@@ -649,6 +737,17 @@ EOS
 式1.1　The Equivalence of Mass and Energy
 e=mc^2
 
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['caption_position']['equation'] = 'bottom'
+    expected = <<-EOS
+式1.1
+
+e=mc^2
+式1.1　The Equivalence of Mass and Energy
+
 EOS
     actual = compile_block(src)
     assert_equal expected, actual

data/test/test_topbuilder.rb

@@ -295,6 +295,19 @@ EOS
  2: bar
 ◆→終了:リスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:リスト←◆
+ 1: foo
+ 2: bar
+
+リスト1.1　this is ★test☆<&>_
+◆→終了:リスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -310,6 +323,20 @@ bar
 buz
 ◆→終了:ソースコードリスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+◆→開始:ソースコードリスト←◆
+foo
+bar
+
+buz
+■foo/bar/test.rb
+◆→終了:ソースコードリスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -347,6 +374,18 @@ foo
 bar
 ◆→終了:書式←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:書式←◆
+foo
+bar
+■FOO
+◆→終了:書式←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -370,6 +409,18 @@ lineA
 lineB
 ◆→終了:コマンド←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:コマンド←◆
+lineA
+lineB
+■cap1
+◆→終了:コマンド←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -395,6 +446,18 @@ lineA
 lineB
 ◆→終了:インラインリスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+lineA
+lineB
+■cap1
+◆→終了:インラインリスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -408,6 +471,18 @@ EOS
  2: bar
 ◆→終了:インラインリスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+ 1: foo
+ 2: bar
+■this is ★test☆<&>_
+◆→終了:インラインリスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -440,6 +515,19 @@ EOS
 ccc\tddd<>&
 ◆→終了:表←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+
+表1.1　FOO
+◆→終了:表←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -657,6 +745,18 @@ EOS
     actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
     expected = <<-EOS
 ◆→開始:図←◆
+◆→./images/chap1-sampleimg.png←◆
+
+図1.1　sample photo
+◆→終了:図←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
+    expected = <<-EOS
+◆→開始:図←◆
 図1.1　sample photo
 
 ◆→./images/chap1-sampleimg.png←◆
@@ -676,9 +776,9 @@ EOS
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\nfoo\n//}\n")
     expected = <<-EOS
 ◆→開始:図←◆
-図1.1　sample photo
-
 ◆→./images/chap1-sampleimg.png scale=1.2←◆
+
+図1.1　sample photo
 ◆→終了:図←◆
 
 EOS
@@ -829,6 +929,20 @@ EOS
 e=mc^2
 ◆→終了:TeX式←◆
 
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['caption_position']['equation'] = 'bottom'
+
+    expected = <<-EOS
+式1.1
+
+◆→開始:TeX式←◆
+e=mc^2
+式1.1　The Equivalence of Mass ▲and☆ Energy
+◆→終了:TeX式←◆
+
 EOS
     actual = compile_block(src)
     assert_equal expected, actual

data/test/test_webtocprinter.rb

@@ -35,8 +35,8 @@ EOB
       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
@@ -58,16 +58,12 @@ EOB
       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
@@ -91,16 +87,12 @@ EOB
       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
@@ -141,21 +133,61 @@ EOB
 <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