Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update jsclasses to v20200202 #1481

Merged
merged 2 commits into from
Feb 19, 2020
Merged

update jsclasses to v20200202 #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b993a50
copy jsclasses 2020/02/02 version (b02363c4c5b41faf9b2bb44ef2d74601a9…
kmuto Feb 19, 2020
3831105
add book_test_helper for test unit
kmuto Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/test_catalog.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'test_helper'
require 'book_test_helper'
require 'review/catalog'

class CatalogTest < Test::Unit::TestCase
Expand Down
2 changes: 1 addition & 1 deletion vendor/jsclasses/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright 1995-1999 ASCII MEDIA WORKS
Copyright 1999-2016 Haruhiko Okumura
Copyright 2016-2018 Japanese TeX Development Community
Copyright 2016-2020 Japanese TeX Development Community
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
67 changes: 53 additions & 14 deletions vendor/jsclasses/jis/jsarticle.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
[2018/06/23 jsclasses (okumura, texjporg)]
[2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
Expand Down Expand Up @@ -460,6 +460,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
Expand All @@ -469,6 +470,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
\AtBeginDocument{%
\ifx\mweights@init\@undefined\else % mweights.sty is loaded
% my definitions above should have been overwritten, recover it!
% \selectfont is executed twice but I don't care about speed...
\expandafter\g@addto@macro\csname rmfamily \endcsname
{\kanjifamily\mcdefault\selectfont}%
\expandafter\g@addto@macro\csname sffamily \endcsname
{\kanjifamily\gtdefault\selectfont}%
\expandafter\g@addto@macro\csname ttfamily \endcsname
{\kanjifamily\gtdefault\selectfont}%
\fi}
\else % 2020-02-02
\g@addto@macro\@rmfamilyhook
{\prepare@family@series@update@kanji{mc}\mcdefault}
\g@addto@macro\@sffamilyhook
{\prepare@family@series@update@kanji{gt}\gtdefault}
\g@addto@macro\@ttfamilyhook
{\prepare@family@series@update@kanji{gt}\gtdefault}
\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
Expand Down Expand Up @@ -1370,11 +1390,11 @@
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\newcommand{\labelenumi}{\theenumi.}
\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
Expand Down Expand Up @@ -1519,7 +1539,7 @@
\vskip\abovecaptionskip
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
\ifdim \wd\@tempboxa <\hsize \centering \fi
#1\hskip1zw\relax #2\par
#1{\hskip1zw\relax}#2\par
\vskip\belowcaptionskip}}
\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
Expand Down Expand Up @@ -1885,23 +1905,42 @@
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\pltx@today@year@#1{%
\ifnum\numexpr\year-#1=1 $B85(B\else
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
\kansuji\numexpr\year-#1\relax
\else
\number\numexpr\year-#1\relax\nobreak
\fi
\fi $BG/(B
}
\def\pltx@today@year{%
\ifnum\numexpr\year*10000+\month*100+\day<19890108
$B><OB(B\pltx@today@year@{1925}%
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
$BJ?@.(B\pltx@today@year@{1988}%
\else
$BNaOB(B\pltx@today@year@{2018}%
\fi\fi}
\def\today{%
\if@english
\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year
\else\if$B@>Nq(B
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
\else\number\year\nobreak\fi $BG/(B
\else
\if$B@>Nq(B
\number\year $BG/(B
\number\month $B7n(B
\number\day $BF|(B
\else
$BJ?@.(B\number\heisei $BG/(B
\number\month $B7n(B
\number\day $BF|(B
\fi
\fi}
\pltx@today@year
\fi
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
\kansuji\month $B7n(B
\kansuji\day $BF|(B
\else
\number\month\nobreak $B7n(B
\number\day\nobreak $BF|(B
\fi\fi}
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
\pagenumbering{arabic}
Expand Down
67 changes: 53 additions & 14 deletions vendor/jsclasses/jis/jsbook.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
[2018/06/23 jsclasses (okumura, texjporg)]
[2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
Expand Down Expand Up @@ -465,6 +465,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
Expand All @@ -474,6 +475,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
\AtBeginDocument{%
\ifx\mweights@init\@undefined\else % mweights.sty is loaded
% my definitions above should have been overwritten, recover it!
% \selectfont is executed twice but I don't care about speed...
\expandafter\g@addto@macro\csname rmfamily \endcsname
{\kanjifamily\mcdefault\selectfont}%
\expandafter\g@addto@macro\csname sffamily \endcsname
{\kanjifamily\gtdefault\selectfont}%
\expandafter\g@addto@macro\csname ttfamily \endcsname
{\kanjifamily\gtdefault\selectfont}%
\fi}
\else % 2020-02-02
\g@addto@macro\@rmfamilyhook
{\prepare@family@series@update@kanji{mc}\mcdefault}
\g@addto@macro\@sffamilyhook
{\prepare@family@series@update@kanji{gt}\gtdefault}
\g@addto@macro\@ttfamilyhook
{\prepare@family@series@update@kanji{gt}\gtdefault}
\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
Expand Down Expand Up @@ -1477,11 +1497,11 @@
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\newcommand{\labelenumi}{\theenumi.}
\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
Expand Down Expand Up @@ -1588,7 +1608,7 @@
\vskip\abovecaptionskip
\sbox\@tempboxa{#1\hskip1zw\relax #2}%
\ifdim \wd\@tempboxa <\hsize \centering \fi
#1\hskip1zw\relax #2\par
#1{\hskip1zw\relax}#2\par
\vskip\belowcaptionskip}}
\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
Expand Down Expand Up @@ -1976,23 +1996,42 @@
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\pltx@today@year@#1{%
\ifnum\numexpr\year-#1=1 $B85(B\else
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
\kansuji\numexpr\year-#1\relax
\else
\number\numexpr\year-#1\relax\nobreak
\fi
\fi $BG/(B
}
\def\pltx@today@year{%
\ifnum\numexpr\year*10000+\month*100+\day<19890108
$B><OB(B\pltx@today@year@{1925}%
\else\ifnum\numexpr\year*10000+\month*100+\day<20190501
$BJ?@.(B\pltx@today@year@{1988}%
\else
$BNaOB(B\pltx@today@year@{2018}%
\fi\fi}
\def\today{%
\if@english
\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year
\else\if$B@>Nq(B
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
\else\number\year\nobreak\fi $BG/(B
\else
\if$B@>Nq(B
\number\year $BG/(B
\number\month $B7n(B
\number\day $BF|(B
\else
$BJ?@.(B\number\heisei $BG/(B
\number\month $B7n(B
\number\day $BF|(B
\fi
\fi}
\pltx@today@year
\fi
\ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
\kansuji\month $B7n(B
\kansuji\day $BF|(B
\else
\number\month\nobreak $B7n(B
\number\day\nobreak $BF|(B
\fi\fi}
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
\if@report \pagestyle{plain} \else \pagestyle{headings} \fi
\pagenumbering{arabic}
Expand Down
Loading