From 34897eebd22c3de968b64f09bb4a371d96cb0b89 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 3 Feb 2020 03:02:01 +0000 Subject: CTAN sync 202002030302 --- language/japanese/platex/LICENSE | 2 +- language/japanese/platex/README.md | 35 +- language/japanese/platex/exppl2e.pdf | Bin 172706 -> 177606 bytes language/japanese/platex/exppl2e.sty | 26 +- language/japanese/platex/jclasses.dtx | 31 +- language/japanese/platex/pldoc.pdf | Bin 850926 -> 867066 bytes language/japanese/platex/plfonts.dtx | 677 ++++++++++++++++++++++----- language/japanese/platex/plvers.dtx | 12 +- language/japanese/uplatex/LICENSE | 2 +- language/japanese/uplatex/README.md | 9 +- language/japanese/uplatex/README_uplatex.txt | 2 +- language/japanese/uplatex/ujclasses.dtx | 33 +- language/japanese/uplatex/upldoc.pdf | Bin 545121 -> 542292 bytes language/japanese/uplatex/uplfonts.dtx | 101 +--- language/japanese/uplatex/uplvers.dtx | 22 +- language/japanese/zxjafont/README-ja.md | 4 + language/japanese/zxjafont/README.md | 5 + language/japanese/zxjafont/zxjafont.pdf | Bin 147263 -> 160706 bytes language/japanese/zxjafont/zxjafont.sty | 208 +++++--- language/japanese/zxjafont/zxjafont.tex | 174 +++++-- 20 files changed, 966 insertions(+), 377 deletions(-) (limited to 'language') diff --git a/language/japanese/platex/LICENSE b/language/japanese/platex/LICENSE index 5c1490cdb8..cd23b4d446 100644 --- a/language/japanese/platex/LICENSE +++ b/language/japanese/platex/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016-2019 Japanese TeX Development Community +Copyright (c) 2016-2020 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/language/japanese/platex/README.md b/language/japanese/platex/README.md index e50ca3f7ff..f5e1b1d929 100644 --- a/language/japanese/platex/README.md +++ b/language/japanese/platex/README.md @@ -1,13 +1,17 @@ # platex -The bundle provides pLaTeX2e and miscellaneous macros for pTeX and e-pTeX. +The bundle provides pLaTeX2e format and miscellaneous macros +for pTeX and e-pTeX. +This is a community edition maintained by +[Japanese TeX Development Community](http://texjp.org), +which forked from the original ASCII edition (ptex-texmf-2.5). -The bundle is a community edition forked from the original ASCII edition -(ptex-texmf-2.5). The GitHub repository +## Repository -- https://github.com/texjporg/platex +The bundle is maintained on GitHub: +https://github.com/texjporg/platex -is now maintained by [Japanese TeX Development Community](http://texjp.org). +If you have issues, please let us know from the above page. The original ASCII edition can be obtained from: @@ -15,15 +19,21 @@ The original ASCII edition can be obtained from: ## Changes from the original ASCII edition -See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf) for more information. +The original ASCII edition (pLaTeX2e 2006/11/10) was based on +pTeX-3.1.10 and LaTeX2e 2005/12/01. +The community edition (this package) has the following advantages: -- Fix macros which are inconsistent with the latest e-pTeX - (e.g. \footnote, tabular, \parbox, \underline). - Fix several bugs in pLaTeX2e format and packages. +- Fix macros which are inconsistent with the latest pTeX + (e.g. \footnote, tabular, \parbox, \underline). +- Support LaTeX2e 2015/01/01 and later versions. - Add platexrelease.sty. As with the latexrelease package, this package enables us to use the old versions of pLaTeX2e (from 2006/11/10 the ASCII edition). +See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf) +for more information. + ## Documentation A brief exposition of pLaTeX2e is provided in platex.pdf. @@ -47,13 +57,6 @@ All the text files containing Japanese characters in this repository are encoded in ISO-2022-JP. This is because ISO-2022-JP encoded texts are most suitable for the traditional pTeX engine. -## Repository - -The bundle is maintained on GitHub: -https://github.com/texjporg/platex - -If you have issues, please let us know from the above page. - ## License The bundle may be distributed and/or modified under the terms of @@ -61,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-10-21 +2020-02-02 Japanese TeX Development Community diff --git a/language/japanese/platex/exppl2e.pdf b/language/japanese/platex/exppl2e.pdf index 408b5d000f..3773c6ad2f 100644 Binary files a/language/japanese/platex/exppl2e.pdf and b/language/japanese/platex/exppl2e.pdf differ diff --git a/language/japanese/platex/exppl2e.sty b/language/japanese/platex/exppl2e.sty index 9fab0c5b09..8774d28fbd 100644 --- a/language/japanese/platex/exppl2e.sty +++ b/language/japanese/platex/exppl2e.sty @@ -2,7 +2,7 @@ % % This is file `exppl2e.sty', for experimental pLaTeX2e. % -% Copyright (c) 2016-2018 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2019/09/16 v1.1d Experimental pLaTeX2e features] + [2020/02/02 v1.1e Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -330,6 +330,28 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{\cs{verb}$B@hF,$N9g;zM^@)$H(B\cs{xkanjiskip}} +% +% \begin{macro}{\do@noligs} +% |>|$B$J$I$N0lIt$NJ8;z$K$D$$$F!"(B|\xspcode`\>=3|$B$H$7$?$H$-$K(B +% |\texttt{>}|$B$G$OA08e$K(B|\xkanjiskip|$BM3Mh$N%"%-$,F~$k$N$K!"(B +% |\verb+>+|$B$G$O8e$m$K$7$+%"%-$,F~$i$J$$$H$$$&8=>]$KBP=h$7$^$9!#(B +% +% $B85$NDj5A$O(B\file{ltmiscen.dtx}$B$r;2>H$7$F$/$@$5$$!#(B +% p\LaTeX{}$B$G$O!"(B|\kern\z@|$B$r(B|\vadjust{}|$B$KCV$-49$($k$3$H$G(B +% $B!V9g;z=hM}$rM^;_!W$+$D!VOB2$J84V%9%Z!<%9$NA^F~=hM}$OF)2a!W$r8e$G$N2~9T$r5v2D(B} % % 2016/09/03$B$KF3F~:Q$_!#(B diff --git a/language/japanese/platex/jclasses.dtx b/language/japanese/platex/jclasses.dtx index cf77787d31..1ac4a591d2 100644 --- a/language/japanese/platex/jclasses.dtx +++ b/language/japanese/platex/jclasses.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -100,6 +100,11 @@ % \changes{v1.8b}{2019/04/02}{$B?7859fBP1~(B} % \changes{v1.8c}{2019/10/17}{$B%U%)%s%H%5%$%:JQ99L?Na$r(Brobust$B$K(B % (sync with classes.dtx 2019/08/27 v1.4j)} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (sync with classes.dtx 2019/10/25 v1.4k)} +% \changes{v1.8e}{2020/01/03}{Normalize label fonts +% (sync with classes.dtx 2019/12/20 v1.4l)} % \fi % % \iffalse @@ -129,7 +134,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} % - [2019/10/17 v1.8c + [2020/01/03 v1.8e % Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -617,10 +622,17 @@ % $B%+!<%M%k$NDj5A$r(B|\renewcommand|$B$7$?8e$K(B|\MakeRobust|$B$r;H$C$F$$$kM}M3$O!"(B % $B%m%0$K(B |LaTeX Info: Redefining \normalsize on input line ...| $B$H$$$&(B % $B%a%C%;!<%8$r=P$7$?$/$J$$$+$i$G$9!#(B +% $B$?$@$7!"(B\textsf{latexrelease}$B%Q%C%1!<%8$G(B2015/01/01$B$h$j(B +% $B@N$NF|IU$K4,$-La$C$F$$$k>l9g$O(B|\MakeRobust|$B$,Dj5A$5$l$F$$$^$;$s!#(B % \changes{v1.8c}{2019/10/17}{$B%U%)%s%H%5%$%:JQ99L?Na$r(Brobust$B$K(B % (sync with classes.dtx 2019/08/27 v1.4j)} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (sync with classes.dtx 2019/10/25 v1.4k)} % \begin{macrocode} -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi % \end{macrocode} % \end{macro} % \end{macro} @@ -3347,17 +3359,20 @@ % itemize$B4D6-$N$=$l$>$l$N9`L\$N%i%Y%k$O!"(B % |\labelenumi| \ldots\ |\labelenumiv|$B$G@8@.$5$l$^$9!#(B % \changes{v1.1a}{1997/01/28}{Bug fix: \cs{labelitemii}.} +% \changes{v1.8e}{2020/01/03}{Normalize label fonts +% (sync with classes.dtx 2019/12/20 v1.4l)} % \begin{macrocode} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/language/japanese/platex/pldoc.pdf b/language/japanese/platex/pldoc.pdf index 183733ad59..5f4e818016 100644 Binary files a/language/japanese/platex/pldoc.pdf and b/language/japanese/platex/pldoc.pdf differ diff --git a/language/japanese/platex/plfonts.dtx b/language/japanese/platex/plfonts.dtx index bfe6e4913a..fead9278ea 100644 --- a/language/japanese/platex/plfonts.dtx +++ b/language/japanese/platex/plfonts.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2006 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -113,13 +113,27 @@ % (sync with ltfssbas.dtx 2019/08/27 v3.2d)} % \changes{v1.6u}{2019/09/29}{Make \cs{userelfont} robust} % \changes{v1.6u}{2019/09/29}{Make \cs{adjustbaseline} robust} +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontseriesforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontshapeforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \changes{v1.6v}{2020/02/01}{Don't call \cs{fontseries} or \cs{fontshape} +% (sync with ltfssbas.dtx 2019/12/17 v3.2e)} +% \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)} +% \changes{v1.6v}{2020/02/01}{Support \cs{emph} sequences +% (sync with ltfssini.dtx 2019/12/17 v3.1e)} +% \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)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2019/09/29 v1.6u pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2020/02/01 v1.6v pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -1799,10 +1813,10 @@ % $BEPO?$5$l$F$$$l$P!"$3$N0z?t$OOBJ8%U%!%_%j$G$O$"$j$^$;$s$N$G!"(B % |\@notkfam|$B%U%i%0$r??$K$7$F!"2$J8%U%!%_%j$N%k!<%A%s$K0\$j$^$9!#(B % -% $B$3$N$H$-!"(B|\efam@list|$B$rD4$Y$k$N$G$O$J$$$3$H$KCm0U$r$7$F$/$@$5$$!#(B -% |\efam@list|$B$rD4$Y!"$3$l$K$J$$%U%!%_%j$rOBJ8%U%!%_%j$G$"$k$H$9$k$H!"(B +% $B$3$N$H$-!"(B|\ffam@list|$B$rD4$Y$k$N$G$O$J$$$3$H$KCm0U$r$7$F$/$@$5$$!#(B +% |\ffam@list|$B$rD4$Y!"$3$l$K$J$$%U%!%_%j$rOBJ8%U%!%_%j$G$"$k$H$9$k$H!"(B % $B$?$H$($P!"2$J8%J!<%k%U%!%_%j$,Dj5A$5$l$F$$$k$1$l$I$b!"OBJ8%J!<%k%U%!%_%j(B -% $B$,L$Dj5A$N>l9g!"(B|\fontfamily{nar}|$B$H$$$&;XDj$O!"(B|nar|$B$,(B|\efam@list|$B$K$@$1!"(B +% $B$,L$Dj5A$N>l9g!"(B|\fontfamily{nar}|$B$H$$$&;XDj$O!"(B|nar|$B$,(B|\ffam@list|$B$K$@$1!"(B % $BEPO?$5$l$F$$$k$?$a!"OBJ8=qBN$r%J!<%k$K$9$k$3$H$,$G$-$^$;$s!#(B % % $B5U$K!"(B|\kfam@list|$B$KEPO?$5$l$F$$$J$$$+$i$H$$$C$F!"(B|\k@family|$B$K(B|nar|$B$r@_Dj(B @@ -1889,6 +1903,7 @@ \if@notkfam\if@notffam \edef\k@family{#1}\edef\f@family{#1}% \fi\fi} +% % \end{macrocode} % \end{macro} % \end{macro} @@ -1900,10 +1915,86 @@ % \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 % \begin{macrocode} +%<*plcore|platexrelease> +\ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % 2020-02-02 +\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\romanseriesforce} +% \begin{macro}{\kanjiseriesforce} +% \begin{macro}{\fontseriesforce} +% $BL5>r7o$K%7%j!<%:$rJQ99$7$^$9!#(B +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontseriesforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \begin{macrocode} +\ifx\fontseriesforce\@undefined % old +\let\romanseriesforce\@undefined +\let\kanjiseriesforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} +\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\merge@kanji@series} +% \begin{macro}{\merge@kanji@series@} +% \begin{macro}{\set@target@series@kanji} +% \cs{merge@font@series}$B$NOBJ8HG$G$9!#(B +% \begin{macrocode} +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@series\@undefined +\let\merge@kanji@series@\@undefined +\let\set@target@series@kanji\@undefined +\else % 2020-02-02 +\def\merge@kanji@series#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@empty + \set@target@series@kanji{#2}% + \else + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \edef\@reserveda{\k@encoding /\k@family /#1/\k@shape}% + \ifcsname \@reserveda \endcsname + \set@target@series@kanji{#1}% + \else + \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname + \set@target@series@kanji{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \set@target@series@kanji{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\def\set@target@series@kanji#1{% + \edef\k@series{#1}% + \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}% +} +\fi % \end{macrocode} % \end{macro} % \end{macro} @@ -1915,15 +2006,83 @@ % \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 % \begin{macrocode} +\ifx\fontshapeforce\@undefined % old \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} +\else % 2020-02-02 +\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} +\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} +\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} +\fi % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % +% \begin{macro}{\romanshapeforce} +% \begin{macro}{\kanjishapeforce} +% \begin{macro}{\fontshapeforce} +% $BL5>r7o$K%7%'%$%W$rJQ99$7$^$9!#(B +% \changes{v1.6v}{2020/02/01}{New commands \cs{fontshapeforce} etc. +% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)} +% \begin{macrocode} +\ifx\fontshapeforce\@undefined % old +\let\romanshapeforce\@undefined +\let\kanjishapeforce\@undefined +\else % 2020-02-02 +\DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} +\DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} +\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\merge@kanji@shape} +% \begin{macro}{\merge@kanji@shape@} +% \cs{merge@font@shape}$B$NOBJ8HG$G$9!#(B +% \begin{macrocode} +\ifx\fontseriesforce\@undefined % old +\let\merge@kanji@shape\@undefined +\let\merge@kanji@shape@\@undefined +\else % 2020-02-02 +\def\merge@kanji@shape#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@#1#2#3\@nil{% + \def\@reserveda{#3}% + \ifx\@reserveda\@empty + \edef\k@shape{#2}% + \else + \maybe@load@fontshape + \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% + \ifcsname \@reserveda\endcsname + \edef\k@shape{#1}% + \else + \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname + \edef\k@shape{#2}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \else + \edef\k@shape{#3}% + {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% + \fi + \fi + \fi +} +\fi +% +% \end{macrocode} +% \end{macro} +% \end{macro} +% % % \begin{macro}{\usekanji} % \begin{macro}{\useroman} @@ -1935,17 +2094,22 @@ % $BOBJ8$^$?$O2$J8%U%)%s%H$r@Z$jBX$($^$9!#(B % \changes{v1.6t}{2019/09/16}{Make \cs{usefont} etc. robust % (sync with ltfssbas.dtx 2019/08/27 v3.2d)} +% \changes{v1.6v}{2020/02/01}{Don't call \cs{fontseries} or \cs{fontshape} +% (sync with ltfssbas.dtx 2019/12/17 v3.2e)} % \begin{macrocode} -% -%\plIncludeInRelease{2019/10/01}{\usefont} -% {Make robust}% +%\plIncludeInRelease{2020/02/02}{\usefont} +% {Don't call \fontseries or \fontshape}% %<*plcore|platexrelease> -\DeclareRobustCommand\usekanji[4]{% - \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% - \selectfont\ignorespaces} -\DeclareRobustCommand\useroman[4]{% - \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% - \selectfont\ignorespaces} +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \edef\k@series{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \edef\f@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter @@ -1955,6 +2119,22 @@ \fi} % %\plEndIncludeInRelease +%\plIncludeInRelease{2019/10/01}{\usefont} +% {Make robust}% +%\DeclareRobustCommand\usekanji[4]{% +% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% +% \selectfont\ignorespaces} +%\DeclareRobustCommand\useroman[4]{% +% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% +% \selectfont\ignorespaces} +%\DeclareRobustCommand\usefont[4]{% +% \edef\tmp@item{{#1}}% +% \expandafter\expandafter\expandafter +% \inlist@\expandafter\tmp@item\expandafter{\kenc@list}% +% \ifin@ \usekanji{#1}{#2}{#3}{#4}% +% \else\useroman{#1}{#2}{#3}{#4}% +% \fi} +%\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\usefont} % {ASCII Corporation original}% %\def\usekanji#1#2#3#4{% @@ -1974,7 +2154,6 @@ %\expandafter \let \csname useroman \endcsname \@undefined %\expandafter \let \csname usefont \endcsname \@undefined %\plEndIncludeInRelease -%<*plcore> % \end{macrocode} % \end{macro} % \end{macro} @@ -1987,18 +2166,250 @@ % $B$?$@$79bB.2=$N$?$a!"(B|\usekanji|$B$H(B|\useroman|$B$rE83+$7!"(B % |\selectfont|$B$r0lEY$7$+8F$S=P$5$J$$$h$&$K$7$F$$$^$9!#(B % \begin{macrocode} +%\plIncludeInRelease{2020/02/02}{\normalfont} +% {Don't call \fontseries or \fontshape}% +%<*plcore|platexrelease> \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% - \kanjifamily{\kanjifamilydefault}% - \kanjiseries{\kanjiseriesdefault}% - \kanjishape{\kanjishapedefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% \romanencoding{\encodingdefault}% - \romanfamily{\familydefault}% - \romanseries{\seriesdefault}% - \romanshape{\shapedefault}% + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% \selectfont\ignorespaces} \adjustbaseline \let\reset@font\normalfont +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\normalfont} +% {ASCII Corporation original}% +%\DeclareRobustCommand\normalfont{% +% \kanjiencoding{\kanjiencodingdefault}% +% \kanjifamily{\kanjifamilydefault}% +% \kanjiseries{\kanjiseriesdefault}% +% \kanjishape{\kanjishapedefault}% +% \romanencoding{\encodingdefault}% +% \romanfamily{\familydefault}% +% \romanseries{\seriesdefault}% +% \romanshape{\shapedefault}% +% \selectfont\ignorespaces} +%\adjustbaseline +%\let\reset@font\normalfont +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\bfseries@mc} +% \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 +% \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)} +% \begin{macrocode} +%<*plcore|platexrelease> +\ifx\bfseries@rm\@undefined % old +\let\bfseries@mc\@undefined +\let\bfseries@gt\@undefined +\let\mdseries@mc\@undefined +\let\mdseries@gt\@undefined +\else % 2020-02-02 +\edef\bfseries@mc{\bfdefault}% b +\edef\bfseries@gt{\bfdefault}% b +\edef\mdseries@mc{\mddefault}% m +\edef\mdseries@gt{\mddefault}% m +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\expand@font@defaults} +% $B%U%!%_%j$N%G%U%)%k%H$r40A4E83+$7$^$9!#(B +% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A$r:\$;$F$*$-$^$9!#(B +% \begin{macrocode} +%\def\expand@font@defaults{% +% \edef\rmdef@ult{\rmdefault}% +% \edef\sfdef@ult{\sfdefault}% +% \edef\ttdef@ult{\ttdefault}% +% \edef\bfdef@ult{\bfdefault}% +% \edef\mddef@ult{\mddefault}% +% \edef\famdef@ult{\familydefault}% +%} +% \end{macrocode} +% p\LaTeX{}$B$G$O!"0J2<$N%3!<%I$rKvHx$KDI2C$7$^$9!#(B +% \begin{macrocode} +\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +\g@addto@macro\expand@font@defaults{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + \edef\kanjidef@ult{\kanjifamilydefault}% +} +\fi +% \end{macrocode} +% +% \end{macro} +% +% \begin{macro}{\bfseries} +% \begin{macro}{\mdseries} +% $B%+%9%?%`@_Dj$r%A%'%C%/$7$^$9!#(B +% \begin{macrocode} +\ifx\bfseries@rm\@undefined\else % 2020-02-02 +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \bfseries@rm + \else\ifx\f@family\sfdef@ult \bfseries@sf + \else\ifx\f@family\ttdef@ult \bfseries@tt + \else \bfdefault + \fi\fi\fi + }% +% \end{macrocode} +% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B +% \begin{macrocode} + \kanjiseries{% + \ifx\k@family\mcdef@ult \bfseries@mc + \else\ifx\k@family\gtdef@ult \bfseries@gt + \else \bfdefault + \fi\fi + }% +% \end{macrocode} +% $B$3$3$^$G!#(B +% \begin{macrocode} + \selectfont +} +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + \romanseries{% changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \mdseries@rm + \else\ifx\f@family\sfdef@ult \mdseries@sf + \else\ifx\f@family\ttdef@ult \mdseries@tt + \else \mddefault + \fi\fi\fi + }% +% \end{macrocode} +% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B +% \begin{macrocode} + \kanjiseries{% + \ifx\k@family\mcdef@ult \mdseries@mc + \else\ifx\k@family\gtdef@ult \mdseries@gt + \else \mddefault + \fi\fi + }% +% \end{macrocode} +% $B$3$3$^$G!#(B +% \begin{macrocode} + \selectfont +} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\prepare@family@series@update@kanji} +% \begin{macro}{\@meta@family@list@kanji} +% \begin{macro}{\update@series@target@value@kanji} +% |\prepare@family@series@update|$B$NOBJ8HG$G$9!#(B +% \begin{macrocode} +\ifx\prepare@family@series@update\@undefined % old +\let\prepare@family@series@update@kanji\@undefined +\let\@meta@family@list@kanji\@undefined +\else % 2020-02-02 +\def\prepare@family@series@update#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value + \@meta@family@list + \let\@elt\relax + \romanfamily#2% % changed \fontfamily -> \romanfamily + \ifx\target@series@value\@empty + \else + \maybe@load@fontshape + \let\f@series\target@series@value + \fi +} +\def\prepare@family@series@update@kanji#1#2{% + \expand@font@defaults + \let\target@series@value\@empty + \def\target@meta@family@value{#1}% + \let\@elt\update@series@target@value@kanji + \@meta@family@list@kanji + \let\@elt\relax + \kanjifamily#2% + \ifx\target@series@value\@empty + \else + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \let\k@series\target@series@value + \fi +} +\def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}} +\def\update@series@target@value@kanji#1{% + \def\@reserveda{#1}% + \ifx\target@meta@family@value\@reserveda % rm -> rm do nothing + \else + \expandafter\ifx\csname#1def@ult\endcsname\k@family + \let\@elt\@gobble + \expandafter\let\expandafter\@reservedb + \csname mdseries@\target@meta@family@value\endcsname + \expandafter\let\expandafter\@reservedc + \csname bfseries@\target@meta@family@value\endcsname + \expandafter\ifx\csname mdseries@#1\endcsname\k@series + \let\target@series@value\@reservedb + \else\expandafter\ifx\csname bfseries@#1\endcsname\k@series + \let\target@series@value\@reservedc + \else\ifx\k@series\mddef@ult \let\target@series@value\@reservedb + \else\ifx\k@series\bfdef@ult \let\target@series@value\@reservedc + \fi\fi\fi\fi + \fi + \fi +} +\fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\init@series@setup} +% |\begin{document}|$B$G$G$9!#(B % \begin{macrocode} +\ifx\prepare@family@series@update@kanji\@undefined % 2020-02-02 \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc \kanjifamily\mcdefault\selectfont} \DeclareRobustCommand\gtfamily {\not@math@alphabet\gtfamily\mathgt \kanjifamily\gtdefault\selectfont} +\else +\DeclareRobustCommand\mcfamily + {\not@math@alphabet\mcfamily\mathmc + \prepare@family@series@update@kanji{mc}\mcdefault\selectfont} +\DeclareRobustCommand\gtfamily + {\not@math@alphabet\gtfamily\mathgt + \prepare@family@series@update@kanji{gt}\gtdefault\selectfont} +\fi +% % \end{macrocode} % \end{macro} % \end{macro} % +% \begin{macro}{\textmc} +% \begin{macro}{\textgt} +% \changes{v1.3b}{1997/01/28}{\cs{textmc}, \cs{textgt}$B$NF0:n=$@5(B} +% \changes{v1.6v}{2020/02/01}{$BDj5A$r(Bpldefs$B$+$i(Bplcore$B$X0\F0(B} +% $B%F%-%9%H%U%!%_%j$r@Z$jBX$($k$?$a$N%3%^%s%I$G$9!#(B +% \file{ltfntcmd.dtx}$B$GDj5A$5$l$F$$$k(B|\textrm|$B$J$I$KBP1~$7$^$9!#(B +% \begin{macrocode} +%<*plcore> +\DeclareTextFontCommand{\textmc}{\mcfamily} +\DeclareTextFontCommand{\textgt}{\gtfamily} +% +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\em} +% \begin{macro}{\emph} +% \begin{macro}{\eminnershape} +% \changes{v1.3d}{1997/06/25}{\cs{em},\cs{emph}$B$GOBJ8$r6/D4=qBN$K(B} +% $B=>Mh$O(B|\em|, |\emph|$B$GOBJ8%U%)%s%H$N@Z$jBX$($O9T$C$F$$$^$;$s$G$7$?$,!"(B +% $BOBJ8%U%)%s%H$b(B|\gtfamily|$B$K@Z$jBX$($k$h$&$K$7$^$7$?!#(B +% +% [p\LaTeXe~2016/04/17] +% \LaTeX\ \texttt{<2015/01/01>}$B$GDI2C$5$l$?(B|\eminnershape|$B$bl9g$N=qBN$r<+M3$K:FDj5A$G$-$k$h$&$K$J$j$^$7$?!#(B +% \changes{v1.6}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}$B$G$N(B\cs{em}$B$N(B +% $BDj5AJQ99$KBP1~!#(B\cs{eminnershape}$B$rDI2C!#(B} +% +% [p\LaTeXe~2020-02-02] +% \LaTeX\ \texttt{<2020-02-02>}$B$GDI2C$5$l$?(B|\DeclareEmphSequence|$B$r(B +% $B%5%]!<%H$7$^$7$?!#(B +% \changes{v1.6v}{2020/02/01}{Support \cs{emph} sequences +% (sync with ltfssini.dtx 2019/12/17 v3.1e)} +% \changes{v1.6v}{2020/02/01}{$BDj5A$r(Bpldefs$B$+$i(Bplcore$B$X0\F0(B} +% \begin{macrocode} +%\plIncludeInRelease{2020/02/02}{\DeclareEmphSequence} +% {Nested emph}% +%<*plcore|platexrelease> +\ifx\DeclareEmphSequence\@undefined % old +\DeclareRobustCommand\em + {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi}% +\else +\DeclareRobustCommand\em{% % 2020-02-02 + \@nomath\em + \ifx\emfontdeclare@clist\@empty + \ifdim \fontdimen\@ne\font >\z@ + \eminnershape \else \gtfamily \itshape \fi + \else + \edef\em@currfont{\csname\curr@fontshape/\f@size\endcsname}% + \expandafter\do@emfont@update\emfontdeclare@clist\do@emfont@update + \fi +} +\fi +\def\eminnershape{\mcfamily \upshape}% +% +%\plEndIncludeInRelease +%\plIncludeInRelease{2016/04/17}{\DeclareEmphSequence} +% {Support \eminnershape}% +%\DeclareRobustCommand\em +% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ +% \eminnershape \else \gtfamily \itshape \fi}% +%\def\eminnershape{\mcfamily \upshape}% +%\plEndIncludeInRelease +%\plIncludeInRelease{2015/01/01}{\DeclareEmphSequence} +% {Non-supported \eminnershape}% +%\DeclareRobustCommand\em +% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ +% \mcfamily \upshape \else \gtfamily \itshape \fi} +%\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\DeclareEmphSequence} +% {ASCII Corporation original}% +%\DeclareRobustCommand\em +% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ +% \mcfamily \upshape \else \gtfamily \itshape \fi} +%\let\eminnershape\@undefined +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % % \begin{macro}{\romanprocess@table} % \begin{macro}{\kanjiprocess@table} @@ -2027,6 +2531,7 @@ % \changes{v1.3g}{1999/04/05}{plpatch.ltx$B$NFbMF$rH?1G!#(B % $B$"$j$,$H$&!";3K\$5$s!#(B} % \begin{macrocode} +%<*plcore> \let\romanprocess@table\process@table \def\kanjiprocess@table{% \kanjiencoding{\kanjiencodingdefault}% @@ -2040,6 +2545,7 @@ } \@onlypreamble\romanprocess@table \@onlypreamble\kanjiprocess@table +% % \end{macrocode} % \end{macro} % \end{macro} @@ -2060,7 +2566,6 @@ % $BJd@5$KDI?o$9$k$h$&$K$7$F$$$^$9!#(B % \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B} % \begin{macrocode} -% %\plIncludeInRelease{2017/04/08}{\textunderscore} % {Baseline shift for \textunderscore}% %<*plcore|platexrelease> @@ -2610,6 +3115,39 @@ % \end{macro} % % +% \begin{macro}{\<} +% $B:G8e$K!"(B|\inhibitglue|$B$N4JN,7A$rDj5A$7$^$9!#(B +% $B$3$N%3%^%s%I$O!"OBJ8%U%)%s%H$N%a%H%j%C%/>pJs$+$i!"<+F0E*$KA^F~$5$l$k(B +% $B%0%k!<$NA^F~$r6X;_$7$^$9!#(B +% +% 2014$BG/$N(Bp\TeX{}$B$N(B|\inhibitglue|$B$N%P%0=$@5$KH<$$!"(B +% |\inhibitglue|$B$,?bD>%b!<%I$G$O8z$+$J$/$J$j$^$7$?!#(B +% \LaTeX{}$B$G$O?bD>%b!<%I$H?eJ?%b!<%I$N6hJL$,1#$5$l$F$$$^$9$N$G!"(B +% p\LaTeX{}$B$NDI2CL?Na$G$"$k(B|\<|$B$OCJMnF,$G$b8z$/$h$&$K=$@5$7$^$9!#(B +% +% |\DeclareRobustCommand|$B$r;H$&$H(B|\protect|$B$N1F6A$GA0J}$NJ8;z$KBP$9$k(B +% |\inhibitglue|$B$,8z$+$J$/$J$k$N$G!"(Be-\TeX{}$B$N(B|\protected|$B$,I,MW$G$9!#(B +% \changes{v1.6i}{2017/09/24}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B} +% \changes{v1.6v}{2020/02/01}{$BDj5A$r(Bpldefs$B$+$i(Bplcore$B$X0\F0(B} +% \begin{macrocode} +%\plIncludeInRelease{2017/10/28}{\<} +% {\inhibitglue in vertical mode}% +%<*plcore|platexrelease> +\ifx\protected\@undefined +\def\<{\inhibitglue} +\else +\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} +\fi +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\<} +% {ASCII Corporation original}% +%\def\<{\inhibitglue} +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% % \subsection{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_(B} % $B%G%U%)%k%H@_Dj%U%!%$%k(B\file{pldefs.ltx}$B$O!"$b$H$b$H(B\file{plcore.ltx}$B$NESCf$G(B % $BFI$_9~$s$G$$$^$7$?$,!"(B2018$BG/0J9_$N?7$7$$%3%_%e%K%F%#HG(B\pLaTeX{}$B$G$O(B @@ -2619,8 +3157,6 @@ % \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} % % -% -% % \section{$B%G%U%)%k%H@_Dj%U%!%$%k(B}\label{plfonts:pldefs} % $B$3$3$G$O!"%U%)!<%^%C%H%U%!%$%k$KFI$_9~$^$l$k%G%U%)%k%HCM$r@_Dj$7$F$$$^$9!#(B % $B$3$N@a$G$NFbMF$O(B\file{pldefs.ltx}$B$K=PNO$5$l$^$9!#(B @@ -2634,7 +3170,7 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{pldefs.ltx} - [2019/09/16 v1.6t pLaTeX Kernel (Default settings)] + [2020/02/01 v1.6v pLaTeX Kernel (Default settings)] % % \end{macrocode} % @@ -2673,13 +3209,18 @@ \KanjiEncodingPair{JY1}{JT1} % \end{macrocode} % $B%U%)%s%HB0@-$N%G%U%)%k%HCM!'(B +% \LaTeXe~2019-10-01$B$^$G$O(B|\shapedefault|$B$O(B|\updefault|$B$G$7$?$,!"(B +% \LaTeXe~2020-02-02$B$G(B|\updefault|$B$,(B``n''$B$+$i(B``up''$B$X$H=$@5$5$l$?$3$H$K(B +% $BH<$$!"(B|\shapedefault|$B$OL@<(E*$K(B``n''$B$K@_Dj$5$l$^$7$?!#(B +% \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n'' +% (sync with fontdef.dtx 2019/12/17 v3.0e)} % \begin{macrocode} \newcommand\mcdefault{mc} \newcommand\gtdefault{gt} \newcommand\kanjiencodingdefault{JY1} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\newcommand\kanjishapedefault{\updefault} +\newcommand\kanjishapedefault{n}% formerly \updefault % \end{macrocode} % $BOBJ8%(%s%3!<%I$N;XDj!'(B % \begin{macrocode} @@ -2700,57 +3241,6 @@ \fontencoding{JY1}\selectfont % \end{macrocode} % -% \begin{macro}{\textmc} -% \begin{macro}{\textgt} -% \changes{v1.3b}{1997/01/28}{\cs{textmc}, \cs{textgt}$B$NF0:n=$@5(B} -% $B%F%-%9%H%U%!%_%j$r@Z$jBX$($k$?$a$N%3%^%s%I$G$9!#(B -% \file{ltfntcmd.dtx}$B$GDj5A$5$l$F$$$k(B|\textrm|$B$J$I$KBP1~$7$^$9!#(B -% \begin{macrocode} -\DeclareTextFontCommand{\textmc}{\mcfamily} -\DeclareTextFontCommand{\textgt}{\gtfamily} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\em} -% \begin{macro}{\emph} -% \begin{macro}{\eminnershape} -% \changes{v1.3d}{1997/06/25}{\cs{em},\cs{emph}$B$GOBJ8$r6/D4=qBN$K(B} -% \changes{v1.6}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}$B$G$N(B\cs{em}$B$N(B -% $BDj5AJQ99$KBP1~!#(B\cs{eminnershape}$B$rDI2C!#(B} -% $B=>Mh$O(B|\em|, |\emph|$B$GOBJ8%U%)%s%H$N@Z$jBX$($O9T$C$F$$$^$;$s$G$7$?$,!"(B -% $BOBJ8%U%)%s%H$b(B|\gtfamily|$B$K@Z$jBX$($k$h$&$K$7$^$7$?!#(B -% \LaTeX\ \texttt{<2015/01/01>}$B$GDI2C$5$l$?(B|\eminnershape|$B$bl9g$N=qBN$r<+M3$K:FDj5A$G$-$k$h$&$K$J$j$^$7$?!#(B -% \begin{macrocode} -% -%\plIncludeInRelease{2016/04/17}{\eminnershape}{\eminnershape}% -%<*pldefs|platexrelease> -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \gtfamily \itshape \fi}% -\def\eminnershape{\mcfamily \upshape}% -% -%\plEndIncludeInRelease -%\plIncludeInRelease{2015/01/01}{\eminnershape}{\eminnershape}% -%\DeclareRobustCommand\em -% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -% \mcfamily \upshape \else \gtfamily \itshape \fi} -%\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\eminnershape}{\eminnershape}% -%\DeclareRobustCommand\em -% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -% \mcfamily \upshape \else \gtfamily \itshape \fi} -%\let\eminnershape\@undefined -%\plEndIncludeInRelease -%<*pldefs> -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% -% % \changes{v1.3b}{1997/01/30}{$B?t<0MQ%U%)%s%H$N@k8@$r%/%i%9%U%!%$%k$K0\F0$7$?(B} % % @@ -2828,39 +3318,6 @@ \jcharwidowpenalty=500 % \end{macrocode} % -% \begin{macro}{\<} -% $B:G8e$K!"(B|\inhibitglue|$B$N4JN,7A$rDj5A$7$^$9!#(B -% $B$3$N%3%^%s%I$O!"OBJ8%U%)%s%H$N%a%H%j%C%/>pJs$+$i!"<+F0E*$KA^F~$5$l$k(B -% $B%0%k!<$NA^F~$r6X;_$7$^$9!#(B -% -% 2014$BG/$N(Bp\TeX{}$B$N(B|\inhibitglue|$B$N%P%0=$@5$KH<$$!"(B -% |\inhibitglue|$B$,?bD>%b!<%I$G$O8z$+$J$/$J$j$^$7$?!#(B -% \LaTeX{}$B$G$O?bD>%b!<%I$H?eJ?%b!<%I$N6hJL$,1#$5$l$F$$$^$9$N$G!"(B -% p\LaTeX{}$B$NDI2CL?Na$G$"$k(B|\<|$B$OCJMnF,$G$b8z$/$h$&$K=$@5$7$^$9!#(B -% -% |\DeclareRobustCommand|$B$r;H$&$H(B|\protect|$B$N1F6A$GA0J}$NJ8;z$KBP$9$k(B -% |\inhibitglue|$B$,8z$+$J$/$J$k$N$G!"(Be-\TeX{}$B$N(B|\protected|$B$,I,MW$G$9!#(B -% \changes{v1.6i}{2017/09/24}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B} -% \begin{macrocode} -% -%\plIncludeInRelease{2017/10/28}{\<} -% {\inhibitglue in vertical mode}% -%<*pldefs|platexrelease> -\ifx\protected\@undefined -\def\<{\inhibitglue} -\else -\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} -\fi -% -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\<} -% {ASCII Corporation original}% -%\def\<{\inhibitglue} -%\plEndIncludeInRelease -%<*pldefs> -% \end{macrocode} -% \end{macro} -% % $B$3$3$^$G$,!"(B\file{pldefs.ltx}$B$NFbMF$G$9!#(B % \begin{macrocode} % diff --git a/language/japanese/platex/plvers.dtx b/language/japanese/platex/plvers.dtx index 0087b31ef4..7be5ca9cc0 100644 --- a/language/japanese/platex/plvers.dtx +++ b/language/japanese/platex/plvers.dtx @@ -3,7 +3,7 @@ % % Copyright 1995-2006 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -92,12 +92,13 @@ % \changes{v1.1p}{2019/09/16}{$B%(%i!<%a%C%;!<%8$r99?7(B % (sync with ltvers.dtx 2019/07/01 v1.1c)} % \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}$BHGBP1~3NG'(B} +% \changes{v1.1r}{2020/02/01}{\LaTeX\ \texttt{!<2020-02-02!>}$BHGBP1~3NG'(B} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2019/10/01 v1.1q pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2020/02/01 v1.1r pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -136,6 +137,7 @@ % \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}$BHGBP1~3NG'(B} % \changes{v1.1o}{2018/12/01}{\LaTeX\ \texttt{!<2018-12-01!>}$BHGBP1~3NG'(B} % \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}$BHGBP1~3NG'(B} +% \changes{v1.1r}{2020/02/01}{\LaTeX\ \texttt{!<2020-02-02!>}$BHGBP1~3NG'(B} % % $B$3$N%P!<%8%g%s$N(Bp\LaTeXe{}$B$O!"\edef\latexreleaseversion %\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2019-10-01} + {2020-02-02} % % \end{macrocode} % @@ -190,10 +192,10 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2019-10-01} + {2020-02-02} % %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{0} % % \end{macrocode} % \end{macro} diff --git a/language/japanese/uplatex/LICENSE b/language/japanese/uplatex/LICENSE index fa08676706..1c7b99eea0 100644 --- a/language/japanese/uplatex/LICENSE +++ b/language/japanese/uplatex/LICENSE @@ -1,6 +1,6 @@ Copyright (c) 2010 ASCII MEDIA WORKS Copyright (c) 2016 Takuji Tanaka -Copyright (c) 2016-2019 Japanese TeX Development Community +Copyright (c) 2016-2020 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/language/japanese/uplatex/README.md b/language/japanese/uplatex/README.md index 4ed32cfe3b..c7d913897a 100644 --- a/language/japanese/uplatex/README.md +++ b/language/japanese/uplatex/README.md @@ -1,7 +1,10 @@ # uplatex -The bundle provides pLaTeX2e macros for [upTeX by Takuji Tanaka](http://www.t-lab.opal.ne.jp/tex/uptex_en.html). -This is a community edition syncing with [platex](https://github.com/texjporg/platex). +The bundle provides pLaTeX2e format +for [upTeX by Takuji Tanaka](http://www.t-lab.opal.ne.jp/tex/uptex_en.html). +This is a community edition maintained by +[Japanese TeX Development Community](http://texjp.org), +syncing with [platex](https://github.com/texjporg/platex). ## Repository @@ -17,6 +20,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2019-10-21 +2020-02-02 Japanese TeX Development Community diff --git a/language/japanese/uplatex/README_uplatex.txt b/language/japanese/uplatex/README_uplatex.txt index ec866e7749..bf24259187 100644 --- a/language/japanese/uplatex/README_uplatex.txt +++ b/language/japanese/uplatex/README_uplatex.txt @@ -16,7 +16,7 @@ upLaTeX standard format files and class files uplfonts.dtx: for font files. ukinsoku.dtx: for kinsoku file. ujclasses.dtx: for class files. - Document (*.dvi) ganeration has not been checked yet. + Document (*.dvi) generation has not been checked yet. ## fd files, cls files, sty files, tex files these are generated by uptex and above sources. diff --git a/language/japanese/uplatex/ujclasses.dtx b/language/japanese/uplatex/ujclasses.dtx index 98581b7f8b..1cc6c91c99 100644 --- a/language/japanese/uplatex/ujclasses.dtx +++ b/language/japanese/uplatex/ujclasses.dtx @@ -7,7 +7,7 @@ % % Copyright (c) 2010 ASCII MEDIA WORKS % Copyright (c) 2016 Takuji Tanaka -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the upLaTeX2e system (community edition). % -------------------------------------------------------------- @@ -115,6 +115,13 @@ % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに % (sync with classes.dtx 2019/08/27 v1.4j)} % \changes{v1.8c-u00}{2019/10/17}{p\LaTeX{}用に追随} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (sync with classes.dtx 2019/10/25 v1.4k)} +% \changes{v1.8d-u00}{2019/10/25}{p\LaTeX{}用に追随} +% \changes{v1.8e}{2020/01/03}{Normalize label fonts +% (sync with classes.dtx 2019/12/20 v1.4l)} +% \changes{v1.8e-u00}{2020/01/03}{p\LaTeX{}用に追随} % \fi % % \iffalse @@ -144,7 +151,7 @@ %<11pt&bk>\ProvidesFile{utbk11.clo} %<12pt&bk>\ProvidesFile{utbk12.clo} % - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 % Standard upLaTeX class] %<10pt|11pt|12pt> Standard upLaTeX file (size option)] %<*driver> @@ -633,10 +640,17 @@ % カーネルの定義を|\renewcommand|した後に|\MakeRobust|を使っている理由は、 % ログに |LaTeX Info: Redefining \normalsize on input line ...| という % メッセージを出したくないからです。 +% ただし、\textsf{latexrelease}パッケージで2015/01/01より +% 昔の日付に巻き戻っている場合は|\MakeRobust|が定義されていません。 % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに % (sync with classes.dtx 2019/08/27 v1.4j)} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (sync with classes.dtx 2019/10/25 v1.4k)} % \begin{macrocode} -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi % \end{macrocode} % \end{macro} % \end{macro} @@ -3363,17 +3377,20 @@ % itemize環境のそれぞれの項目のラベルは、 % |\labelenumi| \ldots\ |\labelenumiv|で生成されます。 % \changes{v1.1a}{1997/01/28}{Bug fix: \cs{labelitemii}.} +% \changes{v1.8e}{2020/01/03}{Normalize label fonts +% (sync with classes.dtx 2019/12/20 v1.4l)} % \begin{macrocode} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \iftdir - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/language/japanese/uplatex/upldoc.pdf b/language/japanese/uplatex/upldoc.pdf index bdeadf5d1d..9e1372c8ae 100644 Binary files a/language/japanese/uplatex/upldoc.pdf and b/language/japanese/uplatex/upldoc.pdf differ diff --git a/language/japanese/uplatex/uplfonts.dtx b/language/japanese/uplatex/uplfonts.dtx index d6824c94d4..0ce9aa830f 100644 --- a/language/japanese/uplatex/uplfonts.dtx +++ b/language/japanese/uplatex/uplfonts.dtx @@ -7,7 +7,7 @@ % % Copyright (c) 2010 ASCII MEDIA WORKS % Copyright (c) 2016 Takuji Tanaka -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the upLaTeX2e system (community edition). % -------------------------------------------------------------- @@ -72,13 +72,15 @@ % (based on plfonts.dtx 2018/07/03 v1.6q)} % \changes{v1.6t-u02}{2019/09/22}{p\LaTeX{}の変更に追随。 % (based on plfonts.dtx 2019/09/16 v1.6t)} +% \changes{v1.6v-u02}{2020/02/01}{p\LaTeX{}の変更に追随。 +% (based on plfonts.dtx 2020/02/01 v1.6v)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{uplfonts.dtx}[2019/09/22 v1.6t-u02 upLaTeX New Font Selection Scheme] +\ProvidesFile{uplfonts.dtx}[2020/02/01 v1.6v-u02 upLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{uplfonts.dtx} @@ -169,8 +171,6 @@ % (based on plfonts.dtx 2017/12/05 v1.6k)} % % -% -% % \section{デフォルト設定ファイル}\label{plfonts:pldefs} % ここでは、フォーマットファイルに読み込まれるデフォルト値を設定しています。 % この節での内容は\file{upldefs.ltx}に出力されます。 @@ -184,7 +184,7 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{upldefs.ltx} - [2019/09/22 v1.6t-u02 upLaTeX Kernel (Default settings)] + [2020/02/01 v1.6v-u02 upLaTeX Kernel (Default settings)] % % \end{macrocode} % @@ -224,13 +224,18 @@ \KanjiEncodingPair{JY2}{JT2} % \end{macrocode} % フォント属性のデフォルト値: +% \LaTeXe~2019-10-01までは|\shapedefault|は|\updefault|でしたが、 +% \LaTeXe~2020-02-02で|\updefault|が``n''から``up''へと修正されたことに +% 伴い、|\shapedefault|は明示的に``n''に設定されました。 +% \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n'' +% (sync with fontdef.dtx 2019/12/17 v3.0e)} % \begin{macrocode} \newcommand\mcdefault{mc} \newcommand\gtdefault{gt} \newcommand\kanjiencodingdefault{JY2} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\newcommand\kanjishapedefault{\updefault} +\newcommand\kanjishapedefault{n}% formerly \updefault % \end{macrocode} % 和文エンコードの指定: % \begin{macrocode} @@ -251,57 +256,6 @@ \fontencoding{JY2}\selectfont % \end{macrocode} % -% \begin{macro}{\textmc} -% \begin{macro}{\textgt} -% \changes{v1.3b}{1997/01/28}{\cs{textmc}, \cs{textgt}の動作修正} -% テキストファミリを切り替えるためのコマンドです。 -% \file{ltfntcmd.dtx}で定義されている|\textrm|などに対応します。 -% \begin{macrocode} -\DeclareTextFontCommand{\textmc}{\mcfamily} -\DeclareTextFontCommand{\textgt}{\gtfamily} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\em} -% \begin{macro}{\emph} -% \begin{macro}{\eminnershape} -% \changes{v1.3d}{1997/06/25}{\cs{em},\cs{emph}で和文を強調書体に} -% \changes{v1.6}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}での\cs{em}の -% 定義変更に対応。\cs{eminnershape}を追加。} -% 従来は|\em|, |\emph|で和文フォントの切り替えは行っていませんでしたが、 -% 和文フォントも|\gtfamily|に切り替えるようにしました。 -% \LaTeX\ \texttt{<2015/01/01>}で追加された|\eminnershape|も取り入れ、 -% 強調コマンドを入れ子にする場合の書体を自由に再定義できるようになりました。 -% \begin{macrocode} -% -%\plIncludeInRelease{2016/04/17}{\eminnershape}{\eminnershape}% -%<*pldefs|platexrelease> -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \gtfamily \itshape \fi}% -\def\eminnershape{\mcfamily \upshape}% -% -%\plEndIncludeInRelease -%\plIncludeInRelease{2015/01/01}{\eminnershape}{\eminnershape}% -%\DeclareRobustCommand\em -% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -% \mcfamily \upshape \else \gtfamily \itshape \fi} -%\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\eminnershape}{\eminnershape}% -%\DeclareRobustCommand\em -% {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -% \mcfamily \upshape \else \gtfamily \itshape \fi} -%\let\eminnershape\@undefined -%\plEndIncludeInRelease -%<*pldefs> -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% -% % \changes{v1.3b}{1997/01/30}{数式用フォントの宣言をクラスファイルに移動した} % % @@ -379,39 +333,6 @@ \jcharwidowpenalty=500 % \end{macrocode} % -% \begin{macro}{\<} -% 最後に、|\inhibitglue|の簡略形を定義します。 -% このコマンドは、和文フォントのメトリック情報から、自動的に挿入される -% グルーの挿入を禁止します。 -% -% 2014年のp\TeX{}の|\inhibitglue|のバグ修正に伴い、 -% |\inhibitglue|が垂直モードでは効かなくなりました。 -% \LaTeX{}では垂直モードと水平モードの区別が隠されていますので、 -% p\LaTeX{}の追加命令である|\<|は段落頭でも効くように修正します。 -% -% |\DeclareRobustCommand|を使うと|\protect|の影響で前方の文字に対する -% |\inhibitglue|が効かなくなるので、e-\TeX{}の|\protected|が必要です。 -% \changes{v1.6i}{2017/09/24}{\cs{<}が段落頭でも効くようにした} -% \begin{macrocode} -% -%\plIncludeInRelease{2017/10/28}{\<} -% {\inhibitglue in vertical mode}% -%<*pldefs|platexrelease> -\ifx\protected\@undefined -\def\<{\inhibitglue} -\else -\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} -\fi -% -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\<} -% {ASCII Corporation original}% -%\def\<{\inhibitglue} -%\plEndIncludeInRelease -%<*pldefs> -% \end{macrocode} -% \end{macro} -% % ここまでが、\file{pldefs.ltx}の内容です。 % \begin{macrocode} % diff --git a/language/japanese/uplatex/uplvers.dtx b/language/japanese/uplatex/uplvers.dtx index f6f8869e84..09078835be 100644 --- a/language/japanese/uplatex/uplvers.dtx +++ b/language/japanese/uplatex/uplvers.dtx @@ -7,7 +7,7 @@ % % Copyright (c) 2010 ASCII MEDIA WORKS % Copyright (c) 2016 Takuji Tanaka -% Copyright (c) 2016-2019 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the upLaTeX2e system (community edition). % -------------------------------------------------------------- @@ -65,12 +65,13 @@ % \changes{v1.1h-u02}{2018/02/18}{p\LaTeX{}の変更に追随。 % (based on plvers.dtx 2018/01/10 v1.1h)} % \changes{v1.1i-u02}{2018/03/31}{p\LaTeXe\ 2018/03/09以降必須} +% \changes{v1.1r-u03}{2020/02/01}{p\LaTeXe\ 2020/02/02以降必須} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{uplvers.dtx}[2018/03/31 v1.1i-u02 upLaTeX Kernel (Version Info)] +\ProvidesFile{uplvers.dtx}[2020/02/01 v1.1r-u03 upLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{uplvers.dtx} @@ -87,17 +88,18 @@ % \section{up\LaTeXe{}のバージョンの設定} % まず、このディストリビューションでのup\LaTeXe{}の日付とバージョン番号 % を定義します。 -% このバージョンのup\LaTeXe{}のフォーマット作成では、 +% 2018/03/09以降、up\LaTeXe{}のフォーマット作成では % p\LaTeXe{}が提供する\file{plcore.ltx}の後から % \file{uplcore.ltx}が読まれなければなりません。 -% +% また、2020/02/02以降は|\textmc|や|\em|の定義も +% \file{upldefs.ltx}ではなく共通の\file{plcore.ltx}に依存します。 +% そのため、p\LaTeX{}のバージョンを確認します。 % \changes{v1.0q-u00}{2011/05/07}{p\LaTeX{}用からup\LaTeX{}用に修正。 % (based on plvers.dtx 2006/11/10 v1.0q)} % \changes{v1.1g-u02}{2017/12/10}{p\LaTeX{}との統合のため、 % up\LaTeX{}のバージョンと最小限の変更だけを定義するようにした} -% -% まず、次のバージョンのp\LaTeX{}が利用可能なことを確認します。 % \changes{v1.1i-u02}{2018/03/31}{p\LaTeXe\ 2018/03/09以降必須} +% \changes{v1.1r-u03}{2020/02/01}{p\LaTeXe\ 2020/02/02以降必須} % \begin{macrocode} %<*plcore> \ifx\pfmtversion\@undefined @@ -110,12 +112,12 @@ removing old `uplatex.ltx' and install the latest one}\@@end \else - \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20180309 + \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20200202 \errhelp{Please update your TeX installation; if not available, obtain it^^Jmanually from CTAN (https://ctan.org/pkg/platex) or from^^JGitHub (https://github.com/texjporg/platex).}% - \errmessage{This version of upLaTeX2e requires pLaTeX2e 2018/03/09 + \errmessage{This version of upLaTeX2e requires pLaTeX2e 2020/02/02 or newer!^^JObtain a newer version of `platex', otherwise upLaTeX2e setup will^^Jnever succeed}\@@end \fi @@ -128,11 +130,11 @@ % \begin{macro}{\ppatch@level} % up\LaTeXe{}のフォーマットファイル名とバージョンです。 % フォーマット名はp\LaTeXe{}のもの (\pfmtname) をそのまま引き継ぎ、 -% バージョンはp\LaTeXe{}のものの末尾に``u02''のようにサフィックスを付けます。 +% バージョンはp\LaTeXe{}のものの末尾に``u03''のようにサフィックスを付けます。 % \begin{macrocode} %<*plcore> %\def\pfmtname{pLaTeX2e} -\def\uppatch@level{u02} +\def\uppatch@level{u03} \edef\pfmtversion{\pfmtversion\uppatch@level} % % \end{macrocode} diff --git a/language/japanese/zxjafont/README-ja.md b/language/japanese/zxjafont/README-ja.md index c2b7d22c88..7bc8c16f70 100644 --- a/language/japanese/zxjafont/README-ja.md +++ b/language/japanese/zxjafont/README-ja.md @@ -36,6 +36,10 @@ zxjafont パッケージ ー 本体 更新履歴 -------- + * Version 1.0 〈2020/02/02〉 + - 3 ウェイトのサポート。`(no)threeweight` オプション追加。 + - xeCJK 読込時も和文前提の処理に切り替える。 + - オプション追加:`(no)ignorejatype`。 * Version 0.7 〈2020/01/18〉 - オプション追加:`(no)bold`、`nojisshape`。 - オプション別名:`(no)deluxe`。 diff --git a/language/japanese/zxjafont/README.md b/language/japanese/zxjafont/README.md index bc744ea05e..286ff82bca 100644 --- a/language/japanese/zxjafont/README.md +++ b/language/japanese/zxjafont/README.md @@ -39,6 +39,11 @@ Please refer to the manual `zxjafont.pdf` (in Japanese) for detail. Revision History ---------------- + * Version 1.0 〈2020/02/02〉 + - Now multiweight presets offer three weights per family. New + option `(no)threeweight` is added. + - Now use of xeCJK activates the Japanese-font mode. + - New option: `(no)ignorejatype`. * Version 0.7 〈2020/01/18〉 - New options: `(no)bold`, `nojisshape`. - New option aliases: `(no)deluxe`. diff --git a/language/japanese/zxjafont/zxjafont.pdf b/language/japanese/zxjafont/zxjafont.pdf index a5fa8dc459..a746330b27 100644 Binary files a/language/japanese/zxjafont/zxjafont.pdf and b/language/japanese/zxjafont/zxjafont.pdf differ diff --git a/language/japanese/zxjafont/zxjafont.sty b/language/japanese/zxjafont/zxjafont.sty index f9172fec5e..80805e118d 100644 --- a/language/japanese/zxjafont/zxjafont.sty +++ b/language/japanese/zxjafont/zxjafont.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{zxjafont}[2020/01/18 v0.7] +\ProvidesPackage{zxjafont}[2020/02/02 v1.0] \def\zxjf@pkgname{zxjafont} %% preparation @@ -33,6 +33,10 @@ \PackageError\zxjf@pkgname {Invalid value '#2' for option #1}\@ehc} +%% switch 'fontspec@mw' +\newif\ifzxjf@fontspec@mw +\@ifpackagelater{fontspec}{2014/06/01}{\zxjf@fontspec@mwtrue}{}% v2.4 + %% \zxjf@cond\ifXXX...\fi{}{} \@gobbletwo\if\if \def\zxjf@cond#1\fi{% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} @@ -63,17 +67,27 @@ \chardef\zxjf@cjkshape@@none=0 \chardef\zxjf@cjkshape@@xc=1 % 90jis \chardef\zxjf@cjkshape@@mmiv=2 % jis2004 +\chardef\zxjf@jatype@@none=0 +\chardef\zxjf@jatype@@xeCJK=1 +\chardef\zxjf@jatype@@zxjatype=2 %% variables \let\zxjf@main@preset\relax \let\zxjf@sub@preset\@empty \newif\ifzxjf@prop \newif\ifzxjf@oneweight +\newif\ifzxjf@threeweight \newif\ifzxjf@bold \let\zxjf@cjkshape\zxjf@cjkshape@@none \let\zxjf@scale\relax \let\zxjf@feature\@empty -\newif\ifzxjf@zxjatype +\let\zxjf@jatype\zxjf@jatype@@none +\newif\ifzxjf@ignore@jatype + +%% default for 'threeweight' +\ifzxjf@fontspec@mw + \zxjf@threeweighttrue +\fi %% \zxjf@all@main@preset \zxjf@onlypreamble@def\zxjf@all@main@preset{% @@ -107,6 +121,9 @@ \DeclareOption{nooneweight}{\zxjf@oneweightfalse} \DeclareOption{nodeluxe}{\zxjf@oneweighttrue} \DeclareOption{deluxe}{\zxjf@oneweightfalse} +% 'threeweight' +\DeclareOption{threeweight}{\zxjf@threeweighttrue} +\DeclareOption{nothreeweight}{\zxjf@threeweightfalse} % 'bold' \DeclareOption{bold}{\zxjf@boldtrue} \DeclareOption{nobold}{\zxjf@boldfalse} @@ -116,6 +133,9 @@ \DeclareOption{jis2004}{\let\zxjf@cjkshape\zxjf@cjkshape@@mmiv} \DeclareOption{2004jis}{\let\zxjf@cjkshape\zxjf@cjkshape@@mmiv} \DeclareOption{nojisshape}{\let\zxjf@cjkshape\zxjf@cjkshape@@none} +% 'ignorejatype' +\DeclareOption{ignorejatype}{\zxjf@ignore@jatypetrue} +\DeclareOption{noignorejatype}{\zxjf@ignore@jatypefalse} % dummy options for compatibility with luatexja-preset \DeclareOption{match}{}% xeCJK always work as 'match' is on \DeclareOption{expert}{\zxjf@warn@niopt{expert}} @@ -150,26 +170,41 @@ \space\space\zxjf@all@main@preset} \expandafter\endinput\fi\relax -%% detect zxjatype -\@ifpackageloaded{zxjatype}{\zxjf@zxjatypetrue}{} -\AtBeginDocument{% - \unless\ifzxjf@zxjatype - \@ifpackageloaded{zxjatype}{% - \PackageError\zxjf@pkgname - {zxjatype must be loaded before me}\@ehc - }{}% - \fi} -\ifzxjf@zxjatype\ifzxjf@prop +%% detect zxjatype/xeCJK +\unless\ifzxjf@ignore@jatype + \@ifpackageloaded{xeCJK}{\let\zxjf@jatype\zxjf@jatype@@xeCJK}{} + \@ifpackageloaded{zxjatype}{\let\zxjf@jatype\zxjf@jatype@@zxjatype}{} + \ifnum\zxjf@jatype=\zxjf@jatype@@none + \AtBeginDocument{% + \@ifpackageloaded{xeCJK}{% + \PackageError\zxjf@pkgname + {zxjatype/xeCJK must be loaded before zxjafont}\@ehc + }{}% + } + \fi +\fi + +%% check for 'prop' +\unless\ifnum\zxjf@jatype=\zxjf@jatype@@none\ifzxjf@prop \PackageError\zxjf@pkgname - {Option 'prop' cannot be used with zxjatype}\@ehc + {Option 'prop' cannot be used with zxjatype/xeCJK}\@ehc \zxjf@propfalse \fi\fi +%% check for 'threeweight' +\unless\ifzxjf@fontspec@mw\ifzxjf@threeweight + \PackageError\zxjf@pkgname + {Option 'threeweight' cannot be used, bebause\MessageBreak + your 'fontspec' is too old} + {\@ehc} + \zxjf@threeweightfalse +\fi\fi + %% decide scale factor \ifx\zxjf@scale\relax % If zxjatype is used, try \zxjatypeJaScale, \zxjt@scale, % and \__zxjt_scale_tl. - \ifzxjf@zxjatype + \ifnum\zxjf@jatype=\zxjf@jatype@@zxjatype \ifdefined\zxjatypeJaScale \let\zxjf@scale\zxjatypeJaScale \else\if\zxjf@isvalid{zxjt@scale}\let\zxjf@scale\zxjt@scale \else\if\zxjf@isvalid{__zxjt_scale_tl}% @@ -222,7 +257,12 @@ #3{##1}[#2,##2]{##3}}} %% \zxjf@setmainfont{}{}, etc. -\ifzxjf@zxjatype +\ifnum\zxjf@jatype=\zxjf@jatype@@xeCJK +\edef\zxjf@setmainfont#1{\zxjf@font@set\setCJKmainfont{#1}} +\edef\zxjf@setsansfont#1{\zxjf@font@set\setCJKsansfont{#1}} +\edef\zxjf@setmonofont#1{\zxjf@font@set\setCJKmonofont{#1}} +\zxjf@newfamily@gen{\setCJKfamilyfont} +\else\ifnum\zxjf@jatype=\zxjf@jatype@@zxjatype \edef\zxjf@setmainfont#1{\zxjf@font@set\setjamainfont{#1}} \edef\zxjf@setsansfont#1{\zxjf@font@set\setjasansfont{#1}} \edef\zxjf@setmonofont#1{\zxjf@font@set\setjamonofont{#1}} @@ -234,7 +274,7 @@ \edef\zxjf@newfamily#1#2{% \unexpanded{\zxjf@with@cs\newfontfamily}{#1family}% [\expandonce\zxjf@whole@feature,#2]} -\fi +\fi\fi %--------------------------------------- preset japanese font mappings @@ -246,20 +286,27 @@ \zxjf@setmainfont{#3,BoldFont=#2}{#1}% \zxjf@setsansfont{#3,BoldFont=#2}{#2}% \zxjf@setmonofont{#3,BoldFont=#2}{#2}} -\zxjf@onlypreamble@def\zxjf@multiweight#1#2#3#4#5#6{% +\zxjf@onlypreamble@def\zxjf@multiweight#1#2#3#4#5#6#7#8{% \ifzxjf@bold - \zxjf@setmainfont{#6,BoldFont=#4}{#1}% - \zxjf@setsansfont{#6,BoldFont=#4}{#4}% - \zxjf@setmonofont{#6,BoldFont=#4}{#4}% + \zxjf@setmainfont{#8,BoldFont=#5}{#2}% + \zxjf@setsansfont{#8,BoldFont=#5}{#5}% + \zxjf@setmonofont{#8,BoldFont=#5}{#5}% \else\ifzxjf@oneweight - \zxjf@setmainfont{#6,BoldFont=#5}{#1}% - \zxjf@setsansfont{#6,BoldFont=#5}{#5}% - \zxjf@setmonofont{#6,BoldFont=#5}{#5}% + \zxjf@setmainfont{#8,BoldFont=#7}{#2}% + \zxjf@setsansfont{#8,BoldFont=#7}{#7}% + \zxjf@setmonofont{#8,BoldFont=#7}{#7}% + \else\ifzxjf@threeweight + \zxjf@setmainfont{#8,BoldFont=#3, + FontFace={l}{n}{#1}}{#2}% + \zxjf@setsansfont{#8,BoldFont=#5, + FontFace={eb}{n}{#6}}{#4}% + \zxjf@setmonofont{#8,BoldFont=#5, + FontFace={eb}{n}{#6}}{#4}% \else - \zxjf@setmainfont{#6,BoldFont=#2}{#1}% - \zxjf@setsansfont{#6,BoldFont=#4}{#3}% - \zxjf@setmonofont{#6,BoldFont=#4}{#3}% - \fi\fi} + \zxjf@setmainfont{#8,BoldFont=#3}{#2}% + \zxjf@setsansfont{#8,BoldFont=#5}{#4}% + \zxjf@setmonofont{#8,BoldFont=#5}{#4}% + \fi\fi\fi} %% \zxjf@declare@preset@with@prop{}{} \zxjf@onlypreamble@def\zxjf@declare@preset@with@prop#1#2{% \zxjf@declare@preset{#1}{#2{RawFeature=-palt;-kern}}% @@ -287,94 +334,94 @@ \zxjf@declare@preset{ms/prop}{% \zxjf@uniweight{MS-PMincho}{MS-PGothic}{}} \zxjf@declare@preset{ms-hg}{% - \zxjf@multiweight{MS-Mincho}{HGMinchoE}% - {HGGothicM}{HGGothicE}{MS-Gothic}{}} + \zxjf@multiweight{MS-Mincho}{MS-Mincho}{HGMinchoE}% + {HGGothicM}{HGGothicE}{hgrsgu.ttc}{MS-Gothic}{}} \zxjf@declare@preset{ms-hg/prop}{% - \zxjf@multiweight{MS-PMincho}{HGPMinchoE}% - {HGPGothicM}{HGGothicE}{MS-PGothic}{}} + \zxjf@multiweight{MS-PMincho}{MS-PMincho}{HGPMinchoE}% + {HGPGothicM}{HGGothicE}{hgrsgu.ttc}{MS-PGothic}{}} \zxjf@declare@preset{ipa}{% \zxjf@uniweight{IPAMincho}{IPAGothic}{}} \zxjf@declare@preset{ipa/prop}{% \zxjf@uniweight{IPAPMincho}{IPAPGothic}{}} \zxjf@declare@preset{ipa-hg}{% - \zxjf@multiweight{IPAMincho}{HGMinchoE}% - {HGGothicM}{HGGothicE}{IPAGothic}{}} + \zxjf@multiweight{IPAMincho}{IPAMincho}{HGMinchoE}% + {HGGothicM}{HGGothicE}{hgrsgu.ttc}{IPAGothic}{}} \zxjf@declare@preset{ipa-hg/prop}{% - \zxjf@multiweight{IPAPMincho}{HGPMinchoE}% - {HGPGothicM}{HGGothicE}{IPAPGothic}{}} + \zxjf@multiweight{IPAPMincho}{IPAPMincho}{HGPMinchoE}% + {HGPGothicM}{HGGothicE}{hgrsgu.ttc}{IPAPGothic}{}} \zxjf@declare@preset{ipaex}{% \zxjf@uniweight{ipaexm.ttf}{ipaexg.ttf}{}} \zxjf@declare@preset{ipaex-hg}{% - \zxjf@multiweight{ipaexm.ttf}{HGSMinchoE}% - {HGSGothicM}{HGSGothicE}{ipaexg.ttf}{}} + \zxjf@multiweight{ipaexm.ttf}{ipaexm.ttf}{HGSMinchoE}% + {HGSGothicM}{HGSGothicE}{hgrsgu.ttc}{ipaexg.ttf}{}} \zxjf@declare@preset{moga}{% - \zxjf@multiweight{MogaExMincho}{MogaExMincho Bold}% - {MogaExGothic}{MogaExGothic Bold}{MogaExGothic}{}} + \zxjf@multiweight{MogaExMincho}{MogaExMincho}{MogaExMincho Bold}% + {MogaExGothic}{MogaExGothic Bold}{MogaExGothic Bold}{MogaExGothic}{}} \zxjf@declare@preset{moga-90}{% - \zxjf@multiweight{MogaEx90Mincho}{MogaEx90Mincho Bold}% - {MogaEx90Gothic}{MogaEx90Gothic Bold}{MogaEx90Gothic}{}} + \zxjf@multiweight{MogaEx90Mincho}{MogaEx90Mincho}{MogaEx90Mincho Bold}% + {MogaEx90Gothic}{MogaEx90Gothic Bold}{MogaEx90Gothic Bold}{MogaEx90Gothic}{}} \zxjf@declare@preset{ume}{% - \zxjf@multiweight{Ume Mincho}{Ume Mincho}% - {Ume Gothic}{Ume Gothic O5}{Ume Gothic O5}{}} + \zxjf@multiweight{Ume Mincho}{Ume Mincho}{Ume Mincho}% + {Ume Gothic}{Ume Gothic O5}{Ume Gothic O5}{Ume Gothic O5}{}} \zxjf@declare@preset@with@prop{kozuka-pro}{% - \zxjf@multiweight{KozMinPro-Regular}{KozMinPro-Bold}% - {KozGoPro-Regular}{KozGoPro-Bold}% + \zxjf@multiweight{KozMinPro-Light}{KozMinPro-Regular}{KozMinPro-Bold}% + {KozGoPro-Regular}{KozGoPro-Bold}{KozGoPro-Heavy}% {KozGoPro-Medium}} \zxjf@declare@preset@with@prop{kozuka-pr6}{% - \zxjf@multiweight{KozMinProVI-Regular}{KozMinProVI-Bold}% - {KozGoProVI-Regular}{KozGoProVI-Bold}% + \zxjf@multiweight{KozMinProVI-Light}{KozMinProVI-Regular}{KozMinProVI-Bold}% + {KozGoProVI-Regular}{KozGoProVI-Bold}{KozGoProVI-Heavy}% {KozGoProVI-Medium}} \zxjf@declare@preset@with@prop{kozuka-pr6n}{% - \zxjf@multiweight{KozMinPr6N-Regular}{KozMinPr6N-Bold}% - {KozGoPr6N-Regular}{KozGoPr6N-Bold}% + \zxjf@multiweight{KozMinPr6N-Light}{KozMinPr6N-Regular}{KozMinPr6N-Bold}% + {KozGoPr6N-Regular}{KozGoPr6N-Bold}{KozGoPr6N-Heavy}% {KozGoPr6N-Medium}} \zxjf@declare@preset@with@prop{hiragino-pro}{% - \zxjf@multiweight{Hiragino Mincho Pro W3}{Hiragino Mincho Pro W6}% - {Hiragino Kaku Gothic Pro W3}{Hiragino Kaku Gothic Pro W6}% + \zxjf@multiweight{Hiragino Mincho Pro W2}{Hiragino Mincho Pro W3}{Hiragino Mincho Pro W6}% + {Hiragino Kaku Gothic Pro W3}{Hiragino Kaku Gothic Pro W6}{Hiragino Kaku Gothic Std W8}% {Hiragino Kaku Gothic Pro W6}} \zxjf@declare@preset@with@prop{hiragino-pron}{% - \zxjf@multiweight{Hiragino Mincho ProN W3}{Hiragino Mincho ProN W6}% - {Hiragino Kaku Gothic ProN W3}{Hiragino Kaku Gothic ProN W6}% + \zxjf@multiweight{Hiragino Mincho ProN W2}{Hiragino Mincho ProN W3}{Hiragino Mincho ProN W6}% + {Hiragino Kaku Gothic ProN W3}{Hiragino Kaku Gothic ProN W6}{Hiragino Kaku Gothic StdN W8}% {Hiragino Kaku Gothic ProN W6}} \zxjf@declare@preset@with@prop{morisawa-pro}{% - \zxjf@multiweight{A-OTF-RyuminPro-Light.otf}{A-OTF-FutoMinA101Pro-Bold.otf}% - {A-OTF-GothicBBBPro-Medium.otf}{A-OTF-FutoGoB101Pro-Bold.otf}% + \zxjf@multiweight{A-OTF-RyuminPro-Light.otf}{A-OTF-RyuminPro-Light.otf}{A-OTF-FutoMinA101Pro-Bold.otf}% + {A-OTF-GothicBBBPro-Medium.otf}{A-OTF-FutoGoB101Pro-Bold.otf}{A-OTF-MidashiGoPro-MB31.otf}% {A-OTF-GothicBBBPro-Medium.otf}} \zxjf@declare@preset@with@prop{morisawa-pr6n}{% - \zxjf@multiweight{A-OTF-RyuminPr6N-Light.otf}{A-OTF-FutoMinA101Pr6N-Bold.otf}% - {A-OTF-GothicBBBPr6N-Medium.otf}{A-OTF-FutoGoB101Pr6N-Bold.otf}% + \zxjf@multiweight{A-OTF-RyuminPr6N-Light.otf}{A-OTF-RyuminPr6N-Light.otf}{A-OTF-FutoMinA101Pr6N-Bold.otf}% + {A-OTF-GothicBBBPr6N-Medium.otf}{A-OTF-FutoGoB101Pr6N-Bold.otf}{A-OTF-MidashiGoPr6N-MB31.otf}% {A-OTF-GothicBBBPr6N-Medium.otf}} \zxjf@declare@preset@with@prop{yu-win}{% - \zxjf@multiweight{YuMincho-Regular}{YuMincho-Demibold}% - {YuGothic-Regular}{YuGothic-Bold}% + \zxjf@multiweight{YuMincho-Light}{YuMincho-Regular}{YuMincho-Demibold}% + {YuGothic-Regular}{YuGothic-Bold}{YuGothic-Bold}% {YuGothic-Regular}} \zxjf@declare@preset@with@prop{yu-win10}{% - \zxjf@multiweight{YuMincho-Regular}{YuMincho-Demibold}% - {YuGothic-Regular}{YuGothic-Bold}% + \zxjf@multiweight{YuMincho-Light}{YuMincho-Regular}{YuMincho-Demibold}% + {YuGothic-Regular}{YuGothic-Bold}{YuGothic-Bold}% {YuGothic-Medium}} \zxjf@declare@preset@with@prop{yu-osx}{% - \zxjf@multiweight{YuMincho-Medium}{YuMincho-Demibold}% - {YuGothic-Medium}{YuGothic-Bold}% + \zxjf@multiweight{YuMincho-Medium}{YuMincho-Medium}{YuMincho-Demibold}% + {YuGothic-Medium}{YuGothic-Bold}{YuGothic-Bold}% {YuGothic-Medium}} \zxjf@declare@preset@with@prop{sourcehan}{% - \zxjf@multiweight{SourceHanSerif-Regular}{SourceHanSerif-Bold}% - {SourceHanSans-Regular}{SourceHanSans-Bold}% + \zxjf@multiweight{SourceHanSerif-Light}{SourceHanSerif-Regular}{SourceHanSerif-Bold}% + {SourceHanSans-Regular}{SourceHanSans-Bold}{SourceHanSans-Heavy}% {SourceHanSans-Medium}} \zxjf@declare@preset@with@prop{sourcehan-jp}{% - \zxjf@multiweight{SourceHanSerifJP-Regular}{SourceHanSerifJP-Bold}% - {SourceHanSansJP-Regular}{SourceHanSansJP-Bold}% + \zxjf@multiweight{SourceHanSerifJP-Light}{SourceHanSerifJP-Regular}{SourceHanSerifJP-Bold}% + {SourceHanSansJP-Regular}{SourceHanSansJP-Bold}{SourceHanSansJP-Heavy}% {SourceHanSansJP-Medium}} \zxjf@declare@preset@with@prop{noto}{% - \zxjf@multiweight{NotoSerifCJKjp-Regular}{NotoSerifCJKjp-Bold}% - {NotoSansCJKjp-Regular}{NotoSansCJKjp-Bold}% + \zxjf@multiweight{NotoSerifCJKjp-Light}{NotoSerifCJKjp-Regular}{NotoSerifCJKjp-Bold}% + {NotoSansCJKjp-Regular}{NotoSansCJKjp-Bold}{NotoSansCJKjp-Black}% {NotoSansCJKjp-Medium}} \zxjf@declare@preset@with@prop{noto-jp}{% - \zxjf@multiweight{NotoSerifJP-Regular}{NotoSerifJP-Bold}% - {NotoSansJP-Regular}{NotoSansJP-Bold}% + \zxjf@multiweight{NotoSerifJP-Light}{NotoSerifJP-Regular}{NotoSerifJP-Bold}% + {NotoSansJP-Regular}{NotoSansJP-Bold}{NotoSansJP-Black}% {NotoSansJP-Medium}} \zxjf@declare@preset@with@prop{haranoaji}{% - \zxjf@multiweight{HaranoAjiMincho-Regular}{HaranoAjiMincho-Bold}% - {HaranoAjiGothic-Regular}{HaranoAjiGothic-Bold}% + \zxjf@multiweight{HaranoAjiMincho-Light}{HaranoAjiMincho-Regular}{HaranoAjiMincho-Bold}% + {HaranoAjiGothic-Regular}{HaranoAjiGothic-Bold}{HaranoAjiGothic-Heavy}% {HaranoAjiGothic-Medium}} %(alias) \zxjf@declare@preset@alias@with@prop{kozuka}{kozuka-pro} @@ -429,6 +476,21 @@ %--------------------------------------- and some extras +\ifzxjf@threeweight + %%<*> \ltdefault/\ltseries + \def\ltdefault{l} + \DeclareRobustCommand\ltseries{% + \not@math@alphabet\ltseries\relax + \fontseries\ltdefault\selectfont + } + %%<*> \ebdefault/\ebseries + \def\ebdefault{eb} + \DeclareRobustCommand\ebseries{% + \not@math@alphabet\ebseries\relax + \fontseries\ebdefault\selectfont + } +\fi + %%<*> \useeasyjapanesesettings \newcommand*\useeasyjapanesesettings{% \XeTeXlinebreaklocale "ja"\relax diff --git a/language/japanese/zxjafont/zxjafont.tex b/language/japanese/zxjafont/zxjafont.tex index dbe9910589..038d54aaca 100644 --- a/language/japanese/zxjafont/zxjafont.tex +++ b/language/japanese/zxjafont/zxjafont.tex @@ -12,13 +12,14 @@ \bxtexlogoimport{*} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{0.7} -\newcommand{\PkgDate}{2020/01/18} +\newcommand{\PkgVersion}{1.0} +\newcommand{\PkgDate}{2020/02/02} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} \newcommand{\Means}{:\ } \newcommand{\JEmph}{\textgt} +\newcommand{\JSl}{\mbox{/}\linebreak[0]} %----------------------------------------------------------- \begin{document} \title{\Pkg{zxjafont} パッケージ(v\PkgVersion)} @@ -32,10 +33,10 @@ {\XeLaTeX}+\Pkg{fontspec}でのフォントファミリ名を直接指定する方式は 「好きなフォントを指定する」という点では、 {\pLaTeX}\>よりも格段に使い易いが、 -日本語を扱うためには必ず何らかの設定を行う必要があり、 +日本語を扱うためには必ず何らかのフォント設定を行う必要があり、 これが煩わしく感じられる場合もある。 -本パッケージでは、日本語{\LaTeX}\>において -一般的に行われている設定を予め用意しておいて、 +本パッケージでは、日本語\>{\LaTeX}\>において +一般的に行われている日本語用フォント設定を予め用意しておいて、 簡単に呼び出せるようにしている。 \paragraph{前提環境}\mbox{} @@ -59,29 +60,28 @@ \Meta{サブ設定}と\Meta{他オプション}は任意個数指定可能である。 もし\Pkg{fontspec}が未読込の場合は自動的に読み込む。 {\XeLaTeX}\>には和文と欧文の元来の区別がないので、 -このパッケージで指定するフォントが全ての文字に通用する。 -ただし、\Pkg{zxjatype}パッケージでは和文と欧文を区別するので、 -それと併用の場合は\JEmph{和文のみ}にフォント設定が適用される。 +このパッケージで指定するフォントが全ての文字に通用される。 +ただし、\Pkg{xeCJK}パッケージや\Pkg{zxjatype}パッケージの +日本語処理機能を利用する場合には和文と欧文が区別されるようになり、 +この場合は\JEmph{和文のみ}にフォント設定が適用される。 %------------------- \subsection{メイン設定} -総称ファミリの設定 -(\Pkg{fontspec}の |\setmainfont|、|\setsansfont|、|\setmonofont|) +総称ファミリに関する設定、すなわち、 +\Pkg{fontspec}の\>|\setmainfont|\JSl|\setsansfont|\JSl|\setmonofont|\>% +(\Pkg{xeCJK}\JSl\Pkg{zxjatype}併用時は\>% +|\setCJKmainfont|\JSl|\setCJKsansfont|\JSl|\setCJKmonofont|) を行うもの。 \Note 「メイン設定」は\Pkg{pxchfon}パッケージにおける 「プリセット設定」をそのまま -(ただし明朝・ゴシック2ウェイトに縮減して) 引き継いでいる。 -設定内容の詳細については、\Pkg{pxchfon}の説明書を -参照してほしい。 +設定内容の詳細については、 +\JEmph{\Pkg{pxchfon}の説明書を参照してほしい}。 -\Note かつての\Pkg{fontspec}では取り扱うフォントのウェイトが -通常(|\mdseries|)と太字(|\bfseries|)の2つに限られていた。 -現在の\Pkg{fontspec}では追加のウェイトがサポートされているが、 -残念ながら現状の\Pkg{zxjafont}はまだ3ウェイト以上の設定には -対応できていない。 +\Note 1.0版より、\Pkg{pxchfon}パッケージの多ウェイト設定について +明朝・ゴシックの3ウェイトが全てサポートされるようになった。 \paragraph{単ウェイト用の設定} 明朝・ゴシック各々1ウェイトのみを用いる設定。 @@ -99,13 +99,34 @@ IPAフォント。 \item |ipaex|\Means IPAexフォント。 \end{itemize} -\Note {\XeTeX}\>は「フォント非埋込のPDF生成」に対応していない。 +\Note {\XeTeX}\>は「フォント非埋込のPDF生成」に対応していないので、 +|noembed| 設定は存在しない。 + +例えば、メイン設定\>|ms|\>は以下の\Pkg{fontspec}の設定を行う: +\begin{quote}\small\begin{verbatim} +\setmainfont{MS-Mincho}[BoldFont=MS-Gothic] +\setsansfont{MS-Gothic}[BoldFont=MS-Gothic] +\setmonofont{MS-Gothic}[BoldFont=MS-Gothic] +\end{verbatim}\end{quote} +\Note \Pkg{xeCJK}\JSl\Pkg{zxjatype}読込時は和文用フォントの +設定(|\setCJKmainfont|\>等)に置き換わり、またこの場合は +和文スケール設定(|Scale|\>オプションキー)が追加される。 +これは以降で紹介する例についても同様である。 \paragraph{多ウェイト用の設定} -明朝・ゴシック各々2ウェイトを用いる設定。 -セリフに明朝、サンセリフと等幅にゴシックを割り当て、 -各々について通常(|\mdseries|)と太字(|\bfseries|) -を個別に設定する。 +セリフ(|\rmfamily|)に明朝、 +サンセリフ(|\sffamily|)と等幅(|\ttfamily|)にゴシックを割り当て、 +各々について中字(|\mdseries|)と太字(|\bfseries|)のフォントを +\Pkg{pxchfon}のプリセットと同様に個別に設定する。 + +さらに、|threeweight|\>オプションが有効の場合は、 +{p\LaTeX}\>の\Pkg{japanese-otf}で\>|deluxe|\>オプションを指定したときと +同様に、「明朝の細字(|\rmfamily\ltseries|)」と +「ゴシックの極太(|\sffamily\ebseries|)」が指定できるようになり、 +明朝とゴシックの各々について3ウェイトのフォントが +\Pkg{pxchfon}のプリセットと同様に個別に設定される。 +\Note |threeweight|\>オプションは通常は既定で有効になっている +(詳細は後述)。 \begin{itemize} \item |ms-hg|\Means @@ -119,7 +140,7 @@ IPAexフォント。 Mogaフォント(2004JIS字形)。 \Note MogaEx系統が用いられる。 \item |moga-90|\Means - Mogaフォント(90/2000JIS字形)。 + Mogaフォント(90\JSl 2000JIS字形)。 \Note MogaEx90系統が用いられる。 \item |ume|\Means 梅フォント。 @@ -161,9 +182,46 @@ IPAexフォント。 原ノ味フォント。 \end{itemize} +例えば\>|haranoaji|\>オプションについて説明すると、% +|threeweight|\>が有効の場合は以下の設定 +(3ウェイト)が行われる: +\begin{quote}\small\begin{verbatim} +\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiMincho-Bold, + FontFace={l}{n}{HaranoAjiMincho-Light}] +\setsansfont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold, + FontFace={eb}{n}{HaranoAjiGothic-Heavy}] +\setmonofont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold, + FontFace={eb}{n}{HaranoAjiGothic-Heavy}] +\end{verbatim}\end{quote} + +|threeweight|\>が無効の場合は以下の設定 +(中字・太字のみの2ウェイト)が行われる: +\begin{quote}\small\begin{verbatim} +\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiMincho-Bold] +\setsansfont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold] +\setmonofont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold] +\end{verbatim}\end{quote} + +|oneweight|\>オプション指定時は以下の設定 +(1ウェイトのみ)が行われる: +\begin{quote}\small\begin{verbatim} +\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiMincho-Medium] +\setsansfont{HaranoAjiGothic-Medium}[BoldFont=HaranoAjiGothic-Medium] +\setmonofont{HaranoAjiGothic-Medium}[BoldFont=HaranoAjiGothic-Medium] +\end{verbatim}\end{quote} +\Note 他の例と異なりゴシックで“|HaranoAjiMincho-Medium|”% +(\Pkg{pxchfon}のマニュアルのプリセットの解説で\>|\setgothicfont|\>に +割り当てられているフォント)が使われていることに注意。 + +そして\>|bold|\>オプション指定時は以下の設定が行われる: +\begin{quote}\small\begin{verbatim} +\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiMincho-Bold] +\setsansfont{HaranoAjiGothic-Bold}[BoldFont=HaranoAjiGothic-Bold] +\setmonofont{HaranoAjiGothic-Bold}[BoldFont=HaranoAjiGothic-Bold] +\end{verbatim}\end{quote} + \paragraph{他パッケージとの互換用のオプション} \mbox{} -%\Pkg{ptex-fontmaps}のプリセット名を別名として用意した。 \begin{itemize} \item |kozuka|\Means @@ -192,7 +250,8 @@ IPAexフォント。 0.5版において廃止された。 現在は指定するとエラーが発生する。 -\Note ただし |hiragino| は現在は |hiragino-pro| の別名と解釈される。 +\Note ただし |hiragino| については現在では |hiragino-pro| の別名と +解釈される。 \begin{quote} |kozuka4|、|kozuka6|、|kozuka6n|、|hiragino|、 @@ -235,9 +294,9 @@ Moboフォント(2004JIS字形)を使う設定。 \end{itemize} \item |mobo-90|\Means -Moboフォント(90/2000JIS字形)を使う設定。 +Moboフォント(90\JSl 2000JIS字形)を使う設定。 \begin{itemize} -\item |\mobofamily|\Means Moboフォント(90/2000JIS字形) +\item |\mobofamily|\Means Moboフォント(90\JSl 2000JIS字形) \end{itemize} \item |maruberi|\Means @@ -253,23 +312,31 @@ Moboフォント(90/2000JIS字形)を使う設定。 \begin{itemize} \item |oneweight|(または|nodeluxe|)\Means 多ウェイト用のメイン設定を単ウェイトとして用いる。 -\Note \Pkg{pxchfon}の説明書の記述において |\setminchofont| -と |\setgothicfont| で設定されているウェイトのフォント -が用いられる。 -\item |nooneweight|(または|deluxe|)\Means -|oneweight|の否定。 -\Note |(no)deluxe|は\Pkg{luatexja-preset}との互換の別名。 +\Note \Pkg{pxchfon}のマニュアルのプリセットの記述に +おいて\>|\setminchofont|\>と\>|\setgothicfont|\>で設定されている +ウェイトのフォントが用いられる。 +\item |nooneweight|(または|deluxe|;既定)\Means +|oneweight|\>の否定。 +\Note |(no)deluxe|\>は\Pkg{luatexja-preset}との互換の別名。 + +\item |threeweight|(既定)\Means +多ウェイト用のメイン設定を使う場合に3ウェイトを利用できるようにする。 +\item |nothreeweight|\Means +|threeweight|\>の否定。 +多ウェイト用のメイン設定は2ウェイトのみ使える。 +\Note 既定は\>|threeweight|\>であるが、使用中の\Pkg{fontspec}の版が +古くて追加ウェイトに対応できない場合は\>|nothreeweight|\>が既定になる。 \item |bold|\Means -|oneweight|と同じく多ウェイト用のメイン設定を単ウェイトとして用いるが、 +|oneweight|\>と同じく多ウェイト用のメイン設定を単ウェイトとして用いるが、 この際のゴシック体のフォントとして太字ウェイトに相当するものを用いる。 -\Note \Pkg{pxchfon}の説明書の記述における |\setminchofont| -と |\setboldgothicfont| のフォントが用いられる。 -\Note \Pkg{luatexja-preset}とは異なり、|bold|の指定自体が +\Note \Pkg{pxchfon}の説明書の記述における\>|\setminchofont|\>% +と\>|\setboldgothicfont|\>のフォントが用いられる。 +\Note \Pkg{luatexja-preset}とは異なり、|bold|\>の指定自体が 単ウェイト設定を強制する。 -|bold|と|oneweight|を同時に指定した場合は|bold|が優先する。 -\item |nobold|\Means -|bold|の否定。 +|bold|\>と\>|oneweight|\>を同時に指定した場合は\>|bold|\>が優先する。 +\item |nobold|(既定)\Means +|bold|\>の否定。 \item |prop|\Means プロポーショナル幅のフォントを用いる。 @@ -280,9 +347,10 @@ Moboフォント(90/2000JIS字形)を使う設定。 がある場合はそれを優先させている。 \Note \Pkg{zxjatype}を用いる場合は、 和文は等幅フォントを用いることが前提なので、 -このオプションは指定できない(エラーになる)。 -\item |noprop|\Means -|prop|の否定。 +このオプションは指定できずエラーになる。 +(現状では\Pkg{xeCJK}使用時も同じ。) +\item |noprop|(既定)\Means +|prop|\>の否定。 (和文が)等幅のフォントを用いる。 \item |scale=|\Meta{実数}\Means @@ -291,18 +359,26 @@ Moboフォント(90/2000JIS字形)を使う設定。 \Pkg{zxjatype}パッケージで指定されている場合はその値、 なければ1となる。 -\item |jis90|/|90jis|\Means +\item |jis90|\JSl|90jis|\Means 90JIS字形(2000JIS字形)の使用を指定する。 - -\item |jis2004|/|2004jis|\Means +\item |jis2004|\JSl|2004jis|\Means 2004JIS字形の使用を指定する。 - -\item |nojisshape|\Means +\item |nojisshape|(既定)\Means 特定のJIS字形の使用の指定を行わない。 +\item |ignorejatype|\Means +たとえ\Pkg{xeCJK}\JSl\Pkg{zxjatype}が読み込まれていたとしても +それらを無視して、「和文欧文の区別がない」前提の動作を行う。 +\Note この場合「プリセットで指定した日本語フォントが\JEmph{欧文のみ}に +適用される」という奇妙な動作になるため、このオプションの有用性は +ほぼないと思われる。 +\item |noignorejatype|(既定)\Means +|ignorejatype|\>の否定。 + \item |feature={|\Meta{属性リスト}|}|\Means このパッケージで指定されるフォント全てに通用する \Pkg{fontspec}の属性の指定。 +既定値は空。 \end{itemize} -- cgit v1.2.3