review 2.0.0 → 2.1.0

data/test/test_epub3maker.rb

@@ -403,9 +403,7 @@ EOT
   end
 
   def test_stage3_flat
-    @producer.merge_params({"epubmaker" =>
-        {"flattoc" => true, "flattocindent" => false}
-      })
+    @producer.merge_params({"epubmaker" => {"flattoc" => true, "flattocindent" => false}})
     stage3
     @producer.mytoc(@output)
     expect = <<EOT

data/test/test_htmlbuilder.rb

@@ -433,7 +433,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//indepimage[sampleimg][sample photo]\n")
-    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|, actual
+    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_indepimage_without_caption
@@ -444,7 +444,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//indepimage[sampleimg]\n")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n</div>\n|, actual
+    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n</div>\n|, actual
   end
 
   def test_indepimage_with_metric
@@ -455,7 +455,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
+    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_indepimage_with_metric2
@@ -466,7 +466,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2, html::class=\"sample\",latex::ignore=params]\n")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
+    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n|, actual
   end
 
   def test_indepimage_without_caption_but_with_metric
@@ -477,7 +477,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     end
 
     actual = compile_block("//indepimage[sampleimg][][scale=1.2]\n")
-    assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" class="width-120per" />\n</div>\n|, actual
+    assert_equal %Q|<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="" class="width-120per" />\n</div>\n|, actual
   end
 
   def test_dlist
@@ -536,7 +536,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_][ruby]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
 
     assert_equal %Q|<div class=\"caption-code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n| +
