summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/uplatex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/uplatex')
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jt2gt.fd4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jt2mc.fd4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jy2gt.fd4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/jy2mc.fd4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujarticle.cls5
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbk12.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujbook.cls5
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujreport.cls5
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ujsize12.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/ukinsoku.tex6
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplatex.ltx8
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplcore.ltx1146
-rw-r--r--Master/texmf-dist/tex/uplatex/base/upldefs.ltx4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uptrace.sty179
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utarticle.cls5
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbk12.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utbook.cls5
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utreport.cls5
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize10.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize11.clo4
-rw-r--r--Master/texmf-dist/tex/uplatex/base/utsize12.clo4
27 files changed, 85 insertions, 1352 deletions
diff --git a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
index 725ce092b40..16e1dd05ef1 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2gt.fd
@@ -8,14 +8,14 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
\ProvidesFile{jt2gt.fd}
- [2011/05/07 v1.5-u00 KANJI font defines]
+ [2018/02/04 v1.6l-u02 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 32f8ec100bf..602faed3cb6 100644
--- a/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jt2mc.fd
@@ -8,14 +8,14 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
\ProvidesFile{jt2mc.fd}
- [2011/05/07 v1.5-u00 KANJI font defines]
+ [2018/02/04 v1.6l-u02 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 6209741146a..ecfd110a28c 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2gt.fd
@@ -8,14 +8,14 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
\ProvidesFile{jy2gt.fd}
- [2011/05/07 v1.5-u00 KANJI font defines]
+ [2018/02/04 v1.6l-u02 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 0ce4dd00ec3..87f03197508 100644
--- a/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
+++ b/Master/texmf-dist/tex/uplatex/base/jy2mc.fd
@@ -8,14 +8,14 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
\ProvidesFile{jy2mc.fd}
- [2011/05/07 v1.5-u00 KANJI font defines]
+ [2018/02/04 v1.6l-u02 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/ujarticle.cls b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
index dc09cb2e3e3..2f55a0d05d8 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujarticle.cls
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujarticle}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -124,6 +124,7 @@
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
\ProcessOptions\relax
\input{ujsize1\@ptsize.clo}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{2\Cwd}
\else
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
index 3331e8a0861..23b5e232ef2 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk10.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk10.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
index b9566396536..1afe911e565 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk11.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk11.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
index c36e7f18259..a2947ab4c71 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujbk12.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk12.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujbook.cls b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
index d7ba8f385d9..5cec7b80d92 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujbook.cls
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujbook}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -134,6 +134,7 @@
\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright}
\ProcessOptions\relax
\input{ujbk1\@ptsize.clo}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{2\Cwd}
\else
diff --git a/Master/texmf-dist/tex/uplatex/base/ujreport.cls b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
index f7762375ee4..bb453e1bd5d 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/ujreport.cls
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujreport}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -132,6 +132,7 @@
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
\ProcessOptions\relax
\input{ujsize1\@ptsize.clo}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{2\Cwd}
\else
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
index a351a3c5f70..e71e180baad 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize10.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize10.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
index f7650825aa0..a10d1dbd626 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize11.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize11.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
index 132269d43c0..49e5f6688f6 100644
--- a/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/ujsize12.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize12.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
index 0accc803751..f763959b86b 100644
--- a/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
+++ b/Master/texmf-dist/tex/uplatex/base/ukinsoku.tex
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -397,8 +397,8 @@
%%
%%\inhibitxspcode`¡=2
%%\inhibitxspcode`¿=2
-%%\inhibitxspcode`º=1
-%%\inhibitxspcode`ª=1
+%%\inhibitxspcode"BA=1% º
+%%\inhibitxspcode"AA=1% ª
\inhibitxspcode`™=1
%%
%% inhibitxspcode 半角片仮名
diff --git a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
index 78d74e9ff89..1754980afc5 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplatex.ltx
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -23,7 +23,13 @@
*^^J%
**************************}
\makeatletter
+\input plcore.ltx
\input uplcore.ltx
+\InputIfFileExists{upldefs.cfg}
+ {\typeout{*************************************^^J%
+ * Local config file upldefs.cfg used^^J%
+ *************************************}}%
+ {\input{upldefs.ltx}}
\the\everyjob
\everyjob\expandafter{%
\the\everyjob
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index 31214f925d6..bb02f4fa091 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -5,1100 +5,38 @@
%% The original source files were:
%%
%% uplvers.dtx (with options: `plcore')
-%% uplfonts.dtx (with options: `plcore')
-%% plcore.dtx (with options: `plcore')
%% uplvers.dtx (with options: `plfinal')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
%%
%% File: uplvers.dtx
-\def\pfmtname{pLaTeX2e}
-\def\pfmtversion
- {2017/10/28u01}
-\def\ppatch@level{4}
-\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+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+plIIR\endcsname\@empty
- \fi
- \else
- \GenericInfo{}{Already applied: \the\toks@}%
- \expandafter\@gobble@plIncludeInRelease
- \fi
-}
-\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{}
-\let\plEndIncludeInRelease\relax
-%% File: uplfonts.dtx
-\let\k@encoding\@empty
-\let\ck@encoding\@empty
-\let\cy@encoding\@empty
-\let\ct@encoding\@empty
-\let\k@family\@empty
-\let\k@series\@empty
-\let\k@shape\@empty
-\def\curr@kfontshape{\k@encoding/\k@family/\k@series/\k@shape}
-\def\rel@fontshape{\f@encoding/\f@family/\f@series/\f@shape}
-\newdimen\Cht
-\newdimen\cht
-\newdimen\Cdp
-\newdimen\cdp
-\newdimen\Cwd
-\newdimen\cwd
-\newdimen\Cvs
-\newdimen\cvs
-\newdimen\Chs
-\newdimen\chs
-\newdimen\cHT
-\let\afont\font
-\def\inlist@#1#2{%
- \def\in@@##1<#1>##2##3\in@@{%
- \ifx\in@##2\in@false\else\in@true\fi}%
- \in@@#2<#1>\in@\in@@}
-\def\fam@elt{\noexpand\fam@elt}
-\def\enc@elt{\noexpand\enc@elt}
-\def\fenc@list{\enc@elt<OML>\enc@elt<T1>\enc@elt<OT1>\enc@elt<OMS>%
- \enc@elt<OMX>\enc@elt<TS1>\enc@elt<U>}
-\let\kenc@list\@empty
-\let\kyenc@list\@empty
-\let\ktenc@list\@empty
-\def\kfam@list{\fam@elt<mc>\fam@elt<gt>}
-\def\ffam@list{\fam@elt<cmr>\fam@elt<cmss>\fam@elt<cmtt>%
- \fam@elt<cmm>\fam@elt<cmsy>\fam@elt<cmex>}
-\let\notkfam@list\ffam@list
-\let\notffam@list\kfam@list
-\newbox\tstrutbox
-\newbox\zstrutbox
-\newbox\ystrutbox
-\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}
-\def\strut{\relax
- \ifydir
- \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
- \else
- \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
- \fi}
-\def\tstrut{\relax\hbox{\tate
- \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
-\def\zstrut{\relax\hbox{\tate
- \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
-\def\ystrut{\relax\hbox{\yoko
- \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
-\def\DeclareFontEncoding{%
- \begingroup
- \nfss@catcodes
- \expandafter\endgroup
- \DeclareFontEncoding@}
-\def\DeclareFontEncoding@#1#2#3{%
- \expandafter
- \ifx\csname T@#1\endcsname\relax
- \def\cdp@elt{\noexpand\cdp@elt}%
- \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
- {\default@family}{\default@series}%
- {\default@shape}}%
- \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
- \def\enc@elt{\noexpand\enc@elt}%
- \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
- \else
- \@font@info{Redeclaring font encoding #1}%
- \fi
- \global\@namedef{T@#1}{#2}%
- \global\@namedef{M@#1}{\default@M#3}%
- \xdef\LastDeclaredEncoding{#1}%
- }
-\def\DeclareKanjiEncoding#1{%
- \@latex@warning{%
- The \string\DeclareKanjiEncoding\space is obsoleted command. Please use
- \MessageBreak
- the \string\DeclareTateKanjiEncoding\space for `Tate-kumi' encoding, and
- \MessageBreak
- the \string\DeclareYokoKanjiEncoding\space for `Yoko-kumi' encoding.
- \MessageBreak
- I treat the `#1' encoding as `Yoko-kumi'.}
- \DeclareYokoKanjiEncoding{#1}%
-}
-\def\DeclareYokoKanjiEncoding{%
- \begingroup
- \nfss@catcodes
- \expandafter\endgroup
- \DeclareYokoKanjiEncoding@}
-\def\DeclareYokoKanjiEncoding@#1#2#3{%
- \expandafter
- \ifx\csname T@#1\endcsname\relax
- \def\cdp@elt{\noexpand\cdp@elt}%
- \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
- {\default@k@family}{\default@k@series}%
- {\default@k@shape}}%
- \expandafter\let\csname#1-cmd\endcsname\@changed@kcmd
- \def\enc@elt{\noexpand\enc@elt}%
- \xdef\kyenc@list{\kyenc@list\enc@elt<#1>}%
- \xdef\kenc@list{\kenc@list\enc@elt<#1>}%
- \else
- \@font@info{Redeclaring KANJI (yoko) font encoding #1}%
- \fi
- \global\@namedef{T@#1}{#2}%
- \global\@namedef{M@#1}{\default@KM#3}%
- }
-\def\DeclareTateKanjiEncoding{%
- \begingroup
- \nfss@catcodes
- \expandafter\endgroup
- \DeclareTateKanjiEncoding@}
-\def\DeclareTateKanjiEncoding@#1#2#3{%
- \expandafter
- \ifx\csname T@#1\endcsname\relax
- \def\cdp@elt{\noexpand\cdp@elt}%
- \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
- {\default@k@family}{\default@k@series}%
- {\default@k@shape}}%
- \expandafter\let\csname#1-cmd\endcsname\@changed@kcmd
- \def\enc@elt{\noexpand\enc@elt}%
- \xdef\ktenc@list{\ktenc@list\enc@elt<#1>}%
- \xdef\kenc@list{\kenc@list\enc@elt<#1>}%
- \else
- \@font@info{Redeclaring KANJI (tate) font encoding #1}%
- \fi
- \global\@namedef{T@#1}{#2}%
- \global\@namedef{M@#1}{\default@KM#3}%
- }
-\@onlypreamble\DeclareKanjiEncoding
-\@onlypreamble\DeclareYokoKanjiEncoding
-\@onlypreamble\DeclareYokoKanjiEncoding@
-\@onlypreamble\DeclareTateKanjiEncoding
-\@onlypreamble\DeclareTateKanjiEncoding@
-\def\DeclareKanjiEncodingDefaults#1#2{%
- \ifx\relax#1\else
- \ifx\default@KT\@empty\else
- \@font@info{Overwriting KANJI encoding scheme text defaults}%
- \fi
- \gdef\default@KT{#1}%
- \fi
- \ifx\relax#2\else
- \ifx\default@KM\@empty\else
- \@font@info{Overwriting KANJI encoding scheme math defaults}%
- \fi
- \gdef\default@KM{#2}%
- \fi}
-\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}%
- {\edef\tmp@item{{#2}}%
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\ffam@list}%
- \ifin@ \else
- \def\fam@elt{\noexpand\fam@elt}%
- \xdef\ffam@list{\ffam@list\fam@elt<#2>}%
- \fi
- \def\reserved@a{#3}%
- \global
- \expandafter\let\csname #1+#2\expandafter\endcsname
- \ifx \reserved@a\@empty
- \@empty
- \else \reserved@a
- \fi
- }%
-}
-\def\DeclareKanjiFamily#1#2#3{%
- \@ifundefined{T@#1}%
- {\@latex@error{KANJI Encoding scheme `#1' unknown}\@eha}%
- {\edef\tmp@item{{#2}}%
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kfam@list}%
- \ifin@ \else
- \def\fam@elt{\noexpand\fam@elt}%
- \xdef\kfam@list{\kfam@list\fam@elt<#2>}%
- \fi
- \def\reserved@a{#3}%
- \global
- \expandafter\let\csname #1+#2\expandafter\endcsname
- \ifx \reserved@a\@empty
- \@empty
- \else \reserved@a
- \fi
- }%
-}
-\def\DeclareKanjiSubstitution#1#2#3#4{%
- \expandafter\ifx\csname T@#1\endcsname\relax
- \@latex@error{KANJI Encoding scheme `#1' unknown}\@eha
- \else
- \begingroup
- \def\reserved@a{#1}%
- \toks@{}%
- \def\cdp@elt##1##2##3##4{%
- \def\reserved@b{##1}%
- \ifx\reserved@a\reserved@b
- \addto@hook\toks@{\cdp@elt{#1}{#2}{#3}{#4}}%
- \else
- \addto@hook\toks@{\cdp@elt{##1}{##2}{##3}{##4}}%
- \fi}%
- \cdp@list
- \xdef\cdp@list{\the\toks@}%
- \endgroup
- \global\@namedef{D@#1}{\def\default@family{#2}%
- \def\default@series{#3}%
- \def\default@shape{#4}}%
- \fi}
-\def\DeclareErrorKanjiFont#1#2#3#4#5{%
- \xdef\error@kfontshape{%
- \noexpand\expandafter\noexpand\split@name\noexpand\string
- \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname
- \noexpand\@nil}%
- \gdef\default@k@family{#2}%
- \gdef\default@k@series{#3}%
- \gdef\default@k@shape{#4}%
- \global\let\k@family\default@k@family
- \global\let\k@series\default@k@series
- \global\let\k@shape\default@k@shape
- \gdef\f@size{#5}%
- \gdef\f@baselineskip{#5pt}}
-\@onlypreamble\DeclareKanjiSubstitution
-\@onlypreamble\DeclareErrorKanjiFont
-\def\DeclareFixedFont#1#2#3#4#5#6{%
- \begingroup
- \let\afont\font
- \math@fontsfalse
- \every@math@size{}%
- \fontsize{#6}\z@
- \edef\tmp@item{{#2}}%
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
- \ifin@
- \usekanji{#2}{#3}{#4}{#5}%
- \let\font\jfont
- \else
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
- \ifin@
- \usekanji{#2}{#3}{#4}{#5}%
- \let\font\tfont
- \else
- \useroman{#2}{#3}{#4}{#5}%
- \let\font\afont
- \fi
- \fi
- \global\expandafter\let\expandafter#1\the\font
- \let\font\afont
- \endgroup
- }
-\def\reDeclareMathAlphabet#1#2#3{%
- \edef#1{\noexpand\protect\expandafter\noexpand\csname%
- \expandafter\@gobble\string#1\space\space\endcsname}%
- \edef\@tempa{\expandafter\@gobble\string#2}%
- \edef\@tempb{\expandafter\@gobble\string#3}%
- \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}%
- \ifx\@tempc\@tempa%
- \edef\@tempa{\expandafter\@gobbletwo\string#2}%
- \edef\@tempb{\expandafter\@gobbletwo\string#3}%
- \fi
- \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname%
- {\noexpand\DualLang@mathalph@bet%
- {\expandafter\noexpand\csname\@tempa\space\endcsname}%
- {\expandafter\noexpand\csname\@tempb\space\endcsname}%
- }%
-}
-\@onlypreamble\reDeclareMathAlphabet
-\def\DualLang@mathalph@bet#1#2{%
- \relax\ifmmode
- \ifx\math@bgroup\bgroup% 2e normal style (\mathrm{...})
- \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard
- \else
- \ifx\math@bgroup\relax% 2e two letter style (\rm->\mathrm)
- \let\DualLang@Mfontsw\DLMfontsw@oldstyle
- \else
- \ifx\math@bgroup\@empty% 2.09 oldlfont style ({\mathrm ...})
- \let\DualLang@Mfontsw\DLMfontsw@oldlfont
- \else% panic! assume 2e normal style
- \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard
- \fi
- \fi
- \fi
- \else
- \let\DualLang@Mfontsw\@firstoftwo
- \fi
- \DualLang@Mfontsw{#1}{#2}%
-}
-\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup}
-\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}}
-\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax}
-\def\all@shape{all}%
-\def\DeclareRelationFont#1#2#3#4#5#6#7#8{%
- \def\rel@shape{#4}%
- \ifx\rel@shape\@empty
- \global
- \expandafter\def\csname rel@#1/#2/#3/all\endcsname{%
- \romanencoding{#5}\romanfamily{#6}%
- \romanseries{#7}}%
- \else
- \global
- \expandafter\def\csname rel@#1/#2/#3/#4\endcsname{%
- \romanencoding{#5}\romanfamily{#6}%
- \romanseries{#7}\romanshape{#8}}%
- \fi
-}
-\def\SetRelationFont#1#2#3#4#5#6#7#8{%
- \def\rel@shape{#4}%
- \ifx\rel@shape\@empty
- \expandafter\def\csname rel@#1/#2/#3/all\endcsname{%
- \romanencoding{#5}\romanfamily{#6}%
- \romanseries{#7}}%
- \else
- \expandafter\def\csname rel@#1/#2/#3/#4\endcsname{%
- \romanencoding{#5}\romanfamily{#6}%
- \romanseries{#7}\romanshape{#8}}%
- \fi
-}
-\newif\if@knjcmd
-\def\userelfont{\@knjcmdtrue}
-\DeclareRobustCommand\selectfont{%
- \let\tmp@error@fontshape\error@fontshape
- \let\error@fontshape\error@kfontshape
- \edef\tmp@item{{\k@encoding}}%
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
- \ifin@
- \let\cy@encoding\k@encoding
- \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}%
- \else
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
- \ifin@
- \let\ct@encoding\k@encoding
- \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}%
- \else
- \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
- \fi
- \fi
- \let\font\tfont
- \let\k@encoding\ct@encoding
- \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
- \pickup@font
- \font@name
- \let\font\jfont
- \let\k@encoding\cy@encoding
- \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
- \pickup@font
- \font@name
- \expandafter\def\expandafter\k@encoding\tmp@item
- \kenc@update
- \let\error@fontshape\tmp@error@fontshape
- \if@knjcmd \@knjcmdfalse
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax
- \else
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname
- \fi
- \else
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname
- \fi
- \fi
- \let\font\afont
- \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
- \pickup@font
- \font@name
- \enc@update
- \ifx\f@linespread\baselinestretch \else
- \set@fontsize\baselinestretch\f@size\f@baselineskip
- \fi
- \size@update}
-\def\set@fontsize#1#2#3{%
- \@defaultunits\@tempdimb#2pt\relax\@nnil
- \edef\f@size{\strip@pt\@tempdimb}%
- \@defaultunits\@tempskipa#3pt\relax\@nnil
- \edef\f@baselineskip{\the\@tempskipa}%
- \edef\f@linespread{#1}%
- \let\baselinestretch\f@linespread
- \def\size@update{%
- \baselineskip\f@baselineskip\relax
- \baselineskip\f@linespread\baselineskip
- \normalbaselineskip\baselineskip
- \adjustbaseline
- \setbox\ystrutbox\hbox{\yoko
- \vrule\@width\z@
- \@height.7\baselineskip \@depth.3\baselineskip}%
- \setbox\tstrutbox\hbox{\tate
- \vrule\@width\z@
- \@height.5\baselineskip \@depth.5\baselineskip}%
- \setbox\zstrutbox\hbox{\tate
- \vrule\@width\z@
- \@height.7\baselineskip \@depth.3\baselineskip}%
- \let\size@update\relax}}
-\newbox\adjust@box
-\newdimen\adjust@dimen
-\def\adjustbaseline{%
- \setbox\adjust@box\hbox{\char\jis"3441}%"
- \cht\ht\adjust@box
- \cdp\dp\adjust@box
- \cwd\wd\adjust@box
- \cvs\normalbaselineskip
- \chs\cwd
- \cHT\cht \advance\cHT\cdp
- \iftdir
- \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
- \adjust@dimen\ht\adjust@box
- \advance\adjust@dimen\dp\adjust@box
- \advance\adjust@dimen-\cHT
- \divide\adjust@dimen\tw@
- \advance\adjust@dimen\cdp
- \advance\adjust@dimen-\dp\adjust@box
- \tbaselineshift\adjust@dimen
- \fi}
-\DeclareRobustCommand\romanencoding[1]{%
- \expandafter\ifx\csname T@#1\endcsname\relax
- \@latex@error{Encoding scheme `#1' unknown}\@eha
- \else
- \edef\f@encoding{#1}%
- \ifx\cf@encoding\f@encoding
- \let\enc@update\relax
- \else
- \let\enc@update\@@enc@update
- \fi
- \fi
-}
-\DeclareRobustCommand\kanjiencoding[1]{%
- \expandafter\ifx\csname T@#1\endcsname\relax
- \@latex@error{KANJI Encoding scheme `#1' unknown}\@eha
- \else
- \edef\k@encoding{#1}%
- \ifx\ck@encoding\k@encoding
- \let\kenc@update\relax
- \else
- \let\kenc@update\@@kenc@update
- \fi
- \fi
-}
-\DeclareRobustCommand\fontencoding[1]{%
- \edef\tmp@item{{#1}}%
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
- \ifin@ \kanjiencoding{#1}\else\romanencoding{#1}\fi}
-\def\@@kenc@update{%
- \default@KT
- \csname T@\k@encoding\endcsname
- \csname D@\k@encoding\endcsname
- \let\kenc@update\relax
- \let\ck@encoding\k@encoding
- \edef\tmp@item{{\k@encoding}}%
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
- \ifin@ \let\cy@encoding\k@encoding
- \else
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
- \ifin@ \let\ct@encoding\k@encoding
- \else
- \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
- \fi
- \fi
-}
-\let\kenc@update\relax
-\def\@changed@kcmd#1#2{%
- \ifx\protect\@typeset@protect
- \@inmathwarn#1%
- \expandafter\ifx\csname\ck@encoding\string#1\endcsname\relax
- \expandafter\ifx\csname ?\string#1\endcsname\relax
- \expandafter\def\csname ?\string#1\endcsname{%
- \TextSymbolUnavailable#1%
- }%
- \fi
- \global\expandafter\let
- \csname\cf@encoding \string#1\expandafter\endcsname
- \csname ?\string#1\endcsname
- \fi
- \csname\ck@encoding\string#1%
- \expandafter\endcsname
- \else
- \noexpand#1%
- \fi}
-\newif\if@notkfam
-\newif\if@notffam
-\newif\if@tempswz
-\DeclareRobustCommand\romanfamily[1]{\edef\f@family{#1}}
-\DeclareRobustCommand\kanjifamily[1]{\edef\k@family{#1}}
-\DeclareRobustCommand\fontfamily[1]{%
- \edef\tmp@item{{#1}}%
- \@notkfamfalse
- \@notffamfalse
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kfam@list}%
- \ifin@ \edef\k@family{#1}%
- \else
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\notkfam@list}%
- \ifin@ \@notkfamtrue
- \else
- \@tempswzfalse
- \def\fam@elt{\noexpand\fam@elt}%
- \message{(I search kanjifont definition file:}%
- \def\enc@elt<##1>{\message{.}%
- \edef\reserved@a{\lowercase{\noexpand\IfFileExists{##1#1.fd}}}%
- \reserved@a{\@tempswztrue}{}\relax}%
- \kenc@list
- \message{)}%
- \if@tempswz
- \edef\k@family{#1}%
- \else
- \@notkfamtrue
- \xdef\notkfam@list{\notkfam@list\fam@elt<#1>}%
- \fi
- \fi\fi
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\ffam@list}%
- \ifin@ \edef\f@family{#1}\else
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\notffam@list}%
- \ifin@ \@notffamtrue \else
- \@tempswzfalse
- \def\fam@elt{\noexpand\fam@elt}%
- \message{(I search font definition file:}%
- \def\enc@elt<##1>{\message{.}%
- \edef\reserved@a{\lowercase{\noexpand\IfFileExists{##1#1.fd}}}%
- \reserved@a{\@tempswztrue}{}\relax}%
- \fenc@list
- \message{)}%
- \if@tempswz
- \edef\f@family{#1}%
- \else
- \@notffamtrue
- \xdef\notffam@list{\notffam@list\fam@elt<#1>}%
- \fi
- \fi\fi
- \if@notkfam\if@notffam
- \edef\k@family{#1}\edef\f@family{#1}%
- \fi\fi}
-\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
-\DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}}
-\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
-\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}}
-\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}}
-\def\usekanji#1#2#3#4{%
- \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
- \selectfont\ignorespaces}
-\def\useroman#1#2#3#4{%
- \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
- \selectfont\ignorespaces}
-\def\usefont#1#2#3#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}
-\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
-\DeclareRobustCommand\mcfamily
- {\not@math@alphabet\mcfamily\mathmc
- \kanjifamily\mcdefault\selectfont}
-\DeclareRobustCommand\gtfamily
- {\not@math@alphabet\gtfamily\mathgt
- \kanjifamily\gtdefault\selectfont}
-\let\romanprocess@table\process@table
-\def\kanjiprocess@table{%
- \kanjiencoding{\kanjiencodingdefault}%
- \kanjifamily{\kanjifamilydefault}%
- \kanjiseries{\kanjiseriesdefault}%
- \kanjishape{\kanjishapedefault}%
-}
-\def\process@table{%
- \romanprocess@table
- \kanjiprocess@table
-}
-\@onlypreamble\romanprocess@table
-\@onlypreamble\kanjiprocess@table
-\DeclareTextCommandDefault{\textunderscore}{%
- \leavevmode\kern.06em
- \raise-\iftdir\ifmdir\ybaselineshift
- \else\tbaselineshift\fi
- \else\ybaselineshift\fi
- \vbox{\hrule\@width.3em}}
-\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
-\def\pltx@mark{\pltx@mark@}
-\let\pltx@scanstop\relax
-\long\def\pltx@cond#1\fi{%
- #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\long\def\pltx@isletter#1{%
- \expandafter\pltx@isletter@i#1\pltx@scanstop}
-\long\def\pltx@isletter@i#1\pltx@scanstop{%
- \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
- {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
-\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
- \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
- {\pltx@isletter@iii}{\pltx@isletter@iv}}
-\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
-\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
- \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
- \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
- {\@firstoftwo}{\@secondoftwo}%
- }{\@secondoftwo}}
-\InputIfFileExists{upldefs.cfg}
- {\typeout{*************************************^^J%
- * Local config file upldefs.cfg used^^J%
- *************************************}}%
- {\input{upldefs.ltx}}
-%% File: plcore.dtx
-\def\NeedsTeXFormat#1{%
- \def\reserved@a{#1}%
- \ifx\reserved@a\pfmtname
- \expandafter\@needsPformat
- \else
- \ifx\reserved@a\fmtname
- \expandafter\expandafter\expandafter\@needsformat
- \else
- \@latex@error{This file needs format `\reserved@a'%
- \MessageBreak but this is `\pfmtname'}{%
- The current input file will not be processed
- further,\MessageBreak
- because it was written for some other flavor of
- TeX.\MessageBreak\@ehd}%
- \endinput
- \fi
- \fi}
-\def\@needsPformat{\@ifnextchar[\@needsPf@rmat{}}
-\def\@needsPf@rmat[#1]{%
- \@ifl@t@r\pfmtversion{#1}{}%
- {\@latex@warning@no@line
- {You have requested release `#1' of pLaTeX,\MessageBreak
- but only release `\pfmtversion' is available}}}
-\@onlypreamble\@needsPformat
-\@onlypreamble\@needsPf@rmat
-\def\documentstyle{%
- \makeatletter\input{pl209.def}\makeatother
- \documentclass}
-\def\cleardoublepage{\clearpage\if@twoside
- \ifodd\c@page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if@twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if@twocolumn\hbox{}\newpage\fi
- \fi
- \fi\fi}
-\def\@gnewline #1{%
- \ifvmode
- \@nolnerr
- \else
- \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
- \ignorespaces
- \fi}
-\gdef\@makecol{%
- \setbox\@outputbox\box\@cclv%
- \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k)
- \xdef\@freelist{\@freelist\@midlist}%
- \global \let \@midlist \@empty
- \@combinefloats
- \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25)
- \ifvoid\footins\else % changed (pLaTeX 2017/02/25)
- \setbox\@outputbox \vbox {%
- \boxmaxdepth \@maxdepth
- \unvbox \@outputbox
- \@textbottom % inserted here (pLaTeX 2017/02/25)
- \vskip \skip\footins
- \color@begingroup
- \normalcolor
- \footnoterule
- \unvbox \footins
- \color@endgroup
- }%
- \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25)
- \fi
- \ifvbox\@kludgeins
- \@makespecialcolbox
- \else
- \setbox\@outputbox \vbox to\@colht {%
- \@texttop
- \dimen@ \dp\@outputbox
- \unvbox \@outputbox
- \iftdir\vbox{\hskip\z@}\fi
- \vskip -\dimen@
- \@textbottom
- }%
- \fi
- \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25)
- \global \maxdepth \@maxdepth
-}
-\gdef\@makespecialcolbox{%
- \setbox\@outputbox \vbox {%
- \@texttop
- \dimen@ \dp\@outputbox
- \unvbox\@outputbox
- \vskip-\dimen@
- }%
- \@tempdima \@colht
- \ifdim \wd\@kludgeins>\z@
- \advance \@tempdima -\ht\@outputbox
- \advance \@tempdima \pageshrink
- \setbox\@outputbox \vbox to \@colht {%
- \unvbox\@outputbox
- \vskip \@tempdima
- \@textbottom
- \ifvoid\footins\else % for pLaTeX
- \vskip\skip\footins
- \color@begingroup
- \normalcolor
- \footnoterule
- \unvbox \footins
- \color@endgroup
- \fi
- }%
- \else
- \advance \@tempdima -\ht\@kludgeins
- \setbox \@outputbox \vbox to \@colht {%
- \vbox to \@tempdima {%
- \unvbox\@outputbox
- \@textbottom
- \ifvoid\footins\else % for pLaTeX
- \vskip\skip\footins
- \color@begingroup
- \normalcolor
- \footnoterule
- \unvbox \footins
- \color@endgroup
- \fi
- }\vss}%
- \fi
- {\setbox \@tempboxa \box \@kludgeins}%
-}
-\def\@reinserts{%
- \ifvoid\footins\else\insert\footins{%
- \iftbox\footins\tate\else\yoko\fi
- \unvbox\footins}\fi
- \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi
-}
-\newif\iftombow \tombowfalse
-\newif\iftombowdate \tombowdatetrue
-\newdimen\@tombowwidth
-\setlength{\@tombowwidth}{.1\p@}
-\newbox\@TL\newbox\@Tl
-\newbox\@TC
-\newbox\@TR\newbox\@Tr
-\newbox\@BL\newbox\@Bl
-\newbox\@BC
-\newbox\@BR\newbox\@Br
-\newbox\@CL
-\newbox\@CR
-\font\@bannerfont=cmtt9
-\newtoks\@bannertoken
-\@bannertoken{}
-\def\maketombowbox{%
- \setbox\@TL\hbox to\z@{\yoko\hss
- \vrule width13mm height\@tombowwidth depth\z@
- \vrule height10mm width\@tombowwidth depth\z@
- \iftombowdate
- \raise4pt\hbox to\z@{\hskip5mm\@bannerfont\the\@bannertoken\hss}%
- \fi}%
- \setbox\@Tl\hbox to\z@{\yoko\hss
- \vrule width10mm height\@tombowwidth depth\z@
- \vrule height13mm width\@tombowwidth depth\z@}%
- \setbox\@TC\hbox{\yoko
- \vrule width10mm height\@tombowwidth depth\z@
- \vrule height10mm width\@tombowwidth depth\z@
- \vrule width10mm height\@tombowwidth depth\z@}%
- \setbox\@TR\hbox to\z@{\yoko
- \vrule height10mm width\@tombowwidth depth\z@
- \vrule width13mm height\@tombowwidth depth\z@\hss}%
- \setbox\@Tr\hbox to\z@{\yoko
- \vrule height13mm width\@tombowwidth depth\z@
- \vrule width10mm height\@tombowwidth depth\z@\hss}%
- \setbox\@BL\hbox to\z@{\yoko\hss
- \vrule width13mm depth\@tombowwidth height\z@
- \vrule depth10mm width\@tombowwidth height\z@}%
- \setbox\@Bl\hbox to\z@{\yoko\hss
- \vrule width10mm depth\@tombowwidth height\z@
- \vrule depth13mm width\@tombowwidth height\z@}%
- \setbox\@BC\hbox{\yoko
- \vrule width10mm depth\@tombowwidth height\z@
- \vrule depth10mm width\@tombowwidth height\z@
- \vrule width10mm depth\@tombowwidth height\z@}%
- \setbox\@BR\hbox to\z@{\yoko
- \vrule depth10mm width\@tombowwidth height\z@
- \vrule width13mm depth\@tombowwidth height\z@\hss}%
- \setbox\@Br\hbox to\z@{\yoko
- \vrule depth13mm width\@tombowwidth height\z@
- \vrule width10mm depth\@tombowwidth height\z@\hss}%
- \setbox\@CL\hbox to\z@{\yoko\hss
- \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth
- \vrule height10mm depth10mm width\@tombowwidth}%
- \setbox\@CR\hbox to\z@{\yoko
- \vrule height10mm depth10mm width\@tombowwidth
- \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss}%
-}
-\def\@outputtombow{%
- \iftombow
- \vbox to\z@{\kern-13mm\relax
- \boxmaxdepth\maxdimen%% Added (Apr 1, 2016)
- \moveleft3mm\vbox to\@@paperheight{%
- \hbox to\@@paperwidth{\hskip3mm\relax
- \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}%
- \kern-10mm
- \hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}%
- \vfill
- \hbox to\@@paperwidth{\copy\@CL\hfill\copy\@CR}%
- \vfill
- \hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}%
- \kern-10mm
- \hbox to\@@paperwidth{\hskip3mm\relax
- \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip3mm}%
- }\vss
- }%
- \fi
-}
-\newdimen\@@paperheight
-\newdimen\@@paperwidth
-\newdimen\@@topmargin
-\def\@outputpage{%
-\begingroup % the \endgroup is put in by \aftergroup
- \iftdir
- \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@
- \fi
- \let \protect \noexpand
- \language\document@default@language
- \@resetactivechars
- \global\let\@@if@newlist\if@newlist
- \global\@newlistfalse
- \@parboxrestore
- \shipout\vbox{\yoko
- \set@typeset@protect
- \aftergroup\endgroup
- \aftergroup\set@typeset@protect
- \if@specialpage
- \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
- \fi
- \if@twoside
- \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
- \iftdir\let\@themargin\evensidemargin
- \else\let\@themargin\oddsidemargin\fi
- \else \let\@thehead\@evenhead
- \let\@thefoot\@evenfoot
- \iftdir\let\@themargin\oddsidemargin
- \else\let\@themargin\evensidemargin\fi
- \fi\fi
- \@@topmargin\topmargin
- \iftombow
- \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax
- \@@paperheight\paperheight \advance\@@paperheight 16mm\relax
- \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax
- \fi
- \reset@font
- \normalsize
- \normalsfcodes
- \let\label\@gobble
- \let\index\@gobble
- \let\glossary\@gobble
- \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
- \@begindvi
- \@outputtombow
- \vskip \@@topmargin
- \moveright\@themargin\vbox{%
- \setbox\@tempboxa \vbox to\headheight{%
- \vfil
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thehead}%
- \color@endbox
- }% %% 22 Feb 87
- \dp\@tempboxa \z@
- \box\@tempboxa
- \vskip \headsep
- \box\@outputbox
- \baselineskip \footskip
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thefoot}%
- \color@endbox
- }%
- }%
- \global\let\if@newlist\@@if@newlist
- \global \@colht \textheight
- \stepcounter{page}%
- \let\firstmark\botmark
-}
-\def \AtBeginDvi #1{%
- \global \setbox \@begindvibox
- \vbox{\yoko \unvbox \@begindvibox #1}%
-}
-\renewcommand\@makefnmark{%
- \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}%
- \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}
-\ifx\@undefined\pltx@foot@penalty \newcount\pltx@foot@penalty \fi
-\pltx@foot@penalty\z@
-\def\footnote{\inhibitglue
- \@ifnextchar[\@xfootnote{\stepcounter\@mpfn
- \protected@xdef\@thefnmark{\thempfn}%
- \@footnotemark\@footnotetext}}
-\def\footnotemark{\inhibitglue
- \@ifnextchar[\@xfootnotemark
- {\stepcounter{footnote}%
- \protected@xdef\@thefnmark{\thefootnote}%
- \@footnotemark}}
-\def\footnotetext{%
- \ifhmode\pltx@foot@penalty\lastpenalty\unpenalty\fi%
- \@ifnextchar [\@xfootnotenext
- {\protected@xdef\@thefnmark{\thempfn}%
- \@footnotetext}}
-\long\def\@footnotetext#1{%
- \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
- \insert\footins{\@tempa%
- \reset@font\footnotesize
- \interlinepenalty\interfootnotelinepenalty
- \splittopskip\footnotesep
- \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
- \hsize\columnwidth \@parboxrestore
- \protected@edef\@currentlabel{%
- \csname p@footnote\endcsname\@thefnmark
- }%
- \color@begingroup
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color@endgroup}\ifhmode\null\fi
- \ifnum\pltx@foot@penalty=\z@\else
- \penalty\pltx@foot@penalty
- \pltx@foot@penalty\z@
- \fi}
-\def\@footnotemark{\leavevmode
- \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi
- \ifydir\@makefnmark
- \else\hbox to\z@{\hskip-.25zw\raise.9zh\@makefnmark\hss}\fi
- \ifhmode\spacefactor\@x@sf\fi\relax}
-\def\@setref#1#2#3{%
- \ifx#1\relax
- \protect\G@refundefinedtrue
- \nfss@text{\reset@font\bfseries ??}%
- \@latex@warning{Reference `#3' on page \thepage \space
- undefined}%
- \else
- \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{}
- \fi}
-\def\@setref@{\ifhmode\spacefactor\@m\fi}
-\if@compatibility\else
-\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
- \bgroup
- \verb@eol@error \let\do\@makeother \dospecials
- \verbatim@font\@noligs
- \language\l@nohyphenation
- \@ifstar\@sverb\@verb}
-\fi
-\gdef\@startline{%
- \ifnum \@nxttabmar >\@hightab
- \@badtab
- \global\@nxttabmar \@hightab
- \fi
- \global\@curtabmar \@nxttabmar
- \global\@curtab \@curtabmar
- \global\setbox\@curline \hbox {}%
- \@startfield
- \strut\inhibitglue}
-\gdef\@stopfield{\null\color@endgroup\egroup}
-\newcommand\printglossary{\@input@{\jobname.gls}}
-\newcount\hour
-\newcount\minute
-\def\@tabclassz{%
- \ifcase\@lastchclass
- \@acolampacol
- \or
- \@ampacol
- \or
- \or
- \or
- \@addamp
- \or
- \@acolampacol
- \or
- \@firstampfalse\@acol
- \fi
- \edef\@preamble{%
- \@preamble{%
- \ifcase\@chnum
- \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
- \or
- \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
- \or
- \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r
- \fi}}}
-\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
-\@sharp\unskip\@endpbox}}
-\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
- \let\@classz\@tabclassz
- \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
-\def\endtabular{\crcr\egroup\egroup $\egroup\null}
-\expandafter \let \csname endtabular*\endcsname = \endtabular
-\let\@parboxto\@empty
-\long\def\@iiiparbox#1#2[#3]#4#5{%
- \leavevmode
- \@pboxswfalse
- \setlength\@tempdima{#4}%
- \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
- \ifx\relax#2\else
- \setlength\@tempdimb{#2}%
- \edef\@parboxto{to\the\@tempdimb}%
- \fi
- \if#1b\vbox
- \else\if #1t\vtop
- \else\ifmmode\vcenter
- \else\@pboxswtrue\null$\vcenter% !!!
- \fi\fi\fi
- \@parboxto{\let\hss\vss\let\unhbox\unvbox
- \csname bm@#3\endcsname}%
- \if@pboxsw \m@th$\null\fi% !!!
- \@end@tempboxa}
-\def\underline#1{%
- \relax
- \ifmmode\@@underline{#1}%
- \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
-\ifx\omathchar\@undefined
- \ifx\widowpenalties\@undefined
- \mathchardef\e@alloc@top=255
- \let\e@alloc@chardef\chardef
- \else
- \mathchardef\e@alloc@top=32767
- \let\e@alloc@chardef\mathchardef
- \fi
+\ifx\pfmtversion\@undefined
+ \errhelp{Please update your TeX installation; if not available,
+ obtain it^^Jmanually from CTAN
+ (https://www.ctan.org/pkg/uplatex) or from^^JGitHub
+ (https://github.com/texjporg/uplatex).}%
+ \errmessage{This should not happen!^^JThere should be some
+ inconsistency in your installation;^^Jtry
+ removing old `uplatex.ltx' and install the
+ latest one}\@@end
\else
- \ifx\enablecjktoken\@undefined % pTeX
- \omathchardef\e@alloc@top=65535
- \let\e@alloc@chardef\omathchardef
- \else % upTeX
- \chardef\e@alloc@top=65535
- \let\e@alloc@chardef\chardef
+ \ifnum\expandafter\@parse@version\pfmtversion\@nil<20180309
+ \errhelp{Please update your TeX installation; if not available,
+ obtain it^^Jmanually from CTAN
+ (https://www.ctan.org/pkg/platex) or from^^JGitHub
+ (https://github.com/texjporg/platex).}%
+ \errmessage{This version of upLaTeX2e requires pLaTeX2e 2018/03/09
+ or newer!^^JObtain a newer version of `platex',
+ otherwise upLaTeX2e setup will^^Jnever succeed}\@@end
\fi
\fi
-\ifx\omathchar\@undefined
- \chardef\e@mathgroup@top=16 % LaTeX2e kernel standard
-\else
- \mathchardef\e@mathgroup@top=256 % for e-pTeX FAM256 patched
-\fi
+\def\uppatch@level{u02}
+\edef\pfmtversion{\pfmtversion\uppatch@level}
%% File: uplvers.dtx
\def\documentstyle{%
\@latex@error{upLaTeX does NOT support LaTeX 2.09 compatibility
@@ -1110,50 +48,6 @@
New documents should use Standard LaTeX conventions, and
start\MessageBreak with the \noexpand\documentclass command.}%
\documentclass}
-\ifx\patch@level\@undefined % fallback if undefined in LaTeX
- \def\patch@level{0}\fi
-\ifx\ppatch@level\@undefined % fallback if undefined in upLaTeX
- \def\ppatch@level{0}\fi
-\begingroup
- \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
- \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}
- \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
-\ifx\document@default@language \@undefined
- \let\document@default@language\m@ne
-\fi
-\AtBeginDocument{%
- \@ifpackageloaded{latexrelease}{%
- \@ifpackageloaded{platexrelease}{}{%
- \@latex@warning@no@line{%
- Package latexrelease is loaded.\MessageBreak
- Some patches in pLaTeX2e core may be overwritten.\MessageBreak
- Consider using platexrelease.\MessageBreak
- See platex.pdf for detail}%
- }%
- }{}%
-}
\endinput
%%
%% End of file `uplcore.ltx'.
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index 5db531fe170..48f137dbf41 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -8,14 +8,14 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
%%
%% File: uplfonts.dtx
\ProvidesFile{upldefs.ltx}
- [2017/11/06 v1.6j-u00 upLaTeX Kernel (Default settings)]
+ [2018/02/04 v1.6l-u02 upLaTeX Kernel (Default settings)]
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10}
\DeclareYokoKanjiEncoding{JY2}{}{}
diff --git a/Master/texmf-dist/tex/uplatex/base/uptrace.sty b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
index cba13346d34..e1a938ba6c7 100644
--- a/Master/texmf-dist/tex/uplatex/base/uptrace.sty
+++ b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,181 +16,8 @@
%% File: uplfonts.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{uptrace}
- [2017/08/05 v1.6h-u00 Standard upLaTeX package (font tracing)]
-\RequirePackageWithOptions{tracefnt}
-\DeclareRobustCommand\selectfont{%
- \let\tmp@error@fontshape\error@fontshape
- \let\error@fontshape\error@kfontshape
- \edef\tmp@item{{\k@encoding}}%
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
- \ifin@
- \let\cy@encoding\k@encoding
- \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}%
- \else
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
- \ifin@
- \let\ct@encoding\k@encoding
- \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}%
- \else
- \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
- \fi
- \fi
- \let\font\tfont
- \let\k@encoding\ct@encoding
- \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
- \pickup@font
- \font@name
- \let\font\jfont
- \let\k@encoding\cy@encoding
- \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
- \pickup@font
- \font@name
- \expandafter\def\expandafter\k@encoding\tmp@item
- \kenc@update
- \let\error@fontshape\tmp@error@fontshape
- \if@knjcmd \@knjcmdfalse
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax
- \else
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname
- \fi
- \else
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname
- \fi
- \fi
- \let\font\afont
- \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
- \pickup@font
- \font@name
- \ifnum \tracingfonts>\tw@
- \@font@info{Roman:Switching to \font@name}\fi
- \enc@update
- \ifx\f@linespread\baselinestretch \else
- \set@fontsize\baselinestretch\f@size\f@baselineskip
- \fi
- \size@update}
-\plIncludeInRelease{2017/04/08}{\set@fontsize}
- {Construct \ystrutbox}%
-\def\set@fontsize#1#2#3{%
- \@defaultunits\@tempdimb#2pt\relax\@nnil
- \edef\f@size{\strip@pt\@tempdimb}%
- \@defaultunits\@tempskipa#3pt\relax\@nnil
- \edef\f@baselineskip{\the\@tempskipa}%
- \edef\f@linespread{#1}%
- \let\baselinestretch\f@linespread
- \def\size@update{%
- \baselineskip\f@baselineskip\relax
- \baselineskip\f@linespread\baselineskip
- \normalbaselineskip\baselineskip
- \adjustbaseline
- \setbox\ystrutbox\hbox{\yoko
- \vrule\@width\z@
- \@height.7\baselineskip \@depth.3\baselineskip}%
- \setbox\tstrutbox\hbox{\tate
- \vrule\@width\z@
- \@height.5\baselineskip \@depth.5\baselineskip}%
- \setbox\zstrutbox\hbox{\tate
- \vrule\@width\z@
- \@height.7\baselineskip \@depth.3\baselineskip}%
- \ifnum \tracingfonts>\tw@
- \ifx\f@linespread\@empty
- \let\reserved@a\@empty
- \else
- \def\reserved@a{\f@linespread x}%
- \fi
- \@font@info{Changing size to\space
- \f@size/\reserved@a \f@baselineskip}%
- \aftergroup\type@restoreinfo
- \fi
- \let\size@update\relax}}
-\plEndIncludeInRelease
-\plIncludeInRelease{0000/00/00}{\set@fontsize}
- {Construct \ystrutbox}%
-\def\set@fontsize#1#2#3{%
- \@defaultunits\@tempdimb#2pt\relax\@nnil
- \edef\f@size{\strip@pt\@tempdimb}%
- \@defaultunits\@tempskipa#3pt\relax\@nnil
- \edef\f@baselineskip{\the\@tempskipa}%
- \edef\f@linespread{#1}%
- \let\baselinestretch\f@linespread
- \def\size@update{%
- \baselineskip\f@baselineskip\relax
- \baselineskip\f@linespread\baselineskip
- \normalbaselineskip\baselineskip
- \adjustbaseline
- \setbox\strutbox\hbox{\yoko
- \vrule\@width\z@
- \@height.7\baselineskip \@depth.3\baselineskip}%
- \setbox\tstrutbox\hbox{\tate
- \vrule\@width\z@
- \@height.5\baselineskip \@depth.5\baselineskip}%
- \setbox\zstrutbox\hbox{\tate
- \vrule\@width\z@
- \@height.7\baselineskip \@depth.3\baselineskip}%
- \ifnum \tracingfonts>\tw@
- \ifx\f@linespread\@empty
- \let\reserved@a\@empty
- \else
- \def\reserved@a{\f@linespread x}%
- \fi
- \@font@info{Changing size to\space
- \f@size/\reserved@a \f@baselineskip}%
- \aftergroup\type@restoreinfo
- \fi
- \let\size@update\relax}}
-\plEndIncludeInRelease
-\plIncludeInRelease{2017/07/29}{\adjustbaseline}
- {Change zenkaku reference}%
-\def\adjustbaseline{%
- \setbox\adjust@box\hbox{\char\jis"3441}%"
- \cht\ht\adjust@box
- \cdp\dp\adjust@box
- \cwd\wd\adjust@box
- \cvs\normalbaselineskip
- \chs\cwd
- \cHT\cht \advance\cHT\cdp
- \iftdir
- \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
- \adjust@dimen\ht\adjust@box
- \advance\adjust@dimen\dp\adjust@box
- \advance\adjust@dimen-\cHT
- \divide\adjust@dimen\tw@
- \advance\adjust@dimen\cdp
- \advance\adjust@dimen-\dp\adjust@box
- \tbaselineshift\adjust@dimen
- \ifnum \tracingfonts>\tw@
- \typeout{baselineshift:\the\tbaselineshift}%
- \fi
- \fi}
-\plEndIncludeInRelease
-\plIncludeInRelease{0000/00/00}{\adjustbaseline}
- {Change zenkaku reference}%
-\def\adjustbaseline{%
- \setbox\adjust@box\hbox{\char\euc"A1A1}%"
- \cht\ht\adjust@box
- \cdp\dp\adjust@box
- \cwd\wd\adjust@box
- \cvs\normalbaselineskip
- \chs\cwd
- \cHT\cht \advance\cHT\cdp
- \iftdir
- \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
- \adjust@dimen\ht\adjust@box
- \advance\adjust@dimen\dp\adjust@box
- \advance\adjust@dimen-\cHT
- \divide\adjust@dimen\tw@
- \advance\adjust@dimen\cdp
- \advance\adjust@dimen-\dp\adjust@box
- \tbaselineshift\adjust@dimen
- \ifnum \tracingfonts>\tw@
- \typeout{baselineshift:\the\tbaselineshift}
- \fi
- \fi}
-\plEndIncludeInRelease
+ [2017/12/10 v1.6k-u02 Standard upLaTeX package (font tracing)]
+\RequirePackageWithOptions{ptrace}
\endinput
%%
%% End of file `uptrace.sty'.
diff --git a/Master/texmf-dist/tex/uplatex/base/utarticle.cls b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
index ccec7de858b..f9e3db25353 100644
--- a/Master/texmf-dist/tex/uplatex/base/utarticle.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utarticle.cls
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utarticle}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -125,6 +125,7 @@
\ProcessOptions\relax
\input{utsize1\@ptsize.clo}
\RequirePackage{plext}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{3\Cwd}
\else
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk10.clo b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
index d77bfb6dccd..18b43cb7d02 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk10.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk10.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk11.clo b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
index ba0922fdc93..609421d8edc 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk11.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk11.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbk12.clo b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
index 959cbb7800b..cb827edc756 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbk12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utbk12.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk12.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utbook.cls b/Master/texmf-dist/tex/uplatex/base/utbook.cls
index f6a2d4ea664..521cd3714c0 100644
--- a/Master/texmf-dist/tex/uplatex/base/utbook.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utbook.cls
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utbook}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -135,6 +135,7 @@
\ProcessOptions\relax
\input{utbk1\@ptsize.clo}
\RequirePackage{plext}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{3\Cwd}
\else
diff --git a/Master/texmf-dist/tex/uplatex/base/utreport.cls b/Master/texmf-dist/tex/uplatex/base/utreport.cls
index ca6a9ea8a27..99d4a4c76ce 100644
--- a/Master/texmf-dist/tex/uplatex/base/utreport.cls
+++ b/Master/texmf-dist/tex/uplatex/base/utreport.cls
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utreport}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -133,6 +133,7 @@
\ProcessOptions\relax
\input{utsize1\@ptsize.clo}
\RequirePackage{plext}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{3\Cwd}
\else
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize10.clo b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
index 19b283fcd0a..5ff06bb89c2 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize10.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize10.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize10.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize11.clo b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
index 37fad7c8de6..ebfb005c448 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize11.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize11.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize11.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/uplatex/base/utsize12.clo b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
index fbe83bbe6c9..aa739cb842e 100644
--- a/Master/texmf-dist/tex/uplatex/base/utsize12.clo
+++ b/Master/texmf-dist/tex/uplatex/base/utsize12.clo
@@ -8,7 +8,7 @@
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
%% Copyright (c) 2016 Takuji Tanaka
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the upLaTeX2e system (community edition).
%% --------------------------------------------------------------
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize12.clo}
- [2017/09/19 v1.7g-u00
+ [2018/02/04 v1.7h-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%