review 4.2.0 → 5.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (165) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby-win.yml +11 -5
  3. data/.rubocop.yml +113 -24
  4. data/NEWS.ja.md +94 -0
  5. data/NEWS.md +94 -0
  6. data/bin/review-catalog-converter +1 -1
  7. data/bin/review-check +2 -4
  8. data/bin/review-checkdep +1 -1
  9. data/bin/review-compile +8 -14
  10. data/bin/review-validate +1 -1
  11. data/doc/config.yml.sample +4 -1
  12. data/doc/config.yml.sample-simple +1 -1
  13. data/doc/format.ja.md +83 -4
  14. data/doc/format.md +84 -7
  15. data/doc/makeindex.ja.md +2 -2
  16. data/doc/quickstart.ja.md +3 -3
  17. data/doc/quickstart.md +2 -2
  18. data/lib/epubmaker/content.rb +3 -2
  19. data/lib/epubmaker/epubcommon.rb +33 -25
  20. data/lib/epubmaker/epubv2.rb +5 -6
  21. data/lib/epubmaker/epubv3.rb +20 -18
  22. data/lib/review/book.rb +2 -2
  23. data/lib/review/book/base.rb +61 -25
  24. data/lib/review/book/bib.rb +21 -0
  25. data/lib/review/book/book_unit.rb +155 -0
  26. data/lib/review/book/chapter.rb +30 -26
  27. data/lib/review/book/index.rb +23 -185
  28. data/lib/review/book/index/item.rb +7 -1
  29. data/lib/review/book/part.rb +21 -9
  30. data/lib/review/book/volume.rb +1 -1
  31. data/lib/review/builder.rb +68 -13
  32. data/lib/review/catalog.rb +2 -2
  33. data/lib/review/compiler.rb +159 -73
  34. data/lib/review/configure.rb +22 -1
  35. data/lib/review/converter.rb +1 -1
  36. data/lib/review/epub2html.rb +6 -1
  37. data/lib/review/epubmaker.rb +12 -23
  38. data/lib/review/htmlbuilder.rb +36 -7
  39. data/lib/review/htmlutils.rb +7 -10
  40. data/lib/review/i18n.rb +1 -1
  41. data/lib/review/idgxmlbuilder.rb +51 -6
  42. data/lib/review/idgxmlmaker.rb +9 -14
  43. data/lib/review/index_builder.rb +653 -0
  44. data/lib/review/init.rb +5 -13
  45. data/lib/review/latexbuilder.rb +65 -4
  46. data/lib/review/logger.rb +2 -2
  47. data/lib/review/makerhelper.rb +11 -0
  48. data/lib/review/markdownbuilder.rb +19 -1
  49. data/lib/review/pdfmaker.rb +17 -36
  50. data/lib/review/plaintextbuilder.rb +48 -2
  51. data/lib/review/preprocessor.rb +5 -5
  52. data/lib/review/rstbuilder.rb +25 -6
  53. data/lib/review/sec_counter.rb +13 -0
  54. data/lib/review/textmaker.rb +4 -12
  55. data/lib/review/tocprinter.rb +2 -3
  56. data/lib/review/topbuilder.rb +26 -0
  57. data/lib/review/update.rb +7 -7
  58. data/lib/review/version.rb +1 -1
  59. data/lib/review/volumeprinter.rb +2 -3
  60. data/lib/review/webmaker.rb +9 -20
  61. data/review.gemspec +2 -2
  62. data/samples/sample-book/src/config.yml +1 -1
  63. data/samples/syntax-book/Gemfile +1 -1
  64. data/samples/syntax-book/config.yml +1 -1
  65. data/templates/latex/config.erb +27 -23
  66. data/templates/latex/review-jlreq/README.md +3 -1
  67. data/templates/latex/review-jlreq/review-base.sty +31 -15
  68. data/templates/latex/review-jlreq/review-jlreq.cls +8 -24
  69. data/templates/latex/review-jsbook/README.md +7 -5
  70. data/templates/latex/review-jsbook/review-base.sty +34 -16
  71. data/templates/latex/review-jsbook/review-jsbook.cls +4 -2
  72. data/templates/web/html/layout-html5.html.erb +1 -1
  73. data/test/assets/test_template.tex +3 -3
  74. data/test/assets/test_template_backmatter.tex +3 -3
  75. data/test/book_test_helper.rb +11 -5
  76. data/test/test_book.rb +54 -63
  77. data/test/test_book_chapter.rb +93 -52
  78. data/test/test_builder.rb +24 -15
  79. data/test/test_converter.rb +1 -0
  80. data/test/test_epub3maker.rb +2 -2
  81. data/test/test_epubmaker.rb +8 -0
  82. data/test/test_helper.rb +4 -1
  83. data/test/test_htmlbuilder.rb +627 -56
  84. data/test/test_htmlutils.rb +0 -12
  85. data/test/test_i18n.rb +33 -33
  86. data/test/test_idgxmlbuilder.rb +358 -11
  87. data/test/test_idgxmlmaker_cmd.rb +1 -1
  88. data/test/test_index.rb +62 -52
  89. data/test/test_indexbuilder.rb +52 -0
  90. data/test/test_latexbuilder.rb +547 -10
  91. data/test/test_latexbuilder_v2.rb +43 -5
  92. data/test/test_logger.rb +7 -7
  93. data/test/test_makerhelper.rb +0 -12
  94. data/test/test_markdownbuilder.rb +3 -0
  95. data/test/test_pdfmaker.rb +13 -12
  96. data/test/test_pdfmaker_cmd.rb +1 -1
  97. data/test/test_plaintextbuilder.rb +422 -7
  98. data/test/test_review_ext.rb +2 -1
  99. data/test/test_rstbuilder.rb +25 -1
  100. data/test/test_sec_counter.rb +156 -0
  101. data/test/test_textmaker_cmd.rb +1 -1
  102. data/test/test_topbuilder.rb +187 -10
  103. data/test/test_update.rb +10 -10
  104. data/test/test_webtocprinter.rb +12 -12
  105. data/vendor/gentombow/LICENSE +1 -1
  106. data/vendor/gentombow/Makefile +0 -1
  107. data/vendor/gentombow/bounddvi-en.pdf +0 -0
  108. data/vendor/gentombow/bounddvi-en.tex +1 -0
  109. data/vendor/gentombow/bounddvi.pdf +0 -0
  110. data/vendor/gentombow/bounddvi.sty +30 -7
  111. data/vendor/gentombow/bounddvi.tex +1 -0
  112. data/vendor/gentombow/create_archive.sh +1 -0
  113. data/vendor/gentombow/gentombow-ja.pdf +0 -0
  114. data/vendor/gentombow/gentombow-ja.tex +9 -0
  115. data/vendor/gentombow/gentombow.pdf +0 -0
  116. data/vendor/gentombow/gentombow.sty +32 -10
  117. data/vendor/gentombow/gentombow.tex +8 -0
  118. data/vendor/gentombow/tests/gentombow-01-pdfx.tex +8 -0
  119. data/vendor/gentombow/tests/gentombow-02-pdfx.tex +8 -0
  120. data/vendor/jsclasses/Makefile +3 -2
  121. data/vendor/jsclasses/create_archive.sh +5 -5
  122. data/vendor/jsclasses/jis/Makefile +3 -2
  123. data/vendor/jsclasses/jis/jsarticle.cls +22 -18
  124. data/vendor/jsclasses/jis/jsbook.cls +22 -18
  125. data/vendor/jsclasses/jis/jsclasses.dtx +94 -13
  126. data/vendor/jsclasses/jis/jsclasses.ins +15 -5
  127. data/vendor/jsclasses/jis/jslogo.ins +9 -0
  128. data/vendor/jsclasses/jis/jslogo.sty +1 -13
  129. data/vendor/jsclasses/jis/jspf.cls +22 -18
  130. data/vendor/jsclasses/jis/jsreport.cls +22 -18
  131. data/vendor/jsclasses/jis/jsverb.ins +9 -0
  132. data/vendor/jsclasses/jis/jsverb.sty +1 -13
  133. data/vendor/jsclasses/jis/kiyou.cls +22 -18
  134. data/vendor/jsclasses/jis/minijs.sty +65 -22
  135. data/vendor/jsclasses/jis/okumacro.ins +9 -0
  136. data/vendor/jsclasses/jis/okumacro.sty +1 -13
  137. data/vendor/jsclasses/jis/okuverb.ins +9 -0
  138. data/vendor/jsclasses/jis/okuverb.sty +1 -13
  139. data/vendor/jsclasses/jis/winjis.sty +23 -19
  140. data/vendor/jsclasses/jsarticle.cls +22 -18
  141. data/vendor/jsclasses/jsbook.cls +22 -18
  142. data/vendor/jsclasses/jsclasses.dtx +94 -13
  143. data/vendor/jsclasses/jsclasses.ins +15 -5
  144. data/vendor/jsclasses/jsclasses.pdf +0 -0
  145. data/vendor/jsclasses/jslogo.ins +9 -0
  146. data/vendor/jsclasses/jslogo.pdf +0 -0
  147. data/vendor/jsclasses/jslogo.sty +1 -13
  148. data/vendor/jsclasses/jspf.cls +22 -18
  149. data/vendor/jsclasses/jsreport.cls +22 -18
  150. data/vendor/jsclasses/jsverb.ins +9 -0
  151. data/vendor/jsclasses/jsverb.pdf +0 -0
  152. data/vendor/jsclasses/jsverb.sty +1 -13
  153. data/vendor/jsclasses/kiyou.cls +22 -18
  154. data/vendor/jsclasses/minijs.sty +68 -22
  155. data/vendor/jsclasses/okumacro.ins +9 -0
  156. data/vendor/jsclasses/okumacro.pdf +0 -0
  157. data/vendor/jsclasses/okumacro.sty +1 -13
  158. data/vendor/jsclasses/okuverb.ins +9 -0
  159. data/vendor/jsclasses/okuverb.pdf +0 -0
  160. data/vendor/jsclasses/okuverb.sty +1 -13
  161. data/vendor/jsclasses/tests/relfont.tex +10 -0
  162. data/vendor/jsclasses/winjis.sty +23 -19
  163. metadata +14 -6
  164. data/.rubocop_todo.yml +0 -7
  165. data/lib/review/book/compilable.rb +0 -174
