summaryrefslogtreecommitdiff
path: root/language/japanese
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-05 03:03:08 +0000
committerNorbert Preining <norbert@preining.info>2020-02-05 03:03:08 +0000
commit4b795f65d52cde0d136c0175ce20101946378b54 (patch)
tree07b9b0c89193d379ff6971be01a8ca1e3e6931ca /language/japanese
parentfc358ce7332053945afe16ced2a271556cdccfb7 (diff)
CTAN sync 202002050303
Diffstat (limited to 'language/japanese')
-rw-r--r--language/japanese/BX/bxjscls/LICENSE4
-rw-r--r--language/japanese/BX/bxjscls/README-ja.md3
-rw-r--r--language/japanese/BX/bxjscls/README.md2
-rw-r--r--language/japanese/BX/bxjscls/bxjscls-manual.pdfbin729019 -> 729015 bytes
-rw-r--r--language/japanese/BX/bxjscls/bxjscls.dtx33
-rw-r--r--language/japanese/BX/bxjscls/bxjscls.pdfbin1152167 -> 1153350 bytes
-rw-r--r--language/japanese/platex/README.md2
-rw-r--r--language/japanese/platex/pldoc.pdfbin867066 -> 871349 bytes
-rw-r--r--language/japanese/platex/plfonts.dtx39
-rw-r--r--language/japanese/platex/plvers.dtx2
10 files changed, 68 insertions, 17 deletions
diff --git a/language/japanese/BX/bxjscls/LICENSE b/language/japanese/BX/bxjscls/LICENSE
index 4e794feb3a..b1ab4fd482 100644
--- a/language/japanese/BX/bxjscls/LICENSE
+++ b/language/japanese/BX/bxjscls/LICENSE
@@ -2,8 +2,8 @@ The BSD 2-Clause License
Copyright 1995-1999 ASCII Corporation.
Copyright 1999-2016 Haruhiko Okumura
-Copyright 2016-2019 Japanese TeX Development Community
-Copyright 2013-2019 Takayuki YATO (aka. "ZR")
+Copyright 2016-2020 Japanese TeX Development Community
+Copyright 2013-2020 Takayuki YATO (aka. "ZR")
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/language/japanese/BX/bxjscls/README-ja.md b/language/japanese/BX/bxjscls/README-ja.md
index 00b2b20ffa..23c9abcf4e 100644
--- a/language/japanese/BX/bxjscls/README-ja.md
+++ b/language/japanese/BX/bxjscls/README-ja.md
@@ -98,6 +98,9 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使
更新履歴
--------
+ * Version 1.9j 〈2020/02/05〉
+ - jsclasses の 2020/02/02 と同期。
+ + NFSS の改修に対応した。
* Version 1.9i 〈2019/11/24〉
- Pandoc モードを最新の Pandoc に対応させる。
* Version 1.9h 〈2019/07/27〉
diff --git a/language/japanese/BX/bxjscls/README.md b/language/japanese/BX/bxjscls/README.md
index bd1505a229..8433915dff 100644
--- a/language/japanese/BX/bxjscls/README.md
+++ b/language/japanese/BX/bxjscls/README.md
@@ -88,6 +88,8 @@ This package is distributed under the BSD 2-Clause License.
Revision History
----------------
+ * Version 1.9j 〈2020/02/05〉
+ - Sync with jsclasses 2020/02/02.
* Version 1.9i 〈2019/11/24〉
* Version 1.9h 〈2019/07/27〉
* Version 1.9g 〈2019/06/23〉
diff --git a/language/japanese/BX/bxjscls/bxjscls-manual.pdf b/language/japanese/BX/bxjscls/bxjscls-manual.pdf
index 8b304a1f97..0ba7c6e7d5 100644
--- a/language/japanese/BX/bxjscls/bxjscls-manual.pdf
+++ b/language/japanese/BX/bxjscls/bxjscls-manual.pdf
Binary files differ
diff --git a/language/japanese/BX/bxjscls/bxjscls.dtx b/language/japanese/BX/bxjscls/bxjscls.dtx
index d5f5646485..0fcdd4b575 100644
--- a/language/japanese/BX/bxjscls/bxjscls.dtx
+++ b/language/japanese/BX/bxjscls/bxjscls.dtx
@@ -25,15 +25,15 @@
%
%---------------------------------------
%
-% Copyright 1993-2016
+% Copyright 1993-2019
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
% Copyright 1995-1999 ASCII Corporation.
% Copyright 1999-2016 Haruhiko Okumura
-% Copyright 2016-2019 Japanese TeX Development Community
+% Copyright 2016-2020 Japanese TeX Development Community
%
-% Copyright 2013-2019 Takayuki YATO (aka. "ZR")
+% Copyright 2013-2020 Takayuki YATO (aka. "ZR")
%
% \fi
% \CheckSum{0}
@@ -56,7 +56,9 @@
%<*driver>
\ProvidesFile{bxjscls.dtx}
%</driver>
- [2019/11/24 v1.9i BXJS document classes]
+ [2020/02/05 v1.9j BXJS document classes]
+% based on jsclasses [2020/02/02]
+% [2019/11/24 v1.9i BXJS document classes]
% [2019/07/27 v1.9h BXJS document classes]
% based on jsclasses [2019/07/25]
% [2019/06/23 v1.9g BXJS document classes]
@@ -8470,7 +8472,11 @@
%
% 欧文総称フォント命令で和文フォントが連動するように修正する。
% その他の和文フォント関係の定義を行う。
+%
+% \Note 2020-02-02のNFSSの改修に対する |jsclasses| の対策くぉ
+% 取り入れた。
% \begin{macrocode}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -8480,6 +8486,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\g@addto@macro\bxjs@begin@document@hook{%
+ \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
\DeclareJaTextFontCommand{\textmc}{\mcfamily}
\DeclareJaTextFontCommand{\textgt}{\gtfamily}
diff --git a/language/japanese/BX/bxjscls/bxjscls.pdf b/language/japanese/BX/bxjscls/bxjscls.pdf
index 8f525c313c..4e248e1921 100644
--- a/language/japanese/BX/bxjscls/bxjscls.pdf
+++ b/language/japanese/BX/bxjscls/bxjscls.pdf
Binary files differ
diff --git a/language/japanese/platex/README.md b/language/japanese/platex/README.md
index f5e1b1d929..64c33cbabc 100644
--- a/language/japanese/platex/README.md
+++ b/language/japanese/platex/README.md
@@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-02-02
+2020-02-04
Japanese TeX Development Community
diff --git a/language/japanese/platex/pldoc.pdf b/language/japanese/platex/pldoc.pdf
index 5f4e818016..92241bc1ca 100644
--- a/language/japanese/platex/pldoc.pdf
+++ b/language/japanese/platex/pldoc.pdf
Binary files differ
diff --git a/language/japanese/platex/plfonts.dtx b/language/japanese/platex/plfonts.dtx
index fead9278ea..b91a130c2b 100644
--- a/language/japanese/platex/plfonts.dtx
+++ b/language/japanese/platex/plfonts.dtx
@@ -127,13 +127,14 @@
% \changes{v1.6v}{2020/02/01}{$BDj5A$r(Bpldefs$B$+$i(Bplcore$B$X0\F0(B}
% \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n''
% (sync with fontdef.dtx 2019/12/17 v3.0e)}
+% \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2020/02/01 v1.6v pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2020/02/03 v1.6w pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -1915,7 +1916,10 @@
% \begin{macro}{\fontseries}
% $B=qBN$N%7%j!<%:$r;XDj$9$k%3%^%s%I$G$9!#(B
% |\fontseries|$B%3%^%s%I$OOB2$J8$NN>J}$K1F6A$7$^$9!#(B
-% \LaTeXe~2020-02-02$B$G$O(B|\merge@font@series|$B$r;H$$$^$9!#(B
+%
+% 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%j!<%:$rA*Br$7$F$$$^$7$?$,!"(B
+% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontSeriesChangeRule|$B$K$h$C$F(B
+% $B@k8@$5$l$?!V%7%j!<%:99?75,B'!W$K4p$E$-%7%j!<%:$rA*Br$7$^$9!#(B
% \begin{macrocode}
%<*plcore|platexrelease>
\ifx\fontseriesforce\@undefined % old
@@ -2006,7 +2010,10 @@
% \begin{macro}{\fontshape}
% $B=qBN$N%7%'%$%W$r;XDj$9$k%3%^%s%I$G$9!#(B
% |\fontshape|$B%3%^%s%I$OOB2$J8$NN>J}$K1F6A$7$^$9!#(B
-% \LaTeXe~2020-02-02$B$G$O(B|\merge@font@shape|$B$r;H$$$^$9!#(B
+%
+% 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%'%$%W$rA*Br$7$F$$$^$7$?$,!"(B
+% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontShapeChangeRule|$B$K$h$C$F(B
+% $B@k8@$5$l$?!V%7%'%$%W99?75,B'!W$K4p$E$-%7%'%$%W$rA*Br$7$^$9!#(B
% \begin{macrocode}
\ifx\fontshapeforce\@undefined % old
\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
@@ -2062,7 +2069,8 @@
\ifx\@reserveda\@empty
\edef\k@shape{#2}%
\else
- \maybe@load@fontshape
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
\edef\@reserveda{\k@encoding /\k@family /\k@series/#1}%
\ifcsname \@reserveda\endcsname
\edef\k@shape{#1}%
@@ -2206,9 +2214,15 @@
% \begin{macro}{\bfseries@gt}
% \begin{macro}{\mdseries@mc}
% \begin{macro}{\mdseries@gt}
-% \LaTeXe~2020-02-02$B$G$O(Bmweights$B%Q%C%1!<%8$r4p$K$7$?(B
-% $B2$J8%U%)%s%H$N%7%j!<%:$N%+%9%?%`@_Dj$,F3F~$5$l$F$$$^$9$N$G!"(B
-% p\LaTeXe{}$B$NOBJ8%U%)%s%H$G$b$3$l$r%5%]!<%H$7$^$9!#(B
+% \LaTeXe~2020-02-02$B$G$O!"2$J8%U%)%s%H$K$D$$$F(B
+% $B!V%U%!%_%j$4$H$N<B:]$N%7%j!<%:CM$r@_Dj$G$-$k!W(B
+% $B$H$$$&5!G=$,F3F~$5$l$^$7$?!J85$O(Bmweights$B%Q%C%1!<%8$N5!G=!K!#(B
+% $B$^$?!"F1;~$K(B
+% $B!V(BComputer Modern$B$H(BLatin Modern$B$N>l9g$O8_49@-$N$?$aB@;z$r(Bbx$B$K!"(B
+% $B$=$l0J30$N2$J8%U%!%_%j$N>l9g$OB@;z$r(Bb$B$K$9$k!W(B
+% $B$H$$$&;EMMJQ99$bF~$j$^$7$?!#(B
+% $B$3$l$K9g$o$;$F!"(Bp\LaTeXe{}$B$NOBJ8%U%)%s%H$K$bF1Ey$N5!G=$rDI2C$7!"(B
+% $BOBJ8%U%!%_%j$NB@;z$b(Bbx$B$G$O$J$/(Bb$B$KJQ99$7$^$7$?!#(B
% \changes{v1.6v}{2020/02/01}{\LaTeX{}$B$,(Bmweights$B%Q%C%1!<%8$r4p$K$7$?(B
% $B%7%j!<%:$N%+%9%?%`@_Dj$rF3F~$7$?$N$G!"$3$l$r%5%]!<%H(B
% (sync with ltfssini.dtx 2019/12/17 v3.1e)}
@@ -2259,7 +2273,7 @@
%
% \begin{macro}{\bfseries}
% \begin{macro}{\mdseries}
-% $B%+%9%?%`@_Dj$r%A%'%C%/$7$^$9!#(B
+% $B%U%!%_%j$4$H$N@_DjCM$r;2>H$7$^$9!#(B
% \begin{macrocode}
\ifx\bfseries@rm\@undefined\else % 2020-02-02
\DeclareRobustCommand\bfseries{%
@@ -2402,8 +2416,15 @@
%}%
% \end{macrocode}
% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B
+% \begin{itemize}
+% \item \LaTeXe~2019-10-01$B0JA0!'L$Dj5A(B
+% \item \LaTeXe~2020-02-02$B0J9_!'>e$N$H$*$j$NDj5A(B
+% \item $B$?$@$7!"(Blatexrelease$B$G4,$-La$7!'(B|\relax|$B$HF15A(B
+% \end{itemize}
+% $B$K$J$k$3$H$KCm0U$7$^$9!#(B
+% \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B}
% \begin{macrocode}
-\ifx\init@series@setup\@undefined\else % 2020-02-02
+\expandafter\ifx\csname init@series@setup\endcsname\relax\else % 2020-02-02
\g@addto@macro\init@series@setup{%
\ifx\kanjidef@ult\mcdef@ult \mcfamily
\else\ifx\kanjidef@ult\gtdef@ult \gtfamily
diff --git a/language/japanese/platex/plvers.dtx b/language/japanese/platex/plvers.dtx
index 7be5ca9cc0..b354d4f4a6 100644
--- a/language/japanese/platex/plvers.dtx
+++ b/language/japanese/platex/plvers.dtx
@@ -195,7 +195,7 @@
{2020-02-02}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch@level{0}
+\def\ppatch@level{1}
%</plcore>
% \end{macrocode}
% \end{macro}