review 3.0.0 → 4.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (170) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby-win.yml +39 -0
  3. data/.github/workflows/ruby.yml +27 -0
  4. data/.rubocop.yml +50 -12
  5. data/.travis.yml +17 -8
  6. data/Dockerfile +21 -5
  7. data/NEWS.ja.md +358 -0
  8. data/NEWS.md +358 -1
  9. data/README.md +11 -8
  10. data/appveyor.yml +1 -3
  11. data/bin/review-catalog-converter +4 -4
  12. data/bin/review-check +8 -8
  13. data/bin/review-checkdep +1 -1
  14. data/bin/review-compile +12 -12
  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 +14 -19
  19. data/bin/review-validate +3 -3
  20. data/bin/review-vol +4 -78
  21. data/doc/LICENSE +1 -1
  22. data/doc/config.yml.sample +46 -12
  23. data/doc/config.yml.sample-simple +4 -2
  24. data/doc/format.ja.md +37 -13
  25. data/doc/format.md +35 -20
  26. data/doc/pdfmaker.ja.md +43 -1
  27. data/doc/pdfmaker.md +42 -1
  28. data/doc/quickstart.ja.md +46 -26
  29. data/doc/quickstart.md +38 -17
  30. data/lib/epubmaker/epubcommon.rb +10 -5
  31. data/lib/epubmaker/epubv2.rb +1 -1
  32. data/lib/epubmaker/epubv3.rb +1 -0
  33. data/lib/epubmaker/producer.rb +4 -2
  34. data/lib/review/book.rb +1 -1
  35. data/lib/review/book/base.rb +38 -79
  36. data/lib/review/book/chapter.rb +18 -3
  37. data/lib/review/book/compilable.rb +6 -5
  38. data/lib/review/book/index.rb +69 -101
  39. data/lib/review/book/index/item.rb +40 -0
  40. data/lib/review/book/page_metric.rb +7 -7
  41. data/lib/review/book/part.rb +28 -5
  42. data/lib/review/book/volume.rb +3 -4
  43. data/lib/review/builder.rb +105 -44
  44. data/lib/review/catalog.rb +13 -16
  45. data/lib/review/compiler.rb +84 -72
  46. data/lib/review/configure.rb +19 -8
  47. data/lib/review/epub2html.rb +37 -4
  48. data/lib/review/epubmaker.rb +62 -7
  49. data/lib/review/extentions/string.rb +0 -4
  50. data/lib/review/htmlbuilder.rb +102 -115
  51. data/lib/review/htmlutils.rb +2 -3
  52. data/lib/review/i18n.rb +2 -2
  53. data/lib/review/i18n.yml +9 -0
  54. data/lib/review/idgxmlbuilder.rb +153 -74
  55. data/lib/review/idgxmlmaker.rb +191 -0
  56. data/lib/review/init-web/finish.html +10 -0
  57. data/lib/review/init-web/index.html +190 -0
  58. data/lib/review/init-web/review-layout-design.js +691 -0
  59. data/lib/review/init.rb +125 -34
  60. data/lib/review/latexbuilder.rb +199 -88
  61. data/lib/review/lineinput.rb +1 -1
  62. data/lib/review/location.rb +32 -0
  63. data/lib/review/logger.rb +4 -8
  64. data/lib/review/makerhelper.rb +24 -5
  65. data/lib/review/markdownbuilder.rb +31 -37
  66. data/lib/review/md2inaobuilder.rb +3 -5
  67. data/lib/review/pdfmaker.rb +44 -22
  68. data/lib/review/plaintextbuilder.rb +106 -85
  69. data/lib/review/preprocessor.rb +32 -41
  70. data/lib/review/rstbuilder.rb +33 -33
  71. data/lib/review/textmaker.rb +19 -3
  72. data/lib/review/textutils.rb +76 -2
  73. data/lib/review/tocprinter.rb +231 -102
  74. data/lib/review/topbuilder.rb +114 -61
  75. data/lib/review/update.rb +19 -19
  76. data/lib/review/version.rb +1 -1
  77. data/lib/review/volumeprinter.rb +99 -0
  78. data/lib/review/webmaker.rb +11 -4
  79. data/lib/review/webtocprinter.rb +38 -35
  80. data/lib/review/yamlloader.rb +26 -16
  81. data/review.gemspec +6 -4
  82. data/samples/sample-book/README.md +7 -2
  83. data/samples/sample-book/src/.gitignore +154 -0
  84. data/samples/sample-book/src/config-ebook.yml +4 -0
  85. data/samples/sample-book/src/config-jlreq-ebook.yml +4 -0
  86. data/samples/sample-book/src/config-jlreq.yml +6 -0
  87. data/samples/sample-book/src/config.yml +2 -2
  88. data/samples/sample-book/src/lib/tasks/review.rake +29 -14
  89. data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake +14 -8
  90. data/samples/syntax-book/ch01.re +4 -2
  91. data/samples/syntax-book/ch02.re +8 -16
  92. data/samples/syntax-book/ch03.re +3 -6
  93. data/samples/syntax-book/config-jlreq-lualatex.yml +4 -0
  94. data/samples/syntax-book/config-jlreq.yml +5 -0
  95. data/samples/syntax-book/config-print.yml +3 -0
  96. data/samples/syntax-book/config.yml +1 -1
  97. data/samples/syntax-book/lib/tasks/review.rake +30 -15
  98. data/samples/syntax-book/lib/tasks/z01_copy_sty.rake +14 -8
  99. data/templates/latex/config.erb +16 -0
  100. data/templates/latex/layout.tex.erb +4 -0
  101. data/templates/latex/review-jlreq/review-base.sty +150 -61
  102. data/templates/latex/review-jlreq/review-jlreq.cls +74 -8
  103. data/templates/latex/review-jlreq/review-style.sty +4 -1
  104. data/templates/latex/review-jsbook/README.md +39 -0
  105. data/templates/latex/review-jsbook/review-base.sty +101 -23
  106. data/templates/latex/review-jsbook/review-jsbook.cls +28 -5
  107. data/templates/latex/review-jsbook/review-style.sty +5 -2
  108. data/templates/opf/epubv3.opf.erb +1 -0
  109. data/templates/web/html/layout-html5.html.erb +2 -2
  110. data/test/assets/test_template.tex +24 -3
  111. data/test/assets/test_template_backmatter.tex +24 -3
  112. data/test/test_book.rb +75 -21
  113. data/test/test_book_chapter.rb +4 -2
  114. data/test/test_book_part.rb +3 -3
  115. data/test/test_builder.rb +16 -0
  116. data/test/test_catalog.rb +24 -42
  117. data/test/test_catalog_converter_cmd.rb +1 -1
  118. data/test/test_epubmaker_cmd.rb +14 -7
  119. data/test/test_helper.rb +15 -7
  120. data/test/test_htmlbuilder.rb +909 -159
  121. data/test/test_i18n.rb +25 -25
  122. data/test/test_idgxmlbuilder.rb +395 -38
  123. data/test/test_idgxmlmaker_cmd.rb +46 -0
  124. data/test/test_image_finder.rb +52 -70
  125. data/test/test_index.rb +50 -10
  126. data/test/test_latexbuilder.rb +1194 -106
  127. data/test/test_latexbuilder_v2.rb +628 -97
  128. data/test/test_logger.rb +14 -1
  129. data/test/test_makerhelper.rb +3 -3
  130. data/test/test_markdownbuilder.rb +134 -16
  131. data/test/test_md2inaobuilder.rb +32 -9
  132. data/test/test_pdfmaker.rb +18 -1
  133. data/test/test_pdfmaker_cmd.rb +100 -6
  134. data/test/test_plaintextbuilder.rb +371 -25
  135. data/test/test_preprocessor.rb +2 -16
  136. data/test/test_rstbuilder.rb +249 -26
  137. data/test/test_textmaker_cmd.rb +54 -0
  138. data/test/test_textutils.rb +109 -2
  139. data/test/test_topbuilder.rb +546 -31
  140. data/test/test_update.rb +17 -8
  141. data/test/test_webtocprinter.rb +66 -34
  142. data/test/test_yamlloader.rb +13 -0
  143. data/vendor/jsclasses/LICENSE +1 -1
  144. data/vendor/jsclasses/jis/jsarticle.cls +53 -14
  145. data/vendor/jsclasses/jis/jsbook.cls +53 -14
  146. data/vendor/jsclasses/jis/jsclasses.dtx +84 -25
  147. data/vendor/jsclasses/jis/jslogo.dtx +4 -4
  148. data/vendor/jsclasses/jis/jslogo.sty +3 -3
  149. data/vendor/jsclasses/jis/jspf.cls +52 -13
  150. data/vendor/jsclasses/jis/jsreport.cls +53 -14
  151. data/vendor/jsclasses/jis/kiyou.cls +53 -14
  152. data/vendor/jsclasses/jis/okumacro.dtx +4 -5
  153. data/vendor/jsclasses/jis/okumacro.sty +3 -4
  154. data/vendor/jsclasses/jsarticle.cls +53 -14
  155. data/vendor/jsclasses/jsbook.cls +53 -14
  156. data/vendor/jsclasses/jsclasses.dtx +84 -25
  157. data/vendor/jsclasses/jsclasses.pdf +0 -0
  158. data/vendor/jsclasses/jslogo.dtx +4 -4
  159. data/vendor/jsclasses/jslogo.pdf +0 -0
  160. data/vendor/jsclasses/jslogo.sty +3 -3
  161. data/vendor/jsclasses/jspf.cls +52 -13
  162. data/vendor/jsclasses/jsreport.cls +53 -14
  163. data/vendor/jsclasses/kiyou.cls +53 -14
  164. data/vendor/jsclasses/okumacro.dtx +4 -5
  165. data/vendor/jsclasses/okumacro.pdf +0 -0
  166. data/vendor/jsclasses/okumacro.sty +3 -4
  167. metadata +55 -10
  168. data/lib/review/tocparser.rb +0 -271
  169. data/samples/syntax-book/review-ext.rb +0 -14
  170. data/test/test_tocparser.rb +0 -25
