review 5.1.1 → 5.2.0

data/review.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('mini_magick')
   gem.add_development_dependency('pygments.rb')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rubocop', '~> 1.10.0')
+  gem.add_development_dependency('rubocop', '~> 1.12.0')
   gem.add_development_dependency('rubocop-performance')
   gem.add_development_dependency('rubocop-rake')
   gem.add_development_dependency('simplecov')

data/samples/sample-book/src/lib/tasks/review.rake

@@ -130,15 +130,17 @@ file IDGXMLROOT => SRC do
   FileUtils.rm_rf([IDGXMLROOT])
 end
 
-desc 'run vivliostyle'
+desc 'preview with vivliostyle'
 task 'vivliostyle:preview': BOOK_EPUB do
   sh "#{REVIEW_VSCLI} preview #{REVIEW_VSCLI_USESANDBOX} #{REVIEW_VSCLI_OPTIONS} #{BOOK_EPUB}"
 end
 
+desc 'build with vivliostyle'
 task 'vivliostyle:build': BOOK_EPUB do
   sh "#{REVIEW_VSCLI} build #{REVIEW_VSCLI_USESANDBOX} #{REVIEW_VSCLI_OPTIONS} -o #{REVIEW_VSCLI_PDF} #{BOOK_EPUB}"
 end
 
+desc 'build with vivliostyle'
 task vivliostyle: 'vivliostyle:build'
 
 CLEAN.include([BOOK, BOOK_PDF, BOOK_EPUB, BOOK + '-pdf', BOOK + '-epub', WEBROOT, 'images/_review_math', 'images/_review_math_text', TEXTROOT, IDGXMLROOT])

data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake

@@ -1,5 +1,6 @@
-desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 REVIEW_TEMPLATE = ENV['REVIEW_TEMPLATE'] || 'review-jsbook'
+
+desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 task :copy_sty do
   review_rootdir = '../../..'
   template_dir = File.join(review_rootdir, "templates/latex/#{REVIEW_TEMPLATE}")

data/samples/syntax-book/lib/tasks/z01_copy_sty.rake

@@ -1,5 +1,6 @@
-desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 REVIEW_TEMPLATE = ENV['REVIEW_TEMPLATE'] || 'review-jsbook'
+
+desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 task :copy_sty do
   review_rootdir = '../..'
   template_dir = File.join(review_rootdir, "templates/latex/#{REVIEW_TEMPLATE}")

data/templates/latex/review-jlreq/review-base.sty

