uplatex (30sep20)

git-svn-id: svn://tug.org/texlive/trunk@56488 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 33 insertions, 15 deletions

diff --git a/Master/texmf-dist/source/uplatex/base/Makefile b/Master/texmf-dist/source/uplatex/base/Makefile
index 92d1388fa4f..308634974c2 100644
--- a/Master/texmf-dist/source/uplatex/base/Makefile
+++ b/Master/texmf-dist/source/uplatex/base/Makefile
@@ -4,7 +4,8 @@ DOCTARGET = uplatex upldoc \
 PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
 DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
 KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f uptex-ipaex.map
+#FONTMAP = -f ipaex.map -f uptex-ipaex.map
+FONTMAP = -f haranoaji.map -f uptex-haranoaji.map
 TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
 
 default: $(STRIPTARGET) $(DVITARGET)
diff --git a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
index 1cc6c91c991..08881f00b7e 100644
--- a/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ujclasses.dtx
@@ -122,6 +122,10 @@
 % \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{}用に追随}
+% \changes{v1.8f}{2020/09/30}{add a fourth argument for better
+%    hyperref compability
+%    (sync with ltsect.dtx 2020/07/27 v1.1e)}
+% \changes{v1.8f-u00}{2020/09/30}{p\LaTeX{}用に追随}
 % \fi
 %
 % \iffalse
@@ -151,7 +155,7 @@
 %<11pt&bk>\ProvidesFile{utbk11.clo}
 %<12pt&bk>\ProvidesFile{utbk12.clo}
 %</tate>
-  [2020/01/03 v1.8e-u00
+  [2020/09/30 v1.8f-u00
 %<article|report|book> Standard upLaTeX class]
 %<10pt|11pt|12pt>  Standard upLaTeX file (size option)]
 %<*driver>
@@ -4015,21 +4019,23 @@
 %
 % \begin{macro}{\addcontentsline}
 % 縦組の場合にページ番号を|\rensuji|で囲むように変更します。
-% ^^A 横組のときにも`|\rensuji|'コマンドが出力されますが、
-% ^^A このコマンドによる影響はありません。
 %
 % このマクロは\file{ltsect.dtx}で定義されています。
+% ^^A 命令 |\addcontentsline| と |\addtocontents| を組み合わせ
 % \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
 %    (sync with ltsect.dtx 2018/09/26 v1.1c)}
+% \changes{v1.8f}{2020/09/30}{add a fourth argument for better
+%    hyperref compability
+%    (sync with ltsect.dtx 2020/07/27 v1.1e)}
 %    \begin{macrocode}
 \providecommand*\protected@file@percent{}
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-%<tate>     \@temptokena{\rensuji{\thepage}}}%
-%<yoko>     \@temptokena{\thepage}}%
-    {\string\@writefile{#1}%
-       {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+%<tate>     \@temptokena{\rensuji{\thepage}}%
+%<yoko>     \@temptokena{\thepage}%
+    }{\string\@writefile{#1}%
+       {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
         \protected@file@percent}}%
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
index a68ae8b0a72..70ce9c1280d 100644
--- a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ukinsoku.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).
 %  --------------------------------------------------------------
@@ -32,13 +32,15 @@
 % \changes{v1.0b-u04}{2019/01/29}{内部Unicode化されていることを確認}
 % \changes{v1.0b-u05}{2019/05/19}{up\TeX~v1.24の\cs{kcatcode}の既定値のバグ回避}
 % \changes{v1.0b-u06}{2019/09/22}{バグ回避コードがかえって有害なため除去}
+% \changes{v1.0c}{2020/09/28}{！の\cs{inhibitxspcode}を設定}
+% \changes{v1.0c-u06}{2020/09/28}{p\LaTeX{}の変更に追随}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{ukinsoku.dtx}[2019/09/22 v1.0b-u06 upLaTeX Kernel]
+\ProvidesFile{ukinsoku.dtx}[2020/09/28 v1.0c-u06 upLaTeX Kernel]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{ukinsoku.dtx}
@@ -484,6 +486,7 @@
 % \end{tabular}
 % \end{center}
 %
+% \changes{v1.0c}{2020/09/28}{！の\cs{inhibitxspcode}を設定}
 %    \begin{macrocode}
 %%
 %% inhibitxspcode
@@ -493,6 +496,7 @@
 \inhibitxspcode`．=1
 \inhibitxspcode`；=1
 \inhibitxspcode`？=1
+\inhibitxspcode`！=1
 \inhibitxspcode`）=1
 \inhibitxspcode`（=2
 \inhibitxspcode`］=1
diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
index 37783982d8f..7f014b8b388 100644
--- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplatex.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).
 %  --------------------------------------------------------------
@@ -91,6 +91,7 @@
 % \changes{v1.0y-u02}{2018/09/22}{最終更新日を\file{upldoc.pdf}に表示
 %     (based on platex.dtx 2018/09/22 v1.0y)}
 % \changes{v1.0y-u03}{2019/05/22}{ドキュメントを更新}
+% \changes{v1.1b-u03}{2020/09/28}{defs読込後にフック追加}
 %\else
 % \changes{v1.0c-u00}{2011/05/07}{Created \upLaTeX\ version based on \pLaTeX\ one
 %     (based on platex.dtx 1997/01/29 v1.0c)}
@@ -130,6 +131,7 @@
 % \changes{v1.0y-u02}{2018/09/22}{Show last update info on \file{upldoc.pdf}
 %     (based on platex.dtx 2018/09/22 v1.0y)}
 % \changes{v1.0y-u03}{2019/05/22}{Update document.}
+% \changes{v1.1b-u03}{2020/09/28}{Add hook after loading defs}
 %\fi
 % \fi
 %
@@ -137,7 +139,7 @@
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{uplatex.dtx}[2019/05/22 v1.0y-u03 upLaTeX document file]
+\ProvidesFile{uplatex.dtx}[2020/09/28 v1.1b-u03 upLaTeX document file]
 % \iffalse
 \documentclass{jltxdoc}
 \usepackage{plext}
@@ -466,16 +468,20 @@
 % \TeX{}の入力ファイル検索パスに設定されている
 % ディレクトリに\file{upldefs.cfg}ファイルがある場合は、
 % そのファイルを使います。
+% 読み込み後にコードが実行されるかもしれません。
 % \changes{v1.0s-u01}{2017/12/05}{デフォルト設定ファイルの読み込みを
 %    \file{uplcore.ltx}から\file{uplatex.ltx}へ移動
 %     (based on platex.dtx 2017/12/05 v1.0s)}
+% \changes{v1.1b-u03}{2020/09/28}{defs読込後にフック追加}
 %\else
 % Load font-related default settings, \file{upldefs.ltx}.
 % If a file \file{upldefs.cfg} is found, then that file will be
 % used instead.
+% Some code may be executed after loading.
 % \changes{v1.0s-u01}{2017/12/05}{Moved loading default settings
 %    from \file{uplcore.ltx} to \file{uplatex.ltx}
 %     (based on platex.dtx 2017/12/05 v1.0s)}
+% \changes{v1.1b-u03}{2020/09/28}{Add hook after loading defs}
 %\fi
 %    \begin{macrocode}
 \InputIfFileExists{upldefs.cfg}
@@ -483,6 +489,7 @@
                      * Local config file upldefs.cfg used^^J%
                      *************************************}}%
            {\input{upldefs.ltx}}
+\ifx\code@after@pldefs\@undefined\else \code@after@pldefs \fi
 %    \end{macrocode}
 %
 %\ifJAPANESE
@@ -752,7 +759,7 @@
 % current \upLaTeXe\ and older versions or original \pLaTeXe/\LaTeXe.
 %
 % \subsection{Compatibility with \pLaTeXe/\LaTeXe}
-% \upLaTeXe\ is in most part upper compatible with \pLaTeXe,
+% \upLaTeXe\ is in most part upward compatible with \pLaTeXe,
 % so you can move from \pLaTeXe\ to \upLaTeXe\ by simply replacing
 % the document class and some macros. However, the default Japanese
 % font metrics in \upLaTeXe\ is different from those in \pLaTeXe;
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index 09078835be6..d811788b13e 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -130,11 +130,11 @@
 % \begin{macro}{\ppatch@level}
 % up\LaTeXe{}のフォーマットファイル名とバージョンです。
 % フォーマット名はp\LaTeXe{}のもの (\pfmtname) をそのまま引き継ぎ、
-% バージョンはp\LaTeXe{}のものの末尾に``u03''のようにサフィックスを付けます。
+% バージョンはp\LaTeXe{}のものの末尾に``u04''のようにサフィックスを付けます。
 %    \begin{macrocode}
 %<*plcore>
 %\def\pfmtname{pLaTeX2e}
-\def\uppatch@level{u03}
+\def\uppatch@level{u04}
 \edef\pfmtversion{\pfmtversion\uppatch@level}
 %</plcore>
 %    \end{macrocode}