review 3.1.0 → 5.0.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
@@ -64,7 +64,7 @@ EOT
       io = StringIO.new
       @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
       assert_raise(ApplicationError) { @u.check_old_catalogs(@tmpdir) }
-      assert_match(/review\-catalog\-converter/, io.string)
+      assert_match(/review-catalog-converter/, io.string)
 
       File.unlink(File.join(@tmpdir, fname))
     end
@@ -86,7 +86,7 @@ EOT
     io = StringIO.new
     @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
     @u.check_own_files(@tmpdir)
-    assert_match(/There is review\-ext\.rb file/, io.string)
+    assert_match(/There is review-ext\.rb file/, io.string)
   end
 
   def test_update_version_older
@@ -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 '5.0'/, io.string)
+    assert_equal 'review_version: 5.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 '5.0'/, io.string)
+    assert_equal 'review_version: 5.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: 5.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: 5.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 '5.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) }
@@ -376,7 +385,7 @@ EOT
 
     File.write(File.join(@tmpdir, 'sty/review-base.sty'), "% MODIFIED\n")
     @u.update_tex_stys('review-jsbook', @tmpdir)
-    assert_match(/review\-base\.sty will be overridden/, io.string)
+    assert_match(/review-base\.sty will be overridden/, io.string)
     assert_equal cont, File.read(File.join(@tmpdir, 'sty/review-base.sty'))
   end
 
@@ -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

@@ -11,7 +11,7 @@ class WEBTOCPrinterTest < Test::Unit::TestCase
   end
 
   def test_webtocprinter_null
-    dummy_book = ReVIEW::Book::Base.load
+    dummy_book = ReVIEW::Book::Base.new
     # chap = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
     str = WEBTOCPrinter.book_to_string(dummy_book)
     expect = <<-EOB