@@ -1,8 +1,18 @@
1
+ \input docstrip
2
+ \preamble
3
+
4
+ Maintained on GitHub: https://github.com/texjporg/jsclasses
5
+
6
+ \endpreamble
7
+
1
8
  \def\batchfile{jsclasses.ins}
2
9
  \input docstrip.tex
3
10
  \keepsilent
4
- \generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{article}}
5
- \generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{book}}
6
- \generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{report}}
7
- \generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{jspf}}
8
- \generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{kiyou}}
11
+ \generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{class,article}}
12
+ \generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{class,book}}
13
+ \generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{class,report}}
14
+ \generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{class,jspf}}
15
+ \generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{class,kiyou}}
16
+ \generateFile{minijs.sty}{f}{\from{jsclasses.dtx}{minijs}}
17
+
18
+ \endbatchfile
@@ -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,20 +6,8 @@
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
13
  [2019/07/25 okumura, texjporg]
@@ -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
- [2020/02/02 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,10 @@
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
459
452
  \ifx\@rmfamilyhook\@undefined % old
460
453
  \DeclareRobustCommand\rmfamily
461
454
  {\not@math@alphabet\rmfamily\mathrm
@@ -485,6 +478,14 @@
485
478
  \g@addto@macro\@ttfamilyhook
486
479
  {\prepare@family@series@update@kanji{gt}\gtdefault}
487
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
488
489
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
489
490
  \DeclareRobustCommand\textmc[1]{%
490
491
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -693,6 +694,7 @@
693
694
  \xspcode`^^fe=3
694
695
  \xspcode`^^ff=3
695
696
  \def\@{\spacefactor3000{}}
697
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
696
698
  \def\@setfontsize#1#2#3{%
697
699
  \ifx\protect\@typeset@protect
698
700
  \let\@currsize#1%
@@ -710,7 +712,8 @@
710
712
  \if@slide \xkanjiskip=0.1em \else
711
713
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
712
714
  \fi
713
- \fi}
715
+ \fi
716
+ }
714
717
  \def\jsc@setfontsize#1#2#3{%
715
718
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
716
719
  \emergencystretch 3zw
@@ -741,6 +744,7 @@
741
744
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
742
745
  \belowdisplayshortskip \belowdisplayskip
743
746
  \let\@listi\@listI}
