review 3.1.0 → 5.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (225) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby-win.yml +45 -0
  3. data/.github/workflows/ruby.yml +27 -0
  4. data/.rubocop.yml +161 -34
  5. data/.travis.yml +16 -15
  6. data/Dockerfile +21 -5
  7. data/NEWS.ja.md +394 -0
  8. data/NEWS.md +395 -1
  9. data/README.md +10 -7
  10. data/appveyor.yml +1 -3
  11. data/bin/review-catalog-converter +5 -5
  12. data/bin/review-check +10 -12
  13. data/bin/review-checkdep +2 -2
  14. data/bin/review-compile +17 -23
  15. data/bin/review-epubmaker +3 -35
  16. data/bin/review-idgxmlmaker +16 -0
  17. data/bin/review-index +2 -89
  18. data/bin/review-preproc +13 -13
  19. data/bin/review-validate +4 -4
  20. data/bin/review-vol +4 -78
  21. data/doc/config.yml.sample +47 -12
  22. data/doc/config.yml.sample-simple +3 -2
  23. data/doc/format.ja.md +120 -17
  24. data/doc/format.md +119 -27
  25. data/doc/makeindex.ja.md +2 -2
  26. data/doc/pdfmaker.ja.md +43 -1
  27. data/doc/pdfmaker.md +42 -1
  28. data/doc/quickstart.ja.md +45 -25
  29. data/doc/quickstart.md +37 -16
  30. data/lib/epubmaker/content.rb +3 -2
  31. data/lib/epubmaker/epubcommon.rb +34 -27
  32. data/lib/epubmaker/epubv2.rb +5 -6
  33. data/lib/epubmaker/epubv3.rb +21 -18
  34. data/lib/epubmaker/producer.rb +2 -1
  35. data/lib/review/book.rb +2 -2
  36. data/lib/review/book/base.rb +91 -96
  37. data/lib/review/book/bib.rb +21 -0
  38. data/lib/review/book/book_unit.rb +155 -0
  39. data/lib/review/book/chapter.rb +48 -29
  40. data/lib/review/book/index.rb +46 -240
  41. data/lib/review/book/index/item.rb +46 -0
  42. data/lib/review/book/page_metric.rb +7 -7
  43. data/lib/review/book/part.rb +45 -10
  44. data/lib/review/book/volume.rb +4 -5
  45. data/lib/review/builder.rb +172 -56
  46. data/lib/review/catalog.rb +14 -17
  47. data/lib/review/compiler.rb +219 -121
  48. data/lib/review/configure.rb +39 -7
  49. data/lib/review/converter.rb +1 -1
  50. data/lib/review/epub2html.rb +43 -5
  51. data/lib/review/epubmaker.rb +69 -27
  52. data/lib/review/extentions/string.rb +0 -4
  53. data/lib/review/htmlbuilder.rb +112 -101
  54. data/lib/review/htmlutils.rb +9 -13
  55. data/lib/review/i18n.rb +3 -3
  56. data/lib/review/idgxmlbuilder.rb +202 -78
  57. data/lib/review/idgxmlmaker.rb +186 -0
  58. data/lib/review/index_builder.rb +653 -0
  59. data/lib/review/init-web/finish.html +10 -0
  60. data/lib/review/init-web/index.html +190 -0
  61. data/lib/review/init-web/review-layout-design.js +691 -0
  62. data/lib/review/init.rb +129 -46
  63. data/lib/review/latexbuilder.rb +255 -92
  64. data/lib/review/lineinput.rb +1 -1
  65. data/lib/review/location.rb +32 -0
  66. data/lib/review/logger.rb +4 -8
  67. data/lib/review/makerhelper.rb +35 -5
  68. data/lib/review/markdownbuilder.rb +50 -38
  69. data/lib/review/md2inaobuilder.rb +3 -5
  70. data/lib/review/pdfmaker.rb +60 -57
  71. data/lib/review/plaintextbuilder.rb +154 -87
  72. data/lib/review/preprocessor.rb +20 -42
  73. data/lib/review/rstbuilder.rb +57 -38
  74. data/lib/review/sec_counter.rb +13 -0
  75. data/lib/review/textmaker.rb +23 -15
  76. data/lib/review/textutils.rb +76 -2
  77. data/lib/review/tocprinter.rb +230 -102
  78. data/lib/review/topbuilder.rb +139 -60
  79. data/lib/review/update.rb +24 -24
  80. data/lib/review/version.rb +1 -1
  81. data/lib/review/volumeprinter.rb +98 -0
  82. data/lib/review/webmaker.rb +20 -24
  83. data/lib/review/webtocprinter.rb +38 -35
  84. data/lib/review/yamlloader.rb +26 -16
  85. data/review.gemspec +6 -4
  86. data/samples/sample-book/README.md +7 -2
  87. data/samples/sample-book/src/.gitignore +154 -0
  88. data/samples/sample-book/src/config-ebook.yml +4 -0
  89. data/samples/sample-book/src/config-jlreq-ebook.yml +4 -0
  90. data/samples/sample-book/src/config-jlreq.yml +6 -0
  91. data/samples/sample-book/src/config.yml +2 -2
  92. data/samples/sample-book/src/lib/tasks/review.rake +29 -14
  93. data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake +14 -8
  94. data/samples/syntax-book/Gemfile +1 -1
  95. data/samples/syntax-book/ch01.re +4 -2
  96. data/samples/syntax-book/ch02.re +8 -16
  97. data/samples/syntax-book/ch03.re +3 -6
  98. data/samples/syntax-book/config-jlreq-lualatex.yml +4 -0
  99. data/samples/syntax-book/config-jlreq.yml +5 -0
  100. data/samples/syntax-book/config-print.yml +3 -0
  101. data/samples/syntax-book/config.yml +1 -1
  102. data/samples/syntax-book/lib/tasks/review.rake +30 -15
  103. data/samples/syntax-book/lib/tasks/z01_copy_sty.rake +14 -8
  104. data/templates/latex/config.erb +39 -25
  105. data/templates/latex/layout.tex.erb +1 -0
  106. data/templates/latex/review-jlreq/README.md +3 -1
  107. data/templates/latex/review-jlreq/review-base.sty +161 -50
  108. data/templates/latex/review-jlreq/review-jlreq.cls +21 -22
  109. data/templates/latex/review-jlreq/review-style.sty +4 -1
  110. data/templates/latex/review-jsbook/README.md +46 -5
  111. data/templates/latex/review-jsbook/review-base.sty +123 -35
  112. data/templates/latex/review-jsbook/review-jsbook.cls +10 -4
  113. data/templates/latex/review-jsbook/review-style.sty +5 -2
  114. data/templates/opf/epubv3.opf.erb +1 -0
  115. data/templates/web/html/layout-html5.html.erb +3 -3
  116. data/test/assets/test_template.tex +19 -7
  117. data/test/assets/test_template_backmatter.tex +19 -7
  118. data/test/book_test_helper.rb +11 -5
  119. data/test/test_book.rb +124 -79
  120. data/test/test_book_chapter.rb +97 -54
  121. data/test/test_book_part.rb +3 -3
  122. data/test/test_builder.rb +38 -13
  123. data/test/test_catalog.rb +24 -42
  124. data/test/test_catalog_converter_cmd.rb +1 -1
  125. data/test/test_converter.rb +1 -0
  126. data/test/test_epub3maker.rb +2 -2
  127. data/test/test_epubmaker.rb +8 -0
  128. data/test/test_epubmaker_cmd.rb +14 -7
  129. data/test/test_helper.rb +18 -7
  130. data/test/test_htmlbuilder.rb +1491 -205
  131. data/test/test_htmlutils.rb +0 -12
  132. data/test/test_i18n.rb +37 -37
  133. data/test/test_idgxmlbuilder.rb +744 -42
  134. data/test/test_idgxmlmaker_cmd.rb +46 -0
  135. data/test/test_image_finder.rb +52 -70
  136. data/test/test_index.rb +94 -44
  137. data/test/test_indexbuilder.rb +52 -0
  138. data/test/test_latexbuilder.rb +1784 -161
  139. data/test/test_latexbuilder_v2.rb +671 -102
  140. data/test/test_logger.rb +17 -4
  141. data/test/test_makerhelper.rb +2 -14
  142. data/test/test_markdownbuilder.rb +137 -16
  143. data/test/test_md2inaobuilder.rb +32 -9
  144. data/test/test_pdfmaker.rb +30 -12
  145. data/test/test_pdfmaker_cmd.rb +100 -6
  146. data/test/test_plaintextbuilder.rb +791 -30
  147. data/test/test_preprocessor.rb +2 -16
  148. data/test/test_review_ext.rb +2 -1
  149. data/test/test_rstbuilder.rb +274 -27
  150. data/test/test_sec_counter.rb +156 -0
  151. data/test/test_textmaker_cmd.rb +54 -0
  152. data/test/test_textutils.rb +109 -2
  153. data/test/test_topbuilder.rb +724 -34
  154. data/test/test_update.rb +20 -11
  155. data/test/test_webtocprinter.rb +75 -43
  156. data/test/test_yamlloader.rb +13 -0
  157. data/vendor/gentombow/LICENSE +1 -1
  158. data/vendor/gentombow/Makefile +0 -1
  159. data/vendor/gentombow/bounddvi-en.pdf +0 -0
  160. data/vendor/gentombow/bounddvi-en.tex +1 -0
  161. data/vendor/gentombow/bounddvi.pdf +0 -0
  162. data/vendor/gentombow/bounddvi.sty +30 -7
  163. data/vendor/gentombow/bounddvi.tex +1 -0
  164. data/vendor/gentombow/create_archive.sh +1 -0
  165. data/vendor/gentombow/gentombow-ja.pdf +0 -0
  166. data/vendor/gentombow/gentombow-ja.tex +9 -0
  167. data/vendor/gentombow/gentombow.pdf +0 -0
  168. data/vendor/gentombow/gentombow.sty +32 -10
  169. data/vendor/gentombow/gentombow.tex +8 -0
  170. data/vendor/gentombow/tests/gentombow-01-pdfx.tex +8 -0
  171. data/vendor/gentombow/tests/gentombow-02-pdfx.tex +8 -0
  172. data/vendor/jsclasses/LICENSE +1 -1
  173. data/vendor/jsclasses/Makefile +3 -2
  174. data/vendor/jsclasses/create_archive.sh +5 -5
  175. data/vendor/jsclasses/jis/Makefile +3 -2
  176. data/vendor/jsclasses/jis/jsarticle.cls +74 -31
  177. data/vendor/jsclasses/jis/jsbook.cls +74 -31
  178. data/vendor/jsclasses/jis/jsclasses.dtx +176 -36
  179. data/vendor/jsclasses/jis/jsclasses.ins +15 -5
  180. data/vendor/jsclasses/jis/jslogo.dtx +4 -4
  181. data/vendor/jsclasses/jis/jslogo.ins +9 -0
  182. data/vendor/jsclasses/jis/jslogo.sty +4 -16
  183. data/vendor/jsclasses/jis/jspf.cls +73 -30
  184. data/vendor/jsclasses/jis/jsreport.cls +74 -31
  185. data/vendor/jsclasses/jis/jsverb.ins +9 -0
  186. data/vendor/jsclasses/jis/jsverb.sty +1 -13
  187. data/vendor/jsclasses/jis/kiyou.cls +74 -31
  188. data/vendor/jsclasses/jis/minijs.sty +65 -22
  189. data/vendor/jsclasses/jis/okumacro.dtx +4 -5
  190. data/vendor/jsclasses/jis/okumacro.ins +9 -0
  191. data/vendor/jsclasses/jis/okumacro.sty +4 -17
  192. data/vendor/jsclasses/jis/okuverb.ins +9 -0
  193. data/vendor/jsclasses/jis/okuverb.sty +1 -13
  194. data/vendor/jsclasses/jis/winjis.sty +23 -19
  195. data/vendor/jsclasses/jsarticle.cls +74 -31
  196. data/vendor/jsclasses/jsbook.cls +74 -31
  197. data/vendor/jsclasses/jsclasses.dtx +176 -36
  198. data/vendor/jsclasses/jsclasses.ins +15 -5
  199. data/vendor/jsclasses/jsclasses.pdf +0 -0
  200. data/vendor/jsclasses/jslogo.dtx +4 -4
  201. data/vendor/jsclasses/jslogo.ins +9 -0
  202. data/vendor/jsclasses/jslogo.pdf +0 -0
  203. data/vendor/jsclasses/jslogo.sty +4 -16
  204. data/vendor/jsclasses/jspf.cls +73 -30
  205. data/vendor/jsclasses/jsreport.cls +74 -31
  206. data/vendor/jsclasses/jsverb.ins +9 -0
  207. data/vendor/jsclasses/jsverb.pdf +0 -0
  208. data/vendor/jsclasses/jsverb.sty +1 -13
  209. data/vendor/jsclasses/kiyou.cls +74 -31
  210. data/vendor/jsclasses/minijs.sty +68 -22
  211. data/vendor/jsclasses/okumacro.dtx +4 -5
  212. data/vendor/jsclasses/okumacro.ins +9 -0
  213. data/vendor/jsclasses/okumacro.pdf +0 -0
  214. data/vendor/jsclasses/okumacro.sty +4 -17
  215. data/vendor/jsclasses/okuverb.ins +9 -0
  216. data/vendor/jsclasses/okuverb.pdf +0 -0
  217. data/vendor/jsclasses/okuverb.sty +1 -13
  218. data/vendor/jsclasses/tests/relfont.tex +10 -0
  219. data/vendor/jsclasses/winjis.sty +23 -19
  220. metadata +65 -12
  221. data/.rubocop_todo.yml +0 -7
  222. data/lib/review/book/compilable.rb +0 -173
  223. data/lib/review/tocparser.rb +0 -271
  224. data/samples/syntax-book/review-ext.rb +0 -14
  225. data/test/test_tocparser.rb +0 -25
