uplatex (1jul16)

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

2 files changed, 15 insertions, 47 deletions

diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index 4b874fbff61..6425216d4b3 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -35,8 +35,8 @@
 %%
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
-   {2016/06/10u01}
-\def\ppatch@level{1}
+   {2016/07/01u01}
+\def\ppatch@level{0}
 \def\plIncludeInRelease#1{\kernel@ifnextchar[%
   {\@plIncludeInRelease{#1}}
   {\@plIncludeInRelease{#1}[#1]}}
@@ -958,6 +958,10 @@
   \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}
@@ -1082,6 +1086,14 @@
   }
   \expandafter
 \endgroup \platexTMP
+\everyjob\expandafter{%
+  \the\everyjob
+  \IfFileExists{uplatex.cfg}{%
+    \typeout{*************************^^J%
+             * Loading uplatex.cfg.^^J%
+             *************************}%
+    \input{uplatex.cfg}}{}%
+}
 \AtBeginDocument{%
   \@ifpackageloaded{latexrelease}{%
     \@ifpackageloaded{platexrelease}{}{%
diff --git a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
index f8b22882d96..a8c379761d9 100644
--- a/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
@@ -31,7 +31,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 \ProvidesFile{upldefs.ltx}
-      [2016/06/19 v1.6d-u00 upLaTeX Kernel (Default settings)]
+      [2016/06/29 v1.6e-u00 upLaTeX Kernel (Default settings)]
 \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
 \def\pltx@mark{\pltx@mark@}
 \let\pltx@scanstop\relax
@@ -51,50 +51,6 @@
     \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
       {\@firstoftwo}{\@secondoftwo}%
   }{\@secondoftwo}}
-\def\@text@composite@x#1#2{%
-  \ifx#1\relax
-    #2%
-  \else\pltx@isletter{#1}{#1}{%
-    \begingroup
-    \setbox\z@\hbox\bgroup%
-      \ybaselineshift\z@\tbaselineshift\z@
-      #1%
-      \g@tlastchart@\@tempcntb
-      \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
-      \aftergroup\pltx@composite@temp
-    \egroup
-    \ifnum\@tempcntb<\z@
-      \@tempdima=\iftdir
-          \ifmdir
-            \ifmmode\tbaselineshift\else\ybaselineshift\fi
-          \else
-            \tbaselineshift
-          \fi
-        \else
-          \ybaselineshift
-        \fi
-      \@tempcntb=\@cclvi
-    \else\@tempdima=\z@
-    \fi
-    \ifnum\@tempcntb<\@cclvi
-      \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
-        \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi
-      \fi\fi
-      \begingroup\mathsurround\z@$%
-        \ifx\textbaselineshiftfactor\@undefined\else
-          \textbaselineshiftfactor\z@\fi
-        \box\z@
-      $\endgroup%
-      \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
-        \ifnum\xspcode\@tempcntb<2\hbox{}\fi
-      \fi\fi
-    \else
-      \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
-      \else\lower\@tempdima\box\z@\fi
-    \fi
-    \endgroup}%
-  \fi
-}
 \def \check@nocorr@ #1#2\nocorr#3\@nil {%
   \let \check@icl \relax% \maybe@ic から変更
   \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%