747
+ %% initialize
744
748
  \normalsize
745
749
  \setbox0\hbox{\char\jis"3441}%
746
750
  \setlength\Cht{\ht0}
@@ -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
- [2020/02/02 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,10 @@
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
464
457
  \ifx\@rmfamilyhook\@undefined % old
465
458
  \DeclareRobustCommand\rmfamily
466
459
  {\not@math@alphabet\rmfamily\mathrm
@@ -490,6 +483,14 @@
490
483
  \g@addto@macro\@ttfamilyhook
491
484
  {\prepare@family@series@update@kanji{gt}\gtdefault}
492
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
493
494
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
494
495
  \DeclareRobustCommand\textmc[1]{%
495
496
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -698,6 +699,7 @@
698
699
  \xspcode`^^fe=3
699
700
  \xspcode`^^ff=3
700
701
  \def\@{\spacefactor3000{}}
702
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
701
703
  \def\@setfontsize#1#2#3{%
702
704
  \ifx\protect\@typeset@protect
703
705
  \let\@currsize#1%
@@ -715,7 +717,8 @@
715
717
  \if@slide \xkanjiskip=0.1em \else
716
718
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
717
719
  \fi
718
- \fi}
720
+ \fi
721
+ }
719
722
  \def\jsc@setfontsize#1#2#3{%
720
723
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
721
724
  \emergencystretch 3zw
@@ -746,6 +749,7 @@
746
749
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
747
750
  \belowdisplayshortskip \belowdisplayskip
748
751
  \let\@listi\@listI}
752
+ %% initialize
749
753
  \normalsize
750
754
  \setbox0\hbox{\char\jis"3441}%
751
755
  \setlength\Cht{\ht0}
@@ -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
- [2020/02/02 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,10 @@
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
470
463
  \ifx\@rmfamilyhook\@undefined % old
471
464
  \DeclareRobustCommand\rmfamily
472
465
  {\not@math@alphabet\rmfamily\mathrm
@@ -496,6 +489,14 @@
496
489
  \g@addto@macro\@ttfamilyhook
497
490
  {\prepare@family@series@update@kanji{gt}\gtdefault}
498
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
499
500
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
500
501
  \DeclareRobustCommand\textmc[1]{%
501
502
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -704,6 +705,7 @@
704
705
  \xspcode`^^fe=3
705
706
  \xspcode`^^ff=3
706
707
  \def\@{\spacefactor3000{}}
708
+ %% \@setfontsize with \parindent and \(x)kanjiskip settings
707
709
  \def\@setfontsize#1#2#3{%
708
710
  \ifx\protect\@typeset@protect
709
711
  \let\@currsize#1%
@@ -721,7 +723,8 @@
721
723
  \if@slide \xkanjiskip=0.1em \else
722
724
  \xkanjiskip=0.25em plus 0.15em minus 0.06em
723
725
  \fi
724
- \fi}
726
+ \fi
727
+ }
725
728
  \def\jsc@setfontsize#1#2#3{%
726
729
  \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
727
730
  \emergencystretch 3zw
@@ -752,6 +755,7 @@
752
755
  \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
753
756
  \belowdisplayshortskip \belowdisplayskip
754
757
  \let\@listi\@listI}
758
+ %% initialize
755
759
  \normalsize
756
760
  \setbox0\hbox{\char\jis"3441}%
757
761
  \setlength\Cht{\ht0}
@@ -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'.