@@ -28,15 +28,15 @@ CHAPS:
   - ch1.re
   - ch2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    mktmpbookdir('catalog.yml' => catalog_yml,
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
+                 '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>
+<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
@@ -51,23 +51,19 @@ CHAPS:
   - part2:
     - ch2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    mktmpbookdir('catalog.yml' => catalog_yml,
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
+                 '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>
+<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
@@ -82,25 +78,21 @@ CHAPS:
   - p2.re:
     - ch2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    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|
+                 '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>
+<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
@@ -124,7 +116,7 @@ POSTDEF:
   - post1.re
   - post2.re
 EOB
-    mktmpbookdir 'catalog.yml' => catalog_yml,
+    mktmpbookdir('catalog.yml' => catalog_yml,
                  'pre1.re' => "= PRE1\n\npre111\n",
                  'pre2.re' => "= PRE2\n\npre222\n",
                  'app1.re' => "= APP1\n\napp111\n",
@@ -134,28 +126,68 @@ EOB
                  '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|
+                 '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="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/gentombow/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 Hironobu Yamashita
+Copyright (c) 2016-2020 Hironobu Yamashita
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/vendor/gentombow/Makefile

@@ -25,7 +25,6 @@ gentombow.pdf: gentombow.tex
 .PHONY: install clean
 install:
 	mkdir -p ${TEXMF}/doc/latex/gentombow
-	cp ./Makefile ${TEXMF}/doc/latex/gentombow/
 	cp ./LICENSE ${TEXMF}/doc/latex/gentombow/
 	cp ./README.md ${TEXMF}/doc/latex/gentombow/
 	cp ./*.pdf ${TEXMF}/doc/latex/gentombow/

data/vendor/gentombow/bounddvi-en.tex

@@ -130,6 +130,7 @@ using \textsf{bounddvi} package.
   \item 2016/10/25 v7.1 (HY) Support for p\LaTeXe\ tombow option,
                              compatibility with \textsf{graphics}/\textsf{color} packages
   \item 2016/12/28 v7.2 (HY) Documentation for the new \texttt{dvips} behavior
+  \item 2020/09/25 v8.0 (HY) Support for \LaTeXe/p\LaTeXe~2020-10-01
 \end{itemize}
 
 \end{document}

data/vendor/gentombow/bounddvi.sty

@@ -1,7 +1,7 @@
 %
 % bounddvi.sty
-% 2016/12/28 v7.2-v7.0 h.y.acetaminophen@gmail.com
-% 2004/12/15 v6.0-v1.0 inoue@ma.ns.tcu.ac.jp
+% 2020/09/25 v8.0-v7.0 h.y.acetaminophen [at] gmail.com
+% 2004/12/15 v6.0-v1.0 inoue [at] ma.ns.tcu.ac.jp
 %
 % This package, originally written by Koichi Inoue
 % and modified by Hironobu Yamashita, is distributed
@@ -10,7 +10,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bounddvi}[2016/12/28 v7.2 bounddvi]
+\ProvidesPackage{bounddvi}[2020/09/25 v8.0 bounddvi]
 
 % catcode trick to hide \iftombow ... \else ... \fi
 % since \iftombow is defined only in pLaTeX.
@@ -50,6 +50,33 @@ Q \fi
 % reset catcode trick
 \catcode`\Q=11\relax
 
+%% Since LaTeX2e 2020-10-01, \@begindocumenthook is deprecated
+%% and \UseHook{begindocument} etc. are used.
+%% This code appends papersize special to the _end_ of the hook.
+%% (Note: support for old dvips is removed.)
+\ifx\AddToHook\@undefined\else
+  \AtBeginDocument{\AtBeginDvi{%
+    \begingroup
+      % if \stockwidth/\stockheight are defined & have effective
+      % values, copy them to \paperwidth/\paperheight
+      % for current group
+      \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
+        \paperwidth\stockwidth
+      \fi\fi
+      \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
+        \paperheight\stockheight
+      \fi\fi
+      % adjust for \mag and emit papersize special
+      \divide\paperwidth\@m\multiply\paperwidth\mag
+      \divide\paperheight\@m\multiply\paperheight\mag
+      \special{papersize=\the\paperwidth,\the\paperheight}%
+    \endgroup}}
+  \expandafter\endinput
+\fi
+
+%% The rest of this package is meant for
+%% LaTeX2e 2020-02-02 PL5 or older.
+
 % following code is almost equivalent to
 %   \AtBeginDocument{\AtBeginDvi{...}}
 % however, we append the specification to the _beginning_ of
@@ -59,16 +86,12 @@ Q \fi
 \def\@prependto@begindocumenthook{\global\setbox\@begindvibox
   \vbox{\csname yoko\endcsname\unvbox\@begindvibox
     \begingroup
-      % if \stockwidth/\stockheight are defined & have effective
-      % values, copy them to \paperwidth/\paperheight
-      % for current group
       \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
         \paperwidth\stockwidth
       \fi\fi
       \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
         \paperheight\stockheight
       \fi\fi
-      % adjust for \mag and emit papersize special
       \divide\paperwidth\@m\multiply\paperwidth\mag
       \divide\paperheight\@m\multiply\paperheight\mag
       \special{papersize=\the\paperwidth,\the\paperheight}%

data/vendor/gentombow/bounddvi.tex

@@ -143,6 +143,7 @@ DVIファイルは用紙サイズ情報を含みませんが、PostScriptやPDF
   \item 2016/10/25 v7.1 (HY) p\LaTeXe{}のトンボサポート、
                              2016年の新しい\textsf{graphics}/\textsf{color}に対応
   \item 2016/12/28 v7.2 (HY) 新仕様の\texttt{dvips}をドキュメント化
+  \item 2020/09/25 v8.0 (HY) \LaTeXe/p\LaTeXe~2020-10-01（予定）への対応
 \end{itemize}
 
 \end{document}

data/vendor/gentombow/create_archive.sh

@@ -14,6 +14,7 @@ echo " * Create $PROJECT.zip ($RELEASEDATE)"
 git archive --format=tar --prefix=$PROJECT/ HEAD | (cd $TMP && tar xf -)
 rm $TMP/$PROJECT/.gitignore
 rm $TMP/$PROJECT/create_archive.sh
+rm $TMP/$PROJECT/Makefile
 rm -rf $TMP/$PROJECT/tests
 perl -pi.bak -e "s/\\\$RELEASEDATE/$RELEASEDATE/g" $TMP/$PROJECT/README.md
 rm -f $TMP/$PROJECT/README.md.bak

data/vendor/gentombow/gentombow-ja.tex

@@ -291,6 +291,9 @@ CMYKの版ごとにトンボを作成する場合や、特色のトンボが必
 \item \verb+/BleedBox+: 裁ち落とし領域を含んだサイズ。
 \item \verb+/CropBox+, \verb+/ArtBox+: 明示しない。
 \end{itemize}
+注意：\textsf{pdfx}パッケージがPDF/Xモードで読み込まれていれば、
+このオプション機能は自動的に有効化されます。
+また、\verb+/CropBox+も明示します。
 
 \section{その他の注意点}
 
@@ -390,6 +393,11 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以
 \end{verbatim}
 \end{dangerous}
 
+なお、\textsf{geometry}パッケージは用紙サイズ
+(\verb+\paperwidth+, \verb+\paperheight+)を変更する場合もあります。
+こうした場合に備え、\textsf{gentombow}パッケージは
+\textsf{geometry}パッケージよりも後に読み込むようにしてください。
+
 \section*{雑記}
 
 発端はこの話です。
@@ -444,6 +452,7 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以
                          \verb+pdfbox+オプションが正常動作するように改良、
                          \verb+\settombowbleed+が\verb+/TrimBox+に反映されな
                          かったバグの修正
+  \item 2019/07/21 v0.9k \textsf{pdfx}パッケージとの整合性をとる改良
 \end{itemize}
 
 \end{document}

data/vendor/gentombow/gentombow.sty

@@ -8,7 +8,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gentombow}
-    [2018/08/30 v0.9j Generate crop mark 'tombow']
+    [2019/07/21 v0.9k Generate crop mark 'tombow']
 \def\pxgtmb@pkgname{gentombow}
 \@namedef{ver@pxgentombow.sty}{}% fake
 
@@ -290,6 +290,7 @@
 %% prepare flag
 \newif\ifpxgtmb@switch    \pxgtmb@switchfalse
 \newif\ifpxgtmb@landscape \pxgtmb@landscapefalse
+\newif\ifpxgtmb@pdfx@x    \pxgtmb@pdfx@xfalse
 
 %% passed from class options
 %% should be declared first inside this package (least priority)
@@ -507,7 +508,7 @@
 %% pdf "digital tombo" (driver-dependent)
 %  the box size calculation is delayed until \AtBeginDocument
 %  to allow users to change \@tombowbleed in the preamble
-\if 1\pxgtmb@pdfbox@status
+
 % convert pt -> bp
 \def\pxgtmb@PDF@setbp#1#2{%
   \@tempdima=.996264#2\relax % 0.996264 = 72/72.27 (cf. 1in = 72.27pt = 72bp)
@@ -521,8 +522,8 @@
     \def\pxgtmb@magscale{1}%
   \fi
   % set pdf boxes in bp unit
-  %\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@x\stockwidth
-  %\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@y\stockheight
+  \pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@x\stockwidth
+  \pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@y\stockheight
   \pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@x{\dimexpr(\stockwidth-\paperwidth)/2}%
   \pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@y{\dimexpr(\stockheight-\paperheight)/2}%
   \pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ur@x{\dimexpr(\stockwidth+\paperwidth)/2}%
@@ -532,8 +533,14 @@
   \pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@x{\dimexpr(\stockwidth+\paperwidth)/2+\@tombowbleed}%
   \pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@y{\dimexpr(\stockheight+\paperheight)/2+\@tombowbleed}%
   \xdef\pxgtmb@PDF@CTM{%
-    %% CropBox: implicit (same as MediaBox, large paper size)
-    %/CropBox  [0 0 \pxgtmb@PDF@crop@ur@x\space \pxgtmb@PDF@crop@ur@y]
+    %% CropBox: normally implicit (same as MediaBox, large paper size)
+    %% however, pdfx.sty in PDF/X mode sets /CropBox explicitly, so I need to override it!
+   \ifpxgtmb@pdfx@x
+    \noexpand\pxgtmb@PDF@begin
+    /CropBox  [0 0
+               \pxgtmb@PDF@crop@ur@x\space
+               \pxgtmb@PDF@crop@ur@y] \noexpand\pxgtmb@PDF@end
+   \fi
     %% BleedBox: explicit (final paper size + surrounding \@tombowbleed)
     \noexpand\pxgtmb@PDF@begin
     /BleedBox [\pxgtmb@PDF@bleed@ll@x\space
@@ -547,9 +554,20 @@
                \pxgtmb@PDF@trim@ur@x\space
                \pxgtmb@PDF@trim@ur@y] \noexpand\pxgtmb@PDF@end
     %% ArtBox: implicit
+    %% [Note] PDF/X requires /TrimBox or /ArtBox but not both!
   }%
   \endgroup
 }
+
+% do it
+\AtBeginDocument{\pxgtmb@PDF@emit}
+\def\pxgtmb@PDF@emit{%
+  % handle compatibility with pdfx.sty here;
+  % if pdfx.sty with PDF/X mode detected, force [pdfbox] option!
+  \pxgtmb@handle@pdfx
+  \ifpxgtmb@pdfx@x\def\pxgtmb@pdfbox@status{1}\fi
+  % start actual procedure for [pdfbox] option
+ \if 1\pxgtmb@pdfbox@status
 %% supported drivers: dvips, dvipdfmx, XeTeX, pdfTeX, LuaTeX
 \ifnum0\ifx\pdfvariable\@undefined\else\the\outputmode\fi=0\relax
 \ifnum0\ifx\pdfpageattr\@undefined\else\the\pdfoutput\fi=0\relax
@@ -666,8 +684,7 @@
     \def\pxgtmb@PDF@begin{}\def\pxgtmb@PDF@end{}%
     \edef\pxgtmb@PDF@CTM{{\pxgtmb@PDF@CTM}}%
     \expandafter\pdfpageattr\pxgtmb@PDF@CTM}
-\fi
-\else
+\fi\else
   %% for LuaTeX
   \def\pxgtmb@driver{l}
   % force paper size
@@ -679,7 +696,8 @@
     \edef\pxgtmb@PDF@CTM{pageattr{\pxgtmb@PDF@CTM}}%
     \expandafter\pdfvariable\pxgtmb@PDF@CTM}
 \fi
-\fi
+ \fi
+}
 
 %% make visible tombow box according to the current status of
 %% \@bannerfont, \@bannertoken, \@tombowwidth & \@tombowbleed
@@ -713,7 +731,7 @@
 % because pdf boxes are calculated only inside \AtBeginDocument
 \@onlypreamble\settombowbleed
 
-%% patch internal for pdfpages to work with tombow
+%% patch internal of pdfpages.sty to work with tombow
 %% (tested on pdfpages 2017/10/31 v0.5l)
 %% Note the code is the same as that of pxpdfpages.sty,
 %% but reserved here since gentombow.sty can be used on
@@ -744,4 +762,8 @@
 %% do it
 \AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb@patch@pdfpages}{}}
 
+%% patch pdfx.sty
+%% (tested on pdfx 2019/02/27 v1.6.3)
+\def\pxgtmb@handle@pdfx{\@ifpackageloaded{pdfx}{\let\ifpxgtmb@pdfx@x\ifpdfx@x}{}}
+
 \endinput