diff options
Diffstat (limited to 'Master/texmf-dist')
27 files changed, 151 insertions, 189 deletions
diff --git a/Master/texmf-dist/doc/uplatex/base/LICENSE b/Master/texmf-dist/doc/uplatex/base/LICENSE index fa086767062..1c7b99eea09 100644 --- a/Master/texmf-dist/doc/uplatex/base/LICENSE +++ b/Master/texmf-dist/doc/uplatex/base/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/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md index 4ed32cfe3bd..c7d913897aa 100644 --- a/Master/texmf-dist/doc/uplatex/base/README.md +++ b/Master/texmf-dist/doc/uplatex/base/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/Master/texmf-dist/doc/uplatex/base/README_uplatex.txt b/Master/texmf-dist/doc/uplatex/base/README_uplatex.txt index ec866e77492..bf24259187b 100644 --- a/Master/texmf-dist/doc/uplatex/base/README_uplatex.txt +++ b/Master/texmf-dist/doc/uplatex/base/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/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf Binary files differindex bdeadf5d1d2..9e1372c8aec 100644 --- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf +++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf diff --git a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx index 98581b7f8b9..1cc6c91c991 100644 --- a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx +++ b/Master/texmf-dist/source/uplatex/base/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} %</tate> - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 %<article|report|book> 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/Master/texmf-dist/source/uplatex/base/uplfonts.dtx b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx index d6824c94d4f..0ce9aa830f9 100644 --- a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx +++ b/Master/texmf-dist/source/uplatex/base/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)] %</pldefs> % \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} -%</pldefs> -%<platexrelease>\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}% -%</pldefs|platexrelease> -%<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{2015/01/01}{\eminnershape}{\eminnershape}% -%<platexrelease>\DeclareRobustCommand\em -%<platexrelease> {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -%<platexrelease> \mcfamily \upshape \else \gtfamily \itshape \fi} -%<platexrelease>\def\eminnershape{\upshape}% defined by LaTeX, but not used by pLaTeX -%<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{0000/00/00}{\eminnershape}{\eminnershape}% -%<platexrelease>\DeclareRobustCommand\em -%<platexrelease> {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ -%<platexrelease> \mcfamily \upshape \else \gtfamily \itshape \fi} -%<platexrelease>\let\eminnershape\@undefined -%<platexrelease>\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} -%</pldefs> -%<platexrelease>\plIncludeInRelease{2017/10/28}{\<} -%<platexrelease> {\inhibitglue in vertical mode}% -%<*pldefs|platexrelease> -\ifx\protected\@undefined -\def\<{\inhibitglue} -\else -\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} -\fi -%</pldefs|platexrelease> -%<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{0000/00/00}{\<} -%<platexrelease> {ASCII Corporation original}% -%<platexrelease>\def\<{\inhibitglue} -%<platexrelease>\plEndIncludeInRelease -%<*pldefs> -% \end{macrocode} -% \end{macro} -% % ここまでが、\file{pldefs.ltx}の内容です。 % \begin{macrocode} %</pldefs> diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx index f6f8869e840..09078835be6 100644 --- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx +++ b/Master/texmf-dist/source/uplatex/base/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} %</plcore> % \end{macrocode} diff --git a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls index 1e287918f6e..0c98c34a2ee 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujarticle} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -506,16 +506,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\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} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo index e19d4bc197d..d2e8e099f48 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk10.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo index a6ff0560b91..472bed49708 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk11.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo index 6fb0acb5538..8f19a855807 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk12.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls index 111d00da217..b7725e24d66 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujbook} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -595,16 +595,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\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} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls index 7db84ec2603..271577bb720 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujreport} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -591,16 +591,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\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} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo index 886bb26500b..5d7c28c9856 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize10.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo index a204aa078a5..33091809937 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize11.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo index bc8729227f9..251b7c62ff2 100644 --- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize12.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -26,7 +26,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx index 18e5e94a2fa..1f0b313646f 100644 --- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx +++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx @@ -25,17 +25,17 @@ 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 \fi -\def\uppatch@level{u02} +\def\uppatch@level{u03} \edef\pfmtversion{\pfmtversion\uppatch@level} %% File: uplvers.dtx \def\documentstyle{% diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx index 0a56c6ff9c9..63b7fa36cc8 100644 --- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx +++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx @@ -15,7 +15,7 @@ %% %% File: uplfonts.dtx \ProvidesFile{upldefs.ltx} - [2019/09/22 v1.6t-u02 upLaTeX Kernel (Default settings)] + [2020/02/01 v1.6v-u02 upLaTeX Kernel (Default settings)] \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10} \kanjifamily{mc} @@ -32,7 +32,7 @@ \newcommand\kanjiencodingdefault{JY2} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\newcommand\kanjishapedefault{\updefault} +\newcommand\kanjishapedefault{n}% formerly \updefault \kanjiencoding{JY2} \input{jy2mc.fd} \input{jy2gt.fd} @@ -40,12 +40,6 @@ \input{jt2gt.fd} \fontencoding{JT2}\selectfont \fontencoding{JY2}\selectfont -\DeclareTextFontCommand{\textmc}{\mcfamily} -\DeclareTextFontCommand{\textgt}{\gtfamily} -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \gtfamily \itshape \fi}% -\def\eminnershape{\mcfamily \upshape}% \DeclarePreloadSizes{JY2}{mc}{m}{n}{5,7,10,12} \DeclarePreloadSizes{JY2}{gt}{m}{n}{5,7,10,12} \DeclarePreloadSizes{JT2}{mc}{m}{n}{5,7,10,12} @@ -63,11 +57,6 @@ \xkanjiskip=.25zw plus1pt minus1pt \autoxspacing \jcharwidowpenalty=500 -\ifx\protected\@undefined -\def\<{\inhibitglue} -\else -\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} -\fi \endinput %% %% End of file `upldefs.ltx'. diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls index 49747e1a184..c7784093160 100644 --- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls +++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utarticle} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -510,16 +510,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\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} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo index 64915253ad9..3a54d099b7a 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk10.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo index 4e7291a1e3a..d942807202b 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk11.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo index ec8f39dc2ae..57096af4a45 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk12.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls index 448f4ae263d..6c83c66dcd1 100644 --- a/Master/texmf-dist/tex/uplatex/base/utbook.cls +++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utbook} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -599,16 +599,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\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} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls index ef31509aa2b..84068451bdc 100644 --- a/Master/texmf-dist/tex/uplatex/base/utreport.cls +++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utreport} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -595,16 +595,17 @@ \usecounter{\@enumctr}% \def\makelabel##1{\hss\llap{##1}}}% \fi}{\endlist} -\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} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo index ab856728c77..3e2d5c0cf19 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize10.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo index d6cb678c5e2..333d341d1f5 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize11.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo index 72c8cce45ae..cf9d7f01af0 100644 --- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo +++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize12.clo} - [2019/10/17 v1.8c-u00 + [2020/01/03 v1.8e-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -28,7 +28,9 @@ \def\kanjiencodingdefault{JT2}% \kanjiencoding{\kanjiencodingdefault}% \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} |