review 4.0.0 → 4.1.0

data/test/test_pdfmaker_cmd.rb

@@ -3,6 +3,7 @@ require 'tmpdir'
 require 'fileutils'
 require 'yaml'
 require 'rbconfig'
+require 'open3'
 
 REVIEW_PDFMAKER = File.expand_path('../bin/review-pdfmaker', File.dirname(__FILE__))
 
@@ -19,18 +20,111 @@ class PDFMakerCmdTest < Test::Unit::TestCase
     ENV['RUBYLIB'] = @old_rubylib
   end
 
-  def test_pdfmaker_cmd
+  def common_buildpdf(bookdir, templatedir, configfile, targetpdffile, option = nil)
     if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
-      config = prepare_samplebook(@tmpdir1)
+      config = prepare_samplebook(@tmpdir1, bookdir, templatedir, configfile)
       builddir = File.join(@tmpdir1, config['bookname'] + '-pdf')
-      # assert !File.exist?(builddir)
+      assert !File.exist?(builddir)
 
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
       Dir.chdir(@tmpdir1) do
-        system("#{ruby_cmd} -S #{REVIEW_PDFMAKER} config.yml 1>/dev/null 2>/dev/null")
+        _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_PDFMAKER} #{option} #{configfile}")
+        if !e.empty? && !s.success?
+          STDERR.puts e
+        end
+        assert s.success?
       end
+      assert File.exist?(File.join(@tmpdir1, targetpdffile))
+    end
+  end
+
+  def test_pdfmaker_cmd_sample_jsbook_print
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jsbook_print'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jsbook', 'config.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_sample_jsbook_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jsbook_ebook'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jsbook', 'config-ebook.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_sample_jlreq_print
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jlreq_print'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jlreq', 'config-jlreq.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_sample_jlreq_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jlreq_ebook'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jlreq', 'config-jlreq-ebook.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_syntax_jsbook_print
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_print'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jsbook', 'config-print.yml', 'syntax-book.pdf')
+  end
+
+  def test_pdfmaker_cmd_syntax_jsbook_print_buildonly
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_print_buildonly'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jsbook', 'config-print.yml', 'syntax-book.pdf', '-y ch01')
+  end
+
+  def test_pdfmaker_cmd_syntax_jsbook_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_ebook'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jsbook', 'config.yml', 'syntax-book.pdf')
+  end
+
+  def test_pdfmaker_cmd_syntax_jlreq_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jlreq_ebook'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jlreq', 'config-jlreq.yml', 'syntax-book.pdf')
+  end
 
-      assert File.exist?(builddir)
+  def test_pdfmaker_cmd_syntax_jlreq_ebook_lualatex
+    begin
+      `lualatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jlreq_ebook_lualatex'
+      return true
     end
+    common_buildpdf('syntax-book', 'review-jlreq', 'config-jlreq-lualatex.yml', 'syntax-book.pdf')
   end
 end

data/test/test_textmaker_cmd.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+require 'tmpdir'
+require 'fileutils'
+require 'yaml'
+require 'rbconfig'
+require 'open3'
+
+REVIEW_TEXTMAKER = File.expand_path('../bin/review-textmaker', File.dirname(__FILE__))
+
+class TEXTMakerCmdTest < Test::Unit::TestCase
+  def setup
+    @tmpdir1 = Dir.mktmpdir
+
+    @old_rubylib = ENV['RUBYLIB']
+    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+  end
+
+  def teardown
+    FileUtils.rm_rf(@tmpdir1)
+    ENV['RUBYLIB'] = @old_rubylib
+  end
+
+  def common_buildtext(bookdir, configfile, targetfile, option)
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+      config = prepare_samplebook(@tmpdir1, bookdir, nil, configfile)
+      builddir = File.join(@tmpdir1, config['bookname'] + '-text')
+      assert !File.exist?(builddir)
+
+      ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']
+      Dir.chdir(@tmpdir1) do
+        _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_TEXTMAKER} #{option} #{configfile}")
+        STDERR.puts e unless e.empty?
+        assert s.success?
+      end
+      assert File.exist?(File.join(@tmpdir1, targetfile))
+    end
+  end
+
+  def test_textmaker_cmd_samplebook
+    common_buildtext('sample-book/src', 'config.yml', 'book-text/ch01.txt', nil)
+  end
+
+  def test_textmaker_cmd_samplebook_plain
+    common_buildtext('sample-book/src', 'config.yml', 'book-text/ch01.txt', '-n')
+  end
+
+  def test_textmaker_cmd_syntaxbook
+    common_buildtext('syntax-book', 'config.yml', 'syntax-book-text/ch01.txt', nil)
+  end
+
+  def test_textmaker_cmd_syntaxbook_plain
+    common_buildtext('syntax-book', 'config.yml', 'syntax-book-text/ch01.txt', '-n')
+  end
+end

data/test/test_topbuilder.rb

@@ -170,6 +170,19 @@ para
 
 ●\tbar
 
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_dt_inline
+    fn = Book::FootnoteIndex.parse(['//footnote[bar][bar]'])
+    @chapter.instance_eval { @footnote_index = fn }
+    actual = compile_block(" : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
+
+    expected = <<-EOS
+★foo【注1】[]<>&◆→TeX式ここから←◆\\alpha[]◆→TeX式ここまで←◆☆
+	
+
 EOS
     assert_equal expected, actual
   end
@@ -462,6 +475,52 @@ ccc\tddd<>&
 ccc\tddd<>&
 ◆→終了:表←◆
 
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_table_row_separator
+    src = "//table{\n1\t2\t\t3  4| 5\n------------\na b\tc  d   |e\n//}\n"
+    expected = <<-EOS
+◆→開始:表←◆
+★1☆	★2☆	★3  4| 5☆
+a b	c  d   |e	
+◆→終了:表←◆
+
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'singletab'
+    actual = compile_block(src)
+    expected = <<-EOS
+◆→開始:表←◆
+★1☆	★2☆	★☆	★3  4| 5☆
+a b	c  d   |e		
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'spaces'
+    actual = compile_block(src)
+    expected = <<-EOS
+◆→開始:表←◆
+★1☆	★2☆	★3☆	★4|☆	★5☆
+a	b	c	d	|e
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'verticalbar'
+    actual = compile_block(src)
+    expected = <<-EOS
+◆→開始:表←◆
+★1	2		3  4☆	★5☆
+a b	c  d	e
+◆→終了:表←◆
+
 EOS
     assert_equal expected, actual
   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}