review 4.1.0 → 5.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ruby-tex.yml +35 -0
- data/.github/workflows/ruby-win.yml +19 -9
- data/.github/workflows/ruby.yml +7 -3
- data/.rubocop.yml +138 -34
- data/NEWS.ja.md +285 -0
- data/NEWS.md +285 -1
- data/README.md +7 -6
- data/Rakefile +7 -2
- data/bin/review +2 -4
- data/bin/review-catalog-converter +4 -4
- data/bin/review-check +8 -12
- data/bin/review-checkdep +2 -5
- data/bin/review-compile +18 -34
- data/bin/review-epub2html +1 -4
- data/bin/review-epubmaker +3 -4
- data/bin/review-idgxmlmaker +1 -3
- data/bin/review-index +5 -86
- data/bin/review-init +1 -4
- data/bin/review-pdfmaker +1 -3
- data/bin/review-preproc +30 -38
- data/bin/review-textmaker +1 -3
- data/bin/review-update +1 -4
- data/bin/review-validate +4 -4
- data/bin/review-vol +5 -82
- data/bin/review-webmaker +1 -3
- data/doc/config.yml.sample +45 -11
- data/doc/config.yml.sample-simple +3 -3
- data/doc/format.ja.md +103 -13
- data/doc/format.md +104 -16
- data/doc/makeindex.ja.md +2 -2
- data/doc/pdfmaker.ja.md +42 -0
- data/doc/pdfmaker.md +41 -0
- data/doc/quickstart.ja.md +19 -6
- data/doc/quickstart.md +18 -6
- data/doc/writing_vertical.ja.md +6 -0
- data/lib/review.rb +1 -1
- data/lib/review/book.rb +2 -2
- data/lib/review/book/base.rb +67 -29
- data/lib/review/book/bib.rb +21 -0
- data/lib/review/book/book_unit.rb +158 -0
- data/lib/review/book/chapter.rb +33 -26
- data/lib/review/book/index.rb +24 -185
- data/lib/review/book/index/item.rb +7 -1
- data/lib/review/book/page_metric.rb +7 -7
- data/lib/review/book/part.rb +26 -11
- data/lib/review/book/volume.rb +5 -5
- data/lib/review/builder.rb +121 -52
- data/lib/review/call_hook.rb +20 -0
- data/lib/review/catalog.rb +3 -2
- data/lib/review/compiler.rb +230 -111
- data/lib/review/configure.rb +91 -7
- data/lib/review/converter.rb +1 -1
- data/lib/review/epub2html.rb +6 -1
- data/lib/review/epubmaker.rb +124 -152
- data/lib/review/epubmaker/content.rb +113 -0
- data/lib/review/epubmaker/epubcommon.rb +372 -0
- data/lib/review/epubmaker/epubv2.rb +178 -0
- data/lib/review/epubmaker/epubv3.rb +231 -0
- data/lib/review/epubmaker/producer.rb +167 -0
- data/lib/review/epubmaker/reviewheaderlistener.rb +12 -2
- data/lib/review/epubmaker/zip_exporter.rb +84 -0
- data/lib/review/exception.rb +13 -0
- data/lib/review/htmlbuilder.rb +176 -89
- data/lib/review/htmlutils.rb +8 -11
- data/lib/review/i18n.rb +2 -1
- data/lib/review/idgxmlbuilder.rb +165 -75
- data/lib/review/idgxmlmaker.rb +24 -28
- data/lib/review/img_math.rb +238 -0
- data/lib/review/index_builder.rb +645 -0
- data/lib/review/init.rb +9 -17
- data/lib/review/latexbox.rb +58 -0
- data/lib/review/latexbuilder.rb +193 -75
- data/lib/review/latexutils.rb +9 -1
- data/lib/review/lineinput.rb +112 -2
- data/lib/review/loggable.rb +27 -0
- data/lib/review/logger.rb +90 -3
- data/lib/review/makerhelper.rb +17 -188
- data/lib/review/markdownbuilder.rb +54 -4
- data/lib/review/pdfmaker.rb +76 -84
- data/lib/review/plaintextbuilder.rb +106 -22
- data/lib/review/preprocessor.rb +107 -303
- data/lib/review/preprocessor/directive.rb +35 -0
- data/lib/review/preprocessor/line.rb +34 -0
- data/lib/review/preprocessor/repository.rb +177 -0
- data/lib/review/rstbuilder.rb +27 -8
- data/lib/review/sec_counter.rb +14 -0
- data/lib/review/template.rb +11 -1
- data/lib/review/textmaker.rb +27 -32
- data/lib/review/textutils.rb +3 -12
- data/lib/review/tocprinter.rb +242 -97
- data/lib/review/topbuilder.rb +98 -31
- data/lib/review/update.rb +12 -13
- data/lib/review/version.rb +1 -1
- data/lib/review/volumeprinter.rb +97 -0
- data/lib/review/webmaker.rb +40 -47
- data/lib/review/webtocprinter.rb +39 -35
- data/lib/review/yamlloader.rb +2 -1
- data/review.gemspec +5 -3
- data/samples/sample-book/src/config-epub2.yml +1 -1
- data/samples/sample-book/src/config.yml +3 -3
- data/samples/sample-book/src/lib/tasks/review.rake +19 -1
- data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake +2 -1
- data/samples/syntax-book/Gemfile +1 -1
- data/samples/syntax-book/ch01.re +1 -1
- data/samples/syntax-book/ch02.re +21 -6
- data/samples/syntax-book/ch03.re +1 -1
- data/samples/syntax-book/config.yml +1 -1
- data/samples/syntax-book/images/img3-2.png +0 -0
- data/samples/syntax-book/lib/tasks/z01_copy_sty.rake +2 -1
- data/templates/html/_colophon.html.erb +23 -0
- data/templates/html/_colophon_history.html.erb +9 -0
- data/templates/html/_cover.html.erb +10 -0
- data/templates/html/_part_body.html.erb +6 -0
- data/templates/html/_titlepage.html.erb +20 -0
- data/templates/html/layout-html5.html.erb +6 -0
- data/templates/html/layout-xhtml1.html.erb +6 -0
- data/templates/latex/config.erb +35 -23
- data/templates/latex/review-jlreq/README.md +3 -1
- data/templates/latex/review-jlreq/review-base.sty +36 -23
- data/templates/latex/review-jlreq/review-jlreq.cls +18 -25
- data/templates/latex/review-jlreq/review-style.sty +6 -1
- data/templates/latex/review-jlreq/review-tcbox.sty +348 -0
- data/templates/latex/review-jlreq/reviewmacro.sty +5 -0
- data/templates/latex/review-jsbook/README.md +7 -5
- data/templates/latex/review-jsbook/review-base.sty +40 -24
- data/templates/latex/review-jsbook/review-jsbook.cls +13 -3
- data/templates/latex/review-jsbook/review-style.sty +6 -1
- data/templates/latex/review-jsbook/review-tcbox.sty +348 -0
- data/templates/latex/review-jsbook/reviewmacro.sty +5 -0
- data/templates/opf/epubv2.opf.erb +7 -7
- data/templates/opf/epubv3.opf.erb +7 -7
- data/templates/opf/opf_manifest_epubv2.opf.erb +10 -0
- data/templates/opf/opf_manifest_epubv3.opf.erb +10 -0
- data/templates/opf/opf_metainfo_epubv2.opf.erb +17 -0
- data/templates/opf/opf_metainfo_epubv3.opf.erb +49 -0
- data/templates/opf/opf_tocx_epubv2.opf.erb +9 -0
- data/templates/opf/opf_tocx_epubv3.opf.erb +17 -0
- data/templates/web/html/layout-html5.html.erb +9 -8
- data/templates/web/html/layout-xhtml1.html.erb +6 -0
- data/test/assets/header_listener.html +35 -0
- data/test/assets/img_math/img1.png +0 -0
- data/test/assets/img_math/img2.png +0 -0
- data/test/assets/img_math/img3.png +0 -0
- data/test/assets/syntax_book_index_detail.txt +58 -0
- data/test/assets/test_template.tex +6 -3
- data/test/assets/test_template_backmatter.tex +6 -3
- data/test/book_test_helper.rb +11 -5
- data/test/run_test.rb +1 -1
- data/test/test_book.rb +54 -63
- data/test/test_book_chapter.rb +95 -54
- data/test/test_book_part.rb +3 -3
- data/test/test_builder.rb +29 -20
- data/test/test_catalog_converter_cmd.rb +1 -1
- data/test/test_converter.rb +1 -0
- data/test/test_epub3maker.rb +170 -126
- data/test/test_epubmaker.rb +254 -129
- data/test/test_epubmaker_cmd.rb +15 -4
- data/test/test_helper.rb +12 -5
- data/test/test_htmlbuilder.rb +926 -76
- data/test/test_htmlutils.rb +0 -12
- data/test/test_i18n.rb +33 -33
- data/test/test_idgxmlbuilder.rb +531 -20
- data/test/test_idgxmlmaker_cmd.rb +7 -3
- data/test/test_img_math.rb +111 -0
- data/test/test_index.rb +62 -52
- data/test/test_indexbuilder.rb +52 -0
- data/test/test_latexbuilder.rb +891 -20
- data/test/test_latexbuilder_v2.rb +56 -10
- data/test/test_lineinput.rb +20 -93
- data/test/test_logger.rb +7 -7
- data/test/test_makerhelper.rb +0 -12
- data/test/test_markdownbuilder.rb +32 -0
- data/test/test_pdfmaker.rb +100 -11
- data/test/test_pdfmaker_cmd.rb +3 -3
- data/test/test_plaintextbuilder.rb +546 -32
- data/test/test_preprocessor.rb +188 -1
- data/test/test_review_ext.rb +2 -1
- data/test/test_reviewheaderlistener.rb +49 -0
- data/test/test_rstbuilder.rb +25 -1
- data/test/test_sec_counter.rb +156 -0
- data/test/test_template.rb +12 -2
- data/test/test_textmaker_cmd.rb +5 -1
- data/test/test_tocprinter.rb +46 -0
- data/test/test_topbuilder.rb +324 -20
- data/test/test_update.rb +44 -44
- data/test/test_webtocprinter.rb +75 -43
- data/test/test_zip_exporter.rb +5 -6
- data/vendor/gentombow/LICENSE +1 -1
- data/vendor/gentombow/Makefile +0 -1
- data/vendor/gentombow/bounddvi-en.pdf +0 -0
- data/vendor/gentombow/bounddvi-en.tex +1 -0
- data/vendor/gentombow/bounddvi.pdf +0 -0
- data/vendor/gentombow/bounddvi.sty +30 -7
- data/vendor/gentombow/bounddvi.tex +1 -0
- data/vendor/gentombow/create_archive.sh +1 -0
- data/vendor/gentombow/gentombow-ja.pdf +0 -0
- data/vendor/gentombow/gentombow-ja.tex +9 -0
- data/vendor/gentombow/gentombow.pdf +0 -0
- data/vendor/gentombow/gentombow.sty +32 -10
- data/vendor/gentombow/gentombow.tex +8 -0
- data/vendor/gentombow/tests/gentombow-01-pdfx.tex +8 -0
- data/vendor/gentombow/tests/gentombow-02-pdfx.tex +8 -0
- data/vendor/jsclasses/Makefile +3 -2
- data/vendor/jsclasses/create_archive.sh +5 -5
- data/vendor/jsclasses/jis/Makefile +3 -2
- data/vendor/jsclasses/jis/jsarticle.cls +22 -18
- data/vendor/jsclasses/jis/jsbook.cls +22 -18
- data/vendor/jsclasses/jis/jsclasses.dtx +94 -13
- data/vendor/jsclasses/jis/jsclasses.ins +15 -5
- data/vendor/jsclasses/jis/jslogo.ins +9 -0
- data/vendor/jsclasses/jis/jslogo.sty +1 -13
- data/vendor/jsclasses/jis/jspf.cls +22 -18
- data/vendor/jsclasses/jis/jsreport.cls +22 -18
- data/vendor/jsclasses/jis/jsverb.ins +9 -0
- data/vendor/jsclasses/jis/jsverb.sty +1 -13
- data/vendor/jsclasses/jis/kiyou.cls +22 -18
- data/vendor/jsclasses/jis/minijs.sty +65 -22
- data/vendor/jsclasses/jis/okumacro.ins +9 -0
- data/vendor/jsclasses/jis/okumacro.sty +1 -13
- data/vendor/jsclasses/jis/okuverb.ins +9 -0
- data/vendor/jsclasses/jis/okuverb.sty +1 -13
- data/vendor/jsclasses/jis/winjis.sty +23 -19
- data/vendor/jsclasses/jsarticle.cls +22 -18
- data/vendor/jsclasses/jsbook.cls +22 -18
- data/vendor/jsclasses/jsclasses.dtx +94 -13
- data/vendor/jsclasses/jsclasses.ins +15 -5
- data/vendor/jsclasses/jsclasses.pdf +0 -0
- data/vendor/jsclasses/jslogo.ins +9 -0
- data/vendor/jsclasses/jslogo.pdf +0 -0
- data/vendor/jsclasses/jslogo.sty +1 -13
- data/vendor/jsclasses/jspf.cls +22 -18
- data/vendor/jsclasses/jsreport.cls +22 -18
- data/vendor/jsclasses/jsverb.ins +9 -0
- data/vendor/jsclasses/jsverb.pdf +0 -0
- data/vendor/jsclasses/jsverb.sty +1 -13
- data/vendor/jsclasses/kiyou.cls +22 -18
- data/vendor/jsclasses/minijs.sty +68 -22
- data/vendor/jsclasses/okumacro.ins +9 -0
- data/vendor/jsclasses/okumacro.pdf +0 -0
- data/vendor/jsclasses/okumacro.sty +1 -13
- data/vendor/jsclasses/okuverb.ins +9 -0
- data/vendor/jsclasses/okuverb.pdf +0 -0
- data/vendor/jsclasses/okuverb.sty +1 -13
- data/vendor/jsclasses/tests/relfont.tex +10 -0
- data/vendor/jsclasses/winjis.sty +23 -19
- metadata +106 -22
- data/.rubocop_todo.yml +0 -7
- data/lib/epubmaker.rb +0 -23
- data/lib/epubmaker/content.rb +0 -110
- data/lib/epubmaker/epubcommon.rb +0 -441
- data/lib/epubmaker/epubv2.rb +0 -143
- data/lib/epubmaker/epubv3.rb +0 -233
- data/lib/epubmaker/producer.rb +0 -375
- data/lib/epubmaker/zip_exporter.rb +0 -81
- data/lib/lineinput.rb +0 -155
- data/lib/review/book/compilable.rb +0 -178
- data/lib/review/tocparser.rb +0 -275
- data/test/test_tocparser.rb +0 -25
data/test/test_zip_exporter.rb
CHANGED
@@ -1,11 +1,9 @@
|
|
1
1
|
require 'test_helper'
|
2
|
-
require 'epubmaker'
|
3
|
-
require 'epubmaker/zip_exporter'
|
2
|
+
require 'review/epubmaker'
|
3
|
+
require 'review/epubmaker/zip_exporter'
|
4
4
|
require 'fileutils'
|
5
5
|
|
6
6
|
class ZipExporterTest < Test::Unit::TestCase
|
7
|
-
include EPUBMaker
|
8
|
-
|
9
7
|
def setup
|
10
8
|
@tmpdir = Dir.mktmpdir
|
11
9
|
@epubdir = File.join(@tmpdir, 'epubdir')
|
@@ -67,7 +65,7 @@ class ZipExporterTest < Test::Unit::TestCase
|
|
67
65
|
|
68
66
|
config = { 'epubmaker' => {} }
|
69
67
|
epubfile = File.join(@tmpdir, 'test.epub')
|
70
|
-
exporter = ZipExporter.new(@epubdir, config)
|
68
|
+
exporter = ReVIEW::EPUBMaker::ZipExporter.new(@epubdir, config)
|
71
69
|
exporter.export_zip_extcmd(epubfile)
|
72
70
|
assert_true(File.exist?(epubfile))
|
73
71
|
|
@@ -85,9 +83,10 @@ class ZipExporterTest < Test::Unit::TestCase
|
|
85
83
|
|
86
84
|
def test_export_rubyzip
|
87
85
|
return unless defined?(Zip) ## skip test
|
86
|
+
|
88
87
|
config = { 'epubmaker' => {} }
|
89
88
|
epubfile = File.join(@tmpdir, 'test.epub')
|
90
|
-
exporter = ZipExporter.new(@epubdir, config)
|
89
|
+
exporter = ReVIEW::EPUBMaker::ZipExporter.new(@epubdir, config)
|
91
90
|
exporter.export_zip_rubyzip(epubfile)
|
92
91
|
assert_true(File.exist?(epubfile))
|
93
92
|
|
data/vendor/gentombow/LICENSE
CHANGED
data/vendor/gentombow/Makefile
CHANGED
@@ -25,7 +25,6 @@ gentombow.pdf: gentombow.tex
|
|
25
25
|
.PHONY: install clean
|
26
26
|
install:
|
27
27
|
mkdir -p ${TEXMF}/doc/latex/gentombow
|
28
|
-
cp ./Makefile ${TEXMF}/doc/latex/gentombow/
|
29
28
|
cp ./LICENSE ${TEXMF}/doc/latex/gentombow/
|
30
29
|
cp ./README.md ${TEXMF}/doc/latex/gentombow/
|
31
30
|
cp ./*.pdf ${TEXMF}/doc/latex/gentombow/
|
Binary file
|
@@ -130,6 +130,7 @@ using \textsf{bounddvi} package.
|
|
130
130
|
\item 2016/10/25 v7.1 (HY) Support for p\LaTeXe\ tombow option,
|
131
131
|
compatibility with \textsf{graphics}/\textsf{color} packages
|
132
132
|
\item 2016/12/28 v7.2 (HY) Documentation for the new \texttt{dvips} behavior
|
133
|
+
\item 2020/09/25 v8.0 (HY) Support for \LaTeXe/p\LaTeXe~2020-10-01
|
133
134
|
\end{itemize}
|
134
135
|
|
135
136
|
\end{document}
|
Binary file
|
@@ -1,7 +1,7 @@
|
|
1
1
|
%
|
2
2
|
% bounddvi.sty
|
3
|
-
%
|
4
|
-
% 2004/12/15 v6.0-v1.0 inoue
|
3
|
+
% 2020/09/25 v8.0-v7.0 h.y.acetaminophen [at] gmail.com
|
4
|
+
% 2004/12/15 v6.0-v1.0 inoue [at] ma.ns.tcu.ac.jp
|
5
5
|
%
|
6
6
|
% This package, originally written by Koichi Inoue
|
7
7
|
% and modified by Hironobu Yamashita, is distributed
|
@@ -10,7 +10,7 @@
|
|
10
10
|
%
|
11
11
|
|
12
12
|
\NeedsTeXFormat{LaTeX2e}
|
13
|
-
\ProvidesPackage{bounddvi}[
|
13
|
+
\ProvidesPackage{bounddvi}[2020/09/25 v8.0 bounddvi]
|
14
14
|
|
15
15
|
% catcode trick to hide \iftombow ... \else ... \fi
|
16
16
|
% since \iftombow is defined only in pLaTeX.
|
@@ -50,6 +50,33 @@ Q \fi
|
|
50
50
|
% reset catcode trick
|
51
51
|
\catcode`\Q=11\relax
|
52
52
|
|
53
|
+
%% Since LaTeX2e 2020-10-01, \@begindocumenthook is deprecated
|
54
|
+
%% and \UseHook{begindocument} etc. are used.
|
55
|
+
%% This code appends papersize special to the _end_ of the hook.
|
56
|
+
%% (Note: support for old dvips is removed.)
|
57
|
+
\ifx\AddToHook\@undefined\else
|
58
|
+
\AtBeginDocument{\AtBeginDvi{%
|
59
|
+
\begingroup
|
60
|
+
% if \stockwidth/\stockheight are defined & have effective
|
61
|
+
% values, copy them to \paperwidth/\paperheight
|
62
|
+
% for current group
|
63
|
+
\ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
|
64
|
+
\paperwidth\stockwidth
|
65
|
+
\fi\fi
|
66
|
+
\ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
|
67
|
+
\paperheight\stockheight
|
68
|
+
\fi\fi
|
69
|
+
% adjust for \mag and emit papersize special
|
70
|
+
\divide\paperwidth\@m\multiply\paperwidth\mag
|
71
|
+
\divide\paperheight\@m\multiply\paperheight\mag
|
72
|
+
\special{papersize=\the\paperwidth,\the\paperheight}%
|
73
|
+
\endgroup}}
|
74
|
+
\expandafter\endinput
|
75
|
+
\fi
|
76
|
+
|
77
|
+
%% The rest of this package is meant for
|
78
|
+
%% LaTeX2e 2020-02-02 PL5 or older.
|
79
|
+
|
53
80
|
% following code is almost equivalent to
|
54
81
|
% \AtBeginDocument{\AtBeginDvi{...}}
|
55
82
|
% however, we append the specification to the _beginning_ of
|
@@ -59,16 +86,12 @@ Q \fi
|
|
59
86
|
\def\@prependto@begindocumenthook{\global\setbox\@begindvibox
|
60
87
|
\vbox{\csname yoko\endcsname\unvbox\@begindvibox
|
61
88
|
\begingroup
|
62
|
-
% if \stockwidth/\stockheight are defined & have effective
|
63
|
-
% values, copy them to \paperwidth/\paperheight
|
64
|
-
% for current group
|
65
89
|
\ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
|
66
90
|
\paperwidth\stockwidth
|
67
91
|
\fi\fi
|
68
92
|
\ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
|
69
93
|
\paperheight\stockheight
|
70
94
|
\fi\fi
|
71
|
-
% adjust for \mag and emit papersize special
|
72
95
|
\divide\paperwidth\@m\multiply\paperwidth\mag
|
73
96
|
\divide\paperheight\@m\multiply\paperheight\mag
|
74
97
|
\special{papersize=\the\paperwidth,\the\paperheight}%
|
@@ -143,6 +143,7 @@ DVIファイルは用紙サイズ情報を含みませんが、PostScriptやPDF
|
|
143
143
|
\item 2016/10/25 v7.1 (HY) p\LaTeXe{}のトンボサポート、
|
144
144
|
2016年の新しい\textsf{graphics}/\textsf{color}に対応
|
145
145
|
\item 2016/12/28 v7.2 (HY) 新仕様の\texttt{dvips}をドキュメント化
|
146
|
+
\item 2020/09/25 v8.0 (HY) \LaTeXe/p\LaTeXe~2020-10-01(予定)への対応
|
146
147
|
\end{itemize}
|
147
148
|
|
148
149
|
\end{document}
|
@@ -14,6 +14,7 @@ echo " * Create $PROJECT.zip ($RELEASEDATE)"
|
|
14
14
|
git archive --format=tar --prefix=$PROJECT/ HEAD | (cd $TMP && tar xf -)
|
15
15
|
rm $TMP/$PROJECT/.gitignore
|
16
16
|
rm $TMP/$PROJECT/create_archive.sh
|
17
|
+
rm $TMP/$PROJECT/Makefile
|
17
18
|
rm -rf $TMP/$PROJECT/tests
|
18
19
|
perl -pi.bak -e "s/\\\$RELEASEDATE/$RELEASEDATE/g" $TMP/$PROJECT/README.md
|
19
20
|
rm -f $TMP/$PROJECT/README.md.bak
|
Binary file
|
@@ -291,6 +291,9 @@ CMYKの版ごとにトンボを作成する場合や、特色のトンボが必
|
|
291
291
|
\item \verb+/BleedBox+: 裁ち落とし領域を含んだサイズ。
|
292
292
|
\item \verb+/CropBox+, \verb+/ArtBox+: 明示しない。
|
293
293
|
\end{itemize}
|
294
|
+
注意:\textsf{pdfx}パッケージがPDF/Xモードで読み込まれていれば、
|
295
|
+
このオプション機能は自動的に有効化されます。
|
296
|
+
また、\verb+/CropBox+も明示します。
|
294
297
|
|
295
298
|
\section{その他の注意点}
|
296
299
|
|
@@ -390,6 +393,11 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以
|
|
390
393
|
\end{verbatim}
|
391
394
|
\end{dangerous}
|
392
395
|
|
396
|
+
なお、\textsf{geometry}パッケージは用紙サイズ
|
397
|
+
(\verb+\paperwidth+, \verb+\paperheight+)を変更する場合もあります。
|
398
|
+
こうした場合に備え、\textsf{gentombow}パッケージは
|
399
|
+
\textsf{geometry}パッケージよりも後に読み込むようにしてください。
|
400
|
+
|
393
401
|
\section*{雑記}
|
394
402
|
|
395
403
|
発端はこの話です。
|
@@ -444,6 +452,7 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以
|
|
444
452
|
\verb+pdfbox+オプションが正常動作するように改良、
|
445
453
|
\verb+\settombowbleed+が\verb+/TrimBox+に反映されな
|
446
454
|
かったバグの修正
|
455
|
+
\item 2019/07/21 v0.9k \textsf{pdfx}パッケージとの整合性をとる改良
|
447
456
|
\end{itemize}
|
448
457
|
|
449
458
|
\end{document}
|
Binary file
|
@@ -8,7 +8,7 @@
|
|
8
8
|
|
9
9
|
\NeedsTeXFormat{LaTeX2e}
|
10
10
|
\ProvidesPackage{gentombow}
|
11
|
-
[
|
11
|
+
[2019/07/21 v0.9k Generate crop mark 'tombow']
|
12
12
|
\def\pxgtmb@pkgname{gentombow}
|
13
13
|
\@namedef{ver@pxgentombow.sty}{}% fake
|
14
14
|
|
@@ -290,6 +290,7 @@
|
|
290
290
|
%% prepare flag
|
291
291
|
\newif\ifpxgtmb@switch \pxgtmb@switchfalse
|
292
292
|
\newif\ifpxgtmb@landscape \pxgtmb@landscapefalse
|
293
|
+
\newif\ifpxgtmb@pdfx@x \pxgtmb@pdfx@xfalse
|
293
294
|
|
294
295
|
%% passed from class options
|
295
296
|
%% should be declared first inside this package (least priority)
|
@@ -507,7 +508,7 @@
|
|
507
508
|
%% pdf "digital tombo" (driver-dependent)
|
508
509
|
% the box size calculation is delayed until \AtBeginDocument
|
509
510
|
% to allow users to change \@tombowbleed in the preamble
|
510
|
-
|
511
|
+
|
511
512
|
% convert pt -> bp
|
512
513
|
\def\pxgtmb@PDF@setbp#1#2{%
|
513
514
|
\@tempdima=.996264#2\relax % 0.996264 = 72/72.27 (cf. 1in = 72.27pt = 72bp)
|
@@ -521,8 +522,8 @@
|
|
521
522
|
\def\pxgtmb@magscale{1}%
|
522
523
|
\fi
|
523
524
|
% set pdf boxes in bp unit
|
524
|
-
|
525
|
-
|
525
|
+
\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@x\stockwidth
|
526
|
+
\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@y\stockheight
|
526
527
|
\pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@x{\dimexpr(\stockwidth-\paperwidth)/2}%
|
527
528
|
\pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@y{\dimexpr(\stockheight-\paperheight)/2}%
|
528
529
|
\pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ur@x{\dimexpr(\stockwidth+\paperwidth)/2}%
|
@@ -532,8 +533,14 @@
|
|
532
533
|
\pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@x{\dimexpr(\stockwidth+\paperwidth)/2+\@tombowbleed}%
|
533
534
|
\pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@y{\dimexpr(\stockheight+\paperheight)/2+\@tombowbleed}%
|
534
535
|
\xdef\pxgtmb@PDF@CTM{%
|
535
|
-
%% CropBox: implicit (same as MediaBox, large paper size)
|
536
|
-
|
536
|
+
%% CropBox: normally implicit (same as MediaBox, large paper size)
|
537
|
+
%% however, pdfx.sty in PDF/X mode sets /CropBox explicitly, so I need to override it!
|
538
|
+
\ifpxgtmb@pdfx@x
|
539
|
+
\noexpand\pxgtmb@PDF@begin
|
540
|
+
/CropBox [0 0
|
541
|
+
\pxgtmb@PDF@crop@ur@x\space
|
542
|
+
\pxgtmb@PDF@crop@ur@y] \noexpand\pxgtmb@PDF@end
|
543
|
+
\fi
|
537
544
|
%% BleedBox: explicit (final paper size + surrounding \@tombowbleed)
|
538
545
|
\noexpand\pxgtmb@PDF@begin
|
539
546
|
/BleedBox [\pxgtmb@PDF@bleed@ll@x\space
|
@@ -547,9 +554,20 @@
|
|
547
554
|
\pxgtmb@PDF@trim@ur@x\space
|
548
555
|
\pxgtmb@PDF@trim@ur@y] \noexpand\pxgtmb@PDF@end
|
549
556
|
%% ArtBox: implicit
|
557
|
+
%% [Note] PDF/X requires /TrimBox or /ArtBox but not both!
|
550
558
|
}%
|
551
559
|
\endgroup
|
552
560
|
}
|
561
|
+
|
562
|
+
% do it
|
563
|
+
\AtBeginDocument{\pxgtmb@PDF@emit}
|
564
|
+
\def\pxgtmb@PDF@emit{%
|
565
|
+
% handle compatibility with pdfx.sty here;
|
566
|
+
% if pdfx.sty with PDF/X mode detected, force [pdfbox] option!
|
567
|
+
\pxgtmb@handle@pdfx
|
568
|
+
\ifpxgtmb@pdfx@x\def\pxgtmb@pdfbox@status{1}\fi
|
569
|
+
% start actual procedure for [pdfbox] option
|
570
|
+
\if 1\pxgtmb@pdfbox@status
|
553
571
|
%% supported drivers: dvips, dvipdfmx, XeTeX, pdfTeX, LuaTeX
|
554
572
|
\ifnum0\ifx\pdfvariable\@undefined\else\the\outputmode\fi=0\relax
|
555
573
|
\ifnum0\ifx\pdfpageattr\@undefined\else\the\pdfoutput\fi=0\relax
|
@@ -666,8 +684,7 @@
|
|
666
684
|
\def\pxgtmb@PDF@begin{}\def\pxgtmb@PDF@end{}%
|
667
685
|
\edef\pxgtmb@PDF@CTM{{\pxgtmb@PDF@CTM}}%
|
668
686
|
\expandafter\pdfpageattr\pxgtmb@PDF@CTM}
|
669
|
-
\fi
|
670
|
-
\else
|
687
|
+
\fi\else
|
671
688
|
%% for LuaTeX
|
672
689
|
\def\pxgtmb@driver{l}
|
673
690
|
% force paper size
|
@@ -679,7 +696,8 @@
|
|
679
696
|
\edef\pxgtmb@PDF@CTM{pageattr{\pxgtmb@PDF@CTM}}%
|
680
697
|
\expandafter\pdfvariable\pxgtmb@PDF@CTM}
|
681
698
|
\fi
|
682
|
-
\fi
|
699
|
+
\fi
|
700
|
+
}
|
683
701
|
|
684
702
|
%% make visible tombow box according to the current status of
|
685
703
|
%% \@bannerfont, \@bannertoken, \@tombowwidth & \@tombowbleed
|
@@ -713,7 +731,7 @@
|
|
713
731
|
% because pdf boxes are calculated only inside \AtBeginDocument
|
714
732
|
\@onlypreamble\settombowbleed
|
715
733
|
|
716
|
-
%% patch internal
|
734
|
+
%% patch internal of pdfpages.sty to work with tombow
|
717
735
|
%% (tested on pdfpages 2017/10/31 v0.5l)
|
718
736
|
%% Note the code is the same as that of pxpdfpages.sty,
|
719
737
|
%% but reserved here since gentombow.sty can be used on
|
@@ -744,4 +762,8 @@
|
|
744
762
|
%% do it
|
745
763
|
\AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb@patch@pdfpages}{}}
|
746
764
|
|
765
|
+
%% patch pdfx.sty
|
766
|
+
%% (tested on pdfx 2019/02/27 v1.6.3)
|
767
|
+
\def\pxgtmb@handle@pdfx{\@ifpackageloaded{pdfx}{\let\ifpxgtmb@pdfx@x\ifpdfx@x}{}}
|
768
|
+
|
747
769
|
\endinput
|
@@ -252,6 +252,9 @@ The paper size (\verb+/MediaBox+) is also corrected.
|
|
252
252
|
\item \verb+/BleedBox+: paper size plus bleed margin.
|
253
253
|
\item \verb+/CropBox+ and \verb+/ArtBox+ are not set.
|
254
254
|
\end{itemize}
|
255
|
+
Note: if the package \textsf{pdfx} is loaded with PDF/X mode,
|
256
|
+
this optional feature is automatically enabled.
|
257
|
+
Also, \verb+/CropBox+ is set explicitly.
|
255
258
|
|
256
259
|
\section{Additional Notes}
|
257
260
|
|
@@ -277,6 +280,10 @@ conflict with the feature of \textsf{gentombow} package.
|
|
277
280
|
To set page layout correctly, you should adjust \verb+\oddsidemargin+
|
278
281
|
or \verb+\topmargin+, or leave it to \textsf{geometry} package.
|
279
282
|
|
283
|
+
Note: since the package \textsf{geometry} also has a feature to
|
284
|
+
change the paper size (\verb+\paperwidth+, \verb+\paperheight+),
|
285
|
+
please load \textsf{gentombow} after \textsf{geometry}.
|
286
|
+
|
280
287
|
\section*{Change History}
|
281
288
|
|
282
289
|
\begin{itemize}
|
@@ -293,6 +300,7 @@ or \verb+\topmargin+, or leave it to \textsf{geometry} package.
|
|
293
300
|
also with \verb+pdfbox+ option.
|
294
301
|
Fix a bug that \verb+\settombowbleed+ is not
|
295
302
|
considered by \verb+/TrimBox+.
|
303
|
+
\item 2019/07/21 v0.9k Support \textsf{pdfx} package.
|
296
304
|
\end{itemize}
|
297
305
|
|
298
306
|
\end{document}
|
data/vendor/jsclasses/Makefile
CHANGED
@@ -3,14 +3,15 @@ DOCTARGET = jsclasses jslogo okumacro jsverb okuverb
|
|
3
3
|
PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
|
4
4
|
DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
|
5
5
|
KANJI = -kanji=utf8
|
6
|
-
FONTMAP = -f
|
6
|
+
FONTMAP = -f haranoaji.map -f ptex-haranoaji.map
|
7
7
|
TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
|
8
8
|
|
9
9
|
default: $(STRIPTARGET) $(DVITARGET)
|
10
10
|
strip: $(STRIPTARGET)
|
11
11
|
all: $(STRIPTARGET) $(PDFTARGET)
|
12
12
|
|
13
|
-
JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls
|
13
|
+
JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls \
|
14
|
+
minijs.sty
|
14
15
|
|
15
16
|
# for generating files, we use pdflatex incidentally.
|
16
17
|
# otherwise, ptexenc might convert U+2212 -> U+FF0D in okumacro.sty
|
@@ -14,8 +14,8 @@ echo " * Create $PROJECT.tds.zip"
|
|
14
14
|
git archive --format=tar --prefix=$PROJECT/ HEAD | (cd $TMP && tar xf -)
|
15
15
|
rm $TMP/$PROJECT/.gitignore
|
16
16
|
rm $TMP/$PROJECT/create_archive.sh
|
17
|
-
rm -
|
18
|
-
|
17
|
+
rm -rf $TMP/$PROJECT/tests
|
18
|
+
rm -rf $TMP/$PROJECT/jis
|
19
19
|
perl -pi.bak -e "s/\\\$RELEASEDATE/$RELEASEDATE/g" $TMP/$PROJECT/README.md
|
20
20
|
rm -f $TMP/$PROJECT/README.md.bak
|
21
21
|
|
@@ -46,10 +46,10 @@ git archive --format=tar --prefix=$PROJECT/ HEAD | (cd $TMP && tar xf -)
|
|
46
46
|
# winjis.sty should be removed for CTAN
|
47
47
|
rm $TMP/$PROJECT/.gitignore
|
48
48
|
rm $TMP/$PROJECT/create_archive.sh
|
49
|
-
rm -
|
50
|
-
|
49
|
+
rm -rf $TMP/$PROJECT/tests
|
50
|
+
rm -rf $TMP/$PROJECT/jis
|
51
51
|
rm $TMP/$PROJECT/*.cls
|
52
|
-
|
52
|
+
rm $TMP/$PROJECT/*.sty
|
53
53
|
perl -pi.bak -e "s/\\\$RELEASEDATE/$RELEASEDATE/g" $TMP/$PROJECT/README.md
|
54
54
|
rm -f $TMP/$PROJECT/README.md.bak
|
55
55
|
|
@@ -3,14 +3,15 @@ DOCTARGET = jsclasses jslogo okumacro jsverb okuverb
|
|
3
3
|
PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
|
4
4
|
DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
|
5
5
|
KANJI = -kanji=jis
|
6
|
-
FONTMAP = -f
|
6
|
+
FONTMAP = -f haranoaji.map -f ptex-haranoaji.map
|
7
7
|
TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
|
8
8
|
|
9
9
|
default: $(STRIPTARGET) $(DVITARGET)
|
10
10
|
strip: $(STRIPTARGET)
|
11
11
|
all: $(STRIPTARGET) $(PDFTARGET)
|
12
12
|
|
13
|
-
JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls
|
13
|
+
JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls \
|
14
|
+
minijs.sty
|
14
15
|
|
15
16
|
jsarticle.cls: jsclasses.dtx
|
16
17
|
platex $(KANJI) jsclasses.ins
|
@@ -4,25 +4,13 @@
|
|
4
4
|
%%
|
5
5
|
%% The original source files were:
|
6
6
|
%%
|
7
|
-
%% jsclasses.dtx (with options: `article')
|
7
|
+
%% jsclasses.dtx (with options: `class,article')
|
8
8
|
%%
|
9
|
-
%%
|
9
|
+
%% Maintained on GitHub: https://github.com/texjporg/jsclasses
|
10
10
|
%%
|
11
|
-
%% For the copyright see the source file.
|
12
|
-
%%
|
13
|
-
%% Any modified versions of this file must be renamed
|
14
|
-
%% with new filenames distinct from jsarticle.cls.
|
15
|
-
%%
|
16
|
-
%% For distribution of the original source see the terms
|
17
|
-
%% for copying and modification in the file jsclasses.dtx.
|
18
|
-
%%
|
19
|
-
%% This generated file may be distributed as long as the
|
20
|
-
%% original source files, as listed above, are part of the
|
21
|
-
%% same distribution. (The sources need not necessarily be
|
22
|
-
%% in the same archive or directory.)
|
23
11
|
\NeedsTeXFormat{pLaTeX2e}
|
24
12
|
\ProvidesClass{jsarticle}
|
25
|
-
[2020/
|
13
|
+
[2020/10/09 jsclasses (okumura, texjporg)]
|
26
14
|
\def\jsc@clsname{jsarticle}
|
27
15
|
\newif\ifjsc@needsp@tch
|
28
16
|
\jsc@needsp@tchfalse
|
@@ -256,10 +244,11 @@
|
|
256
244
|
\fi
|
257
245
|
\ifpapersize
|
258
246
|
\iftombow
|
259
|
-
\
|
247
|
+
\edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
|
260
248
|
\else
|
261
|
-
\
|
249
|
+
\edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
|
262
250
|
\fi
|
251
|
+
\AtBeginDvi{\special{\jsc@papersize@special}}
|
263
252
|
\fi
|
264
253
|
\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
|
265
254
|
\newdimen\jsc@mpt
|
@@ -460,6 +449,10 @@
|
|
460
449
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
461
450
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
462
451
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
452
|
+
%% ad-hoc "relation font"
|
453
|
+
\@ifl@t@r\fmtversion{2020/10/01}
|
454
|
+
{\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
|
455
|
+
\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
|
463
456
|
\ifx\@rmfamilyhook\@undefined % old
|
464
457
|
\DeclareRobustCommand\rmfamily
|
465
458
|
{\not@math@alphabet\rmfamily\mathrm
|
@@ -489,6 +482,14 @@
|
|
489
482
|
\g@addto@macro\@ttfamilyhook
|
490
483
|
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
491
484
|
\fi
|
485
|
+
\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
|
486
|
+
\AddToHook{rmfamily}%
|
487
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
488
|
+
\AddToHook{sffamily}%
|
489
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
490
|
+
\AddToHook{ttfamily}%
|
491
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
492
|
+
\fi % --- for 2020-10-01 END
|
492
493
|
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
|
493
494
|
\DeclareRobustCommand\textmc[1]{%
|
494
495
|
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
|
@@ -697,6 +698,7 @@
|
|
697
698
|
\xspcode`^^fe=3
|
698
699
|
\xspcode`^^ff=3
|
699
700
|
\def\@{\spacefactor3000{}}
|
701
|
+
%% \@setfontsize with \parindent and \(x)kanjiskip settings
|
700
702
|
\def\@setfontsize#1#2#3{%
|
701
703
|
\ifx\protect\@typeset@protect
|
702
704
|
\let\@currsize#1%
|
@@ -714,7 +716,8 @@
|
|
714
716
|
\if@slide \xkanjiskip=0.1em \else
|
715
717
|
\xkanjiskip=0.25em plus 0.15em minus 0.06em
|
716
718
|
\fi
|
717
|
-
\fi
|
719
|
+
\fi
|
720
|
+
}
|
718
721
|
\def\jsc@setfontsize#1#2#3{%
|
719
722
|
\@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
|
720
723
|
\emergencystretch 3zw
|
@@ -745,6 +748,7 @@
|
|
745
748
|
\belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
|
746
749
|
\belowdisplayshortskip \belowdisplayskip
|
747
750
|
\let\@listi\@listI}
|
751
|
+
%% initialize
|
748
752
|
\normalsize
|
749
753
|
\setbox0\hbox{\char\jis"3441}%
|
750
754
|
\setlength\Cht{\ht0}
|