@@ -1,4 +1,13 @@
1
+ \input docstrip
2
+ \preamble
3
+
4
+ Maintained on GitHub: https://github.com/texjporg/jsclasses
5
+
6
+ \endpreamble
7
+
1
8
  \def\batchfile{jslogo.ins}
2
9
  \input docstrip.tex
3
10
  \keepsilent
4
11
  \generateFile{jslogo.sty}{f}{\from{jslogo.dtx}{package}}
12
+
13
+ \endbatchfile
@@ -6,23 +6,11 @@
6
6
  %%
7
7
  %% jslogo.dtx (with options: `package')
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 jslogo.sty.
15
- %%
16
- %% For distribution of the original source see the terms
17
- %% for copying and modification in the file jslogo.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{LaTeX2e}
24
12
  \ProvidesPackage{jslogo}
25
- [2017/02/24 okumura, texjporg]
13
+ [2019/07/25 okumura, texjporg]
26
14
  \def\jslg@small#1{\hbox{$\m@th$%
27
15
  \csname S@\f@size\endcsname
28
16
  \fontsize\sf@size\z@
@@ -207,8 +195,8 @@
207
195
  \def\upLaTeX{u\pLaTeX}
208
196
  \def\upLaTeXe{u\pLaTeXe}
209
197
  \def\AmSTeX{\protect\AmS-\protect\TeX{}}
210
- \DeclareRobustCommand{\BibTeX}{B\kern-.05em\jslg@small{I\kern-.025em B}%
211
- \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
198
+ \DeclareRobustCommand{\BibTeX}{%
199
+ B\kern-.05em\jslg@small{I\kern-.025em B}\kern-.15em\TeX}
212
200
  \DeclareRobustCommand{\SliTeX}{%
213
201
  S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
214
202
  \providecommand*\pdfstringdefPreHook{}
@@ -4,25 +4,13 @@
4
4
  %%
5
5
  %% The original source files were:
6
6
  %%
7
- %% jsclasses.dtx (with options: `jspf')
7
+ %% jsclasses.dtx (with options: `class,jspf')
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 jspf.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{jspf}
25
- [2018/06/23 jsclasses (okumura, texjporg)]
13
+ [2020/10/09 jsclasses (okumura, texjporg)]
26
14
  \def\jsc@clsname{jspf}
27
15
  \newif\ifjsc@needsp@tch
28
16
  \jsc@needsp@tchfalse
@@ -252,10 +240,11 @@
252
240
  \fi
253
241
  \ifpapersize
254
242
  \iftombow
255
- \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
243
+ \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
256
244
  \else
257
- \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
245
+ \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
258
246
  \fi
247
+ \AtBeginDvi{\special{\jsc@papersize@special}}
259
248
  \fi
260
249
  \def\n@baseline{14.554375}
261
250
  \newdimen\jsc@mpt
@@ -456,6 +445,11 @@
456
445
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
457
446
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
458
447
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
448
+ %% ad-hoc "relation font"
449
+ \@ifl@t@r\fmtversion{2020/10/01}
450
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
451
+ \ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
452
+ \ifx\@rmfamilyhook\@undefined % old
459
453
  \DeclareRobustCommand\rmfamily
460
454
  {\not@math@alphabet\rmfamily\mathrm
461
455
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -465,6 +459,33 @@
465
459
  \DeclareRobustCommand\ttfamily
466
460
  {\not@math@alphabet\ttfamily\mathtt
467
461
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
462
+ \AtBeginDocument{%
463
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
464
+ % my definitions above should have been overwritten, recover it!
465
+ % \selectfont is executed twice but I don't care about speed...
466
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
467
+ {\kanjifamily\mcdefault\selectfont}%
468
+ \expandafter\g@addto@macro\csname sffamily \endcsname
469
+ {\kanjifamily\gtdefault\selectfont}%
470
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
471
+ {\kanjifamily\gtdefault\selectfont}%
472
+ \fi}
473
+ \else % 2020-02-02
474
+ \g@addto@macro\@rmfamilyhook
475
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
476
+ \g@addto@macro\@sffamilyhook
477
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
478
+ \g@addto@macro\@ttfamilyhook
479
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
480
+ \fi
481
+ \else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
482
+ \AddToHook{rmfamily}%
483
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
484
+ \AddToHook{sffamily}%
485
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
486
+ \AddToHook{ttfamily}%
487
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
488
+ \fi % --- for 2020-10-01 END
468
489
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
469
490
  \DeclareRobustCommand\textmc[1]{%
470
491
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -673,6 +694,7 @@
673
694
  \xspcode`^^fe=3
674
695
  \xspcode`^^ff=3
675
696
  \def\@{\spacefactor3000{}}
697
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
676
698
  \def\@setfontsize#1#2#3{%
677
699
  \ifx\protect\@typeset@protect
678
700
  \let\@currsize#1%
@@ -690,7 +712,8 @@
690
712
  \if@slide \xkanjiskip=0.1em \else
691
713
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
692
714
  \fi
693
- \fi}
715
+ \fi
716
+ }
694
717
  \def\jsc@setfontsize#1#2#3{%
695
718
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
696
719
  \emergencystretch 3zw
@@ -721,6 +744,7 @@
721
744
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
722
745
  \belowdisplayshortskip \belowdisplayskip
723
746
  \let\@listi\@listI}
747
+ %% initialize
724
748
  \normalsize
725
749
  \setbox0\hbox{\char\jis"3441}%
726
750
  \setlength\Cht{\ht0}
@@ -1243,11 +1267,11 @@
1243
1267
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1244
1268
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1245
1269
  \newcommand{\labelenumi}{\theenumi.}
1246
- \newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
1270
+ \newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
1247
1271
  \newcommand{\labelenumiii}{\theenumiii.}
1248
1272
  \newcommand{\labelenumiv}{\theenumiv.}
1249
1273
  \renewcommand{\p@enumii}{\theenumi}
1250
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
1274
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
1251
1275
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1252
1276
  \newcommand\labelitemi{\textbullet}
1253
1277
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1727,23 +1751,42 @@
1727
1751
  \def\$B@>Nq(B{\$B@>Nq(Btrue}
1728
1752
  \def\$BOBNq(B{\$B@>Nq(Bfalse}
1729
1753
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
1754
+ \def\pltx@today@year@#1{%
1755
+ \ifnum\numexpr\year-#1=1 $B85(B\else
1756
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1757
+ \kansuji\numexpr\year-#1\relax
1758
+ \else
1759
+ \number\numexpr\year-#1\relax\nobreak
1760
+ \fi
1761
+ \fi $BG/(B
1762
+ }
1763
+ \def\pltx@today@year{%
1764
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
1765
+ $B><OB(B\pltx@today@year@{1925}%
1766
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
1767
+ $BJ?@.(B\pltx@today@year@{1988}%
1768
+ \else
1769
+ $BNaOB(B\pltx@today@year@{2018}%
1770
+ \fi\fi}
1730
1771
  \def\today{%
1731
1772
  \if@english
1732
1773
  \ifcase\month\or
1733
1774
  January\or February\or March\or April\or May\or June\or
1734
1775
  July\or August\or September\or October\or November\or December\fi
1735
1776
  \space\number\day, \number\year
1777
+ \else\if$B@>Nq(B
1778
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
1779
+ \else\number\year\nobreak\fi $BG/(B
1736
1780
  \else
1737
- \if$B@>Nq(B
1738
- \number\year $BG/(B
1739
- \number\month $B7n(B
1740
- \number\day $BF|(B
1741
- \else
1742
- $BJ?@.(B\number\heisei $BG/(B
1743
- \number\month $B7n(B
1744
- \number\day $BF|(B
1745
- \fi
1746
- \fi}
1781
+ \pltx@today@year
1782
+ \fi
1783
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1784
+ \kansuji\month $B7n(B
1785
+ \kansuji\day $BF|(B
1786
+ \else
1787
+ \number\month\nobreak $B7n(B
1788
+ \number\day\nobreak $BF|(B
1789
+ \fi\fi}
1747
1790
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1748
1791
  \pagestyle{headings}
1749
1792
  \pagenumbering{arabic}
@@ -4,25 +4,13 @@
4
4
  %%
5
5
  %% The original source files were:
6
6
  %%
7
- %% jsclasses.dtx (with options: `report')
7
+ %% jsclasses.dtx (with options: `class,report')
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 jsreport.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{jsreport}
25
- [2018/06/23 jsclasses (okumura, texjporg)]
13
+ [2020/10/09 jsclasses (okumura, texjporg)]
26
14
  \def\jsc@clsname{jsreport}
27
15
  \newif\ifjsc@needsp@tch
28
16
  \jsc@needsp@tchfalse
@@ -257,10 +245,11 @@
257
245
  \fi
258
246
  \ifpapersize
259
247
  \iftombow
260
- \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
248
+ \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
261
249
  \else
262
- \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
250
+ \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
263
251
  \fi
252
+ \AtBeginDvi{\special{\jsc@papersize@special}}
264
253
  \fi
265
254
  \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
266
255
  \newdimen\jsc@mpt
@@ -461,6 +450,11 @@
461
450
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
462
451
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
463
452
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
453
+ %% ad-hoc "relation font"
454
+ \@ifl@t@r\fmtversion{2020/10/01}
455
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
456
+ \ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
457
+ \ifx\@rmfamilyhook\@undefined % old
464
458
  \DeclareRobustCommand\rmfamily
465
459
  {\not@math@alphabet\rmfamily\mathrm
466
460
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -470,6 +464,33 @@
470
464
  \DeclareRobustCommand\ttfamily
471
465
  {\not@math@alphabet\ttfamily\mathtt
472
466
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
467
+ \AtBeginDocument{%
468
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
469
+ % my definitions above should have been overwritten, recover it!
470
+ % \selectfont is executed twice but I don't care about speed...
471
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
472
+ {\kanjifamily\mcdefault\selectfont}%
473
+ \expandafter\g@addto@macro\csname sffamily \endcsname
474
+ {\kanjifamily\gtdefault\selectfont}%
475
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
476
+ {\kanjifamily\gtdefault\selectfont}%
477
+ \fi}
478
+ \else % 2020-02-02
479
+ \g@addto@macro\@rmfamilyhook
480
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
481
+ \g@addto@macro\@sffamilyhook
482
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
483
+ \g@addto@macro\@ttfamilyhook
484
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
485
+ \fi
486
+ \else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
487
+ \AddToHook{rmfamily}%
488
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
489
+ \AddToHook{sffamily}%
490
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
491
+ \AddToHook{ttfamily}%
492
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
493
+ \fi % --- for 2020-10-01 END
473
494
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
474
495
  \DeclareRobustCommand\textmc[1]{%
475
496
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -678,6 +699,7 @@
678
699
  \xspcode`^^fe=3
679
700
  \xspcode`^^ff=3
680
701
  \def\@{\spacefactor3000{}}
702
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
681
703
  \def\@setfontsize#1#2#3{%
682
704
  \ifx\protect\@typeset@protect
683
705
  \let\@currsize#1%
@@ -695,7 +717,8 @@
695
717
  \if@slide \xkanjiskip=0.1em \else
696
718
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
697
719
  \fi
698
- \fi}
720
+ \fi
721
+ }
699
722
  \def\jsc@setfontsize#1#2#3{%
700
723
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
701
724
  \emergencystretch 3zw
@@ -726,6 +749,7 @@
726
749
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
727
750
  \belowdisplayshortskip \belowdisplayskip
728
751
  \let\@listi\@listI}
752
+ %% initialize
729
753
  \normalsize
730
754
  \setbox0\hbox{\char\jis"3441}%
731
755
  \setlength\Cht{\ht0}
@@ -1429,11 +1453,11 @@
1429
1453
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1430
1454
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1431
1455
  \newcommand{\labelenumi}{\theenumi.}
1432
- \newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
1456
+ \newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
1433
1457
  \newcommand{\labelenumiii}{\theenumiii.}
1434
1458
  \newcommand{\labelenumiv}{\theenumiv.}
1435
1459
  \renewcommand{\p@enumii}{\theenumi}
1436
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
1460
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
1437
1461
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1438
1462
  \newcommand\labelitemi{\textbullet}
1439
1463
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1581,7 +1605,7 @@
1581
1605
  \vskip\abovecaptionskip
1582
1606
  \sbox\@tempboxa{#1\hskip1zw\relax #2}%
1583
1607
  \ifdim \wd\@tempboxa <\hsize \centering \fi
1584
- #1\hskip1zw\relax #2\par
1608
+ #1{\hskip1zw\relax}#2\par
1585
1609
  \vskip\belowcaptionskip}}
1586
1610
  \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
1587
1611
  \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1970,23 +1994,42 @@
1970
1994
  \def\$B@>Nq(B{\$B@>Nq(Btrue}
1971
1995
  \def\$BOBNq(B{\$B@>Nq(Bfalse}
1972
1996
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
1997
+ \def\pltx@today@year@#1{%
1998
+ \ifnum\numexpr\year-#1=1 $B85(B\else
1999
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
2000
+ \kansuji\numexpr\year-#1\relax
2001
+ \else
2002
+ \number\numexpr\year-#1\relax\nobreak
2003
+ \fi
2004
+ \fi $BG/(B
2005
+ }
2006
+ \def\pltx@today@year{%
2007
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
2008
+ $B><OB(B\pltx@today@year@{1925}%
2009
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
2010
+ $BJ?@.(B\pltx@today@year@{1988}%
2011
+ \else
2012
+ $BNaOB(B\pltx@today@year@{2018}%
2013
+ \fi\fi}
1973
2014
  \def\today{%
1974
2015
  \if@english
1975
2016
  \ifcase\month\or
1976
2017
  January\or February\or March\or April\or May\or June\or
1977
2018
  July\or August\or September\or October\or November\or December\fi
1978
2019
  \space\number\day, \number\year
2020
+ \else\if$B@>Nq(B
2021
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
2022
+ \else\number\year\nobreak\fi $BG/(B
1979
2023
  \else
1980
- \if$B@>Nq(B
1981
- \number\year $BG/(B
1982
- \number\month $B7n(B
1983
- \number\day $BF|(B
1984
- \else
1985
- $BJ?@.(B\number\heisei $BG/(B
1986
- \number\month $B7n(B
1987
- \number\day $BF|(B
1988
- \fi
1989
- \fi}
2024
+ \pltx@today@year
2025
+ \fi
2026
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
2027
+ \kansuji\month $B7n(B
2028
+ \kansuji\day $BF|(B
2029
+ \else
2030
+ \number\month\nobreak $B7n(B
2031
+ \number\day\nobreak $BF|(B
2032
+ \fi\fi}
1990
2033
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1991
2034
  \pagestyle{plain}
1992
2035
  \pagenumbering{arabic}
@@ -1,4 +1,13 @@
1
+ \input docstrip
2
+ \preamble
3
+
4
+ Maintained on GitHub: https://github.com/texjporg/jsclasses
5
+
6
+ \endpreamble
7
+
1
8
  \def\batchfile{jsverb.ins}
2
9
  \input docstrip.tex
3
10
  \keepsilent
4
11
  \generateFile{jsverb.sty}{f}{\from{jsverb.dtx}{jsverb}}
12
+
13
+ \endbatchfile
@@ -6,20 +6,8 @@
6
6
  %%
7
7
  %% jsverb.dtx (with options: `jsverb')
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 jsverb.sty.
15
- %%
16
- %% For distribution of the original source see the terms
17
- %% for copying and modification in the file jsverb.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
  \ProvidesFile{jsverb.sty}[2007/01/28 okumura]
25
13
  \newif\if@yen \@yenfalse