@@ -1,4 +1,4 @@
-\ProvidesClass{review-base}[2020/12/31]
+\ProvidesClass{review-base}[2021/06/28]
 % jlreq用基本設定
 \def\recls@tmp{luatex}\ifx\recls@tmp\recls@driver
   \hypersetup{
@@ -61,10 +61,7 @@
   \begin{figure}\begin{center}}{\end{center}\end{figure}}
 
 \newenvironment{reviewdummyimage}{%
-  \begin{figure}
-    \begin{center}\begin{alltt}}{%
-    \end{alltt}\end{center}
-  \end{figure}}
+  \begin{figure}\begin{center}}{\end{center}\end{figure}}
 
 \newcommand{\reviewindepimagecaption[2]}{\@makecaption{}{#2}}
 
@@ -388,6 +385,7 @@
 \ifdefined\review@toc
   \def\reviewtableofcontents{%
 \setcounter{tocdepth}{\review@tocdepth}
+\pagestyle{headings}
 \tableofcontents
 }
 \fi

data/templates/latex/review-jlreq/review-jlreq.cls

@@ -21,7 +21,7 @@
 
 \IfFileExists{plautopatch.sty}{\RequirePackage{plautopatch}}{}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{review-jlreq}[2021/01/12 Re:VIEW 5.1 upLaTeX/LuaLaTeX class modified for jlreq.cls]
+\ProvidesClass{review-jlreq}[2021/06/28 Re:VIEW 5.2 upLaTeX/LuaLaTeX class modified for jlreq.cls]
 
 %% hook at end of reviewmacro
 \let\@endofreviewmacrohook\@empty
@@ -82,7 +82,7 @@
 
 %% hiddenfolio=nikko-pc
 \@namedef{@makehiddenfolio@nikko-pc}{%
-  \jlreqtrimmarkssetup{banner = { center-gutter = { in = {\hiddenfolio@font\selectfont \thepage} } } } }
+  \jlreqtrimmarkssetup{banner = { center-gutter= { in = { \hiddenfolio@font\selectfont \thepage} } } } }
 
 %% hiddenfolio=shippo
 \@namedef{@makehiddenfolio@shippo}{%
@@ -218,7 +218,7 @@
 ]{hyperref}
 
 \def\recls@tmp{uplatex}\ifx\recls@tmp\recls@engine
-  \RequirePackage[\recls@driver]{pxjahyper}
+  \RequirePackage{pxjahyper}
 \fi
 
 %% include fullpage graphics
@@ -282,6 +282,7 @@
 % シンプルな通しノンブル
 \ifrecls@serialpage
   \jlreqsetup{frontmatter_pagination=continuous}
+  \if@openright\else\jlreqsetup{mainmatter_pagebreak=clearpage}\fi
 \fi
 
 % 開始ページを変更

data/templates/latex/review-jsbook/review-base.sty

@@ -1,4 +1,4 @@
-\ProvidesClass{review-base}[2020/12/31]
+\ProvidesClass{review-base}[2021/06/04]
 \RequirePackage{ifthen}
 \@ifundefined{Hy@Info}{% for jsbook.cls
   \RequirePackage[dvipdfmx,bookmarks=true,bookmarksnumbered=true]{hyperref}
@@ -112,8 +112,8 @@
 
 \newenvironment{reviewdummyimage}{%
   \begin{figure}
-    \begin{center}\begin{alltt}}{%
-    \end{alltt}\end{center}
+    \begin{center}}{%
+    \end{center}
   \end{figure}}
 
 \DeclareRobustCommand{\reviewincludegraphics}[2][]{%

data/templates/latex/review-jsbook/review-jsbook.cls

@@ -389,7 +389,7 @@
   hidelinks,
   setpagesize=false,
 ]{hyperref}
-\RequirePackage[dvipdfmx]{pxjahyper}
+\RequirePackage{pxjahyper}
 
 %% more useful macros
 %% ----------

data/test/test_builder.rb

@@ -85,15 +85,15 @@ class BuidlerTest < Test::Unit::TestCase
     chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.new, 1, 'chap1', nil, StringIO.new)
     b.bind(nil, chapter, nil)
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_list('unknown|list1') }
-    assert_equal ': error: unknown list: unknown|list1', e.message
+    assert_equal 'unknown list: unknown|list1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_table('unknown|table1') }
-    assert_equal ': error: unknown table: unknown|table1', e.message
+    assert_equal 'unknown table: unknown|table1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_img('unknown|img1') }
-    assert_equal ': error: unknown image: unknown|img1', e.message
+    assert_equal 'unknown image: unknown|img1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_column('unknown|column1') }
-    assert_equal ': error: unknown column: unknown|column1', e.message
+    assert_equal 'unknown column: unknown|column1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_fn('unknown|footnote1') }
-    assert_equal ': error: unknown footnote: unknown|footnote1', e.message
+    assert_equal 'unknown footnote: unknown|footnote1', e.message
   end
 
   def test_nest_error
@@ -102,16 +102,16 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal '', b.solve_nest('')
     b.children = ['dl']
     e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
-    assert_equal ': error: //beginchild of dl misses //endchild', e.message
+    assert_equal '//beginchild of dl misses //endchild', e.message
     b.children = ['ul', 'dl', 'ol']
     e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
