summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/uplatex/base/README.md2
-rw-r--r--Master/texmf-dist/doc/uplatex/base/upldoc.pdfbin543496 -> 542601 bytes
-rw-r--r--Master/texmf-dist/source/uplatex/base/ukinsoku.dtx18
-rw-r--r--Master/texmf-dist/source/uplatex/base/uplfonts.dtx20
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ukinsoku.tex10
-rw-r--r--Master/texmf-dist/tex/uplatex/base/upldefs.ltx6
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uptrace.sty2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds3
8 files changed, 27 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md
index db8d4a571e8..f30823ffb9b 100644
--- a/Master/texmf-dist/doc/uplatex/base/README.md
+++ b/Master/texmf-dist/doc/uplatex/base/README.md
@@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2019-05-22
+2019-10-01
Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
index 807e4502153..32e8f291492 100644
--- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
+++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
index 6fe076ff027..a68ae8b0a72 100644
--- a/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
+++ b/Master/texmf-dist/source/uplatex/base/ukinsoku.dtx
@@ -31,13 +31,14 @@
% \changes{v1.0b-u03}{2018/04/08}{\LaTeX\ 2018-04-01対策}
% \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}{バグ回避コードがかえって有害なため除去}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{ukinsoku.dtx}[2019/05/19 v1.0b-u05 upLaTeX Kernel]
+\ProvidesFile{ukinsoku.dtx}[2019/09/22 v1.0b-u06 upLaTeX Kernel]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{ukinsoku.dtx}
@@ -73,21 +74,8 @@
\fi
% \end{macrocode}
%
-% up\TeX~v1.24で``Halfwidth and Fullwidth Forms''のブロックの|\kcatcode|の既定値に
-% バグが入ったため、回避策を講じます(このバグはv1.25で修正済み)。
% \changes{v1.0b-u05}{2019/05/19}{up\TeX~v1.24の\cs{kcatcode}の既定値のバグ回避}
-% \begin{macrocode}
-%%
-%% default kcatcode, workaround for upTeX 1.24
-\edef\upTeXVersionNumber{\the\uptexversion\uptexrevision}%
-\def\upTeXRevIpXXIV{1.24}%
-\ifx\upTeXVersionNumber\upTeXRevIpXXIV
- \kcatcode"FF00=16% Halfwidth and Fullwidth Forms -> 16(kanji)
- \message{### special kcatcode setting to work around for upTeX 1.24 ###}
-\fi
-\let\upTeXVersionNumber\relax
-\let\upTeXRevIpXXIV\relax
-% \end{macrocode}
+% \changes{v1.0b-u06}{2019/09/22}{バグ回避コードがかえって有害なため除去}
%
% \section{禁則}
%
diff --git a/Master/texmf-dist/source/uplatex/base/uplfonts.dtx b/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
index 1a988137bbd..d6824c94d4f 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-2018 Japanese TeX Development Community
+% Copyright (c) 2016-2019 Japanese TeX Development Community
%
% This file is part of the upLaTeX2e system (community edition).
% --------------------------------------------------------------
@@ -70,13 +70,15 @@
% (based on plfonts.dtx 2018/02/04 v1.6l)}
% \changes{v1.6q-u02}{2018/07/03}{p\LaTeX{}の変更に追随。
% (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)}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{uplfonts.dtx}[2018/07/03 v1.6q-u02 upLaTeX New Font Selection Scheme]
+\ProvidesFile{uplfonts.dtx}[2019/09/22 v1.6t-u02 upLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{uplfonts.dtx}
@@ -153,7 +155,7 @@
%<*trace>
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{uptrace}
- [2017/12/10 v1.6k-u02 Standard upLaTeX package (font tracing)]
+ [2019/09/22 v1.6t-u02 Standard upLaTeX package (font tracing)]
\RequirePackageWithOptions{ptrace}
%</trace>
% \end{macrocode}
@@ -182,7 +184,7 @@
% \begin{macrocode}
%<*pldefs>
\ProvidesFile{upldefs.ltx}
- [2018/02/04 v1.6l-u02 upLaTeX Kernel (Default settings)]
+ [2019/09/22 v1.6t-u02 upLaTeX Kernel (Default settings)]
%</pldefs>
% \end{macrocode}
%
@@ -190,12 +192,20 @@
% テキストフォントのための属性やエラー書体などの宣言です。
% p\LaTeX{}のデフォルトの横組エンコードはJY1、縦組エンコードはJT1ですが、
% up\LaTeX{}では横組エンコードはJY2、縦組エンコードはJT2とします。
+%
+% \changes{v1.6s}{2019/08/13}{Explicitly set some defaults
+% after \cs{DeclareErrorKanjiFont} change
+% (sync with ltfssini.dtx 2019/07/09 v3.1c)}
% \noindent
% 縦横エンコード共通:
% \begin{macrocode}
%<*pldefs>
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10}
+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}
% \end{macrocode}
% 横組エンコード:
% \begin{macrocode}
@@ -395,7 +405,7 @@
%</pldefs|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\<}
-%<platexrelease> {\inhibitglue in vertical mode}%
+%<platexrelease> {ASCII Corporation original}%
%<platexrelease>\def\<{\inhibitglue}
%<platexrelease>\plEndIncludeInRelease
%<*pldefs>
diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
index 7688339cc5a..d09870106c3 100644
--- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
+++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
@@ -21,16 +21,6 @@
internal Kanji encoding Unicode}\@@end
\fi
%%
-%% default kcatcode, workaround for upTeX 1.24
-\edef\upTeXVersionNumber{\the\uptexversion\uptexrevision}%
-\def\upTeXRevIpXXIV{1.24}%
-\ifx\upTeXVersionNumber\upTeXRevIpXXIV
- \kcatcode"FF00=16% Halfwidth and Fullwidth Forms -> 16(kanji)
- \message{### special kcatcode setting to work around for upTeX 1.24 ###}
-\fi
-\let\upTeXVersionNumber\relax
-\let\upTeXRevIpXXIV\relax
-%%
%% 行頭、行末禁則パラメータ
%%
%% 1byte characters
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index 48f137dbf41..0a56c6ff9c9 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -15,9 +15,13 @@
%%
%% File: uplfonts.dtx
\ProvidesFile{upldefs.ltx}
- [2018/02/04 v1.6l-u02 upLaTeX Kernel (Default settings)]
+ [2019/09/22 v1.6t-u02 upLaTeX Kernel (Default settings)]
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10}
+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY2}{}{}
\DeclareKanjiSubstitution{JY2}{mc}{m}{n}
\DeclareTateKanjiEncoding{JT2}{}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/uptrace.sty b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
index e1a938ba6c7..9de76f1137a 100644
--- a/Master/texmf-dist/tex/uplatex/base/uptrace.sty
+++ b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
@@ -16,7 +16,7 @@
%% File: uplfonts.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{uptrace}
- [2017/12/10 v1.6k-u02 Standard upLaTeX package (font tracing)]
+ [2019/09/22 v1.6t-u02 Standard upLaTeX package (font tracing)]
\RequirePackageWithOptions{ptrace}
\endinput
%%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index c1603f689c2..88c316ac28c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -748,6 +748,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'ly1', "&MAKEcopy",
'lyx', "die 'skipping, container directory'",
'mab2bib', "die 'skipping, python'",
+ 'mactex', "die 'skipping, whole distribution'",
'magyar', "die 'skipping, use babel-hungarian'",
'make-env', "die 'skipping, no license, too old to bother with'",
'makebarcode', "&MAKEcopy",
@@ -1299,7 +1300,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'vrb', "die 'skipping, noinfo license, author does not recall'",
'vrsion', "die 'skipping, nonfree license'",
'vxu', "die 'skipping, obsolete'",
- 'w32tex', "die 'skipping, um, no.'",
+ 'w32tex', "die 'skipping, whole disttribution'",
'wadalab', "&MAKEwadalab",
'wasy2', "die 'skipping, use wasy'",
'wasy2-ps', "&MAKEflatten",