uplatex (16apr17)

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

1 files changed, 49 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/uplatex/base/uptrace.sty b/Master/texmf-dist/tex/uplatex/base/uptrace.sty
index c2aafd9bf6a..793da2e868c 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}
-     [2016/04/30 v1.6b-u00 Standard upLaTeX package (font tracing)]
+     [2017/03/05 v1.6f-u00 Standard upLaTeX package (font tracing)]
 \RequirePackageWithOptions{tracefnt}
 \DeclareRobustCommand\selectfont{%
   \let\tmp@error@fontshape\error@fontshape
@@ -75,6 +75,43 @@
   \size@update}
 \def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
 \KanjiEncodingPair{JY2}{JT2}
+\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}%
@@ -96,17 +133,18 @@
       \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
+    \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
 \newbox\adjust@box
 \newdimen\adjust@dimen
 \def\adjustbaseline{%