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{jsverb.ins}
2
9
  \input docstrip.tex
3
10
  \keepsilent
4
11
  \generateFile{jsverb.sty}{f}{\from{jsverb.dtx}{jsverb}}
12
+
13
+ \endbatchfile
Binary file
@@ -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,28 +4,16 @@
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
  \ifx\epTeXinputencoding\undefined\else
24
12
  \epTeXinputencoding utf8 % ^^A added (2017-10-04)
25
13
  \fi
26
14
  \NeedsTeXFormat{pLaTeX2e}
27
15
  \ProvidesClass{kiyou}
28
- [2018/06/23 jsclasses (okumura, texjporg)]
16
+ [2020/10/09 jsclasses (okumura, texjporg)]
29
17
  \def\jsc@clsname{kiyou}
30
18
  \newif\ifjsc@needsp@tch
31
19
  \jsc@needsp@tchfalse
@@ -255,10 +243,11 @@
255
243
  \fi
256
244
  \ifpapersize
257
245
  \iftombow
258
- \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
246
+ \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
259
247
  \else
260
- \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
248
+ \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
261
249
  \fi
250
+ \AtBeginDvi{\special{\jsc@papersize@special}}
262
251
  \fi
263
252
  \def\n@baseline{14.897}
264
253
  \newdimen\jsc@mpt
@@ -470,6 +459,11 @@
470
459
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
471
460
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
472
461
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
462
+ %% ad-hoc "relation font"
463
+ \@ifl@t@r\fmtversion{2020/10/01}
464
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
465
+ \ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
466
+ \ifx\@rmfamilyhook\@undefined % old
473
467
  \DeclareRobustCommand\rmfamily
474
468
  {\not@math@alphabet\rmfamily\mathrm
475
469
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -479,6 +473,33 @@
479
473
  \DeclareRobustCommand\ttfamily
480
474
  {\not@math@alphabet\ttfamily\mathtt
481
475
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
476
+ \AtBeginDocument{%
477
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
478
+ % my definitions above should have been overwritten, recover it!
479
+ % \selectfont is executed twice but I don't care about speed...
480
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
481
+ {\kanjifamily\mcdefault\selectfont}%
482
+ \expandafter\g@addto@macro\csname sffamily \endcsname
483
+ {\kanjifamily\gtdefault\selectfont}%
484
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
485
+ {\kanjifamily\gtdefault\selectfont}%
486
+ \fi}
487
+ \else % 2020-02-02
488
+ \g@addto@macro\@rmfamilyhook
489
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
490
+ \g@addto@macro\@sffamilyhook
491
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
492
+ \g@addto@macro\@ttfamilyhook
493
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
494
+ \fi
495
+ \else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
496
+ \AddToHook{rmfamily}%
497
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
498
+ \AddToHook{sffamily}%
499
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
500
+ \AddToHook{ttfamily}%
501
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
502
+ \fi % --- for 2020-10-01 END
482
503
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
483
504
  \DeclareRobustCommand\textmc[1]{%
484
505
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -687,6 +708,7 @@
687
708
  \xspcode`^^fe=3
688
709
  \xspcode`^^ff=3
689
710
  \def\@{\spacefactor3000{}}
711
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
690
712
  \def\@setfontsize#1#2#3{%
691
713
  \ifx\protect\@typeset@protect
692
714
  \let\@currsize#1%
@@ -704,7 +726,8 @@
704
726
  \if@slide \xkanjiskip=0.1em \else
705
727
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
706
728
  \fi
707
- \fi}
729
+ \fi
730
+ }
708
731
  \def\jsc@setfontsize#1#2#3{%
709
732
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
710
733
  \emergencystretch 3zw
@@ -735,6 +758,7 @@
735
758
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
736
759
  \belowdisplayshortskip \belowdisplayskip
737
760
  \let\@listi\@listI}
761
+ %% initialize
738
762
  \normalsize
739
763
  \setbox0\hbox{\char\jis"3441}%
740
764
  \setlength\Cht{\ht0}
@@ -1328,11 +1352,11 @@
1328
1352
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1329
1353
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1330
1354
  \newcommand{\labelenumi}{\theenumi.}
1331
- \newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
1355
+ \newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
1332
1356
  \newcommand{\labelenumiii}{\theenumiii.}
1333
1357
  \newcommand{\labelenumiv}{\theenumiv.}
1334
1358
  \renewcommand{\p@enumii}{\theenumi}
1335
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
1359
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
1336
1360
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1337
1361
  \newcommand\labelitemi{\textbullet}
1338
1362
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1477,7 +1501,7 @@
1477
1501
  \vskip\abovecaptionskip
1478
1502
  \sbox\@tempboxa{#1\hskip1zw\relax #2}%
1479
1503
  \ifdim \wd\@tempboxa <\hsize \centering \fi
1480
- #1\hskip1zw\relax #2\par
1504
+ #1{\hskip1zw\relax}#2\par
1481
1505
  \vskip\belowcaptionskip}}
