summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/uplatex/base/upldefs.ltx')
-rw-r--r--Master/texmf-dist/tex/uplatex/base/upldefs.ltx48
1 files changed, 34 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index 7701d6b218a..3a5455b681b 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -6,20 +6,13 @@
%%
%% uplfonts.dtx (with options: `pldefs,xpt')
%%
-%% IMPORTANT NOTICE:
+%% Copyright (c) 2010 ASCII MEDIA WORKS
+%% Copyright (c) 2016 Takuji Tanaka
+%% Copyright (c) 2016 Japanese TeX Development Community
%%
-%% For the copyright see the source file.
+%% This file is part of the upLaTeX2e system (community edition).
+%% --------------------------------------------------------------
%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from upldefs.ltx.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file uplfonts.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
%% File: uplfonts.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -38,7 +31,33 @@
%% Right brace \} Tilde \~}
%%
\ProvidesFile{upldefs.ltx}
- [2000/07/13 v1.2u01 upLaTeX Kernel (Default settings)]
+ [2016/04/06 v1.6a-u00 upLaTeX Kernel (Default settings)]
+\def\@text@composite#1#2#3#{%
+ \begingroup
+ \setbox\z@=\hbox\bgroup%
+ \ybaselineshift\z@\tbaselineshift\z@
+ \expandafter\@text@composite@x
+ \csname\string#1-\string#2\endcsname}
+\def\@text@composite@x#1#2{%
+ \ifx#1\relax
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ #1{#2}\egroup
+ \leavevmode
+ \expandafter\lower
+ \iftdir
+ \ifmdir
+ \ifmmode\tbaselineshift\else\ybaselineshift\fi
+ \else
+ \tbaselineshift
+ \fi
+ \else
+ \ybaselineshift
+ \fi
+ \box\z@
+ \endgroup}
\def \check@nocorr@ #1#2\nocorr#3\@nil {%
\let \check@icl \relax% \maybe@ic から変更
\def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
@@ -82,7 +101,8 @@
\DeclareTextFontCommand{\textgt}{\gtfamily}
\DeclareRobustCommand\em
{\@nomath\em \ifdim \fontdimen\@ne\font >\z@
- \mcfamily \upshape \else \gtfamily \itshape \fi}
+ \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}