-    assert_equal ': error: //beginchild of ol,dl,ul misses //endchild', e.message
+    assert_equal '//beginchild of ol,dl,ul misses //endchild', e.message
 
     assert_equal "\u0001→/ol←\u0001", b.endchild
     assert_equal "\u0001→/dl←\u0001", b.endchild
     assert_equal "\u0001→/ul←\u0001", b.endchild
     e = assert_raises(ReVIEW::ApplicationError) { b.endchild }
-    assert_equal ": error: //endchild is shown, but any opened //beginchild doesn't exist", e.message
+    assert_equal "//endchild is shown, but any opened //beginchild doesn't exist", e.message
   end
 
   class XBuilder < Builder

data/test/test_epubmaker.rb

@@ -13,6 +13,8 @@ class EPUBMakerTest < Test::Unit::TestCase
       'language' => 'en',
       'titlepage' => nil
     )
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @producer = ReVIEW::EPUBMaker::Producer.new(config)
   end
 
@@ -901,8 +903,8 @@ EOT
       assert_nothing_raised { epubmaker.copy_stylesheet(tmpdir) }
 
       epubmaker.config['stylesheet'] = ['nothing.css']
-      e = assert_raise(ApplicationError) { epubmaker.copy_stylesheet(tmpdir) }
-      assert_equal 'stylesheet: nothing.css is not found.', e.message
+      assert_raise(SystemExit) { epubmaker.copy_stylesheet(tmpdir) }
+      assert_equal "ERROR --: stylesheet: nothing.css is not found.\n", @log_io.string
     end
 
     epubmaker_instance do |epubmaker, tmpdir|
@@ -911,8 +913,9 @@ EOT
       assert_nothing_raised { epubmaker.copy_frontmatter(tmpdir) }
 
       epubmaker.config['titlefile'] = 'nothing.html'
-      e = assert_raise(ApplicationError) { epubmaker.copy_frontmatter(tmpdir) }
-      assert_equal 'titlefile: nothing.html is not found.', e.message
+      @log_io.string = ''
+      assert_raise(SystemExit) { epubmaker.copy_frontmatter(tmpdir) }
+      assert_equal "ERROR --: titlefile: nothing.html is not found.\n", @log_io.string
     end
 
     # XXX: only `cover' is allowed to have invalid file name.
@@ -922,8 +925,9 @@ EOT
         assert_nothing_raised { epubmaker.copy_frontmatter(tmpdir) }
 
         epubmaker.config[name] = 'nothing.html'
-        e = assert_raise(ApplicationError) { epubmaker.copy_frontmatter(tmpdir) }
-        assert_equal "#{name}: nothing.html is not found.", e.message
+        @log_io.string = ''
+        assert_raise(SystemExit) { epubmaker.copy_frontmatter(tmpdir) }
+        assert_equal "ERROR --: #{name}: nothing.html is not found.\n", @log_io.string
       end
     end
 
@@ -933,8 +937,9 @@ EOT
         assert_nothing_raised { epubmaker.copy_backmatter(tmpdir) }
 
         epubmaker.config[name] = 'nothing.html'
-        e = assert_raise(ApplicationError) { epubmaker.copy_backmatter(tmpdir) }
-        assert_equal "#{name}: nothing.html is not found.", e.message
+        @log_io.string = ''
+        assert_raise(SystemExit) { epubmaker.copy_backmatter(tmpdir) }
+        assert_equal "ERROR --: #{name}: nothing.html is not found.\n", @log_io.string
       end
     end
   end

data/test/test_epubmaker_cmd.rb

@@ -3,13 +3,13 @@ require 'tmpdir'
 require 'fileutils'
 require 'yaml'
 require 'rbconfig'
+require 'zip'
 
 REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', __dir__)
 
 class EPUBMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
-    @tmpdir2 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
     ENV['RUBYLIB'] = File.expand_path('lib', __dir__)
