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,28 +4,16 @@
|
|
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
|
\ifx\epTeXinputencoding\undefined\else
|
24
12
|
\epTeXinputencoding utf8 % ^^A added (2017-10-04)
|
25
13
|
\fi
|
26
14
|
\NeedsTeXFormat{pLaTeX2e}
|
27
15
|
\ProvidesClass{jsarticle}
|
28
|
-
[
|
16
|
+
[2020/10/09 jsclasses (okumura, texjporg)]
|
29
17
|
\def\jsc@clsname{jsarticle}
|
30
18
|
\newif\ifjsc@needsp@tch
|
31
19
|
\jsc@needsp@tchfalse
|
@@ -259,10 +247,11 @@
|
|
259
247
|
\fi
|
260
248
|
\ifpapersize
|
261
249
|
\iftombow
|
262
|
-
\
|
250
|
+
\edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
|
263
251
|
\else
|
264
|
-
\
|
252
|
+
\edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
|
265
253
|
\fi
|
254
|
+
\AtBeginDvi{\special{\jsc@papersize@special}}
|
266
255
|
\fi
|
267
256
|
\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
|
268
257
|
\newdimen\jsc@mpt
|
@@ -463,6 +452,11 @@
|
|
463
452
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
464
453
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
465
454
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
455
|
+
%% ad-hoc "relation font"
|
456
|
+
\@ifl@t@r\fmtversion{2020/10/01}
|
457
|
+
{\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
|
458
|
+
\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
|
459
|
+
\ifx\@rmfamilyhook\@undefined % old
|
466
460
|
\DeclareRobustCommand\rmfamily
|
467
461
|
{\not@math@alphabet\rmfamily\mathrm
|
468
462
|
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
|
@@ -472,6 +466,33 @@
|
|
472
466
|
\DeclareRobustCommand\ttfamily
|
473
467
|
{\not@math@alphabet\ttfamily\mathtt
|
474
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
|
488
|
+
\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
|
489
|
+
\AddToHook{rmfamily}%
|
490
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
491
|
+
\AddToHook{sffamily}%
|
492
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
493
|
+
\AddToHook{ttfamily}%
|
494
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
495
|
+
\fi % --- for 2020-10-01 END
|
475
496
|
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
|
476
497
|
\DeclareRobustCommand\textmc[1]{%
|
477
498
|
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
|
@@ -680,6 +701,7 @@
|
|
680
701
|
\xspcode`^^fe=3
|
681
702
|
\xspcode`^^ff=3
|
682
703
|
\def\@{\spacefactor3000{}}
|
704
|
+
%% \@setfontsize with \parindent and \(x)kanjiskip settings
|
683
705
|
\def\@setfontsize#1#2#3{%
|
684
706
|
\ifx\protect\@typeset@protect
|
685
707
|
\let\@currsize#1%
|
@@ -697,7 +719,8 @@
|
|
697
719
|
\if@slide \xkanjiskip=0.1em \else
|
698
720
|
\xkanjiskip=0.25em plus 0.15em minus 0.06em
|
699
721
|
\fi
|
700
|
-
\fi
|
722
|
+
\fi
|
723
|
+
}
|
701
724
|
\def\jsc@setfontsize#1#2#3{%
|
702
725
|
\@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
|
703
726
|
\emergencystretch 3zw
|
@@ -728,6 +751,7 @@
|
|
728
751
|
\belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
|
729
752
|
\belowdisplayshortskip \belowdisplayskip
|
730
753
|
\let\@listi\@listI}
|
754
|
+
%% initialize
|
731
755
|
\normalsize
|
732
756
|
\setbox0\hbox{\char\jis"3441}%
|
733
757
|
\setlength\Cht{\ht0}
|
@@ -1373,11 +1397,11 @@
|
|
1373
1397
|
\renewcommand{\theenumiii}{\@roman\c@enumiii}
|
1374
1398
|
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
|
1375
1399
|
\newcommand{\labelenumi}{\theenumi.}
|
1376
|
-
\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
|
1400
|
+
\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
|
1377
1401
|
\newcommand{\labelenumiii}{\theenumiii.}
|
1378
1402
|
\newcommand{\labelenumiv}{\theenumiv.}
|
1379
1403
|
\renewcommand{\p@enumii}{\theenumi}
|
1380
|
-
\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
|
1404
|
+
\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
|
1381
1405
|
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
|
1382
1406
|
\newcommand\labelitemi{\textbullet}
|
1383
1407
|
\newcommand\labelitemii{\normalfont\bfseries \textendash}
|
@@ -1522,7 +1546,7 @@
|
|
1522
1546
|
\vskip\abovecaptionskip
|
1523
1547
|
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
|
1524
1548
|
\ifdim \wd\@tempboxa <\hsize \centering \fi
|
1525
|
-
#1\hskip1zw\relax
|
1549
|
+
#1{\hskip1zw\relax}#2\par
|
1526
1550
|
\vskip\belowcaptionskip}}
|
1527
1551
|
\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
|
1528
1552
|
\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
|
@@ -1888,23 +1912,42 @@
|
|
1888
1912
|
\def\西暦{\西暦true}
|
1889
1913
|
\def\和暦{\西暦false}
|
1890
1914
|
\newcount\heisei \heisei\year \advance\heisei-1988\relax
|
1915
|
+
\def\pltx@today@year@#1{%
|
1916
|
+
\ifnum\numexpr\year-#1=1 元\else
|
1917
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
1918
|
+
\kansuji\numexpr\year-#1\relax
|
1919
|
+
\else
|
1920
|
+
\number\numexpr\year-#1\relax\nobreak
|
1921
|
+
\fi
|
1922
|
+
\fi 年
|
1923
|
+
}
|
1924
|
+
\def\pltx@today@year{%
|
1925
|
+
\ifnum\numexpr\year*10000+\month*100+\day<19890108
|
1926
|
+
昭和\pltx@today@year@{1925}%
|
1927
|
+
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
|
1928
|
+
平成\pltx@today@year@{1988}%
|
1929
|
+
\else
|
1930
|
+
令和\pltx@today@year@{2018}%
|
1931
|
+
\fi\fi}
|
1891
1932
|
\def\today{%
|
1892
1933
|
\if@english
|
1893
1934
|
\ifcase\month\or
|
1894
1935
|
January\or February\or March\or April\or May\or June\or
|
1895
1936
|
July\or August\or September\or October\or November\or December\fi
|
1896
1937
|
\space\number\day, \number\year
|
1938
|
+
\else\if西暦
|
1939
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
|
1940
|
+
\else\number\year\nobreak\fi 年
|
1897
1941
|
\else
|
1898
|
-
\
|
1899
|
-
|
1900
|
-
|
1901
|
-
|
1902
|
-
\
|
1903
|
-
|
1904
|
-
|
1905
|
-
|
1906
|
-
|
1907
|
-
\fi}
|
1942
|
+
\pltx@today@year
|
1943
|
+
\fi
|
1944
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
1945
|
+
\kansuji\month 月
|
1946
|
+
\kansuji\day 日
|
1947
|
+
\else
|
1948
|
+
\number\month\nobreak 月
|
1949
|
+
\number\day\nobreak 日
|
1950
|
+
\fi\fi}
|
1908
1951
|
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
|
1909
1952
|
\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
|
1910
1953
|
\pagenumbering{arabic}
|
data/vendor/jsclasses/jsbook.cls
CHANGED
@@ -4,28 +4,16 @@
|
|
4
4
|
%%
|
5
5
|
%% The original source files were:
|
6
6
|
%%
|
7
|
-
%% jsclasses.dtx (with options: `book')
|
7
|
+
%% jsclasses.dtx (with options: `class,book')
|
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 jsbook.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
|
\ifx\epTeXinputencoding\undefined\else
|
24
12
|
\epTeXinputencoding utf8 % ^^A added (2017-10-04)
|
25
13
|
\fi
|
26
14
|
\NeedsTeXFormat{pLaTeX2e}
|
27
15
|
\ProvidesClass{jsbook}
|
28
|
-
[
|
16
|
+
[2020/10/09 jsclasses (okumura, texjporg)]
|
29
17
|
\def\jsc@clsname{jsbook}
|
30
18
|
\newif\ifjsc@needsp@tch
|
31
19
|
\jsc@needsp@tchfalse
|
@@ -264,10 +252,11 @@
|
|
264
252
|
\fi
|
265
253
|
\ifpapersize
|
266
254
|
\iftombow
|
267
|
-
\
|
255
|
+
\edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
|
268
256
|
\else
|
269
|
-
\
|
257
|
+
\edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
|
270
258
|
\fi
|
259
|
+
\AtBeginDvi{\special{\jsc@papersize@special}}
|
271
260
|
\fi
|
272
261
|
\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
|
273
262
|
\newdimen\jsc@mpt
|
@@ -468,6 +457,11 @@
|
|
468
457
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
469
458
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
470
459
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
460
|
+
%% ad-hoc "relation font"
|
461
|
+
\@ifl@t@r\fmtversion{2020/10/01}
|
462
|
+
{\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
|
463
|
+
\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
|
464
|
+
\ifx\@rmfamilyhook\@undefined % old
|
471
465
|
\DeclareRobustCommand\rmfamily
|
472
466
|
{\not@math@alphabet\rmfamily\mathrm
|
473
467
|
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
|
@@ -477,6 +471,33 @@
|
|
477
471
|
\DeclareRobustCommand\ttfamily
|
478
472
|
{\not@math@alphabet\ttfamily\mathtt
|
479
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
|
493
|
+
\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
|
494
|
+
\AddToHook{rmfamily}%
|
495
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
496
|
+
\AddToHook{sffamily}%
|
497
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
498
|
+
\AddToHook{ttfamily}%
|
499
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
500
|
+
\fi % --- for 2020-10-01 END
|
480
501
|
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
|
481
502
|
\DeclareRobustCommand\textmc[1]{%
|
482
503
|
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
|
@@ -685,6 +706,7 @@
|
|
685
706
|
\xspcode`^^fe=3
|
686
707
|
\xspcode`^^ff=3
|
687
708
|
\def\@{\spacefactor3000{}}
|
709
|
+
%% \@setfontsize with \parindent and \(x)kanjiskip settings
|
688
710
|
\def\@setfontsize#1#2#3{%
|
689
711
|
\ifx\protect\@typeset@protect
|
690
712
|
\let\@currsize#1%
|
@@ -702,7 +724,8 @@
|
|
702
724
|
\if@slide \xkanjiskip=0.1em \else
|
703
725
|
\xkanjiskip=0.25em plus 0.15em minus 0.06em
|
704
726
|
\fi
|
705
|
-
\fi
|
727
|
+
\fi
|
728
|
+
}
|
706
729
|
\def\jsc@setfontsize#1#2#3{%
|
707
730
|
\@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
|
708
731
|
\emergencystretch 3zw
|
@@ -733,6 +756,7 @@
|
|
733
756
|
\belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
|
734
757
|
\belowdisplayshortskip \belowdisplayskip
|
735
758
|
\let\@listi\@listI}
|
759
|
+
%% initialize
|
736
760
|
\normalsize
|
737
761
|
\setbox0\hbox{\char\jis"3441}%
|
738
762
|
\setlength\Cht{\ht0}
|
@@ -1480,11 +1504,11 @@
|
|
1480
1504
|
\renewcommand{\theenumiii}{\@roman\c@enumiii}
|
1481
1505
|
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
|
1482
1506
|
\newcommand{\labelenumi}{\theenumi.}
|
1483
|
-
\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
|
1507
|
+
\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
|
1484
1508
|
\newcommand{\labelenumiii}{\theenumiii.}
|
1485
1509
|
\newcommand{\labelenumiv}{\theenumiv.}
|
1486
1510
|
\renewcommand{\p@enumii}{\theenumi}
|
1487
|
-
\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
|
1511
|
+
\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
|
1488
1512
|
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
|
1489
1513
|
\newcommand\labelitemi{\textbullet}
|
1490
1514
|
\newcommand\labelitemii{\normalfont\bfseries \textendash}
|
@@ -1591,7 +1615,7 @@
|
|
1591
1615
|
\vskip\abovecaptionskip
|
1592
1616
|
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
|
1593
1617
|
\ifdim \wd\@tempboxa <\hsize \centering \fi
|
1594
|
-
#1\hskip1zw\relax
|
1618
|
+
#1{\hskip1zw\relax}#2\par
|
1595
1619
|
\vskip\belowcaptionskip}}
|
1596
1620
|
\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
|
1597
1621
|
\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
|
@@ -1979,23 +2003,42 @@
|
|
1979
2003
|
\def\西暦{\西暦true}
|
1980
2004
|
\def\和暦{\西暦false}
|
1981
2005
|
\newcount\heisei \heisei\year \advance\heisei-1988\relax
|
2006
|
+
\def\pltx@today@year@#1{%
|
2007
|
+
\ifnum\numexpr\year-#1=1 元\else
|
2008
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
2009
|
+
\kansuji\numexpr\year-#1\relax
|
2010
|
+
\else
|
2011
|
+
\number\numexpr\year-#1\relax\nobreak
|
2012
|
+
\fi
|
2013
|
+
\fi 年
|
2014
|
+
}
|
2015
|
+
\def\pltx@today@year{%
|
2016
|
+
\ifnum\numexpr\year*10000+\month*100+\day<19890108
|
2017
|
+
昭和\pltx@today@year@{1925}%
|
2018
|
+
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
|
2019
|
+
平成\pltx@today@year@{1988}%
|
2020
|
+
\else
|
2021
|
+
令和\pltx@today@year@{2018}%
|
2022
|
+
\fi\fi}
|
1982
2023
|
\def\today{%
|
1983
2024
|
\if@english
|
1984
2025
|
\ifcase\month\or
|
1985
2026
|
January\or February\or March\or April\or May\or June\or
|
1986
2027
|
July\or August\or September\or October\or November\or December\fi
|
1987
2028
|
\space\number\day, \number\year
|
2029
|
+
\else\if西暦
|
2030
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
|
2031
|
+
\else\number\year\nobreak\fi 年
|
1988
2032
|
\else
|
1989
|
-
\
|
1990
|
-
|
1991
|
-
|
1992
|
-
|
1993
|
-
\
|
1994
|
-
|
1995
|
-
|
1996
|
-
|
1997
|
-
|
1998
|
-
\fi}
|
2033
|
+
\pltx@today@year
|
2034
|
+
\fi
|
2035
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
2036
|
+
\kansuji\month 月
|
2037
|
+
\kansuji\day 日
|
2038
|
+
\else
|
2039
|
+
\number\month\nobreak 月
|
2040
|
+
\number\day\nobreak 日
|
2041
|
+
\fi\fi}
|
1999
2042
|
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
|
2000
2043
|
\if@report \pagestyle{plain} \else \pagestyle{headings} \fi
|
2001
2044
|
\pagenumbering{arabic}
|
@@ -9,13 +9,13 @@
|
|
9
9
|
% pLaTeX2ε新ドキュメントクラス(日本語 TeX 開発コミュニティ版)
|
10
10
|
% 原作者:奥村晴彦 <okumura@okumuralab.org>
|
11
11
|
%
|
12
|
-
% Copyright 1993-
|
12
|
+
% Copyright 1993-2020
|
13
13
|
% The LaTeX3 Project and any individual authors listed elsewhere
|
14
14
|
% in this file.
|
15
15
|
%
|
16
16
|
% Copyright 1995-1999 ASCII Corporation.
|
17
17
|
% Copyright 1999-2016 Haruhiko Okumura
|
18
|
-
% Copyright 2016-
|
18
|
+
% Copyright 2016-2020 Japanese TeX Development Community
|
19
19
|
%
|
20
20
|
% \fi
|
21
21
|
%
|
@@ -28,10 +28,11 @@
|
|
28
28
|
%<report>\ProvidesClass{jsreport}
|
29
29
|
%<jspf>\ProvidesClass{jspf}
|
30
30
|
%<kiyou>\ProvidesClass{kiyou}
|
31
|
+
%<minijs>\ProvidesPackage{minijs}
|
31
32
|
%<*driver>
|
32
33
|
\ProvidesFile{jsclasses.dtx}
|
33
34
|
%</driver>
|
34
|
-
[
|
35
|
+
[2020/10/09 jsclasses (okumura, texjporg)]
|
35
36
|
%<*driver>
|
36
37
|
\documentclass{jsarticle}
|
37
38
|
\usepackage{doc}
|
@@ -124,11 +125,26 @@
|
|
124
125
|
%
|
125
126
|
% 以下では実際のコードに即して説明します。
|
126
127
|
%
|
128
|
+
% \texttt{minijs}は,\texttt{jsclasses}に似た設定を行うパッケージです。
|
129
|
+
%
|
130
|
+
% \begin{macrocode}
|
131
|
+
%<*minijs>
|
132
|
+
%% if jsclasses loaded, abort loading this package
|
133
|
+
\ifx\@jsc@uplatextrue\@undefined\else
|
134
|
+
\PackageInfo{minijs}{jsclasses does not need minijs, exiting}
|
135
|
+
\expandafter\endinput
|
136
|
+
\fi
|
137
|
+
%% "fake" jsarticle
|
138
|
+
\expandafter\def\csname ver@jsarticle.cls\endcsname{}
|
139
|
+
%</minijs>
|
140
|
+
% \end{macrocode}
|
141
|
+
%
|
127
142
|
% \begin{macro}{\jsc@clsname}
|
128
143
|
%
|
129
144
|
% 文書クラスの名前です。エラーメッセージ表示などで使われます。
|
130
145
|
%
|
131
146
|
% \begin{macrocode}
|
147
|
+
%<*class>
|
132
148
|
%<article>\def\jsc@clsname{jsarticle}
|
133
149
|
%<book>\def\jsc@clsname{jsbook}
|
134
150
|
%<report>\def\jsc@clsname{jsreport}
|
@@ -147,8 +163,12 @@
|
|
147
163
|
% をあてる場合があります。この処理に使用するフラグを定義します。
|
148
164
|
%
|
149
165
|
% \begin{macrocode}
|
166
|
+
%</class>
|
167
|
+
%<*class|minijs>
|
150
168
|
\newif\ifjsc@needsp@tch
|
151
169
|
\jsc@needsp@tchfalse
|
170
|
+
%</class|minijs>
|
171
|
+
%<*class>
|
152
172
|
% \end{macrocode}
|
153
173
|
% \end{macro}
|
154
174
|
%
|
@@ -746,6 +766,11 @@
|
|
746
766
|
% [2017-01-11] トンボオプションが指定されているとき「だけ」|\stockwidth|,
|
747
767
|
% |\stockheight|を定義するようにしました。
|
748
768
|
%
|
769
|
+
% [2020-10-04] \LaTeXe~2020-10-01でカーネルの |\shipout| コードが拡張され
|
770
|
+
% |\AtBeginDvi| の実行タイミングが変化したので,この時点で
|
771
|
+
% 発行する |\special| の中身を展開しておくようにしました。
|
772
|
+
% こうしないと,用紙サイズ設定を間違ってしまいます(Issue \#72)。
|
773
|
+
%
|
749
774
|
% \begin{macrocode}
|
750
775
|
\iftombow
|
751
776
|
\newdimen\stockwidth \newdimen\stockheight
|
@@ -756,10 +781,11 @@
|
|
756
781
|
\fi
|
757
782
|
\ifpapersize
|
758
783
|
\iftombow
|
759
|
-
\
|
784
|
+
\edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
|
760
785
|
\else
|
761
|
-
\
|
786
|
+
\edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
|
762
787
|
\fi
|
788
|
+
\AtBeginDvi{\special{\jsc@papersize@special}}
|
763
789
|
\fi
|
764
790
|
% \end{macrocode}
|
765
791
|
%
|
@@ -884,7 +910,7 @@
|
|
884
910
|
\fi
|
885
911
|
\ifnum\@ptsize=-1
|
886
912
|
\def\n@baseline{15}%
|
887
|
-
\fi
|
913
|
+
\fi
|
888
914
|
\fi
|
889
915
|
%<*kiyou>
|
890
916
|
\def\jsc@magscale{0.9769230}
|
@@ -893,7 +919,7 @@
|
|
893
919
|
\def\inv@mag{1.02354}
|
894
920
|
\jsc@mpt=1\p@
|
895
921
|
\jsc@mmm=1mm
|
896
|
-
\else
|
922
|
+
\else
|
897
923
|
\jsc@mpt=\jsc@magscale\p@
|
898
924
|
\jsc@mmm=\jsc@magscale mm
|
899
925
|
\def\inv@mag{1}
|
@@ -1059,6 +1085,24 @@
|
|
1059
1085
|
% $9.62216\,\mathrm{pt} * 0.961 / 10\,\mathrm{pt} = 0.924690$ です。
|
1060
1086
|
%
|
1061
1087
|
% \begin{macrocode}
|
1088
|
+
%</class>
|
1089
|
+
%<*minijs>
|
1090
|
+
%% min/goth -> jis/jisg (for pLaTeX only)
|
1091
|
+
\ifx\ucs\@undefined
|
1092
|
+
\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
|
1093
|
+
\expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
|
1094
|
+
\expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax
|
1095
|
+
\expandafter\let\csname JT1/mc/m/n/\@tempa\endcsname\relax
|
1096
|
+
\expandafter\let\csname JT1/gt/m/n/\@tempa\endcsname\relax
|
1097
|
+
}
|
1098
|
+
\def\Cjascale{0.924690}
|
1099
|
+
\DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] jis}{}
|
1100
|
+
\DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] jisg}{}
|
1101
|
+
\DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{}
|
1102
|
+
\DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{}
|
1103
|
+
\fi
|
1104
|
+
%</minijs>
|
1105
|
+
%<*class>
|
1062
1106
|
%<*!jspf>
|
1063
1107
|
\def\Cjascale{0.924690}
|
1064
1108
|
\ifmingoth
|
@@ -1160,6 +1204,33 @@
|
|
1160
1204
|
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
|
1161
1205
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
|
1162
1206
|
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
|
1207
|
+
% \end{macrocode}
|
1208
|
+
%
|
1209
|
+
% [2020-02-02] \LaTeXe~2020-02-02でNFSSが拡張され,
|
1210
|
+
% それに伴いオリジナルの |\rmfamily| などの定義が変化しました。
|
1211
|
+
% |\DeclareRobustCommand| で直接定義すると,これを上書きして
|
1212
|
+
% NFSSの拡張部分を壊してしまいますので,
|
1213
|
+
% 新たに提供されたフックにコードを挿入します。
|
1214
|
+
% 従来のコードも\LaTeXe~2019-10-01以前のために残してありますが,
|
1215
|
+
% \texttt{mweights}パッケージ対策も施しました(forum:2763)。
|
1216
|
+
%
|
1217
|
+
% [2020-10-04] \LaTeXe~2020-10-01では |\AddToHook| を利用します。
|
1218
|
+
%
|
1219
|
+
% ^^A Note that |\AddToHook| is defined as follows:
|
1220
|
+
% ^^A \begin{itemize}
|
1221
|
+
% ^^A \item Format date 2020-02-02 or older: undefined
|
1222
|
+
% ^^A \item Format date 2020-10-01 or newer: available
|
1223
|
+
% ^^A \item ... under \texttt{latexrelease} rollback: defined but no-op
|
1224
|
+
% ^^A \end{itemize}
|
1225
|
+
%
|
1226
|
+
% \begin{macrocode}
|
1227
|
+
%</class>
|
1228
|
+
%<*class|minijs>
|
1229
|
+
%% ad-hoc "relation font"
|
1230
|
+
\@ifl@t@r\fmtversion{2020/10/01}
|
1231
|
+
{\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
|
1232
|
+
\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
|
1233
|
+
\ifx\@rmfamilyhook\@undefined % old
|
1163
1234
|
\DeclareRobustCommand\rmfamily
|
1164
1235
|
{\not@math@alphabet\rmfamily\mathrm
|
1165
1236
|
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
|
@@ -1169,6 +1240,35 @@
|
|
1169
1240
|
\DeclareRobustCommand\ttfamily
|
1170
1241
|
{\not@math@alphabet\ttfamily\mathtt
|
1171
1242
|
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
|
1243
|
+
\AtBeginDocument{%
|
1244
|
+
\ifx\mweights@init\@undefined\else % mweights.sty is loaded
|
1245
|
+
% my definitions above should have been overwritten, recover it!
|
1246
|
+
% \selectfont is executed twice but I don't care about speed...
|
1247
|
+
\expandafter\g@addto@macro\csname rmfamily \endcsname
|
1248
|
+
{\kanjifamily\mcdefault\selectfont}%
|
1249
|
+
\expandafter\g@addto@macro\csname sffamily \endcsname
|
1250
|
+
{\kanjifamily\gtdefault\selectfont}%
|
1251
|
+
\expandafter\g@addto@macro\csname ttfamily \endcsname
|
1252
|
+
{\kanjifamily\gtdefault\selectfont}%
|
1253
|
+
\fi}
|
1254
|
+
\else % 2020-02-02
|
1255
|
+
\g@addto@macro\@rmfamilyhook
|
1256
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
1257
|
+
\g@addto@macro\@sffamilyhook
|
1258
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1259
|
+
\g@addto@macro\@ttfamilyhook
|
1260
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1261
|
+
\fi
|
1262
|
+
\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
|
1263
|
+
\AddToHook{rmfamily}%
|
1264
|
+
{\prepare@family@series@update@kanji{mc}\mcdefault}
|
1265
|
+
\AddToHook{sffamily}%
|
1266
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1267
|
+
\AddToHook{ttfamily}%
|
1268
|
+
{\prepare@family@series@update@kanji{gt}\gtdefault}
|
1269
|
+
\fi % --- for 2020-10-01 END
|
1270
|
+
%</class|minijs>
|
1271
|
+
%<*class>
|
1172
1272
|
% \end{macrocode}
|
1173
1273
|
%
|
1174
1274
|
% \begin{macro}{\textmc}
|
@@ -1340,10 +1440,10 @@
|
|
1340
1440
|
\xspcode`+=3
|
1341
1441
|
\xspcode`\%=3
|
1342
1442
|
% \end{macrocode}
|
1343
|
-
%
|
1443
|
+
%
|
1344
1444
|
% これ以外にT1エンコーディングで80〜ffの文字もすべて欧文文字ですので,
|
1345
1445
|
% 両側の和文文字との間にスペースが入らなければなりません。
|
1346
|
-
%
|
1446
|
+
%
|
1347
1447
|
% \begin{macrocode}
|
1348
1448
|
\xspcode`^^80=3
|
1349
1449
|
\xspcode`^^81=3
|
@@ -1536,25 +1636,31 @@
|
|
1536
1636
|
% [2008-02-18] |english| オプションで |\parindent| を 1em にしました。
|
1537
1637
|
%
|
1538
1638
|
% \begin{macrocode}
|
1639
|
+
%</class>
|
1640
|
+
%<*class|minijs>
|
1641
|
+
%% \@setfontsize with \parindent and \(x)kanjiskip settings
|
1539
1642
|
\def\@setfontsize#1#2#3{%
|
1540
|
-
|
1643
|
+
%<minijs> \@nomath#1%
|
1541
1644
|
\ifx\protect\@typeset@protect
|
1542
1645
|
\let\@currsize#1%
|
1543
1646
|
\fi
|
1544
1647
|
\fontsize{#2}{#3}\selectfont
|
1545
1648
|
\ifdim\parindent>\z@
|
1546
|
-
\if@english
|
1547
|
-
\parindent=1em
|
1548
|
-
\else
|
1649
|
+
%<class> \if@english
|
1650
|
+
%<class> \parindent=1em
|
1651
|
+
%<class> \else
|
1549
1652
|
\parindent=1zw
|
1550
|
-
\fi
|
1653
|
+
%<class> \fi
|
1551
1654
|
\fi
|
1552
1655
|
\kanjiskip=0zw plus .1zw minus .01zw
|
1553
|
-
\ifdim\xkanjiskip>\z@
|
1554
|
-
\if@slide \xkanjiskip=0.1em \else
|
1656
|
+
%<class> \ifdim\xkanjiskip>\z@
|
1657
|
+
%<class> \if@slide \xkanjiskip=0.1em \else
|
1555
1658
|
\xkanjiskip=0.25em plus 0.15em minus 0.06em
|
1556
|
-
\fi
|
1557
|
-
\fi
|
1659
|
+
%<class> \fi
|
1660
|
+
%<class> \fi
|
1661
|
+
}
|
1662
|
+
%</class|minijs>
|
1663
|
+
%<*class>
|
1558
1664
|
% \end{macrocode}
|
1559
1665
|
% \end{macro}
|
1560
1666
|
%
|
@@ -1663,7 +1769,12 @@
|
|
1663
1769
|
% ここで実際に標準フォントサイズで初期化します。
|
1664
1770
|
%
|
1665
1771
|
% \begin{macrocode}
|
1772
|
+
%</class>
|
1773
|
+
%<*class|minijs>
|
1774
|
+
%% initialize
|
1666
1775
|
\normalsize
|
1776
|
+
%</class|minijs>
|
1777
|
+
%<*class>
|
1667
1778
|
% \end{macrocode}
|
1668
1779
|
%
|
1669
1780
|
% \end{macro}
|
@@ -4037,7 +4148,7 @@
|
|
4037
4148
|
%
|
4038
4149
|
% \begin{macrocode}
|
4039
4150
|
\newcommand{\labelenumi}{\theenumi.}
|
4040
|
-
\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
|
4151
|
+
\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
|
4041
4152
|
\newcommand{\labelenumiii}{\theenumiii.}
|
4042
4153
|
\newcommand{\labelenumiv}{\theenumiv.}
|
4043
4154
|
% \end{macrocode}
|
@@ -4056,7 +4167,7 @@
|
|
4056
4167
|
%
|
4057
4168
|
% \begin{macrocode}
|
4058
4169
|
\renewcommand{\p@enumii}{\theenumi}
|
4059
|
-
\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
|
4170
|
+
\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
|
4060
4171
|
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
|
4061
4172
|
% \end{macrocode}
|
4062
4173
|
% \end{macro}
|
@@ -4456,7 +4567,7 @@
|
|
4456
4567
|
% 数式番号の形式です。
|
4457
4568
|
% デフォルトの値をコメントアウトして示しておきます。
|
4458
4569
|
%
|
4459
|
-
% |\inhibitglue(\theequation)\inhibitglue| のように和文かっこ
|
4570
|
+
% |\inhibitglue (\theequation )\inhibitglue| のように和文かっこ
|
4460
4571
|
% を使うことも可能です。
|
4461
4572
|
%
|
4462
4573
|
% \begin{macrocode}
|
@@ -4467,7 +4578,7 @@
|
|
4467
4578
|
% |amsmath| パッケージを使う場合は |\tagform@| を次のように修正します。
|
4468
4579
|
%
|
4469
4580
|
% \begin{macrocode}
|
4470
|
-
% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr)}}
|
4581
|
+
% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr )}}
|
4471
4582
|
% \end{macrocode}
|
4472
4583
|
%
|
4473
4584
|
% \subsection{フロート}
|
@@ -4641,6 +4752,10 @@
|
|
4641
4752
|
%
|
4642
4753
|
% [2003-11-05] ロジックを少し変えてみました。
|
4643
4754
|
%
|
4755
|
+
% [2018-12-11] 遅くなりましたが,|listings| パッケージを使うときに
|
4756
|
+
% |title| を指定すると ``1zw'' が出力されてしまう
|
4757
|
+
% 問題 (forum:1543,Issue \#71) に対処しました。
|
4758
|
+
%
|
4644
4759
|
% \begin{macrocode}
|
4645
4760
|
%<*!jspf>
|
4646
4761
|
% \long\def\@makecaption#1#2{{\small
|
@@ -4661,7 +4776,7 @@
|
|
4661
4776
|
\vskip\abovecaptionskip
|
4662
4777
|
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
|
4663
4778
|
\ifdim \wd\@tempboxa <\hsize \centering \fi
|
4664
|
-
#1\hskip1zw\relax
|
4779
|
+
#1{\hskip1zw\relax}#2\par
|
4665
4780
|
\vskip\belowcaptionskip}}
|
4666
4781
|
%</!jspf>
|
4667
4782
|
%<*jspf>
|
@@ -5216,7 +5331,7 @@
|
|
5216
5331
|
% とりあえずコメントアウトしておきますので,必要に応じて生かしてください。
|
5217
5332
|
%
|
5218
5333
|
% \begin{macrocode}
|
5219
|
-
% \def\@biblabel#1{\inhibitglue[#1]\inhibitglue}
|
5334
|
+
% \def\@biblabel#1{\inhibitglue [#1]\inhibitglue}
|
5220
5335
|
% \end{macrocode}
|
5221
5336
|
% \end{macro}
|
5222
5337
|
%
|
@@ -5243,7 +5358,7 @@
|
|
5243
5358
|
% \@latex@warning
|
5244
5359
|
% {Citation `\@citeb' on page \thepage \space undefined}}%
|
5245
5360
|
% {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}}
|
5246
|
-
% \def\@cite#1#2{\inhibitglue[{#1\if@tempswa ,#2\fi}]\inhibitglue}
|
5361
|
+
% \def\@cite#1#2{\inhibitglue [{#1\if@tempswa ,#2\fi}]\inhibitglue}
|
5247
5362
|
% \end{macrocode}
|
5248
5363
|
%
|
5249
5364
|
% 引用番号を上ツキの 1)のようなスタイルにするには次のようにします。
|
@@ -5862,8 +5977,13 @@
|
|
5862
5977
|
% \paragraph{今日の日付}
|
5863
5978
|
%
|
5864
5979
|
% \LaTeX で処理した日付を出力します。
|
5865
|
-
% |jarticle|
|
5980
|
+
% ^^A |jarticle| などと違って,標準を西暦にし,
|
5981
|
+
% ^^A 余分な空白が入らないように改良しました。
|
5982
|
+
% ^^A -- 2018年7月以降は |jarticle| なども標準が西暦,
|
5983
|
+
% ^^A -- 2019年4月以降は余分な空白が入らなくなっています。
|
5866
5984
|
% 和暦にするには |\和暦| と書いてください。
|
5985
|
+
% ちなみにこの文章の作成日は西暦では{\西暦\today}で,
|
5986
|
+
% 和暦では{\和暦\today}です。
|
5867
5987
|
%
|
5868
5988
|
% \begin{macro}{\today}
|
5869
5989
|
% \begin{macrocode}
|
@@ -5871,23 +5991,42 @@
|
|
5871
5991
|
\def\西暦{\西暦true}
|
5872
5992
|
\def\和暦{\西暦false}
|
5873
5993
|
\newcount\heisei \heisei\year \advance\heisei-1988\relax
|
5994
|
+
\def\pltx@today@year@#1{%
|
5995
|
+
\ifnum\numexpr\year-#1=1 元\else
|
5996
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
5997
|
+
\kansuji\numexpr\year-#1\relax
|
5998
|
+
\else
|
5999
|
+
\number\numexpr\year-#1\relax\nobreak
|
6000
|
+
\fi
|
6001
|
+
\fi 年
|
6002
|
+
}
|
6003
|
+
\def\pltx@today@year{%
|
6004
|
+
\ifnum\numexpr\year*10000+\month*100+\day<19890108
|
6005
|
+
昭和\pltx@today@year@{1925}%
|
6006
|
+
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
|
6007
|
+
平成\pltx@today@year@{1988}%
|
6008
|
+
\else
|
6009
|
+
令和\pltx@today@year@{2018}%
|
6010
|
+
\fi\fi}
|
5874
6011
|
\def\today{%
|
5875
6012
|
\if@english
|
5876
6013
|
\ifcase\month\or
|
5877
6014
|
January\or February\or March\or April\or May\or June\or
|
5878
6015
|
July\or August\or September\or October\or November\or December\fi
|
5879
6016
|
\space\number\day, \number\year
|
6017
|
+
\else\if西暦
|
6018
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
|
6019
|
+
\else\number\year\nobreak\fi 年
|
5880
6020
|
\else
|
5881
|
-
\
|
5882
|
-
|
5883
|
-
|
5884
|
-
|
5885
|
-
\
|
5886
|
-
|
5887
|
-
|
5888
|
-
|
5889
|
-
|
5890
|
-
\fi}
|
6021
|
+
\pltx@today@year
|
6022
|
+
\fi
|
6023
|
+
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
|
6024
|
+
\kansuji\month 月
|
6025
|
+
\kansuji\day 日
|
6026
|
+
\else
|
6027
|
+
\number\month\nobreak 月
|
6028
|
+
\number\day\nobreak 日
|
6029
|
+
\fi\fi}
|
5891
6030
|
% \end{macrocode}
|
5892
6031
|
% \end{macro}
|
5893
6032
|
%
|
@@ -5956,6 +6095,7 @@
|
|
5956
6095
|
\ignorespaces
|
5957
6096
|
\fi}
|
5958
6097
|
%</article|book|report>
|
6098
|
+
%</class>
|
5959
6099
|
% \end{macrocode}
|
5960
6100
|
% \end{macro}
|
5961
6101
|
%
|