summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-12-06 23:54:48 +0000
committerKarl Berry <karl@freefriends.org>2017-12-06 23:54:48 +0000
commitca00616c46add04269a656e97f1d252a8013077f (patch)
tree28896b3047a0d4bd78c80717314f2f2d7910dd95 /Master/texmf-dist/tex
parent1af85f82c48d00dfbf27a720ea711d12e27895e8 (diff)
uplatex (7dec17)
git-svn-id: svn://tug.org/texlive/trunk@46000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jt2gt.fd2
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jt2mc.fd2
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jy2gt.fd2
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jy2mc.fd2
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplatex.ltx1
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplcore.ltx60
-rw-r--r--Master/texmf-dist/tex/uplatex/base/upldefs.ltx3
7 files changed, 32 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
index 5aabc98e62e..725ce092b40 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
@@ -15,7 +15,7 @@
%%
%% File: uplfonts.dtx
\ProvidesFile{jt2gt.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2011/05/07 v1.5-u00 KANJI font defines]
\DeclareKanjiFamily{JT2}{gt}{}
\DeclareRelationFont{JT2}{gt}{m}{}{T1}{cmr}{bx}{}
\DeclareFontShape{JT2}{gt}{m}{n}{<->s*[0.962216]upjisg-v}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/jt2mc.fd b/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
index 793af32b998..32f8ec100bf 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
@@ -15,7 +15,7 @@
%%
%% File: uplfonts.dtx
\ProvidesFile{jt2mc.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2011/05/07 v1.5-u00 KANJI font defines]
\DeclareKanjiFamily{JT2}{mc}{}
\DeclareRelationFont{JT2}{mc}{m}{}{T1}{cmr}{m}{}
\DeclareRelationFont{JT2}{mc}{bx}{}{T1}{cmr}{bx}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/jy2gt.fd b/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
index 1aad3e8ea4a..6209741146a 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
@@ -15,7 +15,7 @@
%%
%% File: uplfonts.dtx
\ProvidesFile{jy2gt.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2011/05/07 v1.5-u00 KANJI font defines]
\DeclareKanjiFamily{JY2}{gt}{}
\DeclareRelationFont{JY2}{gt}{m}{}{T1}{cmr}{bx}{}
\DeclareFontShape{JY2}{gt}{m}{n}{<->s*[0.962216]upjisg-h}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/jy2mc.fd b/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
index e760174bade..0ce4dd00ec3 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
@@ -15,7 +15,7 @@
%%
%% File: uplfonts.dtx
\ProvidesFile{jy2mc.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2011/05/07 v1.5-u00 KANJI font defines]
\DeclareKanjiFamily{JY2}{mc}{}
\DeclareRelationFont{JY2}{mc}{m}{}{T1}{cmr}{m}{}
\DeclareRelationFont{JY2}{mc}{bx}{}{T1}{cmr}{bx}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
index c08c96cbb3b..78d74e9ff89 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
@@ -17,7 +17,6 @@
\let\orgdump\dump
\let\dump\relax
\input latex.ltx
-\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
\typeout{**************************^^J%
*^^J%
* making upLaTeX format^^J%
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index bc391d1128e..256b3d924b2 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -20,21 +20,22 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2017/10/28u01}
-\def\ppatch@level{2}
+\def\ppatch@level{3}
+\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
\def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
\def\@plIncludeInRele@se#1#2#3{%
\toks@{[#1] #3}%
- \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax
+ \expandafter\ifx\csname\string#2+\@currname+plIIR\endcsname\relax
\ifnum\expandafter\@parse@version#1//00\@nil
>\expandafter\@parse@version\pfmtversion//00\@nil
\GenericInfo{}{Skipping: \the\toks@}%
\expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
\else
\GenericInfo{}{Applying: \the\toks@}%
- \expandafter\let\csname\string#2+\@currname+IIR\endcsname\@empty
+ \expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty
\fi
\else
\GenericInfo{}{Already applied: \the\toks@}%
@@ -46,8 +47,8 @@
%% File: uplfonts.dtx
\let\k@encoding\@empty
\let\ck@encoding\@empty
-\def\cy@encoding{JY2}
-\def\ct@encoding{JT2}
+\let\cy@encoding\@empty
+\let\ct@encoding\@empty
\let\k@family\@empty
\let\k@series\@empty
\let\k@shape\@empty
@@ -195,6 +196,7 @@
\let\default@KT\@empty
\let\default@KM\@empty
\@onlypreamble\DeclareKanjiEncodingDefaults
+\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
\def\DeclareFontFamily#1#2#3{%
\@ifundefined{T@#1}%
{\@latex@error{Encoding scheme `#1' unknown}\@eha}%
@@ -418,8 +420,6 @@
\set@fontsize\baselinestretch\f@size\f@baselineskip
\fi
\size@update}
-\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
-\KanjiEncodingPair{JY2}{JT2}
\def\set@fontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f@size{\strip@pt\@tempdimb}%
@@ -1129,35 +1129,27 @@
\def\ppatch@level{0}\fi
\begingroup
\def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
- \edef\platexTMP{%
- \ifnum\ppatch@level=0
- \everyjob{\noexpand\typeout{%
- \pfmtname\space<\pfmtversion>\space
- (based on \expandafter\parse@@BANNER\platexBANNER)}}%
- \else\ifnum\ppatch@level>0
- \everyjob{\noexpand\typeout{%
- \pfmtname\space<\pfmtversion>+\ppatch@level\space
- (based on \expandafter\parse@@BANNER\platexBANNER)}}%
- \else
- \everyjob{\noexpand\typeout{%
- \pfmtname\space<\pfmtversion>-pre\ppatch@level\space
- (based on \expandafter\parse@@BANNER\platexBANNER)}}%
- \fi\fi
- }
-\expandafter
-\endgroup \platexTMP
+ \toks0=\expandafter\expandafter\expandafter{%
+ \expandafter\parse@@BANNER\platexBANNER}
+ \ifnum\ppatch@level=0
+ \toks2={\pfmtname\space<\pfmtversion>\space}%
+ \else\ifnum\ppatch@level>0
+ \toks2={\pfmtname\space<\pfmtversion>+\ppatch@level\space}%
+ \else
+ \toks2={\pfmtname\space<\pfmtversion>-pre\ppatch@level\space}%
+ \fi\fi
+ \edef\platexBANNER{\the\toks2 (based on \the\toks0)}
+ \global\everyjob\expandafter{%
+ \expandafter\typeout\expandafter{\platexBANNER}}%
+\endgroup
\begingroup
\def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
- \edef\platexTMP{%
- \the\everyjob\noexpand\typeout{\expandafter\parse@@BANNER\platexBANNER}%
- }
- \everyjob=\expandafter{\platexTMP}%
- \edef\platexTMP{%
- \noexpand\let\noexpand\platexBANNER=\noexpand\@undefined
- \noexpand\everyjob={\the\everyjob}%
- }
- \expandafter
-\endgroup \platexTMP
+ \toks0=\expandafter\expandafter\expandafter{%
+ \expandafter\parse@@BANNER\platexBANNER}
+ \edef\platexBANNER{\the\everyjob \noexpand\typeout{\the\toks0}}
+ \global\everyjob\expandafter{\platexBANNER}%
+\endgroup
+\let\platexBANNER=\@undefined
\ifx\l@nohyphenation \@undefined
\newlanguage\l@nohyphenation
\fi
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index 7603ea5fb37..5db531fe170 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -15,13 +15,14 @@
%%
%% File: uplfonts.dtx
\ProvidesFile{upldefs.ltx}
- [2017/08/05 v1.6h-u00 upLaTeX Kernel (Default settings)]
+ [2017/11/06 v1.6j-u00 upLaTeX Kernel (Default settings)]
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10}
\DeclareYokoKanjiEncoding{JY2}{}{}
\DeclareKanjiSubstitution{JY2}{mc}{m}{n}
\DeclareTateKanjiEncoding{JT2}{}{}
\DeclareKanjiSubstitution{JT2}{mc}{m}{n}
+\KanjiEncodingPair{JY2}{JT2}
\newcommand\mcdefault{mc}
\newcommand\gtdefault{gt}
\newcommand\kanjiencodingdefault{JY2}