1482
1506
  \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
1483
1507
  \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1846,23 +1870,42 @@
1846
1870
  \def\西暦{\西暦true}
1847
1871
  \def\和暦{\西暦false}
1848
1872
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
1873
+ \def\pltx@today@year@#1{%
1874
+ \ifnum\numexpr\year-#1=1 元\else
1875
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1876
+ \kansuji\numexpr\year-#1\relax
1877
+ \else
1878
+ \number\numexpr\year-#1\relax\nobreak
1879
+ \fi
1880
+ \fi 年
1881
+ }
1882
+ \def\pltx@today@year{%
1883
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
1884
+ 昭和\pltx@today@year@{1925}%
1885
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
1886
+ 平成\pltx@today@year@{1988}%
1887
+ \else
1888
+ 令和\pltx@today@year@{2018}%
1889
+ \fi\fi}
1849
1890
  \def\today{%
1850
1891
  \if@english
1851
1892
  \ifcase\month\or
1852
1893
  January\or February\or March\or April\or May\or June\or
1853
1894
  July\or August\or September\or October\or November\or December\fi
1854
1895
  \space\number\day, \number\year
1896
+ \else\if西暦
1897
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
1898
+ \else\number\year\nobreak\fi 年
1855
1899
  \else
1856
- \if西暦
1857
- \number\year 年
1858
- \number\month 月
1859
- \number\day
1860
- \else
1861
- 平成\number\heisei 年
1862
- \number\month 月
1863
- \number\day 日
1864
- \fi
1865
- \fi}
1900
+ \pltx@today@year
1901
+ \fi
1902
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1903
+ \kansuji\month
1904
+ \kansuji\day 日
1905
+ \else
1906
+ \number\month\nobreak
1907
+ \number\day\nobreak
1908
+ \fi\fi}
1866
1909
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1867
1910
  \pagestyle{plain}
1868
1911
  \pagenumbering{arabic}
@@ -1,18 +1,29 @@
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
+ %%
11
+ \ifx\epTeXinputencoding\undefined\else
12
+ \epTeXinputencoding utf8 % ^^A added (2017-10-04)
13
+ \fi
3
14
  \NeedsTeXFormat{pLaTeX2e}
4
- \ProvidesPackage{minijs}[2018/02/04 okumura, texjporg]
5
- %
6
- % if jsclasses loaded, abort loading this package
15
+ \ProvidesPackage{minijs}
16
+ [2020/10/09 jsclasses (okumura, texjporg)]
17
+ %% if jsclasses loaded, abort loading this package
7
18
  \ifx\@jsc@uplatextrue\@undefined\else
8
19
  \PackageInfo{minijs}{jsclasses does not need minijs, exiting}
9
20
  \expandafter\endinput
10
21
  \fi
11
- %
12
- % "fake" jsarticle
22
+ %% "fake" jsarticle
13
23
  \expandafter\def\csname ver@jsarticle.cls\endcsname{}
14
- %
15
- % min/goth -> jis/jisg (for pLaTeX only)
24
+ \newif\ifjsc@needsp@tch
25
+ \jsc@needsp@tchfalse
26
+ %% min/goth -> jis/jisg (for pLaTeX only)
16
27
  \ifx\ucs\@undefined
17
28
  \@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
18
29
  \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
@@ -26,18 +37,11 @@
26
37
  \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{}
27
38
  \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{}
28
39
  \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"
40
+ %% ad-hoc "relation font"
41
+ \@ifl@t@r\fmtversion{2020/10/01}
42
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
43
+ \ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN
44
+ \ifx\@rmfamilyhook\@undefined % old
41
45
  \DeclareRobustCommand\rmfamily
