review 3.0.0 → 4.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-win.yml +39 -0
- data/.github/workflows/ruby.yml +27 -0
- data/.rubocop.yml +50 -12
- data/.travis.yml +17 -8
- data/Dockerfile +21 -5
- data/NEWS.ja.md +358 -0
- data/NEWS.md +358 -1
- data/README.md +11 -8
- data/appveyor.yml +1 -3
- data/bin/review-catalog-converter +4 -4
- data/bin/review-check +8 -8
- data/bin/review-checkdep +1 -1
- data/bin/review-compile +12 -12
- data/bin/review-epubmaker +3 -35
- data/bin/review-idgxmlmaker +16 -0
- data/bin/review-index +2 -89
- data/bin/review-preproc +14 -19
- data/bin/review-validate +3 -3
- data/bin/review-vol +4 -78
- data/doc/LICENSE +1 -1
- data/doc/config.yml.sample +46 -12
- data/doc/config.yml.sample-simple +4 -2
- data/doc/format.ja.md +37 -13
- data/doc/format.md +35 -20
- data/doc/pdfmaker.ja.md +43 -1
- data/doc/pdfmaker.md +42 -1
- data/doc/quickstart.ja.md +46 -26
- data/doc/quickstart.md +38 -17
- data/lib/epubmaker/epubcommon.rb +10 -5
- data/lib/epubmaker/epubv2.rb +1 -1
- data/lib/epubmaker/epubv3.rb +1 -0
- data/lib/epubmaker/producer.rb +4 -2
- data/lib/review/book.rb +1 -1
- data/lib/review/book/base.rb +38 -79
- data/lib/review/book/chapter.rb +18 -3
- data/lib/review/book/compilable.rb +6 -5
- data/lib/review/book/index.rb +69 -101
- data/lib/review/book/index/item.rb +40 -0
- data/lib/review/book/page_metric.rb +7 -7
- data/lib/review/book/part.rb +28 -5
- data/lib/review/book/volume.rb +3 -4
- data/lib/review/builder.rb +105 -44
- data/lib/review/catalog.rb +13 -16
- data/lib/review/compiler.rb +84 -72
- data/lib/review/configure.rb +19 -8
- data/lib/review/epub2html.rb +37 -4
- data/lib/review/epubmaker.rb +62 -7
- data/lib/review/extentions/string.rb +0 -4
- data/lib/review/htmlbuilder.rb +102 -115
- data/lib/review/htmlutils.rb +2 -3
- data/lib/review/i18n.rb +2 -2
- data/lib/review/i18n.yml +9 -0
- data/lib/review/idgxmlbuilder.rb +153 -74
- data/lib/review/idgxmlmaker.rb +191 -0
- data/lib/review/init-web/finish.html +10 -0
- data/lib/review/init-web/index.html +190 -0
- data/lib/review/init-web/review-layout-design.js +691 -0
- data/lib/review/init.rb +125 -34
- data/lib/review/latexbuilder.rb +199 -88
- data/lib/review/lineinput.rb +1 -1
- data/lib/review/location.rb +32 -0
- data/lib/review/logger.rb +4 -8
- data/lib/review/makerhelper.rb +24 -5
- data/lib/review/markdownbuilder.rb +31 -37
- data/lib/review/md2inaobuilder.rb +3 -5
- data/lib/review/pdfmaker.rb +44 -22
- data/lib/review/plaintextbuilder.rb +106 -85
- data/lib/review/preprocessor.rb +32 -41
- data/lib/review/rstbuilder.rb +33 -33
- data/lib/review/textmaker.rb +19 -3
- data/lib/review/textutils.rb +76 -2
- data/lib/review/tocprinter.rb +231 -102
- data/lib/review/topbuilder.rb +114 -61
- data/lib/review/update.rb +19 -19
- data/lib/review/version.rb +1 -1
- data/lib/review/volumeprinter.rb +99 -0
- data/lib/review/webmaker.rb +11 -4
- data/lib/review/webtocprinter.rb +38 -35
- data/lib/review/yamlloader.rb +26 -16
- data/review.gemspec +6 -4
- data/samples/sample-book/README.md +7 -2
- data/samples/sample-book/src/.gitignore +154 -0
- data/samples/sample-book/src/config-ebook.yml +4 -0
- data/samples/sample-book/src/config-jlreq-ebook.yml +4 -0
- data/samples/sample-book/src/config-jlreq.yml +6 -0
- data/samples/sample-book/src/config.yml +2 -2
- data/samples/sample-book/src/lib/tasks/review.rake +29 -14
- data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake +14 -8
- data/samples/syntax-book/ch01.re +4 -2
- data/samples/syntax-book/ch02.re +8 -16
- data/samples/syntax-book/ch03.re +3 -6
- data/samples/syntax-book/config-jlreq-lualatex.yml +4 -0
- data/samples/syntax-book/config-jlreq.yml +5 -0
- data/samples/syntax-book/config-print.yml +3 -0
- data/samples/syntax-book/config.yml +1 -1
- data/samples/syntax-book/lib/tasks/review.rake +30 -15
- data/samples/syntax-book/lib/tasks/z01_copy_sty.rake +14 -8
- data/templates/latex/config.erb +16 -0
- data/templates/latex/layout.tex.erb +4 -0
- data/templates/latex/review-jlreq/review-base.sty +150 -61
- data/templates/latex/review-jlreq/review-jlreq.cls +74 -8
- data/templates/latex/review-jlreq/review-style.sty +4 -1
- data/templates/latex/review-jsbook/README.md +39 -0
- data/templates/latex/review-jsbook/review-base.sty +101 -23
- data/templates/latex/review-jsbook/review-jsbook.cls +28 -5
- data/templates/latex/review-jsbook/review-style.sty +5 -2
- data/templates/opf/epubv3.opf.erb +1 -0
- data/templates/web/html/layout-html5.html.erb +2 -2
- data/test/assets/test_template.tex +24 -3
- data/test/assets/test_template_backmatter.tex +24 -3
- data/test/test_book.rb +75 -21
- data/test/test_book_chapter.rb +4 -2
- data/test/test_book_part.rb +3 -3
- data/test/test_builder.rb +16 -0
- data/test/test_catalog.rb +24 -42
- data/test/test_catalog_converter_cmd.rb +1 -1
- data/test/test_epubmaker_cmd.rb +14 -7
- data/test/test_helper.rb +15 -7
- data/test/test_htmlbuilder.rb +909 -159
- data/test/test_i18n.rb +25 -25
- data/test/test_idgxmlbuilder.rb +395 -38
- data/test/test_idgxmlmaker_cmd.rb +46 -0
- data/test/test_image_finder.rb +52 -70
- data/test/test_index.rb +50 -10
- data/test/test_latexbuilder.rb +1194 -106
- data/test/test_latexbuilder_v2.rb +628 -97
- data/test/test_logger.rb +14 -1
- data/test/test_makerhelper.rb +3 -3
- data/test/test_markdownbuilder.rb +134 -16
- data/test/test_md2inaobuilder.rb +32 -9
- data/test/test_pdfmaker.rb +18 -1
- data/test/test_pdfmaker_cmd.rb +100 -6
- data/test/test_plaintextbuilder.rb +371 -25
- data/test/test_preprocessor.rb +2 -16
- data/test/test_rstbuilder.rb +249 -26
- data/test/test_textmaker_cmd.rb +54 -0
- data/test/test_textutils.rb +109 -2
- data/test/test_topbuilder.rb +546 -31
- data/test/test_update.rb +17 -8
- data/test/test_webtocprinter.rb +66 -34
- data/test/test_yamlloader.rb +13 -0
- data/vendor/jsclasses/LICENSE +1 -1
- data/vendor/jsclasses/jis/jsarticle.cls +53 -14
- data/vendor/jsclasses/jis/jsbook.cls +53 -14
- data/vendor/jsclasses/jis/jsclasses.dtx +84 -25
- data/vendor/jsclasses/jis/jslogo.dtx +4 -4
- data/vendor/jsclasses/jis/jslogo.sty +3 -3
- data/vendor/jsclasses/jis/jspf.cls +52 -13
- data/vendor/jsclasses/jis/jsreport.cls +53 -14
- data/vendor/jsclasses/jis/kiyou.cls +53 -14
- data/vendor/jsclasses/jis/okumacro.dtx +4 -5
- data/vendor/jsclasses/jis/okumacro.sty +3 -4
- data/vendor/jsclasses/jsarticle.cls +53 -14
- data/vendor/jsclasses/jsbook.cls +53 -14
- data/vendor/jsclasses/jsclasses.dtx +84 -25
- data/vendor/jsclasses/jsclasses.pdf +0 -0
- data/vendor/jsclasses/jslogo.dtx +4 -4
- data/vendor/jsclasses/jslogo.pdf +0 -0
- data/vendor/jsclasses/jslogo.sty +3 -3
- data/vendor/jsclasses/jspf.cls +52 -13
- data/vendor/jsclasses/jsreport.cls +53 -14
- data/vendor/jsclasses/kiyou.cls +53 -14
- data/vendor/jsclasses/okumacro.dtx +4 -5
- data/vendor/jsclasses/okumacro.pdf +0 -0
- data/vendor/jsclasses/okumacro.sty +3 -4
- metadata +55 -10
- data/lib/review/tocparser.rb +0 -271
- data/samples/syntax-book/review-ext.rb +0 -14
- data/test/test_tocparser.rb +0 -25
@@ -4,13 +4,13 @@
|
|
4
4
|
% pLaTeX2$B&E?7%I%-%e%a%s%H%/%i%9!JF|K\8l(B TeX $B3+H/%3%_%e%K%F%#HG!K(B
|
5
5
|
% $B86:n<T!'1|B<@2I'(B <okumura@okumuralab.org>
|
6
6
|
%
|
7
|
-
% Copyright 1993-
|
7
|
+
% Copyright 1993-2019
|
8
8
|
% The LaTeX3 Project and any individual authors listed elsewhere
|
9
9
|
% in this file.
|
10
10
|
%
|
11
11
|
% Copyright 1995-1999 ASCII Corporation.
|
12
12
|
% Copyright 1999-2016 Haruhiko Okumura
|
13
|
-
% Copyright 2016-
|
13
|
+
% Copyright 2016-2020 Japanese TeX Development Community
|
14
14
|
%
|
15
15
|
% \fi
|
16
16
|
%
|
@@ -26,7 +26,7 @@
|
|
26
26
|
%<*driver>
|
27
27
|
\ProvidesFile{jsclasses.dtx}
|
28
28
|
%</driver>
|
29
|
-
[
|
29
|
+
[2020/02/02 jsclasses (okumura, texjporg)]
|
30
30
|
%<*driver>
|
31
31
|
\documentclass{jsarticle}
|
32
32
|
\usepackage{doc}
|
@@ -879,7 +879,7 @@
|
|
879
879
|
\fi
|
880
880
|
\ifnum\@ptsize=-1
|
881
881
|
\def\n@baseline{15}%
|
882
|
-
\fi
|
882
|
+
\fi
|
883
883
|
\fi
|
884
884
|
%<*kiyou>
|
885
885
|
\def\jsc@magscale{0.9769230}
|
@@ -888,7 +888,7 @@
|
|
888
888
|
\def\inv@mag{1.02354}
|
889
889
|
\jsc@mpt=1\p@
|
890
890
|
\jsc@mmm=1mm
|
891
|
-
\else
|
891
|
+
\else
|
892
892
|
\jsc@mpt=\jsc@magscale\p@
|
893
893
|
\jsc@mmm=\jsc@magscale mm
|
894
894
|
\def\inv@mag{1}
|
@@ -1155,6 +1155,18 @@
|
|
1155
1155
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
1156
1156
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
1157
1157
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
1158
|
+
% \end{macrocode}
|
1159
|
+
%
|
1160
|
+
% [2020-02-02] \LaTeXe~2020-02-02$B$G(BNFSS$B$,3HD%$5$l!$(B
|
1161
|
+
% $B$=$l$KH<$$%*%j%8%J%k$N(B |\rmfamily| $B$J$I$NDj5A$,JQ2=$7$^$7$?!#(B
|
1162
|
+
% |\DeclareRobustCommand| $B$GD>@\Dj5A$9$k$H!$$3$l$r>e=q$-$7$F(B
|
1163
|
+
% NFSS$B$N3HD%ItJ,$r2u$7$F$7$^$$$^$9$N$G!$(B
|
1164
|
+
% $B?7$?$KDs6!$5$l$?%U%C%/$K%3!<%I$rA^F~$7$^$9!#(B
|
1165
|
+
% $B=>Mh$N%3!<%I$b(B\LaTeXe~2019-10-01$B0JA0$N$?$a$K;D$7$F$"$j$^$9$,!$(B
|
1166
|
+
% \texttt{mweights}$B%Q%C%1!<%8BP:v$b;\$7$^$7$?(B(forum:2763)$B!#(B
|
1167
|
+
%
|
1168
|
+
% \begin{macrocode}
|
1169
|
+
\ifx\@rmfamilyhook\@undefined % old
|
1158
1170
|
\DeclareRobustCommand\rmfamily
|
1159
1171
|
{\not@math@alphabet\rmfamily\mathrm
|
1160
1172
|
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
|
@@ -1164,6 +1176,25 @@
|
|
1164
1176
|
\DeclareRobustCommand\ttfamily
|
1165
1177
|
{\not@math@alphabet\ttfamily\mathtt
|
1166
1178
|
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
|
1179
|
+
\AtBeginDocument{%
|
1180
|
+
\ifx\mweights@init\@undefined\else % mweights.sty is loaded
|
1181
|
+
% my definitions above should have been overwritten, recover it!
|
1182
|
+
% \selectfont is executed twice but I don't care about speed...
|
1183
|
+
\expandafter\g@addto@macro\csname rmfamily \endcsname
|
1184
|
+
{\kanjifamily\mcdefault\selectfont}%
|
1185
|
+
\expandafter\g@addto@macro\csname sffamily \endcsname
|
1186
|
+
{\kanjifamily\gtdefault\selectfont}%
|
1187
|
+
\expandafter\g@addto@macro\csname ttfamily \endcsname
|
1188
|
+
{\kanjifamily\gtdefault\selectfont}%
|
1189
|
+
\fi}
|
1190
|
+
\else % 2020-02-02
|
1191
|
+
\g@addto@macro\@rmfamilyhook
|
1192
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
1193
|
+
\g@addto@macro\@sffamilyhook
|
1194
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1195
|
+
\g@addto@macro\@ttfamilyhook
|
1196
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1197
|
+
\fi
|
1167
1198
|
% \end{macrocode}
|
1168
1199
|
%
|
1169
1200
|
% \begin{macro}{\textmc}
|
@@ -1335,10 +1366,10 @@
|
|
1335
1366
|
\xspcode`+=3
|
1336
1367
|
\xspcode`\%=3
|
1337
1368
|
% \end{macrocode}
|
1338
|
-
%
|
1369
|
+
%
|
1339
1370
|
% $B$3$l0J30$K(BT1$B%(%s%3!<%G%#%s%0$G(B80$B!A(Bff$B$NJ8;z$b$9$Y$F2$J8J8;z$G$9$N$G!$(B
|
1340
1371
|
% $BN>B&$NOBJ8J8;z$H$N4V$K%9%Z!<%9$,F~$i$J$1$l$P$J$j$^$;$s!#(B
|
1341
|
-
%
|
1372
|
+
%
|
1342
1373
|
% \begin{macrocode}
|
1343
1374
|
\xspcode`^^80=3
|
1344
1375
|
\xspcode`^^81=3
|
@@ -4032,7 +4063,7 @@
|
|
4032
4063
|
%
|
4033
4064
|
% \begin{macrocode}
|
4034
4065
|
\newcommand{\labelenumi}{\theenumi.}
|
4035
|
-
\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
|
4066
|
+
\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
|
4036
4067
|
\newcommand{\labelenumiii}{\theenumiii.}
|
4037
4068
|
\newcommand{\labelenumiv}{\theenumiv.}
|
4038
4069
|
% \end{macrocode}
|
@@ -4051,7 +4082,7 @@
|
|
4051
4082
|
%
|
4052
4083
|
% \begin{macrocode}
|
4053
4084
|
\renewcommand{\p@enumii}{\theenumi}
|
4054
|
-
\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
|
4085
|
+
\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
|
4055
4086
|
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
|
4056
4087
|
% \end{macrocode}
|
4057
4088
|
% \end{macro}
|
@@ -4451,7 +4482,7 @@
|
|
4451
4482
|
% $B?t<0HV9f$N7A<0$G$9!#(B
|
4452
4483
|
% $B%G%U%)%k%H$NCM$r%3%a%s%H%"%&%H$7$F<($7$F$*$-$^$9!#(B
|
4453
4484
|
%
|
4454
|
-
% |\inhibitglue$B!J(B\theequation$B!K(B\inhibitglue| $B$N$h$&$KOBJ8$+$C$3(B
|
4485
|
+
% |\inhibitglue $B!J(B\theequation $B!K(B\inhibitglue| $B$N$h$&$KOBJ8$+$C$3(B
|
4455
4486
|
% $B$r;H$&$3$H$b2DG=$G$9!#(B
|
4456
4487
|
%
|
4457
4488
|
% \begin{macrocode}
|
@@ -4462,7 +4493,7 @@
|
|
4462
4493
|
% |amsmath| $B%Q%C%1!<%8$r;H$&>l9g$O(B |\tagform@| $B$r<!$N$h$&$K=$@5$7$^$9!#(B
|
4463
4494
|
%
|
4464
4495
|
% \begin{macrocode}
|
4465
|
-
% \def\tagform@#1{\maketag@@@{$B!J(B\ignorespaces#1\unskip\@@italiccorr$B!K(B}}
|
4496
|
+
% \def\tagform@#1{\maketag@@@{$B!J(B\ignorespaces#1\unskip\@@italiccorr $B!K(B}}
|
4466
4497
|
% \end{macrocode}
|
4467
4498
|
%
|
4468
4499
|
% \subsection{$B%U%m!<%H(B}
|
@@ -4636,6 +4667,10 @@
|
|
4636
4667
|
%
|
4637
4668
|
% [2003-11-05] $B%m%8%C%/$r>/$7JQ$($F$_$^$7$?!#(B
|
4638
4669
|
%
|
4670
|
+
% [2018-12-11] $BCY$/$J$j$^$7$?$,!$(B|listings| $B%Q%C%1!<%8$r;H$&$H$-$K(B
|
4671
|
+
% |title| $B$r;XDj$9$k$H(B ``1zw'' $B$,=PNO$5$l$F$7$^$&(B
|
4672
|
+
% $BLdBj(B (forum:1543$B!$(BIssue \#71) $B$KBP=h$7$^$7$?!#(B
|
4673
|
+
%
|
4639
4674
|
% \begin{macrocode}
|
4640
4675
|
%<*!jspf>
|
4641
4676
|
% \long\def\@makecaption#1#2{{\small
|
@@ -4656,7 +4691,7 @@
|
|
4656
4691
|
\vskip\abovecaptionskip
|
4657
4692
|
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
|
4658
4693
|
\ifdim \wd\@tempboxa <\hsize \centering \fi
|
4659
|
-
#1\hskip1zw\relax
|
4694
|
+
#1{\hskip1zw\relax}#2\par
|
4660
4695
|
\vskip\belowcaptionskip}}
|
4661
4696
|
%</!jspf>
|
4662
4697
|
%<*jspf>
|
@@ -5211,7 +5246,7 @@
|
|
5211
5246
|
% $B$H$j$"$($:%3%a%s%H%"%&%H$7$F$*$-$^$9$N$G!$I,MW$K1~$8$F@8$+$7$F$/$@$5$$!#(B
|
5212
5247
|
%
|
5213
5248
|
% \begin{macrocode}
|
5214
|
-
% \def\@biblabel#1{\inhibitglue$B!N(B#1$B!O(B\inhibitglue}
|
5249
|
+
% \def\@biblabel#1{\inhibitglue $B!N(B#1$B!O(B\inhibitglue}
|
5215
5250
|
% \end{macrocode}
|
5216
5251
|
% \end{macro}
|
5217
5252
|
%
|
@@ -5238,7 +5273,7 @@
|
|
5238
5273
|
% \@latex@warning
|
5239
5274
|
% {Citation `\@citeb' on page \thepage \space undefined}}%
|
5240
5275
|
% {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}}
|
5241
|
-
% \def\@cite#1#2{\inhibitglue$B!N(B{#1\if@tempswa $B!$(B#2\fi}$B!O(B\inhibitglue}
|
5276
|
+
% \def\@cite#1#2{\inhibitglue $B!N(B{#1\if@tempswa $B!$(B#2\fi}$B!O(B\inhibitglue}
|
5242
5277
|
% \end{macrocode}
|
5243
5278
|
%
|
5244
5279
|
% $B0zMQHV9f$r>e%D%-$N(B 1$B!K$N$h$&$J%9%?%$%k$K$9$k$K$O<!$N$h$&$K$7$^$9!#(B
|
@@ -5857,8 +5892,13 @@
|
|
5857
5892
|
% \paragraph{$B:#F|$NF|IU(B}
|
5858
5893
|
%
|
5859
5894
|
% \LaTeX $B$G=hM}$7$?F|IU$r=PNO$7$^$9!#(B
|
5860
|
-
% |jarticle| $B$J$I$H0c$C$F!$I8=`$r@>Nq$K$7
|
5895
|
+
% ^^A |jarticle| $B$J$I$H0c$C$F!$I8=`$r@>Nq$K$7!$(B
|
5896
|
+
% ^^A $BM>J,$J6uGr$,F~$i$J$$$h$&$K2~NI$7$^$7$?!#(B
|
5897
|
+
% ^^A -- 2018$BG/(B7$B7n0J9_$O(B |jarticle| $B$J$I$bI8=`$,@>Nq!$(B
|
5898
|
+
% ^^A -- 2019$BG/(B4$B7n0J9_$OM>J,$J6uGr$,F~$i$J$/$J$C$F$$$^$9!#(B
|
5861
5899
|
% $BOBNq$K$9$k$K$O(B |\$BOBNq(B| $B$H=q$$$F$/$@$5$$!#(B
|
5900
|
+
% $B$A$J$_$K$3$NJ8>O$N:n@.F|$O@>Nq$G$O(B{\$B@>Nq(B\today}$B$G!$(B
|
5901
|
+
% $BOBNq$G$O(B{\$BOBNq(B\today}$B$G$9!#(B
|
5862
5902
|
%
|
5863
5903
|
% \begin{macro}{\today}
|
5864
5904
|
% \begin{macrocode}
|
@@ -5866,23 +5906,42 @@
|
|
5866
5906
|
\def\$B@>Nq(B{\$B@>Nq(Btrue}
|
5867
5907
|
\def\$BOBNq(B{\$B@>Nq(Bfalse}
|
5868
5908
|
\newcount\heisei \heisei\year \advance\heisei-1988\relax
|
5909
|
+
\def\pltx@today@year@#1{%
|
5910
|
+
\ifnum\numexpr\year-#1=1 $B85(B\else
|
5911
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
5912
|
+
\kansuji\numexpr\year-#1\relax
|
5913
|
+
\else
|
5914
|
+
\number\numexpr\year-#1\relax\nobreak
|
5915
|
+
\fi
|
5916
|
+
\fi $BG/(B
|
5917
|
+
}
|
5918
|
+
\def\pltx@today@year{%
|
5919
|
+
\ifnum\numexpr\year*10000+\month*100+\day<19890108
|
5920
|
+
$B><OB(B\pltx@today@year@{1925}%
|
5921
|
+
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
|
5922
|
+
$BJ?@.(B\pltx@today@year@{1988}%
|
5923
|
+
\else
|
5924
|
+
$BNaOB(B\pltx@today@year@{2018}%
|
5925
|
+
\fi\fi}
|
5869
5926
|
\def\today{%
|
5870
5927
|
\if@english
|
5871
5928
|
\ifcase\month\or
|
5872
5929
|
January\or February\or March\or April\or May\or June\or
|
5873
5930
|
July\or August\or September\or October\or November\or December\fi
|
5874
5931
|
\space\number\day, \number\year
|
5932
|
+
\else\if$B@>Nq(B
|
5933
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
|
5934
|
+
\else\number\year\nobreak\fi $BG/(B
|
5875
5935
|
\else
|
5876
|
-
\
|
5877
|
-
|
5878
|
-
|
5879
|
-
|
5880
|
-
\
|
5881
|
-
|
5882
|
-
|
5883
|
-
|
5884
|
-
|
5885
|
-
\fi}
|
5936
|
+
\pltx@today@year
|
5937
|
+
\fi
|
5938
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
5939
|
+
\kansuji\month $B7n(B
|
5940
|
+
\kansuji\day $BF|(B
|
5941
|
+
\else
|
5942
|
+
\number\month\nobreak $B7n(B
|
5943
|
+
\number\day\nobreak $BF|(B
|
5944
|
+
\fi\fi}
|
5886
5945
|
% \end{macrocode}
|
5887
5946
|
% \end{macro}
|
5888
5947
|
%
|
@@ -4,7 +4,7 @@
|
|
4
4
|
% LaTeX $B4XO"$N%m%4!J(BpLaTeX2$B&E?7%I%-%e%a%s%H%/%i%9IUO?!K(B
|
5
5
|
%
|
6
6
|
% Copyright 1999-2016 Haruhiko Okumura
|
7
|
-
% Copyright 2016-
|
7
|
+
% Copyright 2016-2019 Japanese TeX Development Community
|
8
8
|
%
|
9
9
|
% \fi
|
10
10
|
%
|
@@ -16,7 +16,7 @@
|
|
16
16
|
%<*driver>
|
17
17
|
\ProvidesFile{jslogo.dtx}
|
18
18
|
%</driver>
|
19
|
-
[
|
19
|
+
[2019/07/25 okumura, texjporg]
|
20
20
|
%<*driver>
|
21
21
|
\documentclass{jsarticle}
|
22
22
|
\usepackage{doc}
|
@@ -368,8 +368,8 @@
|
|
368
368
|
% {\def\BibTeX{{\rmfamily B\kern-.05em%
|
369
369
|
% \textsc{i\kern-.025em b}\kern-.08em%
|
370
370
|
% T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}}{}
|
371
|
-
\DeclareRobustCommand{\BibTeX}{
|
372
|
-
\
|
371
|
+
\DeclareRobustCommand{\BibTeX}{%
|
372
|
+
B\kern-.05em\jslg@small{I\kern-.025em B}\kern-.15em\TeX}
|
373
373
|
\DeclareRobustCommand{\SliTeX}{%
|
374
374
|
S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
|
375
375
|
% \end{macrocode}
|
@@ -22,7 +22,7 @@
|
|
22
22
|
%% in the same archive or directory.)
|
23
23
|
\NeedsTeXFormat{LaTeX2e}
|
24
24
|
\ProvidesPackage{jslogo}
|
25
|
-
[
|
25
|
+
[2019/07/25 okumura, texjporg]
|
26
26
|
\def\jslg@small#1{\hbox{$\m@th$%
|
27
27
|
\csname S@\f@size\endcsname
|
28
28
|
\fontsize\sf@size\z@
|
@@ -207,8 +207,8 @@
|
|
207
207
|
\def\upLaTeX{u\pLaTeX}
|
208
208
|
\def\upLaTeXe{u\pLaTeXe}
|
209
209
|
\def\AmSTeX{\protect\AmS-\protect\TeX{}}
|
210
|
-
\DeclareRobustCommand{\BibTeX}{
|
211
|
-
\
|
210
|
+
\DeclareRobustCommand{\BibTeX}{%
|
211
|
+
B\kern-.05em\jslg@small{I\kern-.025em B}\kern-.15em\TeX}
|
212
212
|
\DeclareRobustCommand{\SliTeX}{%
|
213
213
|
S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
|
214
214
|
\providecommand*\pdfstringdefPreHook{}
|
@@ -22,7 +22,7 @@
|
|
22
22
|
%% in the same archive or directory.)
|
23
23
|
\NeedsTeXFormat{pLaTeX2e}
|
24
24
|
\ProvidesClass{jspf}
|
25
|
-
[
|
25
|
+
[2020/02/02 jsclasses (okumura, texjporg)]
|
26
26
|
\def\jsc@clsname{jspf}
|
27
27
|
\newif\ifjsc@needsp@tch
|
28
28
|
\jsc@needsp@tchfalse
|
@@ -456,6 +456,7 @@
|
|
456
456
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
457
457
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
458
458
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
459
|
+
\ifx\@rmfamilyhook\@undefined % old
|
459
460
|
\DeclareRobustCommand\rmfamily
|
460
461
|
{\not@math@alphabet\rmfamily\mathrm
|
461
462
|
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
|
@@ -465,6 +466,25 @@
|
|
465
466
|
\DeclareRobustCommand\ttfamily
|
466
467
|
{\not@math@alphabet\ttfamily\mathtt
|
467
468
|
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
|
469
|
+
\AtBeginDocument{%
|
470
|
+
\ifx\mweights@init\@undefined\else % mweights.sty is loaded
|
471
|
+
% my definitions above should have been overwritten, recover it!
|
472
|
+
% \selectfont is executed twice but I don't care about speed...
|
473
|
+
\expandafter\g@addto@macro\csname rmfamily \endcsname
|
474
|
+
{\kanjifamily\mcdefault\selectfont}%
|
475
|
+
\expandafter\g@addto@macro\csname sffamily \endcsname
|
476
|
+
{\kanjifamily\gtdefault\selectfont}%
|
477
|
+
\expandafter\g@addto@macro\csname ttfamily \endcsname
|
478
|
+
{\kanjifamily\gtdefault\selectfont}%
|
479
|
+
\fi}
|
480
|
+
\else % 2020-02-02
|
481
|
+
\g@addto@macro\@rmfamilyhook
|
482
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
483
|
+
\g@addto@macro\@sffamilyhook
|
484
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
485
|
+
\g@addto@macro\@ttfamilyhook
|
486
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
487
|
+
\fi
|
468
488
|
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
|
469
489
|
\DeclareRobustCommand\textmc[1]{%
|
470
490
|
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
|
@@ -1243,11 +1263,11 @@
|
|
1243
1263
|
\renewcommand{\theenumiii}{\@roman\c@enumiii}
|
1244
1264
|
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
|
1245
1265
|
\newcommand{\labelenumi}{\theenumi.}
|
1246
|
-
\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
|
1266
|
+
\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
|
1247
1267
|
\newcommand{\labelenumiii}{\theenumiii.}
|
1248
1268
|
\newcommand{\labelenumiv}{\theenumiv.}
|
1249
1269
|
\renewcommand{\p@enumii}{\theenumi}
|
1250
|
-
\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
|
1270
|
+
\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
|
1251
1271
|
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
|
1252
1272
|
\newcommand\labelitemi{\textbullet}
|
1253
1273
|
\newcommand\labelitemii{\normalfont\bfseries \textendash}
|
@@ -1727,23 +1747,42 @@
|
|
1727
1747
|
\def\$B@>Nq(B{\$B@>Nq(Btrue}
|
1728
1748
|
\def\$BOBNq(B{\$B@>Nq(Bfalse}
|
1729
1749
|
\newcount\heisei \heisei\year \advance\heisei-1988\relax
|
1750
|
+
\def\pltx@today@year@#1{%
|
1751
|
+
\ifnum\numexpr\year-#1=1 $B85(B\else
|
1752
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
1753
|
+
\kansuji\numexpr\year-#1\relax
|
1754
|
+
\else
|
1755
|
+
\number\numexpr\year-#1\relax\nobreak
|
1756
|
+
\fi
|
1757
|
+
\fi $BG/(B
|
1758
|
+
}
|
1759
|
+
\def\pltx@today@year{%
|
1760
|
+
\ifnum\numexpr\year*10000+\month*100+\day<19890108
|
1761
|
+
$B><OB(B\pltx@today@year@{1925}%
|
1762
|
+
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
|
1763
|
+
$BJ?@.(B\pltx@today@year@{1988}%
|
1764
|
+
\else
|
1765
|
+
$BNaOB(B\pltx@today@year@{2018}%
|
1766
|
+
\fi\fi}
|
1730
1767
|
\def\today{%
|
1731
1768
|
\if@english
|
1732
1769
|
\ifcase\month\or
|
1733
1770
|
January\or February\or March\or April\or May\or June\or
|
1734
1771
|
July\or August\or September\or October\or November\or December\fi
|
1735
1772
|
\space\number\day, \number\year
|
1773
|
+
\else\if$B@>Nq(B
|
1774
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
|
1775
|
+
\else\number\year\nobreak\fi $BG/(B
|
1736
1776
|
\else
|
1737
|
-
\
|
1738
|
-
|
1739
|
-
|
1740
|
-
|
1741
|
-
\
|
1742
|
-
|
1743
|
-
|
1744
|
-
|
1745
|
-
|
1746
|
-
\fi}
|
1777
|
+
\pltx@today@year
|
1778
|
+
\fi
|
1779
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
1780
|
+
\kansuji\month $B7n(B
|
1781
|
+
\kansuji\day $BF|(B
|
1782
|
+
\else
|
1783
|
+
\number\month\nobreak $B7n(B
|
1784
|
+
\number\day\nobreak $BF|(B
|
1785
|
+
\fi\fi}
|
1747
1786
|
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
|
1748
1787
|
\pagestyle{headings}
|
1749
1788
|
\pagenumbering{arabic}
|
@@ -22,7 +22,7 @@
|
|
22
22
|
%% in the same archive or directory.)
|
23
23
|
\NeedsTeXFormat{pLaTeX2e}
|
24
24
|
\ProvidesClass{jsreport}
|
25
|
-
[
|
25
|
+
[2020/02/02 jsclasses (okumura, texjporg)]
|
26
26
|
\def\jsc@clsname{jsreport}
|
27
27
|
\newif\ifjsc@needsp@tch
|
28
28
|
\jsc@needsp@tchfalse
|
@@ -461,6 +461,7 @@
|
|
461
461
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
462
462
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
463
463
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
464
|
+
\ifx\@rmfamilyhook\@undefined % old
|
464
465
|
\DeclareRobustCommand\rmfamily
|
465
466
|
{\not@math@alphabet\rmfamily\mathrm
|
466
467
|
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
|
@@ -470,6 +471,25 @@
|
|
470
471
|
\DeclareRobustCommand\ttfamily
|
471
472
|
{\not@math@alphabet\ttfamily\mathtt
|
472
473
|
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
|
474
|
+
\AtBeginDocument{%
|
475
|
+
\ifx\mweights@init\@undefined\else % mweights.sty is loaded
|
476
|
+
% my definitions above should have been overwritten, recover it!
|
477
|
+
% \selectfont is executed twice but I don't care about speed...
|
478
|
+
\expandafter\g@addto@macro\csname rmfamily \endcsname
|
479
|
+
{\kanjifamily\mcdefault\selectfont}%
|
480
|
+
\expandafter\g@addto@macro\csname sffamily \endcsname
|
481
|
+
{\kanjifamily\gtdefault\selectfont}%
|
482
|
+
\expandafter\g@addto@macro\csname ttfamily \endcsname
|
483
|
+
{\kanjifamily\gtdefault\selectfont}%
|
484
|
+
\fi}
|
485
|
+
\else % 2020-02-02
|
486
|
+
\g@addto@macro\@rmfamilyhook
|
487
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
488
|
+
\g@addto@macro\@sffamilyhook
|
489
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
490
|
+
\g@addto@macro\@ttfamilyhook
|
491
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
492
|
+
\fi
|
473
493
|
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
|
474
494
|
\DeclareRobustCommand\textmc[1]{%
|
475
495
|
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
|
@@ -1429,11 +1449,11 @@
|
|
1429
1449
|
\renewcommand{\theenumiii}{\@roman\c@enumiii}
|
1430
1450
|
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
|
1431
1451
|
\newcommand{\labelenumi}{\theenumi.}
|
1432
|
-
\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
|
1452
|
+
\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
|
1433
1453
|
\newcommand{\labelenumiii}{\theenumiii.}
|
1434
1454
|
\newcommand{\labelenumiv}{\theenumiv.}
|
1435
1455
|
\renewcommand{\p@enumii}{\theenumi}
|
1436
|
-
\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
|
1456
|
+
\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
|
1437
1457
|
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
|
1438
1458
|
\newcommand\labelitemi{\textbullet}
|
1439
1459
|
\newcommand\labelitemii{\normalfont\bfseries \textendash}
|
@@ -1581,7 +1601,7 @@
|
|
1581
1601
|
\vskip\abovecaptionskip
|
1582
1602
|
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
|
1583
1603
|
\ifdim \wd\@tempboxa <\hsize \centering \fi
|
1584
|
-
#1\hskip1zw\relax
|
1604
|
+
#1{\hskip1zw\relax}#2\par
|
1585
1605
|
\vskip\belowcaptionskip}}
|
1586
1606
|
\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
|
1587
1607
|
\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
|
@@ -1970,23 +1990,42 @@
|
|
1970
1990
|
\def\$B@>Nq(B{\$B@>Nq(Btrue}
|
1971
1991
|
\def\$BOBNq(B{\$B@>Nq(Bfalse}
|
1972
1992
|
\newcount\heisei \heisei\year \advance\heisei-1988\relax
|
1993
|
+
\def\pltx@today@year@#1{%
|
1994
|
+
\ifnum\numexpr\year-#1=1 $B85(B\else
|
1995
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
1996
|
+
\kansuji\numexpr\year-#1\relax
|
1997
|
+
\else
|
1998
|
+
\number\numexpr\year-#1\relax\nobreak
|
1999
|
+
\fi
|
2000
|
+
\fi $BG/(B
|
2001
|
+
}
|
2002
|
+
\def\pltx@today@year{%
|
2003
|
+
\ifnum\numexpr\year*10000+\month*100+\day<19890108
|
2004
|
+
$B><OB(B\pltx@today@year@{1925}%
|
2005
|
+
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
|
2006
|
+
$BJ?@.(B\pltx@today@year@{1988}%
|
2007
|
+
\else
|
2008
|
+
$BNaOB(B\pltx@today@year@{2018}%
|
2009
|
+
\fi\fi}
|
1973
2010
|
\def\today{%
|
1974
2011
|
\if@english
|
1975
2012
|
\ifcase\month\or
|
1976
2013
|
January\or February\or March\or April\or May\or June\or
|
1977
2014
|
July\or August\or September\or October\or November\or December\fi
|
1978
2015
|
\space\number\day, \number\year
|
2016
|
+
\else\if$B@>Nq(B
|
2017
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
|
2018
|
+
\else\number\year\nobreak\fi $BG/(B
|
1979
2019
|
\else
|
1980
|
-
\
|
1981
|
-
|
1982
|
-
|
1983
|
-
|
1984
|
-
\
|
1985
|
-
|
1986
|
-
|
1987
|
-
|
1988
|
-
|
1989
|
-
\fi}
|
2020
|
+
\pltx@today@year
|
2021
|
+
\fi
|
2022
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
2023
|
+
\kansuji\month $B7n(B
|
2024
|
+
\kansuji\day $BF|(B
|
2025
|
+
\else
|
2026
|
+
\number\month\nobreak $B7n(B
|
2027
|
+
\number\day\nobreak $BF|(B
|
2028
|
+
\fi\fi}
|
1990
2029
|
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
|
1991
2030
|
\pagestyle{plain}
|
1992
2031
|
\pagenumbering{arabic}
|