review 3.0.0 → 4.2.0

data/test/test_update.rb

@@ -14,7 +14,7 @@ class UpdateTest < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf @tmpdir
+    FileUtils.rm_rf(@tmpdir)
   end
 
   def test_broken_yml
@@ -96,19 +96,28 @@ EOT
     @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 '4.0'/, io.string)
+    assert_equal 'review_version: 4.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 '4.0'/, io.string)
+    assert_equal 'review_version: 4.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: 4.0\n")
 
     io = StringIO.new
     @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: 4.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
   def test_update_version_newer
@@ -118,7 +127,7 @@ EOT
     @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 '4.0'/, io.string)
     assert_equal 'review_version: 99.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
@@ -143,7 +152,7 @@ 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) }
@@ -389,7 +398,7 @@ EOT
     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

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

data/test/test_yamlloader.rb

@@ -184,4 +184,17 @@ EOB
                    yaml)
     end
   end
+
+  def test_empty_file
+    Dir.mktmpdir do |dir|
+      yaml_file = File.join(dir, 'test.yml')
+      File.open(yaml_file, 'w') do |f|
+        f.write <<EOB
+#
+EOB
+      end
+      e = assert_raise(RuntimeError) { @loader.load_file(yaml_file) }
+      assert_match('test.yml is malformed.', e.message)
+    end
+  end
 end

data/vendor/jsclasses/LICENSE

@@ -1,6 +1,6 @@
 Copyright 1995-1999 ASCII MEDIA WORKS
 Copyright 1999-2016 Haruhiko Okumura
-Copyright 2016-2018 Japanese TeX Development Community
+Copyright 2016-2020 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/vendor/jsclasses/jis/jsarticle.cls

@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsarticle}
-  [2018/06/23 jsclasses (okumura, texjporg)]
+  [2020/02/02 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsarticle}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -460,6 +460,7 @@
 \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined  % old
 \DeclareRobustCommand\rmfamily
         {\not@math@alphabet\rmfamily\mathrm
          \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -469,6 +470,25 @@
 \DeclareRobustCommand\ttfamily
         {\not@math@alphabet\ttfamily\mathtt
          \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+  \ifx\mweights@init\@undefined\else  % mweights.sty is loaded
+    % my definitions above should have been overwritten, recover it!
+    % \selectfont is executed twice but I don't care about speed...
+    \expandafter\g@addto@macro\csname rmfamily \endcsname
+      {\kanjifamily\mcdefault\selectfont}%
+    \expandafter\g@addto@macro\csname sffamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+    \expandafter\g@addto@macro\csname ttfamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+  \fi}
+\else                          % 2020-02-02
+\g@addto@macro\@rmfamilyhook
+  {\prepare@family@series@update@kanji{mc}\mcdefault}
+\g@addto@macro\@sffamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\g@addto@macro\@ttfamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi
 \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
 \DeclareRobustCommand\textmc[1]{%
     \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1370,11 +1390,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1519,7 +1539,7 @@
   \vskip\abovecaptionskip
   \sbox\@tempboxa{#1\hskip1zw\relax #2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1zw\relax #2\par
+  #1{\hskip1zw\relax}#2\par
   \vskip\belowcaptionskip}}
 \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1885,23 +1905,42 @@
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 $B85(B\else
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+      \kansuji\numexpr\year-#1\relax
+    \else
+      \number\numexpr\year-#1\relax\nobreak
+    \fi
+  \fi $BG/(B
+}
+\def\pltx@today@year{%
+  \ifnum\numexpr\year*10000+\month*100+\day<19890108
+    $B><OB(B\pltx@today@year@{1925}%
+  \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+    $BJ?@.(B\pltx@today@year@{1988}%
+  \else
+    $BNaOB(B\pltx@today@year@{2018}%
+  \fi\fi}
 \def\today{%
   \if@english
     \ifcase\month\or
       January\or February\or March\or April\or May\or June\or
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
+  \else\if$B@>Nq(B
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
+    \else\number\year\nobreak\fi $BG/(B
   \else
-    \if$B@>Nq(B
-      \number\year $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \else
-      $BJ?@.(B\number\heisei $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \fi
-  \fi}
+    \pltx@today@year
+  \fi
+  \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+    \kansuji\month $B7n(B
+    \kansuji\day $BF|(B
+  \else
+    \number\month\nobreak $B7n(B
+    \number\day\nobreak $BF|(B
+  \fi\fi}
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
 \pagenumbering{arabic}

data/vendor/jsclasses/jis/jsbook.cls

@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsbook}
-  [2018/06/23 jsclasses (okumura, texjporg)]
+  [2020/02/02 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsbook}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -465,6 +465,7 @@
 \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined  % old
 \DeclareRobustCommand\rmfamily
         {\not@math@alphabet\rmfamily\mathrm
          \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -474,6 +475,25 @@
 \DeclareRobustCommand\ttfamily
         {\not@math@alphabet\ttfamily\mathtt
          \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+  \ifx\mweights@init\@undefined\else  % mweights.sty is loaded
+    % my definitions above should have been overwritten, recover it!
+    % \selectfont is executed twice but I don't care about speed...
+    \expandafter\g@addto@macro\csname rmfamily \endcsname
+      {\kanjifamily\mcdefault\selectfont}%
+    \expandafter\g@addto@macro\csname sffamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+    \expandafter\g@addto@macro\csname ttfamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+  \fi}
+\else                          % 2020-02-02
+\g@addto@macro\@rmfamilyhook
+  {\prepare@family@series@update@kanji{mc}\mcdefault}
+\g@addto@macro\@sffamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\g@addto@macro\@ttfamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi
 \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
 \DeclareRobustCommand\textmc[1]{%
     \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1477,11 +1497,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1588,7 +1608,7 @@
   \vskip\abovecaptionskip
   \sbox\@tempboxa{#1\hskip1zw\relax #2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1zw\relax #2\par
+  #1{\hskip1zw\relax}#2\par
   \vskip\belowcaptionskip}}
 \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1976,23 +1996,42 @@
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 $B85(B\else
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+      \kansuji\numexpr\year-#1\relax
+    \else
+      \number\numexpr\year-#1\relax\nobreak
+    \fi
+  \fi $BG/(B
+}
+\def\pltx@today@year{%
+  \ifnum\numexpr\year*10000+\month*100+\day<19890108
+    $B><OB(B\pltx@today@year@{1925}%
+  \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+    $BJ?@.(B\pltx@today@year@{1988}%
+  \else
+    $BNaOB(B\pltx@today@year@{2018}%
+  \fi\fi}
 \def\today{%
   \if@english
     \ifcase\month\or
       January\or February\or March\or April\or May\or June\or
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
+  \else\if$B@>Nq(B
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
+    \else\number\year\nobreak\fi $BG/(B
   \else
-    \if$B@>Nq(B
-      \number\year $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \else
-      $BJ?@.(B\number\heisei $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \fi
-  \fi}
+    \pltx@today@year
+  \fi
+  \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+    \kansuji\month $B7n(B
+    \kansuji\day $BF|(B
+  \else
+    \number\month\nobreak $B7n(B
+    \number\day\nobreak $BF|(B
+  \fi\fi}
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \if@report \pagestyle{plain} \else \pagestyle{headings} \fi
 \pagenumbering{arabic}