@@ -15,7 +15,7 @@
15
15
  % LaTeX 関連のロゴ(pLaTeX2ε新ドキュメントクラス付録)
16
16
  %
17
17
  % Copyright 1999-2016 Haruhiko Okumura
18
- % Copyright 2016-2017 Japanese TeX Development Community
18
+ % Copyright 2016-2019 Japanese TeX Development Community
19
19
  %
20
20
  % \fi
21
21
  %
@@ -27,7 +27,7 @@
27
27
  %<*driver>
28
28
  \ProvidesFile{jslogo.dtx}
29
29
  %</driver>
30
- [2017/02/24 okumura, texjporg]
30
+ [2019/07/25 okumura, texjporg]
31
31
  %<*driver>
32
32
  \documentclass{jsarticle}
33
33
  \usepackage{doc}
@@ -379,8 +379,8 @@
379
379
  % {\def\BibTeX{{\rmfamily B\kern-.05em%
380
380
  % \textsc{i\kern-.025em b}\kern-.08em%
381
381
  % T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}}{}
382
- \DeclareRobustCommand{\BibTeX}{B\kern-.05em\jslg@small{I\kern-.025em B}%
383
- \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
382
+ \DeclareRobustCommand{\BibTeX}{%
383
+ B\kern-.05em\jslg@small{I\kern-.025em B}\kern-.15em\TeX}
384
384
  \DeclareRobustCommand{\SliTeX}{%
385
385
  S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
386
386
  % \end{macrocode}
Binary file
@@ -22,7 +22,7 @@
22
22
  %% in the same archive or directory.)
23
23
  \NeedsTeXFormat{LaTeX2e}
24
24
  \ProvidesPackage{jslogo}
25
- [2017/02/24 okumura, texjporg]
25
+ [2019/07/25 okumura, texjporg]
26
26
  \def\jslg@small#1{\hbox{$\m@th$%
27
27
  \csname S@\f@size\endcsname
28
28
  \fontsize\sf@size\z@
@@ -207,8 +207,8 @@
207
207
  \def\upLaTeX{u\pLaTeX}
208
208
  \def\upLaTeXe{u\pLaTeXe}
209
209
  \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}
210
+ \DeclareRobustCommand{\BibTeX}{%
211
+ B\kern-.05em\jslg@small{I\kern-.025em B}\kern-.15em\TeX}
212
212
  \DeclareRobustCommand{\SliTeX}{%
213
213
  S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
214
214
  \providecommand*\pdfstringdefPreHook{}
@@ -25,7 +25,7 @@
25
25
  \fi
26
26
  \NeedsTeXFormat{pLaTeX2e}
27
27
  \ProvidesClass{jspf}
28
- [2018/06/23 jsclasses (okumura, texjporg)]
28
+ [2020/02/02 jsclasses (okumura, texjporg)]
29
29
  \def\jsc@clsname{jspf}
30
30
  \newif\ifjsc@needsp@tch
31
31
  \jsc@needsp@tchfalse
@@ -459,6 +459,7 @@
459
459
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
460
460
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
461
461
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
462
+ \ifx\@rmfamilyhook\@undefined % old
462
463
  \DeclareRobustCommand\rmfamily
463
464
  {\not@math@alphabet\rmfamily\mathrm
464
465
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -468,6 +469,25 @@
468
469
  \DeclareRobustCommand\ttfamily
469
470
  {\not@math@alphabet\ttfamily\mathtt
470
471
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
472
+ \AtBeginDocument{%
473
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
474
+ % my definitions above should have been overwritten, recover it!
475
+ % \selectfont is executed twice but I don't care about speed...
476
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
477
+ {\kanjifamily\mcdefault\selectfont}%
478
+ \expandafter\g@addto@macro\csname sffamily \endcsname
479
+ {\kanjifamily\gtdefault\selectfont}%
480
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
481
+ {\kanjifamily\gtdefault\selectfont}%
482
+ \fi}
483
+ \else % 2020-02-02
484
+ \g@addto@macro\@rmfamilyhook
485
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
486
+ \g@addto@macro\@sffamilyhook
487
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
488
+ \g@addto@macro\@ttfamilyhook
489
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
490
+ \fi
471
491
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
472
492
  \DeclareRobustCommand\textmc[1]{%
473
493
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1246,11 +1266,11 @@
1246
1266
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1247
1267
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1248
1268
  \newcommand{\labelenumi}{\theenumi.}
1249
- \newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
1269
+ \newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
1250
1270
  \newcommand{\labelenumiii}{\theenumiii.}
1251
1271
  \newcommand{\labelenumiv}{\theenumiv.}
1252
1272
  \renewcommand{\p@enumii}{\theenumi}
1253
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
1273
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
1254
1274
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1255
1275
  \newcommand\labelitemi{\textbullet}
1256
1276
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1730,23 +1750,42 @@
1730
1750
  \def\西暦{\西暦true}
1731
1751
  \def\和暦{\西暦false}
1732
1752
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
1753
+ \def\pltx@today@year@#1{%
1754
+ \ifnum\numexpr\year-#1=1 元\else
1755
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1756
+ \kansuji\numexpr\year-#1\relax
1757
+ \else
1758
+ \number\numexpr\year-#1\relax\nobreak
1759
+ \fi
1760
+ \fi 年
1761
+ }
1762
+ \def\pltx@today@year{%
1763
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
1764
+ 昭和\pltx@today@year@{1925}%
1765
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
1766
+ 平成\pltx@today@year@{1988}%
1767
+ \else
1768
+ 令和\pltx@today@year@{2018}%
1769
+ \fi\fi}
1733
1770
  \def\today{%
1734
1771
  \if@english
1735
1772
  \ifcase\month\or
1736
1773
  January\or February\or March\or April\or May\or June\or
1737
1774
  July\or August\or September\or October\or November\or December\fi
1738
1775
  \space\number\day, \number\year
1776
+ \else\if西暦
1777
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
1778
+ \else\number\year\nobreak\fi 年
1739
1779
  \else
1740
- \if西暦
1741
- \number\year 年
1742
- \number\month 月
1743
- \number\day
1744
- \else
1745
- 平成\number\heisei 年
1746
- \number\month 月
1747
- \number\day 日
1748
- \fi
1749
- \fi}
1780
+ \pltx@today@year
1781
+ \fi
1782
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1783
+ \kansuji\month
1784
+ \kansuji\day 日
1785
+ \else
1786
+ \number\month\nobreak
1787
+ \number\day\nobreak
1788
+ \fi\fi}
1750
1789
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1751
1790
  \pagestyle{headings}
1752
1791
  \pagenumbering{arabic}
@@ -25,7 +25,7 @@
25
25
  \fi
26
26
  \NeedsTeXFormat{pLaTeX2e}
27
27
  \ProvidesClass{jsreport}
28
- [2018/06/23 jsclasses (okumura, texjporg)]
28
+ [2020/02/02 jsclasses (okumura, texjporg)]
29
29
  \def\jsc@clsname{jsreport}
30
30
  \newif\ifjsc@needsp@tch
31
31
  \jsc@needsp@tchfalse
@@ -464,6 +464,7 @@
464
464
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
465
465
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
466
466
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
467
+ \ifx\@rmfamilyhook\@undefined % old
467
468
  \DeclareRobustCommand\rmfamily
468
469
  {\not@math@alphabet\rmfamily\mathrm
469
470
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -473,6 +474,25 @@
473
474
  \DeclareRobustCommand\ttfamily
474
475
  {\not@math@alphabet\ttfamily\mathtt
475
476
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
477
+ \AtBeginDocument{%
478
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
479
+ % my definitions above should have been overwritten, recover it!
480
+ % \selectfont is executed twice but I don't care about speed...
481
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
482
+ {\kanjifamily\mcdefault\selectfont}%
483
+ \expandafter\g@addto@macro\csname sffamily \endcsname
484
+ {\kanjifamily\gtdefault\selectfont}%
485
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
486
+ {\kanjifamily\gtdefault\selectfont}%
487
+ \fi}
488
+ \else % 2020-02-02
489
+ \g@addto@macro\@rmfamilyhook
490
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
491
+ \g@addto@macro\@sffamilyhook
492
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
493
+ \g@addto@macro\@ttfamilyhook
494
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
495
+ \fi
476
496
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
477
497
  \DeclareRobustCommand\textmc[1]{%
478
498
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1432,11 +1452,11 @@
1432
1452
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1433
1453
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1434
1454
  \newcommand{\labelenumi}{\theenumi.}
1435
- \newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
1455
+ \newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
1436
1456
  \newcommand{\labelenumiii}{\theenumiii.}
1437
1457
  \newcommand{\labelenumiv}{\theenumiv.}
1438
1458
  \renewcommand{\p@enumii}{\theenumi}
1439
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
1459
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
1440
1460
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1441
1461
  \newcommand\labelitemi{\textbullet}
1442
1462
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1584,7 +1604,7 @@
1584
1604
  \vskip\abovecaptionskip
1585
1605
  \sbox\@tempboxa{#1\hskip1zw\relax #2}%
1586
1606
  \ifdim \wd\@tempboxa <\hsize \centering \fi
1587
- #1\hskip1zw\relax #2\par
1607
+ #1{\hskip1zw\relax}#2\par
1588
1608
  \vskip\belowcaptionskip}}
1589
1609
  \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
1590
1610
  \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1973,23 +1993,42 @@
1973
1993
  \def\西暦{\西暦true}
1974
1994
  \def\和暦{\西暦false}
1975
1995
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
1996
+ \def\pltx@today@year@#1{%
1997
+ \ifnum\numexpr\year-#1=1 元\else
1998
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1999
+ \kansuji\numexpr\year-#1\relax
2000
+ \else
2001
+ \number\numexpr\year-#1\relax\nobreak
2002
+ \fi
2003
+ \fi 年
2004
+ }
2005
+ \def\pltx@today@year{%
2006
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
2007
+ 昭和\pltx@today@year@{1925}%
2008
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
2009
+ 平成\pltx@today@year@{1988}%
2010
+ \else
2011
+ 令和\pltx@today@year@{2018}%
2012
+ \fi\fi}
1976
2013
  \def\today{%
1977
2014
  \if@english
1978
2015
  \ifcase\month\or
1979
2016
  January\or February\or March\or April\or May\or June\or
1980
2017
  July\or August\or September\or October\or November\or December\fi
1981
2018
  \space\number\day, \number\year
2019
+ \else\if西暦
2020
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
2021
+ \else\number\year\nobreak\fi 年
1982
2022
  \else
1983
- \if西暦
1984
- \number\year 年
1985
- \number\month 月
1986
- \number\day
1987
- \else
1988
- 平成\number\heisei 年
1989
- \number\month 月
1990
- \number\day 日
1991
- \fi
1992
- \fi}
2023
+ \pltx@today@year
2024
+ \fi
2025
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
2026
+ \kansuji\month
2027
+ \kansuji\day 日
2028
+ \else
2029
+ \number\month\nobreak
2030
+ \number\day\nobreak
2031
+ \fi\fi}
1993
2032
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1994
2033
  \pagestyle{plain}
1995
2034
  \pagenumbering{arabic}
@@ -25,7 +25,7 @@
25
25
  \fi
26
26
  \NeedsTeXFormat{pLaTeX2e}
27
27
  \ProvidesClass{kiyou}
28
- [2018/06/23 jsclasses (okumura, texjporg)]
28
+ [2020/02/02 jsclasses (okumura, texjporg)]
29
29
  \def\jsc@clsname{kiyou}
30
30
  \newif\ifjsc@needsp@tch
31
31
  \jsc@needsp@tchfalse
@@ -470,6 +470,7 @@
470
470
  \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
471
471
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
472
472
  \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
473
+ \ifx\@rmfamilyhook\@undefined % old
473
474
  \DeclareRobustCommand\rmfamily
474
475
  {\not@math@alphabet\rmfamily\mathrm
475
476
  \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -479,6 +480,25 @@
479
480
  \DeclareRobustCommand\ttfamily
480
481
  {\not@math@alphabet\ttfamily\mathtt
481
482
  \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
483
+ \AtBeginDocument{%
484
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
485
+ % my definitions above should have been overwritten, recover it!
486
+ % \selectfont is executed twice but I don't care about speed...
487
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
488
+ {\kanjifamily\mcdefault\selectfont}%
489
+ \expandafter\g@addto@macro\csname sffamily \endcsname
490
+ {\kanjifamily\gtdefault\selectfont}%
491
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
492
+ {\kanjifamily\gtdefault\selectfont}%
493
+ \fi}
494
+ \else % 2020-02-02
495
+ \g@addto@macro\@rmfamilyhook
496
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
497
+ \g@addto@macro\@sffamilyhook
498
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
499
+ \g@addto@macro\@ttfamilyhook
500
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
501
+ \fi
482
502
  \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
483
503
  \DeclareRobustCommand\textmc[1]{%
484
504
  \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1328,11 +1348,11 @@
1328
1348
  \renewcommand{\theenumiii}{\@roman\c@enumiii}
1329
1349
  \renewcommand{\theenumiv}{\@Alph\c@enumiv}
1330
1350
  \newcommand{\labelenumi}{\theenumi.}
1331
- \newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
1351
+ \newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
1332
1352
  \newcommand{\labelenumiii}{\theenumiii.}
1333
1353
  \newcommand{\labelenumiv}{\theenumiv.}
1334
1354
  \renewcommand{\p@enumii}{\theenumi}
1335
- \renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
1355
+ \renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
1336
1356
  \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
1337
1357
  \newcommand\labelitemi{\textbullet}
1338
1358
  \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1477,7 +1497,7 @@
1477
1497
  \vskip\abovecaptionskip
1478
1498
  \sbox\@tempboxa{#1\hskip1zw\relax #2}%
1479
1499
  \ifdim \wd\@tempboxa <\hsize \centering \fi
1480
- #1\hskip1zw\relax #2\par
1500
+ #1{\hskip1zw\relax}#2\par
1481
1501
  \vskip\belowcaptionskip}}
1482
1502
  \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
1483
1503
  \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1846,23 +1866,42 @@
1846
1866
  \def\西暦{\西暦true}
1847
1867
  \def\和暦{\西暦false}
1848
1868
  \newcount\heisei \heisei\year \advance\heisei-1988\relax
1869
+ \def\pltx@today@year@#1{%
1870
+ \ifnum\numexpr\year-#1=1 元\else
1871
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1872
+ \kansuji\numexpr\year-#1\relax
1873
+ \else
1874
+ \number\numexpr\year-#1\relax\nobreak
1875
+ \fi
1876
+ \fi 年
1877
+ }
1878
+ \def\pltx@today@year{%
1879
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
1880
+ 昭和\pltx@today@year@{1925}%
1881
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
1882
+ 平成\pltx@today@year@{1988}%
1883
+ \else
1884
+ 令和\pltx@today@year@{2018}%
1885
+ \fi\fi}
1849
1886
  \def\today{%
1850
1887
  \if@english
1851
1888
  \ifcase\month\or
1852
1889
  January\or February\or March\or April\or May\or June\or
1853
1890
  July\or August\or September\or October\or November\or December\fi
1854
1891
  \space\number\day, \number\year
1892
+ \else\if西暦
1893
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
1894
+ \else\number\year\nobreak\fi 年
1855
1895
  \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}
1896
+ \pltx@today@year
1897
+ \fi
1898
+ \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
1899
+ \kansuji\month
1900
+ \kansuji\day 日
1901
+ \else
1902
+ \number\month\nobreak
1903
+ \number\day\nobreak
1904
+ \fi\fi}
1866
1905
  \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
1867
1906
  \pagestyle{plain}
1868
1907
  \pagenumbering{arabic}
@@ -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}
@@ -24,7 +24,7 @@
24
24
  \epTeXinputencoding utf8 % ^^A added (2017-10-04)
25
25
  \fi
26
26
  \NeedsTeXFormat{pLaTeX2e}
27
- \ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
27
+ \ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
28
28
  \providecommand{\rubyfamily}{}
29
29
  \def\kanjistrut{\iftdir
30
30
  \vrule \@height0.5zw \@depth0.5zw \@width\z@
@@ -249,9 +249,8 @@
249
249
  \newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
250
250
  \newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
251
251
  \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}$}
252
+ \DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
253
+ \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
255
254
  \newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
256
255
  \newcommand{\iTeX}{\accent'27\i\TeX}
257
256
  \newcommand{\MlTeX}{M\kern-.1667em\lower.5ex\hbox{L}\kern-.25em\TeX}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: review
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 4.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - kmuto
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-11-30 00:00:00.000000000 Z
12
+ date: 2020-06-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: image_size
@@ -87,14 +87,28 @@ dependencies:
87
87
  requirements:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: 0.57.2
90
+ version: 0.77.0
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: 0.57.2
97
+ version: 0.77.0
98
+ - !ruby/object:Gem::Dependency
99
+ name: rubocop-performance
100
+ requirement: !ruby/object:Gem::Requirement
101
+ requirements:
102
+ - - ">="
103
+ - !ruby/object:Gem::Version
104
+ version: '0'
105
+ type: :development
106
+ prerelease: false
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ requirements:
109
+ - - ">="
110
+ - !ruby/object:Gem::Version
111
+ version: '0'
98
112
  - !ruby/object:Gem::Dependency
99
113
  name: simplecov
100
114
  requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,20 @@ dependencies:
123
137
  - - ">="
124
138
  - !ruby/object:Gem::Version
125
139
  version: '0'
140
+ - !ruby/object:Gem::Dependency
141
+ name: unicode-eaw
142
+ requirement: !ruby/object:Gem::Requirement
143
+ requirements:
144
+ - - ">="
145
+ - !ruby/object:Gem::Version
146
+ version: '0'
147
+ type: :development
148
+ prerelease: false
149
+ version_requirements: !ruby/object:Gem::Requirement
150
+ requirements:
151
+ - - ">="
152
+ - !ruby/object:Gem::Version
153
+ version: '0'
126
154
  description: Re:VIEW is a digital publishing system for books and ebooks. It supports
127
155
  InDesign, EPUB and LaTeX.
128
156
  email: kmuto@debian.org
@@ -134,6 +162,7 @@ executables:
134
162
  - review-compile
135
163
  - review-epub2html
136
164
  - review-epubmaker
165
+ - review-idgxmlmaker
137
166
  - review-index
138
167
  - review-init
139
168
  - review-pdfmaker
@@ -146,6 +175,8 @@ executables:
146
175
  extensions: []
147
176
  extra_rdoc_files: []
148
177
  files:
178
+ - ".github/workflows/ruby-win.yml"
179
+ - ".github/workflows/ruby.yml"
149
180
  - ".gitignore"
150
181
  - ".rubocop.yml"
151
182
  - ".rubocop_todo.yml"
@@ -165,6 +196,7 @@ files:
165
196
  - bin/review-compile
166
197
  - bin/review-epub2html
167
198
  - bin/review-epubmaker
199
+ - bin/review-idgxmlmaker
168
200
  - bin/review-index
169
201
  - bin/review-init
170
202
  - bin/review-pdfmaker
@@ -226,6 +258,7 @@ files:
226
258
  - lib/review/book/compilable.rb
227
259
  - lib/review/book/image_finder.rb
228
260
  - lib/review/book/index.rb
261
+ - lib/review/book/index/item.rb
229
262
  - lib/review/book/page_metric.rb
230
263
  - lib/review/book/part.rb
231
264
  - lib/review/book/volume.rb
@@ -249,11 +282,16 @@ files:
249
282
  - lib/review/i18n.rb
250
283
  - lib/review/i18n.yml
251
284
  - lib/review/idgxmlbuilder.rb
285
+ - lib/review/idgxmlmaker.rb
286
+ - lib/review/init-web/finish.html
287
+ - lib/review/init-web/index.html
288
+ - lib/review/init-web/review-layout-design.js
252
289
  - lib/review/init.rb
253
290
  - lib/review/latexbuilder.rb
254
291
  - lib/review/latexindex.rb
255
292
  - lib/review/latexutils.rb
256
293
  - lib/review/lineinput.rb
294
+ - lib/review/location.rb
257
295
  - lib/review/logger.rb
258
296
  - lib/review/makerhelper.rb
259
297
  - lib/review/markdownbuilder.rb
@@ -267,23 +305,27 @@ files:
267
305
  - lib/review/textbuilder.rb
268
306
  - lib/review/textmaker.rb
269
307
  - lib/review/textutils.rb
270
- - lib/review/tocparser.rb
271
308
  - lib/review/tocprinter.rb
272
309
  - lib/review/topbuilder.rb
273
310
  - lib/review/update.rb
274
311
  - lib/review/version.rb
312
+ - lib/review/volumeprinter.rb
275
313
  - lib/review/webmaker.rb
276
314
  - lib/review/webtocprinter.rb
277
315
  - lib/review/yamlloader.rb
278
316
  - review.gemspec
279
317
  - samples/LICENSE
280
318
  - samples/sample-book/README.md
319
+ - samples/sample-book/src/.gitignore
281
320
  - samples/sample-book/src/Rakefile
282
321
  - samples/sample-book/src/_cover.html
283
322
  - samples/sample-book/src/catalog.yml
284
323
  - samples/sample-book/src/ch01.re
285
324
  - samples/sample-book/src/ch02.re
325
+ - samples/sample-book/src/config-ebook.yml
286
326
  - samples/sample-book/src/config-epub2.yml
327
+ - samples/sample-book/src/config-jlreq-ebook.yml
328
+ - samples/sample-book/src/config-jlreq.yml
287
329
  - samples/sample-book/src/config.yml
288
330
  - samples/sample-book/src/images/ch01-imgsample.jpg
289
331
  - samples/sample-book/src/images/cover-a5.ai
@@ -304,6 +346,9 @@ files:
304
346
  - samples/syntax-book/ch01.re
305
347
  - samples/syntax-book/ch02.re
306
348
  - samples/syntax-book/ch03.re
349
+ - samples/syntax-book/config-jlreq-lualatex.yml
350
+ - samples/syntax-book/config-jlreq.yml
351
+ - samples/syntax-book/config-print.yml
307
352
  - samples/syntax-book/config.yml
308
353
  - samples/syntax-book/images/ball.png
309
354
  - samples/syntax-book/images/cover-b5.ai
@@ -319,7 +364,6 @@ files:
319
364
  - samples/syntax-book/lib/tasks/z01_copy_sty.rake
320
365
  - samples/syntax-book/part2.re
321
366
  - samples/syntax-book/pre01.re
322
- - samples/syntax-book/review-ext.rb
323
367
  - samples/syntax-book/sty/jumoline.sty
324
368
  - samples/syntax-book/sty/reviewmacro.sty
325
369
  - samples/syntax-book/style.css
@@ -381,6 +425,7 @@ files:
381
425
  - test/test_htmlutils.rb
382
426
  - test/test_i18n.rb
383
427
  - test/test_idgxmlbuilder.rb
428
+ - test/test_idgxmlmaker_cmd.rb
384
429
  - test/test_image_finder.rb
385
430
  - test/test_index.rb
386
431
  - test/test_latexbuilder.rb
@@ -398,8 +443,8 @@ files:
398
443
  - test/test_review_ext.rb
399
444
  - test/test_rstbuilder.rb
400
445
  - test/test_template.rb
446
+ - test/test_textmaker_cmd.rb
401
447
  - test/test_textutils.rb
402
- - test/test_tocparser.rb
403
448
  - test/test_topbuilder.rb
404
449
  - test/test_update.rb
405
450
  - test/test_webtocprinter.rb
@@ -519,8 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
519
564
  - !ruby/object:Gem::Version
520
565
  version: '0'
521
566
  requirements: []
522
- rubyforge_project:
523
- rubygems_version: 2.7.6
567
+ rubygems_version: 3.1.2
524
568
  signing_key:
525
569
  specification_version: 4
526
570
  summary: 'Re:VIEW: a easy-to-use digital publishing system'
@@ -555,6 +599,7 @@ test_files:
555
599
  - test/test_htmlutils.rb
556
600
  - test/test_i18n.rb
557
601
  - test/test_idgxmlbuilder.rb
602
+ - test/test_idgxmlmaker_cmd.rb
558
603
  - test/test_image_finder.rb
559
604
  - test/test_index.rb
560
605
  - test/test_latexbuilder.rb
@@ -572,8 +617,8 @@ test_files:
572
617
  - test/test_review_ext.rb
573
618
  - test/test_rstbuilder.rb
574
619
  - test/test_template.rb
620
+ - test/test_textmaker_cmd.rb
575
621
  - test/test_textutils.rb
576
- - test/test_tocparser.rb
577
622
  - test/test_topbuilder.rb
578
623
  - test/test_update.rb
579
624
  - test/test_webtocprinter.rb