42
46
  {\not@math@alphabet\rmfamily\mathrm
43
47
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -47,6 +51,48 @@
47
51
  \DeclareRobustCommand\ttfamily
48
52
  {\not@math@alphabet\ttfamily\mathtt
49
53
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
54
+ \AtBeginDocument{%
55
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
56
+ % my definitions above should have been overwritten, recover it!
57
+ % \selectfont is executed twice but I don't care about speed...
58
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
59
+ {\kanjifamily\mcdefault\selectfont}%
60
+ \expandafter\g@addto@macro\csname sffamily \endcsname
61
+ {\kanjifamily\gtdefault\selectfont}%
62
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
63
+ {\kanjifamily\gtdefault\selectfont}%
64
+ \fi}
65
+ \else % 2020-02-02
66
+ \g@addto@macro\@rmfamilyhook
67
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
68
+ \g@addto@macro\@sffamilyhook
69
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
70
+ \g@addto@macro\@ttfamilyhook
71
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
72
+ \fi
73
+ \else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
74
+ \AddToHook{rmfamily}%
75
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
76
+ \AddToHook{sffamily}%
77
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
78
+ \AddToHook{ttfamily}%
79
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
80
+ \fi % --- for 2020-10-01 END
81
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
82
+ \def\@setfontsize#1#2#3{%
83
+ \@nomath#1%
84
+ \ifx\protect\@typeset@protect
85
+ \let\@currsize#1%
86
+ \fi
87
+ \fontsize{#2}{#3}\selectfont
88
+ \ifdim\parindent>\z@
89
+ \parindent=1zw
90
+ \fi
91
+ \kanjiskip=0zw plus .1zw minus .01zw
92
+ \xkanjiskip=0.25em plus 0.15em minus 0.06em
93
+ }
94
+ %% initialize
50
95
  \normalsize
51
- %
52
96
  \endinput
97
+ %%
98
+ %% End of file `minijs.sty'.
@@ -12,7 +12,7 @@
12
12
  % http://oku.edu.mie-u.ac.jp/~okumura/
13
13
  %
14
14
  %<okumacro>\NeedsTeXFormat{pLaTeX2e}
15
- %<okumacro>\ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
15
+ %<okumacro>\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
16
16
  %<*driver>
17
17
  \documentclass{jsarticle}
18
18
  \usepackage{doc}
@@ -193,7 +193,7 @@
193
193
  %\end{verbatim}
194
194
  % としていましたが,2017年9月の\pTeX (p3.7.2)に対応するため
195
195
  %\begin{verbatim}
196
- % \setbox1=\hbox to\z@{\hbox to 1zw{\hss・\hss}\hss}%
196
+ % \setbox1=\hbox to\z@{\hbox to 1zw{\hss ・\hss}\hss}%
197
197
  %\end{verbatim}
198
198
  % に変更しました。これで,p3.7.1以前・p3.7.2以降どちらもOKです。
199
199
  %
@@ -604,9 +604,8 @@
604
604
  \newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
605
605
  \newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
606
606
  \newcommand{\JLaTeX}{\leavevmode\lower.5ex\hbox{\rm J}\kern-.17em\LaTeX}
607
- \DeclareRobustCommand{\JBibTeX}{$\mbox{%
608
- \lower.5ex\hbox{J}\ifx\f@family\cmr\kern-.15em\else\kern-.05em\fi
609
- \BibTeX}$}
607
+ \DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
608
+ \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
610
609
  \newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
611
610
  % インプレスの新 TeX の仮称
612
611
  \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,25 +6,13 @@
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
  \ifx\epTeXinputencoding\undefined\else
24
12
  \epTeXinputencoding utf8 % ^^A added (2017-10-04)
25
13
  \fi
26
14
  \NeedsTeXFormat{pLaTeX2e}
27
- \ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
15
+ \ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
28
16
  \providecommand{\rubyfamily}{}
29
17
  \def\kanjistrut{\iftdir
30
18
  \vrule \@height0.5zw \@depth0.5zw \@width\z@
@@ -249,9 +237,8 @@
249
237
  \newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
250
238
  \newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
251
239
  \newcommand{\JLaTeX}{\leavevmode\lower.5ex\hbox{\rm J}\kern-.17em\LaTeX}
252
- \DeclareRobustCommand{\JBibTeX}{$\mbox{%
253
- \lower.5ex\hbox{J}\ifx\f@family\cmr\kern-.15em\else\kern-.05em\fi
254
- \BibTeX}$}
240
+ \DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
241
+ \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
255
242
  \newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
256
243
  \newcommand{\iTeX}{\accent'27\i\TeX}
257
244
  \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
Binary file
@@ -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