@@ -17,7 +17,6 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
 
   def teardown
     FileUtils.rm_rf(@tmpdir1)
-    FileUtils.rm_rf(@tmpdir2)
     ENV['RUBYLIB'] = @old_rubylib
   end
 
@@ -35,11 +34,23 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
     end
   end
 
+  def check_filesize(epubfile)
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+      Zip::File.open(epubfile) do |zio|
+        zio.each do |entry|
+          assert_not_equal(0, entry.size, "#{entry.name} is 0 byte.")
+        end
+      end
+    end
+  end
+
   def test_epubmaker_cmd_samplebook
     common_buildepub('sample-book/src', 'config.yml', 'book.epub')
+    check_filesize(File.join(@tmpdir1, 'book.epub'))
   end
 
   def test_epubmaker_cmd_syntaxbook
     common_buildepub('syntax-book', 'config.yml', 'syntax-book.epub')
+    check_filesize(File.join(@tmpdir1, 'syntax-book.epub'))
   end
 end

data/test/test_htmlbuilder.rb

@@ -16,6 +16,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @book = Book::Base.new('.')
     @book.config = @config
     img_math = ReVIEW::ImgMath.new(@config)
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @builder = HTMLBuilder.new(img_math: img_math)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
@@ -133,6 +135,48 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(\n<h3 id="test"><a id="h1-0-1"></a><span class="secno">1.0.1　</span>this is test.</h3>\n), actual
   end
 
+  def test_headline_sections
+    @book.config['epubmaker']['use_section'] = true
+    actual = compile_block("= H1\n== H2\n== H2-2\n")
+    expected = <<-EOS
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+<section class="level2">
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>H2</h2>
+</section>
+<section class="level2">
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>H2-2</h2>
+</section>
+</section>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("= H1\n== H2\n==== H4\n== H2-2\n")
+    expected = <<-EOS
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+<section class="level2">
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>H2</h2>
+<section class="level4">
+<h4><a id="h1-1-0-1"></a>H4</h4>
+</section>
+</section>
+<section class="level2">
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>H2-2</h2>
+</section>
+</section>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("===== H5\n= H1\n")
+    expected = <<-EOS
+<section class="level5">
+<h5><a id="h1-0-0-0-1"></a>H5</h5>
+</section>
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+</section>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_label
     actual = compile_block("//label[label_test]\n")
     assert_equal %Q(<a id="label_test"></a>\n), actual
@@ -2029,8 +2073,8 @@ EOS
   * AA
 EOS
 
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':1: error: too many *.', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_match(/too many \*\./, @log_io.string)
   end
 
   def test_ul_nest4
@@ -2378,10 +2422,10 @@ EOS
 
   def test_empty_table
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
-    assert_equal ':2: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
 
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
-    assert_equal ':3: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_inline_table
@@ -2736,8 +2780,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2753,8 +2797,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2770,8 +2814,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2813,28 +2857,26 @@ EOS
 EOB
       end
       @book.config['words_file'] = File.join(dir, 'words.csv')
-      io = StringIO.new
-      @builder.instance_eval { @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       assert_equal %Q(<p>foo bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ} <b>bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ}</b> [missing word: N]</p>\n), actual
-      assert_match(/WARN --: :1: word not bound: N/, io.string)
+      assert_match(/WARN --: :1: word not bound: N/, @log_io.string)
     end
   end
 
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
-    assert_equal ':1: error: unknown image: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
-    assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
-    assert_equal ':1: error: unknown headline: n', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
+    assert_match(/unknown image: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
+    assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ":1: error: unknown #{name}: n", e.message
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/unknown #{name}: n/, @log_io.string)
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ':1: error: key not found: "n"', e.message
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 
@@ -2909,7 +2951,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal "//beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -2927,7 +2969,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal '//beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -2947,7 +2989,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+    assert_equal '//beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul