review 3.2.0 → 5.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (282) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby-tex.yml +31 -0
  3. data/.github/workflows/ruby-win.yml +45 -0
  4. data/.github/workflows/ruby.yml +27 -0
  5. data/.rubocop.yml +167 -42
  6. data/.travis.yml +1 -1
  7. data/Dockerfile +21 -5
  8. data/NEWS.ja.md +428 -1
  9. data/NEWS.md +429 -2
  10. data/README.md +11 -7
  11. data/Rakefile +7 -2
  12. data/appveyor.yml +0 -20
  13. data/bin/review +2 -4
  14. data/bin/review-catalog-converter +5 -5
  15. data/bin/review-check +13 -17
  16. data/bin/review-checkdep +3 -6
  17. data/bin/review-compile +13 -22
  18. data/bin/review-epub2html +1 -4
  19. data/bin/review-epubmaker +3 -4
  20. data/bin/review-idgxmlmaker +14 -0
  21. data/bin/review-index +5 -86
  22. data/bin/review-init +1 -4
  23. data/bin/review-pdfmaker +1 -3
  24. data/bin/review-preproc +11 -13
  25. data/bin/review-textmaker +1 -3
  26. data/bin/review-update +1 -4
  27. data/bin/review-validate +7 -7
  28. data/bin/review-vol +5 -82
  29. data/bin/review-webmaker +1 -3
  30. data/doc/config.yml.sample +67 -16
  31. data/doc/config.yml.sample-simple +4 -3
  32. data/doc/format.ja.md +133 -21
  33. data/doc/format.md +135 -34
  34. data/doc/makeindex.ja.md +2 -2
  35. data/doc/pdfmaker.ja.md +43 -1
  36. data/doc/pdfmaker.md +42 -1
  37. data/doc/quickstart.ja.md +55 -25
  38. data/doc/quickstart.md +47 -17
  39. data/lib/review.rb +1 -1
  40. data/lib/review/book.rb +2 -2
  41. data/lib/review/book/base.rb +89 -90
  42. data/lib/review/book/bib.rb +21 -0
  43. data/lib/review/book/book_unit.rb +158 -0
  44. data/lib/review/book/chapter.rb +51 -29
  45. data/lib/review/book/index.rb +42 -248
  46. data/lib/review/book/index/item.rb +46 -0
  47. data/lib/review/book/page_metric.rb +7 -7
  48. data/lib/review/book/part.rb +45 -10
  49. data/lib/review/book/volume.rb +5 -5
  50. data/lib/review/builder.rb +171 -54
  51. data/lib/review/call_hook.rb +20 -0
  52. data/lib/review/catalog.rb +15 -17
  53. data/lib/review/compiler.rb +240 -102
  54. data/lib/review/configure.rb +101 -12
  55. data/lib/review/converter.rb +1 -1
  56. data/lib/review/epub2html.rb +6 -1
  57. data/lib/review/epubmaker.rb +120 -118
  58. data/lib/review/epubmaker/content.rb +113 -0
  59. data/lib/review/epubmaker/epubcommon.rb +372 -0
  60. data/lib/review/epubmaker/epubv2.rb +178 -0
  61. data/lib/review/epubmaker/epubv3.rb +231 -0
  62. data/lib/review/epubmaker/producer.rb +168 -0
  63. data/lib/review/epubmaker/reviewheaderlistener.rb +12 -2
  64. data/lib/review/epubmaker/zip_exporter.rb +84 -0
  65. data/lib/review/exception.rb +6 -0
  66. data/lib/review/extentions/string.rb +0 -4
  67. data/lib/review/htmlbuilder.rb +147 -149
  68. data/lib/review/htmlutils.rb +10 -14
  69. data/lib/review/i18n.rb +4 -3
  70. data/lib/review/idgxmlbuilder.rb +229 -103
  71. data/lib/review/idgxmlmaker.rb +188 -0
  72. data/lib/review/img_math.rb +245 -0
  73. data/lib/review/index_builder.rb +654 -0
  74. data/lib/review/init-web/finish.html +10 -0
  75. data/lib/review/init-web/index.html +190 -0
  76. data/lib/review/init-web/review-layout-design.js +691 -0
  77. data/lib/review/init.rb +124 -41
  78. data/lib/review/latexbox.rb +58 -0
  79. data/lib/review/latexbuilder.rb +249 -97
  80. data/lib/review/latexutils.rb +9 -1
  81. data/lib/review/lineinput.rb +113 -3
  82. data/lib/review/logger.rb +43 -8
  83. data/lib/review/makerhelper.rb +13 -186
  84. data/lib/review/markdownbuilder.rb +75 -39
  85. data/lib/review/md2inaobuilder.rb +3 -5
  86. data/lib/review/pdfmaker.rb +88 -83
  87. data/lib/review/plaintextbuilder.rb +158 -83
  88. data/lib/review/preprocessor.rb +30 -24
  89. data/lib/review/rstbuilder.rb +58 -39
  90. data/lib/review/sec_counter.rb +14 -0
  91. data/lib/review/template.rb +6 -0
  92. data/lib/review/textmaker.rb +29 -17
  93. data/lib/review/textutils.rb +68 -2
  94. data/lib/review/tocprinter.rb +242 -97
  95. data/lib/review/topbuilder.rb +147 -61
  96. data/lib/review/update.rb +27 -28
  97. data/lib/review/version.rb +1 -1
  98. data/lib/review/volumeprinter.rb +97 -0
  99. data/lib/review/webmaker.rb +36 -35
  100. data/lib/review/webtocprinter.rb +39 -35
  101. data/lib/review/yamlloader.rb +4 -0
  102. data/review.gemspec +8 -5
  103. data/samples/sample-book/README.md +7 -2
  104. data/samples/sample-book/src/.gitignore +154 -0
  105. data/samples/sample-book/src/config-ebook.yml +4 -0
  106. data/samples/sample-book/src/config-epub2.yml +1 -1
  107. data/samples/sample-book/src/config-jlreq-ebook.yml +4 -0
  108. data/samples/sample-book/src/config-jlreq.yml +6 -0
  109. data/samples/sample-book/src/config.yml +3 -3
  110. data/samples/sample-book/src/lib/tasks/review.rake +45 -14
  111. data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake +14 -8
  112. data/samples/syntax-book/Gemfile +1 -1
  113. data/samples/syntax-book/ch01.re +3 -1
  114. data/samples/syntax-book/ch02.re +28 -21
  115. data/samples/syntax-book/ch03.re +4 -7
  116. data/samples/syntax-book/config-jlreq-lualatex.yml +4 -0
  117. data/samples/syntax-book/config-jlreq.yml +5 -0
  118. data/samples/syntax-book/config-print.yml +3 -0
  119. data/samples/syntax-book/config.yml +1 -1
  120. data/samples/syntax-book/images/img3-2.png +0 -0
  121. data/samples/syntax-book/lib/tasks/review.rake +30 -15
  122. data/samples/syntax-book/lib/tasks/z01_copy_sty.rake +14 -8
  123. data/templates/html/_colophon.html.erb +23 -0
  124. data/templates/html/_colophon_history.html.erb +9 -0
  125. data/templates/html/_cover.html.erb +10 -0
  126. data/templates/html/_part_body.html.erb +6 -0
  127. data/templates/html/_titlepage.html.erb +20 -0
  128. data/templates/html/layout-html5.html.erb +6 -0
  129. data/templates/html/layout-xhtml1.html.erb +6 -0
  130. data/templates/latex/config.erb +45 -27
  131. data/templates/latex/layout.tex.erb +1 -0
  132. data/templates/latex/review-jlreq/README.md +3 -1
  133. data/templates/latex/review-jlreq/review-base.sty +124 -37
  134. data/templates/latex/review-jlreq/review-jlreq.cls +29 -22
  135. data/templates/latex/review-jlreq/review-style.sty +9 -1
  136. data/templates/latex/review-jlreq/review-tcbox.sty +348 -0
  137. data/templates/latex/review-jlreq/reviewmacro.sty +5 -0
  138. data/templates/latex/review-jsbook/README.md +46 -5
  139. data/templates/latex/review-jsbook/review-base.sty +111 -30
  140. data/templates/latex/review-jsbook/review-jsbook.cls +16 -2
  141. data/templates/latex/review-jsbook/review-style.sty +10 -2
  142. data/templates/latex/review-jsbook/review-tcbox.sty +348 -0
  143. data/templates/latex/review-jsbook/reviewmacro.sty +5 -0
  144. data/templates/opf/epubv2.opf.erb +7 -7
  145. data/templates/opf/epubv3.opf.erb +7 -7
  146. data/templates/opf/opf_manifest_epubv2.opf.erb +10 -0
  147. data/templates/opf/opf_manifest_epubv3.opf.erb +10 -0
  148. data/templates/opf/opf_metainfo_epubv2.opf.erb +17 -0
  149. data/templates/opf/opf_metainfo_epubv3.opf.erb +49 -0
  150. data/templates/opf/opf_tocx_epubv2.opf.erb +9 -0
  151. data/templates/opf/opf_tocx_epubv3.opf.erb +17 -0
  152. data/templates/web/html/layout-html5.html.erb +9 -8
  153. data/templates/web/html/layout-xhtml1.html.erb +6 -0
  154. data/test/assets/header_listener.html +35 -0
  155. data/test/assets/img_math/img1.png +0 -0
  156. data/test/assets/img_math/img2.png +0 -0
  157. data/test/assets/img_math/img3.png +0 -0
  158. data/test/assets/syntax_book_index_detail.txt +58 -0
  159. data/test/assets/test_template.tex +20 -9
  160. data/test/assets/test_template_backmatter.tex +20 -9
  161. data/test/book_test_helper.rb +11 -5
  162. data/test/run_test.rb +1 -1
  163. data/test/test_book.rb +123 -78
  164. data/test/test_book_chapter.rb +99 -56
  165. data/test/test_book_part.rb +3 -3
  166. data/test/test_builder.rb +24 -15
  167. data/test/test_catalog.rb +19 -42
  168. data/test/test_catalog_converter_cmd.rb +1 -1
  169. data/test/test_converter.rb +1 -0
  170. data/test/test_epub3maker.rb +170 -126
  171. data/test/test_epubmaker.rb +249 -129
  172. data/test/test_epubmaker_cmd.rb +16 -9
  173. data/test/test_helper.rb +23 -11
  174. data/test/test_htmlbuilder.rb +1083 -114
  175. data/test/test_htmlutils.rb +0 -12
  176. data/test/test_i18n.rb +37 -37
  177. data/test/test_idgxmlbuilder.rb +627 -27
  178. data/test/test_idgxmlmaker_cmd.rb +50 -0
  179. data/test/test_image_finder.rb +52 -70
  180. data/test/test_img_math.rb +111 -0
  181. data/test/test_index.rb +62 -52
  182. data/test/test_indexbuilder.rb +52 -0
  183. data/test/test_latexbuilder.rb +1189 -59
  184. data/test/test_latexbuilder_v2.rb +74 -34
  185. data/test/test_lineinput.rb +20 -93
  186. data/test/test_logger.rb +17 -4
  187. data/test/test_makerhelper.rb +2 -14
  188. data/test/test_markdownbuilder.rb +77 -4
  189. data/test/test_md2inaobuilder.rb +12 -2
  190. data/test/test_pdfmaker.rb +101 -12
  191. data/test/test_pdfmaker_cmd.rb +102 -8
  192. data/test/test_plaintextbuilder.rb +562 -31
  193. data/test/test_review_ext.rb +2 -1
  194. data/test/test_reviewheaderlistener.rb +49 -0
  195. data/test/test_rstbuilder.rb +58 -5
  196. data/test/test_sec_counter.rb +156 -0
  197. data/test/test_template.rb +12 -2
  198. data/test/test_textmaker_cmd.rb +58 -0
  199. data/test/test_textutils.rb +109 -2
  200. data/test/test_tocprinter.rb +46 -0
  201. data/test/test_topbuilder.rb +400 -17
  202. data/test/test_update.rb +53 -44
  203. data/test/test_webtocprinter.rb +75 -43
  204. data/test/test_yamlloader.rb +13 -0
  205. data/test/test_zip_exporter.rb +5 -6
  206. data/vendor/gentombow/LICENSE +1 -1
  207. data/vendor/gentombow/Makefile +0 -1
  208. data/vendor/gentombow/bounddvi-en.pdf +0 -0
  209. data/vendor/gentombow/bounddvi-en.tex +1 -0
  210. data/vendor/gentombow/bounddvi.pdf +0 -0
  211. data/vendor/gentombow/bounddvi.sty +30 -7
  212. data/vendor/gentombow/bounddvi.tex +1 -0
  213. data/vendor/gentombow/create_archive.sh +1 -0
  214. data/vendor/gentombow/gentombow-ja.pdf +0 -0
  215. data/vendor/gentombow/gentombow-ja.tex +9 -0
  216. data/vendor/gentombow/gentombow.pdf +0 -0
  217. data/vendor/gentombow/gentombow.sty +32 -10
  218. data/vendor/gentombow/gentombow.tex +8 -0
  219. data/vendor/gentombow/tests/gentombow-01-pdfx.tex +8 -0
  220. data/vendor/gentombow/tests/gentombow-02-pdfx.tex +8 -0
  221. data/vendor/jsclasses/LICENSE +1 -1
  222. data/vendor/jsclasses/Makefile +3 -2
  223. data/vendor/jsclasses/create_archive.sh +5 -5
  224. data/vendor/jsclasses/jis/Makefile +3 -2
  225. data/vendor/jsclasses/jis/jsarticle.cls +74 -31
  226. data/vendor/jsclasses/jis/jsbook.cls +74 -31
  227. data/vendor/jsclasses/jis/jsclasses.dtx +176 -36
  228. data/vendor/jsclasses/jis/jsclasses.ins +15 -5
  229. data/vendor/jsclasses/jis/jslogo.dtx +4 -4
  230. data/vendor/jsclasses/jis/jslogo.ins +9 -0
  231. data/vendor/jsclasses/jis/jslogo.sty +4 -16
  232. data/vendor/jsclasses/jis/jspf.cls +73 -30
  233. data/vendor/jsclasses/jis/jsreport.cls +74 -31
  234. data/vendor/jsclasses/jis/jsverb.ins +9 -0
  235. data/vendor/jsclasses/jis/jsverb.sty +1 -13
  236. data/vendor/jsclasses/jis/kiyou.cls +74 -31
  237. data/vendor/jsclasses/jis/minijs.sty +65 -22
  238. data/vendor/jsclasses/jis/okumacro.dtx +4 -5
  239. data/vendor/jsclasses/jis/okumacro.ins +9 -0
  240. data/vendor/jsclasses/jis/okumacro.sty +4 -17
  241. data/vendor/jsclasses/jis/okuverb.ins +9 -0
  242. data/vendor/jsclasses/jis/okuverb.sty +1 -13
  243. data/vendor/jsclasses/jis/winjis.sty +23 -19
  244. data/vendor/jsclasses/jsarticle.cls +74 -31
  245. data/vendor/jsclasses/jsbook.cls +74 -31
  246. data/vendor/jsclasses/jsclasses.dtx +176 -36
  247. data/vendor/jsclasses/jsclasses.ins +15 -5
  248. data/vendor/jsclasses/jsclasses.pdf +0 -0
  249. data/vendor/jsclasses/jslogo.dtx +4 -4
  250. data/vendor/jsclasses/jslogo.ins +9 -0
  251. data/vendor/jsclasses/jslogo.pdf +0 -0
  252. data/vendor/jsclasses/jslogo.sty +4 -16
  253. data/vendor/jsclasses/jspf.cls +73 -30
  254. data/vendor/jsclasses/jsreport.cls +74 -31
  255. data/vendor/jsclasses/jsverb.ins +9 -0
  256. data/vendor/jsclasses/jsverb.pdf +0 -0
  257. data/vendor/jsclasses/jsverb.sty +1 -13
  258. data/vendor/jsclasses/kiyou.cls +74 -31
  259. data/vendor/jsclasses/minijs.sty +68 -22
  260. data/vendor/jsclasses/okumacro.dtx +4 -5
  261. data/vendor/jsclasses/okumacro.ins +9 -0
  262. data/vendor/jsclasses/okumacro.pdf +0 -0
  263. data/vendor/jsclasses/okumacro.sty +4 -17
  264. data/vendor/jsclasses/okuverb.ins +9 -0
  265. data/vendor/jsclasses/okuverb.pdf +0 -0
  266. data/vendor/jsclasses/okuverb.sty +1 -13
  267. data/vendor/jsclasses/tests/relfont.tex +10 -0
  268. data/vendor/jsclasses/winjis.sty +23 -19
  269. metadata +136 -23
  270. data/.rubocop_todo.yml +0 -7
  271. data/lib/epubmaker.rb +0 -23
  272. data/lib/epubmaker/content.rb +0 -110
  273. data/lib/epubmaker/epubcommon.rb +0 -441
  274. data/lib/epubmaker/epubv2.rb +0 -143
  275. data/lib/epubmaker/epubv3.rb +0 -233
  276. data/lib/epubmaker/producer.rb +0 -375
  277. data/lib/epubmaker/zip_exporter.rb +0 -81
  278. data/lib/lineinput.rb +0 -155
  279. data/lib/review/book/compilable.rb +0 -173
  280. data/lib/review/tocparser.rb +0 -271
  281. data/samples/syntax-book/review-ext.rb +0 -14
  282. data/test/test_tocparser.rb +0 -25
@@ -4,25 +4,13 @@
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
- %% IMPORTANT NOTICE:
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
  \NeedsTeXFormat{pLaTeX2e}
24
12
  \ProvidesClass{jsbook}
25
- [2018/06/23 jsclasses (okumura, texjporg)]
13
+ [2020/10/09 jsclasses (okumura, texjporg)]
26
14
  \def\jsc@clsname{jsbook}
27
15
  \newif\ifjsc@needsp@tch
28
16
  \jsc@needsp@tchfalse
@@ -261,10 +249,11 @@
261
249
  \fi
262
250
  \ifpapersize
263
251
  \iftombow
264
- \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
252
+ \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
265
253
  \else
266
- \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
254
+ \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
267
255
  \fi
256
+ \AtBeginDvi{\special{\jsc@papersize@special}}
268
257
  \fi
269
258
  \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
270
259
  \newdimen\jsc@mpt
@@ -465,6 +454,11 @@
465
454
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
466
455
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
467
456
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
457
+ %% ad-hoc "relation font"
458
+ \@ifl@t@r\fmtversion{2020/10/01}
459
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
460
+ \ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
461
+ \ifx\@rmfamilyhook\@undefined % old
468
462
  \DeclareRobustCommand\rmfamily
469
463
  {\not@math@alphabet\rmfamily\mathrm
470
464
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -474,6 +468,33 @@
474
468
  \DeclareRobustCommand\ttfamily
475
469
  {\not@math@alphabet\ttfamily\mathtt
476
470
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
471
+ \AtBeginDocument{%
472
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
473
+ % my definitions above should have been overwritten, recover it!
474
+ % \selectfont is executed twice but I don't care about speed...
475
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
476
+ {\kanjifamily\mcdefault\selectfont}%
477
+ \expandafter\g@addto@macro\csname sffamily \endcsname
478
+ {\kanjifamily\gtdefault\selectfont}%
479
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
480
+ {\kanjifamily\gtdefault\selectfont}%
481
+ \fi}
482
+ \else % 2020-02-02
483
+ \g@addto@macro\@rmfamilyhook
484
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
485
+ \g@addto@macro\@sffamilyhook
486
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
487
+ \g@addto@macro\@ttfamilyhook
488
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
489
+ \fi
490
+ \else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
491
+ \AddToHook{rmfamily}%
492
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
493
+ \AddToHook{sffamily}%
494
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
495
+ \AddToHook{ttfamily}%
496
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
497
+ \fi % --- for 2020-10-01 END
477
498
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
478
499
  \DeclareRobustCommand\textmc[1]{%
479
500
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -682,6 +703,7 @@
682
703
  \xspcode`^^fe=3
683
704
  \xspcode`^^ff=3
684
705
  \def\@{\spacefactor3000{}}
706
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
685
707
  \def\@setfontsize#1#2#3{%
686
708
  \ifx\protect\@typeset@protect
687
709
  \let\@currsize#1%
@@ -699,7 +721,8 @@
699
721
  \if@slide \xkanjiskip=0.1em \else
700
722
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
701
723
  \fi
702
- \fi}
724
+ \fi
725
+ }
703
726
  \def\jsc@setfontsize#1#2#3{%
704
727
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
705
728
  \emergencystretch 3zw
@@ -730,6 +753,7 @@
730
753
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
731
754
  \belowdisplayshortskip \belowdisplayskip
732
755
  \let\@listi\@listI}
756
+ %% initialize
733
757
  \normalsize
734
758
  \setbox0\hbox{\char\jis"3441}%
735
759
  \setlength\Cht{\ht0}
@@ -1477,11 +1501,11 @@
1477
1501
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1478
1502
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1479
1503
  \newcommand{\labelenumi}{\theenumi.}
1480
- \newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
1504
+ \newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
1481
1505
  \newcommand{\labelenumiii}{\theenumiii.}
1482
1506
  \newcommand{\labelenumiv}{\theenumiv.}
1483
1507
  \renewcommand{\p@enumii}{\theenumi}
1484
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
1508
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
1485
1509
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1486
1510
  \newcommand\labelitemi{\textbullet}
1487
1511
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1588,7 +1612,7 @@
1588
1612
  \vskip\abovecaptionskip
1589
1613
  \sbox\@tempboxa{#1\hskip1zw\relax #2}%
1590
1614
  \ifdim \wd\@tempboxa <\hsize \centering \fi
1591
- #1\hskip1zw\relax #2\par
1615
+ #1{\hskip1zw\relax}#2\par
1592
1616
  \vskip\belowcaptionskip}}
1593
1617
  \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
1594
1618
  \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1976,23 +2000,42 @@
1976
2000
  \def\$B@>Nq(B{\$B@>Nq(Btrue}
1977
2001
  \def\$BOBNq(B{\$B@>Nq(Bfalse}
1978
2002
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
2003
+ \def\pltx@today@year@#1{%
2004
+ \ifnum\numexpr\year-#1=1 $B85(B\else
2005
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
2006
+ \kansuji\numexpr\year-#1\relax
2007
+ \else
2008
+ \number\numexpr\year-#1\relax\nobreak
2009
+ \fi
2010
+ \fi $BG/(B
2011
+ }
2012
+ \def\pltx@today@year{%
2013
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
2014
+ $B><OB(B\pltx@today@year@{1925}%
2015
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
2016
+ $BJ?@.(B\pltx@today@year@{1988}%
2017
+ \else
2018
+ $BNaOB(B\pltx@today@year@{2018}%
2019
+ \fi\fi}
1979
2020
  \def\today{%
1980
2021
  \if@english
1981
2022
  \ifcase\month\or
1982
2023
  January\or February\or March\or April\or May\or June\or
1983
2024
  July\or August\or September\or October\or November\or December\fi
1984
2025
  \space\number\day, \number\year
2026
+ \else\if$B@>Nq(B
2027
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
2028
+ \else\number\year\nobreak\fi $BG/(B
1985
2029
  \else
1986
- \if$B@>Nq(B
1987
- \number\year $BG/(B
1988
- \number\month $B7n(B
1989
- \number\day $BF|(B
1990
- \else
1991
- $BJ?@.(B\number\heisei $BG/(B
1992
- \number\month $B7n(B
1993
- \number\day $BF|(B
1994
- \fi
1995
- \fi}
2030
+ \pltx@today@year
2031
+ \fi
2032
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
2033
+ \kansuji\month $B7n(B
2034
+ \kansuji\day $BF|(B
2035
+ \else
2036
+ \number\month\nobreak $B7n(B
2037
+ \number\day\nobreak $BF|(B
2038
+ \fi\fi}
1996
2039
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1997
2040
  \if@report \pagestyle{plain} \else \pagestyle{headings} \fi
1998
2041
  \pagenumbering{arabic}
@@ -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-2016
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-2018 Japanese TeX Development Community
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
- [2018/06/23 jsclasses (okumura, texjporg)]
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
- \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
779
+ \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
755
780
  \else
756
- \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
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
- % \@nomath#1%
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 #2\par
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!$M>J,$J6uGr$,F~$i$J$$$h$&$K2~NI$7$^$7$?!#(B
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
- \if$B@>Nq(B
5877
- \number\year $BG/(B
5878
- \number\month $B7n(B
5879
- \number\day $BF|(B
5880
- \else
5881
- $BJ?@.(B\number\heisei $BG/(B
5882
- \number\month $B7n(B
5883
- \number\day $BF|(B
5884
- \fi
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
  %