review 4.0.0 → 5.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (268) 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 +141 -38
  6. data/Dockerfile +21 -5
  7. data/NEWS.ja.md +338 -1
  8. data/NEWS.md +339 -2
  9. data/README.md +11 -7
  10. data/Rakefile +7 -2
  11. data/appveyor.yml +0 -20
  12. data/bin/review +2 -4
  13. data/bin/review-catalog-converter +4 -4
  14. data/bin/review-check +8 -12
  15. data/bin/review-checkdep +2 -5
  16. data/bin/review-compile +11 -20
  17. data/bin/review-epub2html +1 -4
  18. data/bin/review-epubmaker +3 -4
  19. data/bin/review-idgxmlmaker +1 -3
  20. data/bin/review-index +5 -86
  21. data/bin/review-init +1 -4
  22. data/bin/review-pdfmaker +1 -3
  23. data/bin/review-preproc +3 -5
  24. data/bin/review-textmaker +1 -3
  25. data/bin/review-update +1 -4
  26. data/bin/review-validate +5 -5
  27. data/bin/review-vol +5 -82
  28. data/bin/review-webmaker +1 -3
  29. data/doc/config.yml.sample +55 -12
  30. data/doc/config.yml.sample-simple +4 -3
  31. data/doc/format.ja.md +119 -17
  32. data/doc/format.md +106 -17
  33. data/doc/makeindex.ja.md +2 -2
  34. data/doc/pdfmaker.ja.md +42 -0
  35. data/doc/pdfmaker.md +41 -0
  36. data/doc/quickstart.ja.md +55 -25
  37. data/doc/quickstart.md +47 -17
  38. data/lib/review.rb +1 -1
  39. data/lib/review/book.rb +2 -2
  40. data/lib/review/book/base.rb +69 -30
  41. data/lib/review/book/bib.rb +21 -0
  42. data/lib/review/book/book_unit.rb +158 -0
  43. data/lib/review/book/chapter.rb +33 -26
  44. data/lib/review/book/index.rb +39 -206
  45. data/lib/review/book/index/item.rb +8 -2
  46. data/lib/review/book/page_metric.rb +7 -7
  47. data/lib/review/book/part.rb +26 -11
  48. data/lib/review/book/volume.rb +5 -5
  49. data/lib/review/builder.rb +124 -27
  50. data/lib/review/call_hook.rb +20 -0
  51. data/lib/review/catalog.rb +3 -2
  52. data/lib/review/compiler.rb +197 -91
  53. data/lib/review/configure.rb +95 -9
  54. data/lib/review/converter.rb +1 -1
  55. data/lib/review/epub2html.rb +6 -1
  56. data/lib/review/epubmaker.rb +116 -117
  57. data/lib/review/epubmaker/content.rb +113 -0
  58. data/lib/review/epubmaker/epubcommon.rb +372 -0
  59. data/lib/review/epubmaker/epubv2.rb +178 -0
  60. data/lib/review/epubmaker/epubv3.rb +231 -0
  61. data/lib/review/epubmaker/producer.rb +168 -0
  62. data/lib/review/epubmaker/reviewheaderlistener.rb +12 -2
  63. data/lib/review/epubmaker/zip_exporter.rb +84 -0
  64. data/lib/review/exception.rb +6 -0
  65. data/lib/review/extentions/string.rb +0 -4
  66. data/lib/review/htmlbuilder.rb +132 -87
  67. data/lib/review/htmlutils.rb +8 -11
  68. data/lib/review/i18n.rb +2 -1
  69. data/lib/review/idgxmlbuilder.rb +156 -76
  70. data/lib/review/idgxmlmaker.rb +22 -18
  71. data/lib/review/img_math.rb +245 -0
  72. data/lib/review/index_builder.rb +654 -0
  73. data/lib/review/init.rb +17 -18
  74. data/lib/review/latexbox.rb +58 -0
  75. data/lib/review/latexbuilder.rb +173 -43
  76. data/lib/review/latexutils.rb +9 -1
  77. data/lib/review/lineinput.rb +112 -2
  78. data/lib/review/logger.rb +42 -3
  79. data/lib/review/makerhelper.rb +12 -187
  80. data/lib/review/markdownbuilder.rb +51 -2
  81. data/lib/review/pdfmaker.rb +78 -73
  82. data/lib/review/plaintextbuilder.rb +98 -14
  83. data/lib/review/preprocessor.rb +18 -12
  84. data/lib/review/rstbuilder.rb +28 -9
  85. data/lib/review/sec_counter.rb +14 -0
  86. data/lib/review/template.rb +6 -0
  87. data/lib/review/textmaker.rb +21 -19
  88. data/lib/review/textutils.rb +3 -12
  89. data/lib/review/tocprinter.rb +242 -97
  90. data/lib/review/topbuilder.rb +91 -24
  91. data/lib/review/update.rb +12 -13
  92. data/lib/review/version.rb +1 -1
  93. data/lib/review/volumeprinter.rb +97 -0
  94. data/lib/review/webmaker.rb +34 -33
  95. data/lib/review/webtocprinter.rb +39 -35
  96. data/lib/review/yamlloader.rb +2 -1
  97. data/review.gemspec +5 -3
  98. data/samples/sample-book/src/.gitignore +1 -0
  99. data/samples/sample-book/src/config-ebook.yml +4 -0
  100. data/samples/sample-book/src/config-epub2.yml +1 -1
  101. data/samples/sample-book/src/config-jlreq-ebook.yml +4 -0
  102. data/samples/sample-book/src/config.yml +3 -3
  103. data/samples/sample-book/src/lib/tasks/review.rake +26 -6
  104. data/samples/syntax-book/Gemfile +1 -1
  105. data/samples/syntax-book/ch01.re +3 -1
  106. data/samples/syntax-book/ch02.re +28 -21
  107. data/samples/syntax-book/ch03.re +1 -1
  108. data/samples/syntax-book/config-jlreq-lualatex.yml +4 -0
  109. data/samples/syntax-book/config-print.yml +3 -0
  110. data/samples/syntax-book/config.yml +1 -1
  111. data/samples/syntax-book/images/img3-2.png +0 -0
  112. data/samples/syntax-book/lib/tasks/review.rake +23 -8
  113. data/templates/html/_colophon.html.erb +23 -0
  114. data/templates/html/_colophon_history.html.erb +9 -0
  115. data/templates/html/_cover.html.erb +10 -0
  116. data/templates/html/_part_body.html.erb +6 -0
  117. data/templates/html/_titlepage.html.erb +20 -0
  118. data/templates/html/layout-html5.html.erb +6 -0
  119. data/templates/html/layout-xhtml1.html.erb +6 -0
  120. data/templates/latex/config.erb +41 -29
  121. data/templates/latex/review-jlreq/README.md +3 -1
  122. data/templates/latex/review-jlreq/review-base.sty +47 -22
  123. data/templates/latex/review-jlreq/review-jlreq.cls +25 -24
  124. data/templates/latex/review-jlreq/review-style.sty +6 -1
  125. data/templates/latex/review-jlreq/review-tcbox.sty +348 -0
  126. data/templates/latex/review-jlreq/reviewmacro.sty +5 -0
  127. data/templates/latex/review-jsbook/README.md +7 -5
  128. data/templates/latex/review-jsbook/review-base.sty +47 -21
  129. data/templates/latex/review-jsbook/review-jsbook.cls +12 -2
  130. data/templates/latex/review-jsbook/review-style.sty +6 -1
  131. data/templates/latex/review-jsbook/review-tcbox.sty +348 -0
  132. data/templates/latex/review-jsbook/reviewmacro.sty +5 -0
  133. data/templates/opf/epubv2.opf.erb +7 -7
  134. data/templates/opf/epubv3.opf.erb +7 -7
  135. data/templates/opf/opf_manifest_epubv2.opf.erb +10 -0
  136. data/templates/opf/opf_manifest_epubv3.opf.erb +10 -0
  137. data/templates/opf/opf_metainfo_epubv2.opf.erb +17 -0
  138. data/templates/opf/opf_metainfo_epubv3.opf.erb +49 -0
  139. data/templates/opf/opf_tocx_epubv2.opf.erb +9 -0
  140. data/templates/opf/opf_tocx_epubv3.opf.erb +17 -0
  141. data/templates/web/html/layout-html5.html.erb +9 -8
  142. data/templates/web/html/layout-xhtml1.html.erb +6 -0
  143. data/test/assets/header_listener.html +35 -0
  144. data/test/assets/img_math/img1.png +0 -0
  145. data/test/assets/img_math/img2.png +0 -0
  146. data/test/assets/img_math/img3.png +0 -0
  147. data/test/assets/syntax_book_index_detail.txt +58 -0
  148. data/test/assets/test_template.tex +12 -9
  149. data/test/assets/test_template_backmatter.tex +12 -9
  150. data/test/book_test_helper.rb +11 -5
  151. data/test/run_test.rb +1 -1
  152. data/test/test_book.rb +62 -63
  153. data/test/test_book_chapter.rb +99 -56
  154. data/test/test_book_part.rb +3 -3
  155. data/test/test_builder.rb +24 -15
  156. data/test/test_catalog.rb +1 -0
  157. data/test/test_catalog_converter_cmd.rb +1 -1
  158. data/test/test_converter.rb +1 -0
  159. data/test/test_epub3maker.rb +170 -126
  160. data/test/test_epubmaker.rb +249 -129
  161. data/test/test_epubmaker_cmd.rb +14 -7
  162. data/test/test_helper.rb +23 -11
  163. data/test/test_htmlbuilder.rb +956 -76
  164. data/test/test_htmlutils.rb +0 -12
  165. data/test/test_i18n.rb +33 -33
  166. data/test/test_idgxmlbuilder.rb +568 -10
  167. data/test/test_idgxmlmaker_cmd.rb +50 -0
  168. data/test/test_image_finder.rb +52 -70
  169. data/test/test_img_math.rb +111 -0
  170. data/test/test_index.rb +62 -52
  171. data/test/test_indexbuilder.rb +52 -0
  172. data/test/test_latexbuilder.rb +1056 -30
  173. data/test/test_latexbuilder_v2.rb +52 -12
  174. data/test/test_lineinput.rb +20 -93
  175. data/test/test_logger.rb +7 -7
  176. data/test/test_makerhelper.rb +0 -12
  177. data/test/test_markdownbuilder.rb +32 -0
  178. data/test/test_pdfmaker.rb +100 -11
  179. data/test/test_pdfmaker_cmd.rb +101 -7
  180. data/test/test_plaintextbuilder.rb +531 -25
  181. data/test/test_review_ext.rb +2 -1
  182. data/test/test_reviewheaderlistener.rb +49 -0
  183. data/test/test_rstbuilder.rb +25 -1
  184. data/test/test_sec_counter.rb +156 -0
  185. data/test/test_template.rb +12 -2
  186. data/test/test_textmaker_cmd.rb +58 -0
  187. data/test/test_tocprinter.rb +46 -0
  188. data/test/test_topbuilder.rb +365 -10
  189. data/test/test_update.rb +44 -44
  190. data/test/test_webtocprinter.rb +75 -43
  191. data/test/test_zip_exporter.rb +5 -6
  192. data/vendor/gentombow/LICENSE +1 -1
  193. data/vendor/gentombow/Makefile +0 -1
  194. data/vendor/gentombow/bounddvi-en.pdf +0 -0
  195. data/vendor/gentombow/bounddvi-en.tex +1 -0
  196. data/vendor/gentombow/bounddvi.pdf +0 -0
  197. data/vendor/gentombow/bounddvi.sty +30 -7
  198. data/vendor/gentombow/bounddvi.tex +1 -0
  199. data/vendor/gentombow/create_archive.sh +1 -0
  200. data/vendor/gentombow/gentombow-ja.pdf +0 -0
  201. data/vendor/gentombow/gentombow-ja.tex +9 -0
  202. data/vendor/gentombow/gentombow.pdf +0 -0
  203. data/vendor/gentombow/gentombow.sty +32 -10
  204. data/vendor/gentombow/gentombow.tex +8 -0
  205. data/vendor/gentombow/tests/gentombow-01-pdfx.tex +8 -0
  206. data/vendor/gentombow/tests/gentombow-02-pdfx.tex +8 -0
  207. data/vendor/jsclasses/LICENSE +1 -1
  208. data/vendor/jsclasses/Makefile +3 -2
  209. data/vendor/jsclasses/create_archive.sh +5 -5
  210. data/vendor/jsclasses/jis/Makefile +3 -2
  211. data/vendor/jsclasses/jis/jsarticle.cls +74 -31
  212. data/vendor/jsclasses/jis/jsbook.cls +74 -31
  213. data/vendor/jsclasses/jis/jsclasses.dtx +176 -36
  214. data/vendor/jsclasses/jis/jsclasses.ins +15 -5
  215. data/vendor/jsclasses/jis/jslogo.dtx +4 -4
  216. data/vendor/jsclasses/jis/jslogo.ins +9 -0
  217. data/vendor/jsclasses/jis/jslogo.sty +4 -16
  218. data/vendor/jsclasses/jis/jspf.cls +73 -30
  219. data/vendor/jsclasses/jis/jsreport.cls +74 -31
  220. data/vendor/jsclasses/jis/jsverb.ins +9 -0
  221. data/vendor/jsclasses/jis/jsverb.sty +1 -13
  222. data/vendor/jsclasses/jis/kiyou.cls +74 -31
  223. data/vendor/jsclasses/jis/minijs.sty +65 -22
  224. data/vendor/jsclasses/jis/okumacro.dtx +4 -5
  225. data/vendor/jsclasses/jis/okumacro.ins +9 -0
  226. data/vendor/jsclasses/jis/okumacro.sty +4 -17
  227. data/vendor/jsclasses/jis/okuverb.ins +9 -0
  228. data/vendor/jsclasses/jis/okuverb.sty +1 -13
  229. data/vendor/jsclasses/jis/winjis.sty +23 -19
  230. data/vendor/jsclasses/jsarticle.cls +74 -31
  231. data/vendor/jsclasses/jsbook.cls +74 -31
  232. data/vendor/jsclasses/jsclasses.dtx +176 -36
  233. data/vendor/jsclasses/jsclasses.ins +15 -5
  234. data/vendor/jsclasses/jsclasses.pdf +0 -0
  235. data/vendor/jsclasses/jslogo.dtx +4 -4
  236. data/vendor/jsclasses/jslogo.ins +9 -0
  237. data/vendor/jsclasses/jslogo.pdf +0 -0
  238. data/vendor/jsclasses/jslogo.sty +4 -16
  239. data/vendor/jsclasses/jspf.cls +73 -30
  240. data/vendor/jsclasses/jsreport.cls +74 -31
  241. data/vendor/jsclasses/jsverb.ins +9 -0
  242. data/vendor/jsclasses/jsverb.pdf +0 -0
  243. data/vendor/jsclasses/jsverb.sty +1 -13
  244. data/vendor/jsclasses/kiyou.cls +74 -31
  245. data/vendor/jsclasses/minijs.sty +68 -22
  246. data/vendor/jsclasses/okumacro.dtx +4 -5
  247. data/vendor/jsclasses/okumacro.ins +9 -0
  248. data/vendor/jsclasses/okumacro.pdf +0 -0
  249. data/vendor/jsclasses/okumacro.sty +4 -17
  250. data/vendor/jsclasses/okuverb.ins +9 -0
  251. data/vendor/jsclasses/okuverb.pdf +0 -0
  252. data/vendor/jsclasses/okuverb.sty +1 -13
  253. data/vendor/jsclasses/tests/relfont.tex +10 -0
  254. data/vendor/jsclasses/winjis.sty +23 -19
  255. metadata +109 -20
  256. data/.rubocop_todo.yml +0 -7
  257. data/lib/epubmaker.rb +0 -23
  258. data/lib/epubmaker/content.rb +0 -110
  259. data/lib/epubmaker/epubcommon.rb +0 -441
  260. data/lib/epubmaker/epubv2.rb +0 -143
  261. data/lib/epubmaker/epubv3.rb +0 -233
  262. data/lib/epubmaker/producer.rb +0 -375
  263. data/lib/epubmaker/zip_exporter.rb +0 -81
  264. data/lib/lineinput.rb +0 -155
  265. data/lib/review/book/compilable.rb +0 -178
  266. data/lib/review/tocparser.rb +0 -271
  267. data/samples/syntax-book/review-ext.rb +0 -14
  268. 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{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
@@ -4,25 +4,13 @@
4
4
  %%
5
5
  %% The original source files were:
6
6
  %%
7
- %% jsclasses.dtx (with options: `kiyou')
7
+ %% jsclasses.dtx (with options: `class,kiyou')
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 kiyou.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{kiyou}
25
- [2018/06/23 jsclasses (okumura, texjporg)]
13
+ [2020/10/09 jsclasses (okumura, texjporg)]
26
14
  \def\jsc@clsname{kiyou}
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.897}
261
250
  \newdimen\jsc@mpt
@@ -467,6 +456,11 @@
467
456
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
468
457
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
469
458
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
459
+ %% ad-hoc "relation font"
460
+ \@ifl@t@r\fmtversion{2020/10/01}
461
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
462
+ \ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
463
+ \ifx\@rmfamilyhook\@undefined % old
470
464
  \DeclareRobustCommand\rmfamily
471
465
  {\not@math@alphabet\rmfamily\mathrm
472
466
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -476,6 +470,33 @@
476
470
  \DeclareRobustCommand\ttfamily
477
471
  {\not@math@alphabet\ttfamily\mathtt
478
472
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
473
+ \AtBeginDocument{%
474
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
475
+ % my definitions above should have been overwritten, recover it!
476
+ % \selectfont is executed twice but I don't care about speed...
477
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
478
+ {\kanjifamily\mcdefault\selectfont}%
479
+ \expandafter\g@addto@macro\csname sffamily \endcsname
480
+ {\kanjifamily\gtdefault\selectfont}%
481
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
482
+ {\kanjifamily\gtdefault\selectfont}%
483
+ \fi}
484
+ \else % 2020-02-02
485
+ \g@addto@macro\@rmfamilyhook
486
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
487
+ \g@addto@macro\@sffamilyhook
488
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
489
+ \g@addto@macro\@ttfamilyhook
490
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
491
+ \fi
492
+ \else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
493
+ \AddToHook{rmfamily}%
494
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
495
+ \AddToHook{sffamily}%
496
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
497
+ \AddToHook{ttfamily}%
498
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
499
+ \fi % --- for 2020-10-01 END
479
500
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
480
501
  \DeclareRobustCommand\textmc[1]{%
481
502
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -684,6 +705,7 @@
684
705
  \xspcode`^^fe=3
685
706
  \xspcode`^^ff=3
686
707
  \def\@{\spacefactor3000{}}
708
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
687
709
  \def\@setfontsize#1#2#3{%
688
710
  \ifx\protect\@typeset@protect
689
711
  \let\@currsize#1%
@@ -701,7 +723,8 @@
701
723
  \if@slide \xkanjiskip=0.1em \else
702
724
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
703
725
  \fi
704
- \fi}
726
+ \fi
727
+ }
705
728
  \def\jsc@setfontsize#1#2#3{%
706
729
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
707
730
  \emergencystretch 3zw
@@ -732,6 +755,7 @@
732
755
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
733
756
  \belowdisplayshortskip \belowdisplayskip
734
757
  \let\@listi\@listI}
758
+ %% initialize
735
759
  \normalsize
736
760
  \setbox0\hbox{\char\jis"3441}%
737
761
  \setlength\Cht{\ht0}
@@ -1325,11 +1349,11 @@
1325
1349
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1326
1350
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1327
1351
  \newcommand{\labelenumi}{\theenumi.}
1328
- \newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
1352
+ \newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
1329
1353
  \newcommand{\labelenumiii}{\theenumiii.}
1330
1354
  \newcommand{\labelenumiv}{\theenumiv.}
1331
1355
  \renewcommand{\p@enumii}{\theenumi}
1332
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
1356
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
1333
1357
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1334
1358
  \newcommand\labelitemi{\textbullet}
1335
1359
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1474,7 +1498,7 @@
1474
1498
  \vskip\abovecaptionskip
1475
1499
  \sbox\@tempboxa{#1\hskip1zw\relax #2}%
1476
1500
  \ifdim \wd\@tempboxa <\hsize \centering \fi
1477
- #1\hskip1zw\relax #2\par
1501
+ #1{\hskip1zw\relax}#2\par
1478
1502
  \vskip\belowcaptionskip}}
1479
1503
  \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
1480
1504
  \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1843,23 +1867,42 @@
1843
1867
  \def\$B@>Nq(B{\$B@>Nq(Btrue}
1844
1868
  \def\$BOBNq(B{\$B@>Nq(Bfalse}
1845
1869
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
1870
+ \def\pltx@today@year@#1{%
1871
+ \ifnum\numexpr\year-#1=1 $B85(B\else
1872
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1873
+ \kansuji\numexpr\year-#1\relax
1874
+ \else
1875
+ \number\numexpr\year-#1\relax\nobreak
1876
+ \fi
1877
+ \fi $BG/(B
1878
+ }
1879
+ \def\pltx@today@year{%
1880
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
1881
+ $B><OB(B\pltx@today@year@{1925}%
1882
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
1883
+ $BJ?@.(B\pltx@today@year@{1988}%
1884
+ \else
1885
+ $BNaOB(B\pltx@today@year@{2018}%
1886
+ \fi\fi}
1846
1887
  \def\today{%
1847
1888
  \if@english
1848
1889
  \ifcase\month\or
1849
1890
  January\or February\or March\or April\or May\or June\or
1850
1891
  July\or August\or September\or October\or November\or December\fi
1851
1892
  \space\number\day, \number\year
1893
+ \else\if$B@>Nq(B
1894
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
1895
+ \else\number\year\nobreak\fi $BG/(B
1852
1896
  \else
1853
- \if$B@>Nq(B
1854
- \number\year $BG/(B
1855
- \number\month $B7n(B
1856
- \number\day $BF|(B
1857
- \else
1858
- $BJ?@.(B\number\heisei $BG/(B
1859
- \number\month $B7n(B
1860
- \number\day $BF|(B
1861
- \fi
1862
- \fi}
1897
+ \pltx@today@year
1898
+ \fi
1899
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1900
+ \kansuji\month $B7n(B
1901
+ \kansuji\day $BF|(B
1902
+ \else
1903
+ \number\month\nobreak $B7n(B
1904
+ \number\day\nobreak $BF|(B
1905
+ \fi\fi}
1863
1906
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1864
1907
  \pagestyle{plain}
1865
1908
  \pagenumbering{arabic}
@@ -1,18 +1,26 @@
1
- % minimal jsarticle-like fonts
2
- %
1
+ %%
2
+ %% This is file `minijs.sty',
3
+ %% generated with the docstrip utility.
4
+ %%
5
+ %% The original source files were:
6
+ %%
7
+ %% jsclasses.dtx (with options: `minijs')
8
+ %%
9
+ %% Maintained on GitHub: https://github.com/texjporg/jsclasses
10
+ %%
3
11
  \NeedsTeXFormat{pLaTeX2e}
4
- \ProvidesPackage{minijs}[2018/02/04 okumura, texjporg]
5
- %
6
- % if jsclasses loaded, abort loading this package
12
+ \ProvidesPackage{minijs}
13
+ [2020/10/09 jsclasses (okumura, texjporg)]
14
+ %% if jsclasses loaded, abort loading this package
7
15
  \ifx\@jsc@uplatextrue\@undefined\else
8
16
  \PackageInfo{minijs}{jsclasses does not need minijs, exiting}
9
17
  \expandafter\endinput
10
18
  \fi
11
- %
12
- % "fake" jsarticle
19
+ %% "fake" jsarticle
13
20
  \expandafter\def\csname ver@jsarticle.cls\endcsname{}
14
- %
15
- % min/goth -> jis/jisg (for pLaTeX only)
21
+ \newif\ifjsc@needsp@tch
22
+ \jsc@needsp@tchfalse
23
+ %% min/goth -> jis/jisg (for pLaTeX only)
16
24
  \ifx\ucs\@undefined
17
25
  \@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
18
26
  \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
@@ -26,18 +34,11 @@
26
34
  \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{}
27
35
  \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{}
28
36
  \fi
29
- %
30
- % \@setfontsize with \parindent and \(x)kanjiskip settings
31
- \def\@setfontsize#1#2#3{\@nomath#1%
32
- \ifx\protect\@typeset@protect
33
- \let\@currsize#1%
34
- \fi
35
- \fontsize{#2}{#3}\selectfont
36
- \ifdim\parindent>\z@ \parindent=1zw \fi
37
- \kanjiskip=0zw plus .1zw minus .01zw
38
- \xkanjiskip=0.25em plus 0.15em minus 0.06em}
39
- %
40
- % ad-hoc "relation font"
37
+ %% ad-hoc "relation font"
38
+ \@ifl@t@r\fmtversion{2020/10/01}
39
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
40
+ \ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
41
+ \ifx\@rmfamilyhook\@undefined % old
41
42
  \DeclareRobustCommand\rmfamily
42
43
  {\not@math@alphabet\rmfamily\mathrm
43
44
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -47,6 +48,48 @@
47
48
  \DeclareRobustCommand\ttfamily
48
49
  {\not@math@alphabet\ttfamily\mathtt
49
50
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
51
+ \AtBeginDocument{%
52
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
53
+ % my definitions above should have been overwritten, recover it!
54
+ % \selectfont is executed twice but I don't care about speed...
55
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
56
+ {\kanjifamily\mcdefault\selectfont}%
57
+ \expandafter\g@addto@macro\csname sffamily \endcsname
58
+ {\kanjifamily\gtdefault\selectfont}%
59
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
60
+ {\kanjifamily\gtdefault\selectfont}%
61
+ \fi}
62
+ \else % 2020-02-02
63
+ \g@addto@macro\@rmfamilyhook
64
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
65
+ \g@addto@macro\@sffamilyhook
66
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
67
+ \g@addto@macro\@ttfamilyhook
68
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
69
+ \fi
70
+ \else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
71
+ \AddToHook{rmfamily}%
72
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
73
+ \AddToHook{sffamily}%
74
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
75
+ \AddToHook{ttfamily}%
76
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
77
+ \fi % --- for 2020-10-01 END
78
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
79
+ \def\@setfontsize#1#2#3{%
80
+ \@nomath#1%
81
+ \ifx\protect\@typeset@protect
82
+ \let\@currsize#1%
83
+ \fi
84
+ \fontsize{#2}{#3}\selectfont
85
+ \ifdim\parindent>\z@
86
+ \parindent=1zw
87
+ \fi
88
+ \kanjiskip=0zw plus .1zw minus .01zw
89
+ \xkanjiskip=0.25em plus 0.15em minus 0.06em
90
+ }
91
+ %% initialize
50
92
  \normalsize
51
- %
52
93
  \endinput
94
+ %%
95
+ %% End of file `minijs.sty'.
@@ -7,7 +7,7 @@
7
7
  % http://oku.edu.mie-u.ac.jp/~okumura/
8
8
  %
9
9
  %<okumacro>\NeedsTeXFormat{pLaTeX2e}
10
- %<okumacro>\ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
10
+ %<okumacro>\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
11
11
  %<*driver>
12
12
  \documentclass{jsarticle}
13
13
  \usepackage{doc}
@@ -188,7 +188,7 @@
188
188
  %\end{verbatim}
189
189
  % $B$H$7$F$$$^$7$?$,!$(B2017$BG/(B9$B7n$N(B\pTeX (p3.7.2)$B$KBP1~$9$k$?$a(B
190
190
  %\begin{verbatim}
191
- % \setbox1=\hbox to\z@{\hbox to 1zw{\hss$B!&(B\hss}\hss}%
191
+ % \setbox1=\hbox to\z@{\hbox to 1zw{\hss $B!&(B\hss}\hss}%
192
192
  %\end{verbatim}
193
193
  % $B$KJQ99$7$^$7$?!#$3$l$G!$(Bp3.7.1$B0JA0!&(Bp3.7.2$B0J9_$I$A$i$b(BOK$B$G$9!#(B
194
194
  %
@@ -599,9 +599,8 @@
599
599
  \newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
600
600
  \newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
601
601
  \newcommand{\JLaTeX}{\leavevmode\lower.5ex\hbox{\rm J}\kern-.17em\LaTeX}
602
- \DeclareRobustCommand{\JBibTeX}{$\mbox{%
603
- \lower.5ex\hbox{J}\ifx\f@family\cmr\kern-.15em\else\kern-.05em\fi
604
- \BibTeX}$}
602
+ \DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
603
+ \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
605
604
  \newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
606
605
  % $B%$%s%W%l%9$N?7(B TeX $B$N2>>N(B
607
606
  \newcommand{\iTeX}{\accent'27\i\TeX}
@@ -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{okumacro.ins}
2
9
  \input docstrip.tex
3
10
  \keepsilent
4
11
  \generateFile{okumacro.sty}{f}{\from{okumacro.dtx}{okumacro}}
12
+
13
+ \endbatchfile
@@ -6,22 +6,10 @@
6
6
  %%
7
7
  %% okumacro.dtx (with options: `okumacro')
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 okumacro.sty.
15
- %%
16
- %% For distribution of the original source see the terms
17
- %% for copying and modification in the file okumacro.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
- \ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
12
+ \ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
25
13
  \providecommand{\rubyfamily}{}
26
14
  \def\kanjistrut{\iftdir
27
15
  \vrule \@height0.5zw \@depth0.5zw \@width\z@
@@ -246,9 +234,8 @@
246
234
  \newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
247
235
  \newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
248
236
  \newcommand{\JLaTeX}{\leavevmode\lower.5ex\hbox{\rm J}\kern-.17em\LaTeX}
249
- \DeclareRobustCommand{\JBibTeX}{$\mbox{%
250
- \lower.5ex\hbox{J}\ifx\f@family\cmr\kern-.15em\else\kern-.05em\fi
251
- \BibTeX}$}
237
+ \DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
238
+ \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
252
239
  \newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
253
240
  \newcommand{\iTeX}{\accent'27\i\TeX}
254
241
  \newcommand{\MlTeX}{M\kern-.1667em\lower.5ex\hbox{L}\kern-.25em\TeX}
@@ -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{okuverb.ins}
2
9
  \input docstrip.tex
3
10
  \keepsilent
4
11
  \generateFile{okuverb.sty}{f}{\from{okuverb.dtx}{okuverb}}
12
+
13
+ \endbatchfile
@@ -6,20 +6,8 @@
6
6
  %%
7
7
  %% okuverb.dtx (with options: `okuverb')
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 okuverb.sty.
15
- %%
16
- %% For distribution of the original source see the terms
17
- %% for copying and modification in the file okuverb.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{okuverb.sty}[2003/09/03 okumura]
25
13
  \newif\if@yen \@yenfalse