-                 %Q|<pre class=\"list\"><span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n| +
+                 %Q|<pre class=\"list language-ruby\"><span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n| +
                  %Q|  (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">\|</span>i<span style=\"color: #666666\">\|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n| +
                  %Q|  <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n| +
                  %Q|<span style=\"color: #008000; font-weight: bold\">end</span>\n| +
@@ -561,6 +561,14 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal "<div class=\"caption-code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class=\"list\">def foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n</pre>\n</div>\n", actual
   end
 
+  def test_list_ext
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist.rb",1)
+    end
+    actual = compile_block("//list[samplelist.rb][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list language-rb">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n|, actual
+  end
+
   def test_listnum
     def @chapter.list(id)
       Book::ListIndex::Item.new("samplelist",1)
@@ -579,7 +587,7 @@ EOS
     expected =<<-EOS
 <div class="code">
 <p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
-<pre class="list"> 1: def foo(a1, a2=:test)
+<pre class="list language-ruby"> 1: def foo(a1, a2=:test)
  2:   (1..3).times{|i| a.include?(:foo)}
  3:   return true
  4: end
@@ -641,7 +649,7 @@ EOS
     @book.config["highlight"] = {}
     @book.config["highlight"]["html"] = "pygments"
     actual = compile_block("//emlist[][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
-    assert_equal "<div class=\"emlist-code\">\n<pre class=\"emlist\"><span style=\"color: #008000; font-weight: bold\">SELECT</span> <span style=\"color: #008000; font-weight: bold\">COUNT</span>(<span style=\"color: #666666\">*</span>) <span style=\"color: #008000; font-weight: bold\">FROM</span> tests <span style=\"color: #008000; font-weight: bold\">WHERE</span> tests.<span style=\"color: #008000; font-weight: bold\">no</span> <span style=\"color: #666666\">&gt;</span> <span style=\"color: #666666\">10</span> <span style=\"color: #008000; font-weight: bold\">AND</span> test.name <span style=\"color: #008000; font-weight: bold\">LIKE</span> <span style=\"color: #BA2121\">&#39;ABC%&#39;</span>\n</pre>\n</div>\n", actual
+    assert_equal "<div class=\"emlist-code\">\n<pre class=\"emlist language-sql\"><span style=\"color: #008000; font-weight: bold\">SELECT</span> <span style=\"color: #008000; font-weight: bold\">COUNT</span>(<span style=\"color: #666666\">*</span>) <span style=\"color: #008000; font-weight: bold\">FROM</span> tests <span style=\"color: #008000; font-weight: bold\">WHERE</span> tests.<span style=\"color: #008000; font-weight: bold\">no</span> <span style=\"color: #666666\">&gt;</span> <span style=\"color: #666666\">10</span> <span style=\"color: #008000; font-weight: bold\">AND</span> test.name <span style=\"color: #008000; font-weight: bold\">LIKE</span> <span style=\"color: #BA2121\">&#39;ABC%&#39;</span>\n</pre>\n</div>\n", actual
   end
 
   def test_emlist_caption
@@ -667,6 +675,20 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_emlistnum_lang
+    @book.config["highlight"] = false
+    actual = compile_block("//emlistnum[cap][text]{\nlineA\nlineB\n//}\n")
+    expected =<<-EOS
+<div class="emlistnum-code">
+<p class="caption">cap</p>
+<pre class="emlist language-text"> 1: lineA
+ 2: lineB
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_emlist_with_4tab
     @config["tabwidth"] = 4
     actual = compile_block("//emlist{\n\tlineA\n\t\tlineB\n\tlineC\n//}\n")

data/test/test_i18n.rb

@@ -153,6 +153,34 @@ class I18nTest < Test::Unit::TestCase
     end
   end
 
+  def test_custom_format_numbers
+    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: "%s-%pA:"| }
+        I18n.setup("ja")
+        assert_equal "1-B:", I18n.t("format_number_header", [1, 2])
+
+        File.open(file, "w"){|f| f.write %Q|locale: ja\nformat_number_header: "%s.%pa:"| }
+        I18n.setup("ja")
+        assert_equal "2.c:", I18n.t("format_number_header", [2, 3])
+
+        File.open(file, "w"){|f| f.write %Q|locale: ja\nformat_number_header: "%pA,%pAW:"| }
+        I18n.setup("ja")
+        assert_equal "C,Ｄ:", I18n.t("format_number_header", [3, 4])
+
+        File.open(file, "w"){|f| f.write %Q|locale: ja\nformat_number_header: "%pJ・%pJ:"| }
+        I18n.setup("ja")
+        assert_equal "十二・二十六:", I18n.t("format_number_header", [12, 26])
+
+        File.open(file, "w"){|f| f.write %Q|locale: ja\nformat_number_header: "%pdW―%pdW:"| }
+        I18n.setup("ja")
+        assert_equal "３―12:", I18n.t("format_number_header", [3, 12])
+      end
+    end
+  end
+
   def test_ja
     I18n.setup("ja")
     assert_equal "図", I18n.t("image")

data/test/test_idgxmlbuilder.rb

@@ -412,7 +412,7 @@ inside column
 ===[/column]
 EOS
     expected =<<-EOS.chomp
-<column id="column-1"><title aid:pstyle="column-title">prev column</title><p>inside prev column</p></column><column id="column-2"><title aid:pstyle="column-title">test</title><p>inside column</p></column>
+<column id="column-1"><title aid:pstyle="column-title">prev column</title><?dtp level="9" section="prev column"?><p>inside prev column</p></column><column id="column-2"><title aid:pstyle="column-title">test</title><?dtp level="9" section="test"?><p>inside column</p></column>
 EOS
     assert_equal expected, column_helper(review)
   end
@@ -426,7 +426,7 @@ inside column
 === next level
 EOS
     expected =<<-EOS.chomp
-<column id="column-1"><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"?>
+<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"?>
 EOS
 
     assert_equal expected, column_helper(review)

data/test/test_index.rb

@@ -28,6 +28,16 @@ class IndexTest < Test::Unit::TestCase
     assert_equal 'bar\\a\\$buz', item.content
   end
 
+  def test_footnote_index_key?
+    fn = Book::FootnoteIndex.parse(['//footnote[foo][bar]'])
+    assert_equal true, fn.key?('foo')
+
+    ## for compatibility
+    # rubocop:disable Style/PreferredHashMethods
+    assert_equal true, fn.has_key?('foo')
+    # rubocop:enable Style/PreferredHashMethods
+  end
+
   def test_HeadelineIndex
     src = <<-EOB
 = chap1

data/test/test_location.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+require 'review/compiler'
+
+class LocationTest < Test::Unit::TestCase
+  def setup
+  end
+
+  def test_lineno
+    f = StringIO.new("a\nb\nc\n")
+    location = ReVIEW::Location.new("foo", f)
+    assert_equal 0, location.lineno
+    f.gets
+    assert_equal 1, location.lineno
+  end
+
+  def test_string
+    location = ReVIEW::Location.new("foo", StringIO.new("a\nb\nc\n"))
+    assert_equal "foo:0", location.string
+  end
+
+  def test_to_s
+    location = ReVIEW::Location.new("foo", StringIO.new("a\nb\nc\n"))
+    assert_equal "foo:0", "#{location}"
+  end
+
+  def test_to_s_nil
+    location = ReVIEW::Location.new("foo", nil)
+    assert_equal "foo:nil", "#{location}"
+  end
+end

data/test/test_markdownbuilder.rb

@@ -139,4 +139,10 @@ BBB
     actual = compile_block("//table{\ntestA\ttestB\n------------\ncontentA\tcontentB\n//}\n")
     assert_equal "|testA|testB|\n|:--|:--|\n|contentA|contentB|\n\n", actual
   end
+
+  def test_ruby
+    actual = compile_block("@<ruby>{謳,うた}い文句")
+    assert_equal "<ruby><rb>謳</rb><rp>（</rp><rt>うた</rt><rp>）</rp></ruby>い文句\n\n", actual
+  end
+
 end

data/test/test_md2inaobuilder.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'review/compiler'
+require 'review/book'
+require 'review/md2inaobuilder'
+require 'review/i18n'
+
+class MD2INAOBuilderTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @builder = MD2INAOBuilder.new()
+    @config = {
+      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
+      "stylesheet" => nil, # for HTMLBuilder
+    }
+    @book = Book::Base.new(".")
+    @book.config = @config
+    @compiler = ReVIEW::Compiler.new(@builder)
+    @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
+    location = Location.new(nil, nil)
+    @builder.bind(@compiler, @chapter, location)
+    I18n.setup("ja")
+  end
+
+  def test_paragraph
+    actual = compile_block("Hello, world!")
+    assert_equal "　Hello, world!\n\n", actual
+  end
+
+  def test_cmd
+    actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
+    assert_equal "!!! cmd\nlineA\nlineB\n\n", actual
+  end
+
+  def test_dlist
+    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    assert_equal "<dl>\n<dt>foo</dt>\n<dd>foo.bar.</dd>\n</dl>\n", actual
+  end
+
+  def test_list
+    actual = compile_block(<<-EOS)
+//list[name][caption]{
+AAA
+BBB
+//}
+    EOS
+
+    assert_equal <<-EOS, actual
+```
+●リスト1::caption
+
+AAA
+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
+  end
+
+  def test_ruby_group
+    actual = compile_block("@<ruby>{欠伸,あくび}が出る")
+    assert_equal "　<span class='groupruby'>欠伸(あくび)</span>が出る\n\n", actual
+  end
+
+end

data/test/test_pdfmaker.rb

@@ -19,6 +19,7 @@ class PDFMakerTest < Test::Unit::TestCase
                      "texcommand" => "uplatex",
                    })
     @maker.config = @config
+    @maker.initialize_metachars(@config["texcommand"])
     @output = StringIO.new
     I18n.setup(@config["language"])
   end

data/test/test_review_ext.rb

@@ -3,7 +3,6 @@
 require 'test_helper'
 require 'book_test_helper'
 require 'review/compiler'
-require 'review/book'
 require 'review/htmlbuilder'
 
 class ReviewExtTest < Test::Unit::TestCase
@@ -13,6 +12,7 @@ class ReviewExtTest < Test::Unit::TestCase
     review_ext = <<-EOB
 module ReVIEW
   class HTMLBuilder
+    attr_reader :builder_init_test
     def builder_init
       @builder_init_test = "test"
     end
@@ -20,12 +20,13 @@ module ReVIEW
 end
     EOB
 
+    ReVIEW::Book::Base.clear_rubyenv ## to load review-ext.rb
     mktmpbookdir('CHAPS' => "ch01.re\n",
                  "ch01.re" => "= test\n\ntest.\n",
                  "review-ext.rb" => review_ext) do |dir, book, files|
       builder = ReVIEW::HTMLBuilder.new(false)
       ReVIEW::Compiler.new(builder)
-      assert_equal "test", builder.instance_eval{@builder_init_test}
+      assert_equal "test", builder.builder_init_test
     end
   end
 end

data/test/test_topbuilder.rb

@@ -134,6 +134,17 @@ class TOPBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|test ① test2|, 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 ◆→DTP連絡:コメント←◆ test2|, actual
+  end
+
   def test_inline_in_table
     actual = compile_block("//table{\n★1☆\t▲2☆\n------------\n★3☆\t▲4☆<>&\n//}\n")
     assert_equal %Q|★★1☆☆\t★▲2☆☆\n★3☆\t▲4☆<>&\n◆→終了:表←◆\n\n|, actual

data/test/test_webtocprinter.rb

@@ -0,0 +1,164 @@
+require 'test_helper'
+require 'review/webtocprinter'
+require 'book_test_helper'
+
+class WEBTOCPrinterTest < Test::Unit::TestCase
+  include ReVIEW
+  include BookTestHelper
+
+  def setup
+    I18n.setup
+  end
+
+  def test_webtocprinter_null
+    dummy_book = ReVIEW::Book::Base.load
+    chap = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
+    str = WEBTOCPrinter.book_to_string(dummy_book)
+    expect = <<-EOB
+<ul class="book-toc">
+<li><a href="index.html">TOP</a></li>
+</ul>
+EOB
+    assert_equal expect, str
+  end
+
+  def test_webtocprinter_with_chapters
+    catalog_yml = <<-EOB
+CHAPS:
+  - ch1.re
+  - ch2.re
+EOB
+    mktmpbookdir 'catalog.yml' => catalog_yml,
+                 'ch1.re' => "= ch. 1\n\n111\n",
+                 '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>
+</ul>
+EOB
+      assert_equal expect, str
+    end
+  end
+
+  def test_webtocprinter_with_parts
+    catalog_yml = <<-EOB
+CHAPS:
+  - part1:
+    - ch1.re
+  - part2:
+    - ch2.re
+EOB
+    mktmpbookdir 'catalog.yml' => catalog_yml,
+                 'ch1.re' => "= ch. 1\n\n111\n",
+                 '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>
+</ul>
+EOB
+      assert_equal expect, str
+    end
+  end
+
+  def test_webtocprinter_with_partfiles
+    catalog_yml = <<-EOB
+CHAPS:
+  - p1.re:
+    - ch1.re
+  - p2.re:
+    - ch2.re
+EOB
+    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|
+      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>
+</ul>
+EOB
+      assert_equal expect, str
+    end
+  end
+
+  def test_webtocprinter_full
+    catalog_yml = <<-EOB
+PREDEF:
+  - pre1.re
+  - pre2.re
+CHAPS:
+  - part1.re:
+    - ch1.re
+  - part2.re:
+    - ch2.re
+APPENDIX:
+  - app1.re
+  - app2.re
+POSTDEF:
+  - post1.re
+  - post2.re
+EOB
+    mktmpbookdir 'catalog.yml' => catalog_yml,
+                 'pre1.re' => "= PRE1\n\npre111\n",
+                 'pre2.re' => "= PRE2\n\npre222\n",
+                 'app1.re' => "= APP1\n\napp111\n",
+                 'app2.re' => "= APP2\n\napp222\n",
+                 'part1.re' => "= PART1\n\np111\n",
+                 'part2.re' => "= PART2\n\np111\n",
+                 '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|
+      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="./post1.html">POST1</a></li>
+<li><a href="./post2.html">POST2</a></li>
+</ul>
+EOB
+      assert_equal expect, str
+    end
+  end
+
+end