review 3.1.0 → 5.0.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 +45 -0
- data/.github/workflows/ruby.yml +27 -0
- data/.rubocop.yml +161 -34
- data/.travis.yml +16 -15
- data/Dockerfile +21 -5
- data/NEWS.ja.md +394 -0
- data/NEWS.md +395 -1
- data/README.md +10 -7
- data/appveyor.yml +1 -3
- data/bin/review-catalog-converter +5 -5
- data/bin/review-check +10 -12
- data/bin/review-checkdep +2 -2
- data/bin/review-compile +17 -23
- data/bin/review-epubmaker +3 -35
- data/bin/review-idgxmlmaker +16 -0
- data/bin/review-index +2 -89
- data/bin/review-preproc +13 -13
- data/bin/review-validate +4 -4
- data/bin/review-vol +4 -78
- data/doc/config.yml.sample +47 -12
- data/doc/config.yml.sample-simple +3 -2
- data/doc/format.ja.md +120 -17
- data/doc/format.md +119 -27
- data/doc/makeindex.ja.md +2 -2
- data/doc/pdfmaker.ja.md +43 -1
- data/doc/pdfmaker.md +42 -1
- data/doc/quickstart.ja.md +45 -25
- data/doc/quickstart.md +37 -16
- data/lib/epubmaker/content.rb +3 -2
- data/lib/epubmaker/epubcommon.rb +34 -27
- data/lib/epubmaker/epubv2.rb +5 -6
- data/lib/epubmaker/epubv3.rb +21 -18
- data/lib/epubmaker/producer.rb +2 -1
- data/lib/review/book.rb +2 -2
- data/lib/review/book/base.rb +91 -96
- data/lib/review/book/bib.rb +21 -0
- data/lib/review/book/book_unit.rb +155 -0
- data/lib/review/book/chapter.rb +48 -29
- data/lib/review/book/index.rb +46 -240
- data/lib/review/book/index/item.rb +46 -0
- data/lib/review/book/page_metric.rb +7 -7
- data/lib/review/book/part.rb +45 -10
- data/lib/review/book/volume.rb +4 -5
- data/lib/review/builder.rb +172 -56
- data/lib/review/catalog.rb +14 -17
- data/lib/review/compiler.rb +219 -121
- data/lib/review/configure.rb +39 -7
- data/lib/review/converter.rb +1 -1
- data/lib/review/epub2html.rb +43 -5
- data/lib/review/epubmaker.rb +69 -27
- data/lib/review/extentions/string.rb +0 -4
- data/lib/review/htmlbuilder.rb +112 -101
- data/lib/review/htmlutils.rb +9 -13
- data/lib/review/i18n.rb +3 -3
- data/lib/review/idgxmlbuilder.rb +202 -78
- data/lib/review/idgxmlmaker.rb +186 -0
- data/lib/review/index_builder.rb +653 -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 +129 -46
- data/lib/review/latexbuilder.rb +255 -92
- 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 +35 -5
- data/lib/review/markdownbuilder.rb +50 -38
- data/lib/review/md2inaobuilder.rb +3 -5
- data/lib/review/pdfmaker.rb +60 -57
- data/lib/review/plaintextbuilder.rb +154 -87
- data/lib/review/preprocessor.rb +20 -42
- data/lib/review/rstbuilder.rb +57 -38
- data/lib/review/sec_counter.rb +13 -0
- data/lib/review/textmaker.rb +23 -15
- data/lib/review/textutils.rb +76 -2
- data/lib/review/tocprinter.rb +230 -102
- data/lib/review/topbuilder.rb +139 -60
- data/lib/review/update.rb +24 -24
- data/lib/review/version.rb +1 -1
- data/lib/review/volumeprinter.rb +98 -0
- data/lib/review/webmaker.rb +20 -24
- 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/Gemfile +1 -1
- 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 +39 -25
- data/templates/latex/layout.tex.erb +1 -0
- data/templates/latex/review-jlreq/README.md +3 -1
- data/templates/latex/review-jlreq/review-base.sty +161 -50
- data/templates/latex/review-jlreq/review-jlreq.cls +21 -22
- data/templates/latex/review-jlreq/review-style.sty +4 -1
- data/templates/latex/review-jsbook/README.md +46 -5
- data/templates/latex/review-jsbook/review-base.sty +123 -35
- data/templates/latex/review-jsbook/review-jsbook.cls +10 -4
- 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 +3 -3
- data/test/assets/test_template.tex +19 -7
- data/test/assets/test_template_backmatter.tex +19 -7
- data/test/book_test_helper.rb +11 -5
- data/test/test_book.rb +124 -79
- data/test/test_book_chapter.rb +97 -54
- data/test/test_book_part.rb +3 -3
- data/test/test_builder.rb +38 -13
- data/test/test_catalog.rb +24 -42
- data/test/test_catalog_converter_cmd.rb +1 -1
- data/test/test_converter.rb +1 -0
- data/test/test_epub3maker.rb +2 -2
- data/test/test_epubmaker.rb +8 -0
- data/test/test_epubmaker_cmd.rb +14 -7
- data/test/test_helper.rb +18 -7
- data/test/test_htmlbuilder.rb +1491 -205
- data/test/test_htmlutils.rb +0 -12
- data/test/test_i18n.rb +37 -37
- data/test/test_idgxmlbuilder.rb +744 -42
- data/test/test_idgxmlmaker_cmd.rb +46 -0
- data/test/test_image_finder.rb +52 -70
- data/test/test_index.rb +94 -44
- data/test/test_indexbuilder.rb +52 -0
- data/test/test_latexbuilder.rb +1784 -161
- data/test/test_latexbuilder_v2.rb +671 -102
- data/test/test_logger.rb +17 -4
- data/test/test_makerhelper.rb +2 -14
- data/test/test_markdownbuilder.rb +137 -16
- data/test/test_md2inaobuilder.rb +32 -9
- data/test/test_pdfmaker.rb +30 -12
- data/test/test_pdfmaker_cmd.rb +100 -6
- data/test/test_plaintextbuilder.rb +791 -30
- data/test/test_preprocessor.rb +2 -16
- data/test/test_review_ext.rb +2 -1
- data/test/test_rstbuilder.rb +274 -27
- data/test/test_sec_counter.rb +156 -0
- data/test/test_textmaker_cmd.rb +54 -0
- data/test/test_textutils.rb +109 -2
- data/test/test_topbuilder.rb +724 -34
- data/test/test_update.rb +20 -11
- data/test/test_webtocprinter.rb +75 -43
- data/test/test_yamlloader.rb +13 -0
- 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/LICENSE +1 -1
- 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 +74 -31
- data/vendor/jsclasses/jis/jsbook.cls +74 -31
- data/vendor/jsclasses/jis/jsclasses.dtx +176 -36
- data/vendor/jsclasses/jis/jsclasses.ins +15 -5
- data/vendor/jsclasses/jis/jslogo.dtx +4 -4
- data/vendor/jsclasses/jis/jslogo.ins +9 -0
- data/vendor/jsclasses/jis/jslogo.sty +4 -16
- data/vendor/jsclasses/jis/jspf.cls +73 -30
- data/vendor/jsclasses/jis/jsreport.cls +74 -31
- data/vendor/jsclasses/jis/jsverb.ins +9 -0
- data/vendor/jsclasses/jis/jsverb.sty +1 -13
- data/vendor/jsclasses/jis/kiyou.cls +74 -31
- data/vendor/jsclasses/jis/minijs.sty +65 -22
- data/vendor/jsclasses/jis/okumacro.dtx +4 -5
- data/vendor/jsclasses/jis/okumacro.ins +9 -0
- data/vendor/jsclasses/jis/okumacro.sty +4 -17
- 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 +74 -31
- data/vendor/jsclasses/jsbook.cls +74 -31
- data/vendor/jsclasses/jsclasses.dtx +176 -36
- data/vendor/jsclasses/jsclasses.ins +15 -5
- data/vendor/jsclasses/jsclasses.pdf +0 -0
- data/vendor/jsclasses/jslogo.dtx +4 -4
- data/vendor/jsclasses/jslogo.ins +9 -0
- data/vendor/jsclasses/jslogo.pdf +0 -0
- data/vendor/jsclasses/jslogo.sty +4 -16
- data/vendor/jsclasses/jspf.cls +73 -30
- data/vendor/jsclasses/jsreport.cls +74 -31
- 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 +74 -31
- data/vendor/jsclasses/minijs.sty +68 -22
- data/vendor/jsclasses/okumacro.dtx +4 -5
- data/vendor/jsclasses/okumacro.ins +9 -0
- data/vendor/jsclasses/okumacro.pdf +0 -0
- data/vendor/jsclasses/okumacro.sty +4 -17
- 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 +65 -12
- data/.rubocop_todo.yml +0 -7
- data/lib/review/book/compilable.rb +0 -173
- 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-2020
|
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
|
%
|
@@ -23,10 +23,11 @@
|
|
23
23
|
%<report>\ProvidesClass{jsreport}
|
24
24
|
%<jspf>\ProvidesClass{jspf}
|
25
25
|
%<kiyou>\ProvidesClass{kiyou}
|
26
|
+
%<minijs>\ProvidesPackage{minijs}
|
26
27
|
%<*driver>
|
27
28
|
\ProvidesFile{jsclasses.dtx}
|
28
29
|
%</driver>
|
29
|
-
[
|
30
|
+
[2020/10/09 jsclasses (okumura, texjporg)]
|
30
31
|
%<*driver>
|
31
32
|
\documentclass{jsarticle}
|
32
33
|
\usepackage{doc}
|
@@ -119,11 +120,26 @@
|
|
119
120
|
%
|
120
121
|
% $B0J2<$G$O<B:]$N%3!<%I$KB($7$F@bL@$7$^$9!#(B
|
121
122
|
%
|
123
|
+
% \texttt{minijs}$B$O!$(B\texttt{jsclasses}$B$K;w$?@_Dj$r9T$&%Q%C%1!<%8$G$9!#(B
|
124
|
+
%
|
125
|
+
% \begin{macrocode}
|
126
|
+
%<*minijs>
|
127
|
+
%% if jsclasses loaded, abort loading this package
|
128
|
+
\ifx\@jsc@uplatextrue\@undefined\else
|
129
|
+
\PackageInfo{minijs}{jsclasses does not need minijs, exiting}
|
130
|
+
\expandafter\endinput
|
131
|
+
\fi
|
132
|
+
%% "fake" jsarticle
|
133
|
+
\expandafter\def\csname ver@jsarticle.cls\endcsname{}
|
134
|
+
%</minijs>
|
135
|
+
% \end{macrocode}
|
136
|
+
%
|
122
137
|
% \begin{macro}{\jsc@clsname}
|
123
138
|
%
|
124
139
|
% $BJ8=q%/%i%9$NL>A0$G$9!#%(%i!<%a%C%;!<%8I=<($J$I$G;H$o$l$^$9!#(B
|
125
140
|
%
|
126
141
|
% \begin{macrocode}
|
142
|
+
%<*class>
|
127
143
|
%<article>\def\jsc@clsname{jsarticle}
|
128
144
|
%<book>\def\jsc@clsname{jsbook}
|
129
145
|
%<report>\def\jsc@clsname{jsreport}
|
@@ -142,8 +158,12 @@
|
|
142
158
|
% $B$r$"$F$k>l9g$,$"$j$^$9!#$3$N=hM}$K;HMQ$9$k%U%i%0$rDj5A$7$^$9!#(B
|
143
159
|
%
|
144
160
|
% \begin{macrocode}
|
161
|
+
%</class>
|
162
|
+
%<*class|minijs>
|
145
163
|
\newif\ifjsc@needsp@tch
|
146
164
|
\jsc@needsp@tchfalse
|
165
|
+
%</class|minijs>
|
166
|
+
%<*class>
|
147
167
|
% \end{macrocode}
|
148
168
|
% \end{macro}
|
149
169
|
%
|
@@ -741,6 +761,11 @@
|
|
741
761
|
% [2017-01-11] $B%H%s%\%*%W%7%g%s$,;XDj$5$l$F$$$k$H$-!V$@$1!W(B|\stockwidth|$B!$(B
|
742
762
|
% |\stockheight|$B$rDj5A$9$k$h$&$K$7$^$7$?!#(B
|
743
763
|
%
|
764
|
+
% [2020-10-04] \LaTeXe~2020-10-01$B$G%+!<%M%k$N(B |\shipout| $B%3!<%I$,3HD%$5$l(B
|
765
|
+
% |\AtBeginDvi| $B$N<B9T%?%$%_%s%0$,JQ2=$7$?$N$G!$$3$N;~E@$G(B
|
766
|
+
% $BH/9T$9$k(B |\special| $B$NCf?H$rE83+$7$F$*$/$h$&$K$7$^$7$?!#(B
|
767
|
+
% $B$3$&$7$J$$$H!$MQ;f%5%$%:@_Dj$r4V0c$C$F$7$^$$$^$9(B(Issue \#72)$B!#(B
|
768
|
+
%
|
744
769
|
% \begin{macrocode}
|
745
770
|
\iftombow
|
746
771
|
\newdimen\stockwidth \newdimen\stockheight
|
@@ -751,10 +776,11 @@
|
|
751
776
|
\fi
|
752
777
|
\ifpapersize
|
753
778
|
\iftombow
|
754
|
-
\
|
779
|
+
\edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
|
755
780
|
\else
|
756
|
-
\
|
781
|
+
\edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
|
757
782
|
\fi
|
783
|
+
\AtBeginDvi{\special{\jsc@papersize@special}}
|
758
784
|
\fi
|
759
785
|
% \end{macrocode}
|
760
786
|
%
|
@@ -879,7 +905,7 @@
|
|
879
905
|
\fi
|
880
906
|
\ifnum\@ptsize=-1
|
881
907
|
\def\n@baseline{15}%
|
882
|
-
\fi
|
908
|
+
\fi
|
883
909
|
\fi
|
884
910
|
%<*kiyou>
|
885
911
|
\def\jsc@magscale{0.9769230}
|
@@ -888,7 +914,7 @@
|
|
888
914
|
\def\inv@mag{1.02354}
|
889
915
|
\jsc@mpt=1\p@
|
890
916
|
\jsc@mmm=1mm
|
891
|
-
\else
|
917
|
+
\else
|
892
918
|
\jsc@mpt=\jsc@magscale\p@
|
893
919
|
\jsc@mmm=\jsc@magscale mm
|
894
920
|
\def\inv@mag{1}
|
@@ -1054,6 +1080,24 @@
|
|
1054
1080
|
% $9.62216\,\mathrm{pt} * 0.961 / 10\,\mathrm{pt} = 0.924690$ $B$G$9!#(B
|
1055
1081
|
%
|
1056
1082
|
% \begin{macrocode}
|
1083
|
+
%</class>
|
1084
|
+
%<*minijs>
|
1085
|
+
%% min/goth -> jis/jisg (for pLaTeX only)
|
1086
|
+
\ifx\ucs\@undefined
|
1087
|
+
\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
|
1088
|
+
\expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
|
1089
|
+
\expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax
|
1090
|
+
\expandafter\let\csname JT1/mc/m/n/\@tempa\endcsname\relax
|
1091
|
+
\expandafter\let\csname JT1/gt/m/n/\@tempa\endcsname\relax
|
1092
|
+
}
|
1093
|
+
\def\Cjascale{0.924690}
|
1094
|
+
\DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] jis}{}
|
1095
|
+
\DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] jisg}{}
|
1096
|
+
\DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{}
|
1097
|
+
\DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{}
|
1098
|
+
\fi
|
1099
|
+
%</minijs>
|
1100
|
+
%<*class>
|
1057
1101
|
%<*!jspf>
|
1058
1102
|
\def\Cjascale{0.924690}
|
1059
1103
|
\ifmingoth
|
@@ -1155,6 +1199,33 @@
|
|
1155
1199
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
1156
1200
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
1157
1201
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
1202
|
+
% \end{macrocode}
|
1203
|
+
%
|
1204
|
+
% [2020-02-02] \LaTeXe~2020-02-02$B$G(BNFSS$B$,3HD%$5$l!$(B
|
1205
|
+
% $B$=$l$KH<$$%*%j%8%J%k$N(B |\rmfamily| $B$J$I$NDj5A$,JQ2=$7$^$7$?!#(B
|
1206
|
+
% |\DeclareRobustCommand| $B$GD>@\Dj5A$9$k$H!$$3$l$r>e=q$-$7$F(B
|
1207
|
+
% NFSS$B$N3HD%ItJ,$r2u$7$F$7$^$$$^$9$N$G!$(B
|
1208
|
+
% $B?7$?$KDs6!$5$l$?%U%C%/$K%3!<%I$rA^F~$7$^$9!#(B
|
1209
|
+
% $B=>Mh$N%3!<%I$b(B\LaTeXe~2019-10-01$B0JA0$N$?$a$K;D$7$F$"$j$^$9$,!$(B
|
1210
|
+
% \texttt{mweights}$B%Q%C%1!<%8BP:v$b;\$7$^$7$?(B(forum:2763)$B!#(B
|
1211
|
+
%
|
1212
|
+
% [2020-10-04] \LaTeXe~2020-10-01$B$G$O(B |\AddToHook| $B$rMxMQ$7$^$9!#(B
|
1213
|
+
%
|
1214
|
+
% ^^A Note that |\AddToHook| is defined as follows:
|
1215
|
+
% ^^A \begin{itemize}
|
1216
|
+
% ^^A \item Format date 2020-02-02 or older: undefined
|
1217
|
+
% ^^A \item Format date 2020-10-01 or newer: available
|
1218
|
+
% ^^A \item ... under \texttt{latexrelease} rollback: defined but no-op
|
1219
|
+
% ^^A \end{itemize}
|
1220
|
+
%
|
1221
|
+
% \begin{macrocode}
|
1222
|
+
%</class>
|
1223
|
+
%<*class|minijs>
|
1224
|
+
%% ad-hoc "relation font"
|
1225
|
+
\@ifl@t@r\fmtversion{2020/10/01}
|
1226
|
+
{\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
|
1227
|
+
\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
|
1228
|
+
\ifx\@rmfamilyhook\@undefined % old
|
1158
1229
|
\DeclareRobustCommand\rmfamily
|
1159
1230
|
{\not@math@alphabet\rmfamily\mathrm
|
1160
1231
|
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
|
@@ -1164,6 +1235,35 @@
|
|
1164
1235
|
\DeclareRobustCommand\ttfamily
|
1165
1236
|
{\not@math@alphabet\ttfamily\mathtt
|
1166
1237
|
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
|
1238
|
+
\AtBeginDocument{%
|
1239
|
+
\ifx\mweights@init\@undefined\else % mweights.sty is loaded
|
1240
|
+
% my definitions above should have been overwritten, recover it!
|
1241
|
+
% \selectfont is executed twice but I don't care about speed...
|
1242
|
+
\expandafter\g@addto@macro\csname rmfamily \endcsname
|
1243
|
+
{\kanjifamily\mcdefault\selectfont}%
|
1244
|
+
\expandafter\g@addto@macro\csname sffamily \endcsname
|
1245
|
+
{\kanjifamily\gtdefault\selectfont}%
|
1246
|
+
\expandafter\g@addto@macro\csname ttfamily \endcsname
|
1247
|
+
{\kanjifamily\gtdefault\selectfont}%
|
1248
|
+
\fi}
|
1249
|
+
\else % 2020-02-02
|
1250
|
+
\g@addto@macro\@rmfamilyhook
|
1251
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
1252
|
+
\g@addto@macro\@sffamilyhook
|
1253
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1254
|
+
\g@addto@macro\@ttfamilyhook
|
1255
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1256
|
+
\fi
|
1257
|
+
\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
|
1258
|
+
\AddToHook{rmfamily}%
|
1259
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
1260
|
+
\AddToHook{sffamily}%
|
1261
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1262
|
+
\AddToHook{ttfamily}%
|
1263
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1264
|
+
\fi % --- for 2020-10-01 END
|
1265
|
+
%</class|minijs>
|
1266
|
+
%<*class>
|
1167
1267
|
% \end{macrocode}
|
1168
1268
|
%
|
1169
1269
|
% \begin{macro}{\textmc}
|
@@ -1335,10 +1435,10 @@
|
|
1335
1435
|
\xspcode`+=3
|
1336
1436
|
\xspcode`\%=3
|
1337
1437
|
% \end{macrocode}
|
1338
|
-
%
|
1438
|
+
%
|
1339
1439
|
% $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
1440
|
% $BN>B&$NOBJ8J8;z$H$N4V$K%9%Z!<%9$,F~$i$J$1$l$P$J$j$^$;$s!#(B
|
1341
|
-
%
|
1441
|
+
%
|
1342
1442
|
% \begin{macrocode}
|
1343
1443
|
\xspcode`^^80=3
|
1344
1444
|
\xspcode`^^81=3
|
@@ -1531,25 +1631,31 @@
|
|
1531
1631
|
% [2008-02-18] |english| $B%*%W%7%g%s$G(B |\parindent| $B$r(B 1em $B$K$7$^$7$?!#(B
|
1532
1632
|
%
|
1533
1633
|
% \begin{macrocode}
|
1634
|
+
%</class>
|
1635
|
+
%<*class|minijs>
|
1636
|
+
%% \@setfontsize with \parindent and \(x)kanjiskip settings
|
1534
1637
|
\def\@setfontsize#1#2#3{%
|
1535
|
-
|
1638
|
+
%<minijs> \@nomath#1%
|
1536
1639
|
\ifx\protect\@typeset@protect
|
1537
1640
|
\let\@currsize#1%
|
1538
1641
|
\fi
|
1539
1642
|
\fontsize{#2}{#3}\selectfont
|
1540
1643
|
\ifdim\parindent>\z@
|
1541
|
-
\if@english
|
1542
|
-
\parindent=1em
|
1543
|
-
\else
|
1644
|
+
%<class> \if@english
|
1645
|
+
%<class> \parindent=1em
|
1646
|
+
%<class> \else
|
1544
1647
|
\parindent=1zw
|
1545
|
-
\fi
|
1648
|
+
%<class> \fi
|
1546
1649
|
\fi
|
1547
1650
|
\kanjiskip=0zw plus .1zw minus .01zw
|
1548
|
-
\ifdim\xkanjiskip>\z@
|
1549
|
-
\if@slide \xkanjiskip=0.1em \else
|
1651
|
+
%<class> \ifdim\xkanjiskip>\z@
|
1652
|
+
%<class> \if@slide \xkanjiskip=0.1em \else
|
1550
1653
|
\xkanjiskip=0.25em plus 0.15em minus 0.06em
|
1551
|
-
\fi
|
1552
|
-
\fi
|
1654
|
+
%<class> \fi
|
1655
|
+
%<class> \fi
|
1656
|
+
}
|
1657
|
+
%</class|minijs>
|
1658
|
+
%<*class>
|
1553
1659
|
% \end{macrocode}
|
1554
1660
|
% \end{macro}
|
1555
1661
|
%
|
@@ -1658,7 +1764,12 @@
|
|
1658
1764
|
% $B$3$3$G<B:]$KI8=`%U%)%s%H%5%$%:$G=i4|2=$7$^$9!#(B
|
1659
1765
|
%
|
1660
1766
|
% \begin{macrocode}
|
1767
|
+
%</class>
|
1768
|
+
%<*class|minijs>
|
1769
|
+
%% initialize
|
1661
1770
|
\normalsize
|
1771
|
+
%</class|minijs>
|
1772
|
+
%<*class>
|
1662
1773
|
% \end{macrocode}
|
1663
1774
|
%
|
1664
1775
|
% \end{macro}
|
@@ -4032,7 +4143,7 @@
|
|
4032
4143
|
%
|
4033
4144
|
% \begin{macrocode}
|
4034
4145
|
\newcommand{\labelenumi}{\theenumi.}
|
4035
|
-
\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
|
4146
|
+
\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
|
4036
4147
|
\newcommand{\labelenumiii}{\theenumiii.}
|
4037
4148
|
\newcommand{\labelenumiv}{\theenumiv.}
|
4038
4149
|
% \end{macrocode}
|
@@ -4051,7 +4162,7 @@
|
|
4051
4162
|
%
|
4052
4163
|
% \begin{macrocode}
|
4053
4164
|
\renewcommand{\p@enumii}{\theenumi}
|
4054
|
-
\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
|
4165
|
+
\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
|
4055
4166
|
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
|
4056
4167
|
% \end{macrocode}
|
4057
4168
|
% \end{macro}
|
@@ -4451,7 +4562,7 @@
|
|
4451
4562
|
% $B?t<0HV9f$N7A<0$G$9!#(B
|
4452
4563
|
% $B%G%U%)%k%H$NCM$r%3%a%s%H%"%&%H$7$F<($7$F$*$-$^$9!#(B
|
4453
4564
|
%
|
4454
|
-
% |\inhibitglue$B!J(B\theequation$B!K(B\inhibitglue| $B$N$h$&$KOBJ8$+$C$3(B
|
4565
|
+
% |\inhibitglue $B!J(B\theequation $B!K(B\inhibitglue| $B$N$h$&$KOBJ8$+$C$3(B
|
4455
4566
|
% $B$r;H$&$3$H$b2DG=$G$9!#(B
|
4456
4567
|
%
|
4457
4568
|
% \begin{macrocode}
|
@@ -4462,7 +4573,7 @@
|
|
4462
4573
|
% |amsmath| $B%Q%C%1!<%8$r;H$&>l9g$O(B |\tagform@| $B$r<!$N$h$&$K=$@5$7$^$9!#(B
|
4463
4574
|
%
|
4464
4575
|
% \begin{macrocode}
|
4465
|
-
% \def\tagform@#1{\maketag@@@{$B!J(B\ignorespaces#1\unskip\@@italiccorr$B!K(B}}
|
4576
|
+
% \def\tagform@#1{\maketag@@@{$B!J(B\ignorespaces#1\unskip\@@italiccorr $B!K(B}}
|
4466
4577
|
% \end{macrocode}
|
4467
4578
|
%
|
4468
4579
|
% \subsection{$B%U%m!<%H(B}
|
@@ -4636,6 +4747,10 @@
|
|
4636
4747
|
%
|
4637
4748
|
% [2003-11-05] $B%m%8%C%/$r>/$7JQ$($F$_$^$7$?!#(B
|
4638
4749
|
%
|
4750
|
+
% [2018-12-11] $BCY$/$J$j$^$7$?$,!$(B|listings| $B%Q%C%1!<%8$r;H$&$H$-$K(B
|
4751
|
+
% |title| $B$r;XDj$9$k$H(B ``1zw'' $B$,=PNO$5$l$F$7$^$&(B
|
4752
|
+
% $BLdBj(B (forum:1543$B!$(BIssue \#71) $B$KBP=h$7$^$7$?!#(B
|
4753
|
+
%
|
4639
4754
|
% \begin{macrocode}
|
4640
4755
|
%<*!jspf>
|
4641
4756
|
% \long\def\@makecaption#1#2{{\small
|
@@ -4656,7 +4771,7 @@
|
|
4656
4771
|
\vskip\abovecaptionskip
|
4657
4772
|
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
|
4658
4773
|
\ifdim \wd\@tempboxa <\hsize \centering \fi
|
4659
|
-
#1\hskip1zw\relax
|
4774
|
+
#1{\hskip1zw\relax}#2\par
|
4660
4775
|
\vskip\belowcaptionskip}}
|
4661
4776
|
%</!jspf>
|
4662
4777
|
%<*jspf>
|
@@ -5211,7 +5326,7 @@
|
|
5211
5326
|
% $B$H$j$"$($:%3%a%s%H%"%&%H$7$F$*$-$^$9$N$G!$I,MW$K1~$8$F@8$+$7$F$/$@$5$$!#(B
|
5212
5327
|
%
|
5213
5328
|
% \begin{macrocode}
|
5214
|
-
% \def\@biblabel#1{\inhibitglue$B!N(B#1$B!O(B\inhibitglue}
|
5329
|
+
% \def\@biblabel#1{\inhibitglue $B!N(B#1$B!O(B\inhibitglue}
|
5215
5330
|
% \end{macrocode}
|
5216
5331
|
% \end{macro}
|
5217
5332
|
%
|
@@ -5238,7 +5353,7 @@
|
|
5238
5353
|
% \@latex@warning
|
5239
5354
|
% {Citation `\@citeb' on page \thepage \space undefined}}%
|
5240
5355
|
% {\@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}
|
5356
|
+
% \def\@cite#1#2{\inhibitglue $B!N(B{#1\if@tempswa $B!$(B#2\fi}$B!O(B\inhibitglue}
|
5242
5357
|
% \end{macrocode}
|
5243
5358
|
%
|
5244
5359
|
% $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 +5972,13 @@
|
|
5857
5972
|
% \paragraph{$B:#F|$NF|IU(B}
|
5858
5973
|
%
|
5859
5974
|
% \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
|
5975
|
+
% ^^A |jarticle| $B$J$I$H0c$C$F!$I8=`$r@>Nq$K$7!$(B
|
5976
|
+
% ^^A $BM>J,$J6uGr$,F~$i$J$$$h$&$K2~NI$7$^$7$?!#(B
|
5977
|
+
% ^^A -- 2018$BG/(B7$B7n0J9_$O(B |jarticle| $B$J$I$bI8=`$,@>Nq!$(B
|
5978
|
+
% ^^A -- 2019$BG/(B4$B7n0J9_$OM>J,$J6uGr$,F~$i$J$/$J$C$F$$$^$9!#(B
|
5861
5979
|
% $BOBNq$K$9$k$K$O(B |\$BOBNq(B| $B$H=q$$$F$/$@$5$$!#(B
|
5980
|
+
% $B$A$J$_$K$3$NJ8>O$N:n@.F|$O@>Nq$G$O(B{\$B@>Nq(B\today}$B$G!$(B
|
5981
|
+
% $BOBNq$G$O(B{\$BOBNq(B\today}$B$G$9!#(B
|
5862
5982
|
%
|
5863
5983
|
% \begin{macro}{\today}
|
5864
5984
|
% \begin{macrocode}
|
@@ -5866,23 +5986,42 @@
|
|
5866
5986
|
\def\$B@>Nq(B{\$B@>Nq(Btrue}
|
5867
5987
|
\def\$BOBNq(B{\$B@>Nq(Bfalse}
|
5868
5988
|
\newcount\heisei \heisei\year \advance\heisei-1988\relax
|
5989
|
+
\def\pltx@today@year@#1{%
|
5990
|
+
\ifnum\numexpr\year-#1=1 $B85(B\else
|
5991
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
5992
|
+
\kansuji\numexpr\year-#1\relax
|
5993
|
+
\else
|
5994
|
+
\number\numexpr\year-#1\relax\nobreak
|
5995
|
+
\fi
|
5996
|
+
\fi $BG/(B
|
5997
|
+
}
|
5998
|
+
\def\pltx@today@year{%
|
5999
|
+
\ifnum\numexpr\year*10000+\month*100+\day<19890108
|
6000
|
+
$B><OB(B\pltx@today@year@{1925}%
|
6001
|
+
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
|
6002
|
+
$BJ?@.(B\pltx@today@year@{1988}%
|
6003
|
+
\else
|
6004
|
+
$BNaOB(B\pltx@today@year@{2018}%
|
6005
|
+
\fi\fi}
|
5869
6006
|
\def\today{%
|
5870
6007
|
\if@english
|
5871
6008
|
\ifcase\month\or
|
5872
6009
|
January\or February\or March\or April\or May\or June\or
|
5873
6010
|
July\or August\or September\or October\or November\or December\fi
|
5874
6011
|
\space\number\day, \number\year
|
6012
|
+
\else\if$B@>Nq(B
|
6013
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
|
6014
|
+
\else\number\year\nobreak\fi $BG/(B
|
5875
6015
|
\else
|
5876
|
-
\
|
5877
|
-
|
5878
|
-
|
5879
|
-
|
5880
|
-
\
|
5881
|
-
|
5882
|
-
|
5883
|
-
|
5884
|
-
|
5885
|
-
\fi}
|
6016
|
+
\pltx@today@year
|
6017
|
+
\fi
|
6018
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
6019
|
+
\kansuji\month $B7n(B
|
6020
|
+
\kansuji\day $BF|(B
|
6021
|
+
\else
|
6022
|
+
\number\month\nobreak $B7n(B
|
6023
|
+
\number\day\nobreak $BF|(B
|
6024
|
+
\fi\fi}
|
5886
6025
|
% \end{macrocode}
|
5887
6026
|
% \end{macro}
|
5888
6027
|
%
|
@@ -5951,6 +6090,7 @@
|
|
5951
6090
|
\ignorespaces
|
5952
6091
|
\fi}
|
5953
6092
|
%</article|book|report>
|
6093
|
+
%</class>
|
5954
6094
|
% \end{macrocode}
|
5955
6095
|
% \end{macro}
|
5956
6096
|
%
|
@@ -1,8 +1,18 @@
|
|
1
|
+
\input docstrip
|
2
|
+
\preamble
|
3
|
+
|
4
|
+
Maintained on GitHub: https://github.com/texjporg/jsclasses
|
5
|
+
|
6
|
+
\endpreamble
|
7
|
+
|
1
8
|
\def\batchfile{jsclasses.ins}
|
2
9
|
\input docstrip.tex
|
3
10
|
\keepsilent
|
4
|
-
\generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{article}}
|
5
|
-
\generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{book}}
|
6
|
-
\generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{report}}
|
7
|
-
\generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{jspf}}
|
8
|
-
\generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{kiyou}}
|
11
|
+
\generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{class,article}}
|
12
|
+
\generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{class,book}}
|
13
|
+
\generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{class,report}}
|
14
|
+
\generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{class,jspf}}
|
15
|
+
\generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{class,kiyou}}
|
16
|
+
\generateFile{minijs.sty}{f}{\from{jsclasses.dtx}{minijs}}
|
17
|
+
|
18
|
+
\endbatchfile
|
@@ -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}
|