texlive[41594] Master/texmf-dist: uplatex (1jul16)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 2 00:02:58 CEST 2016
Revision: 41594
http://tug.org/svn/texlive?view=revision&revision=41594
Author: karl
Date: 2016-07-02 00:02:58 +0200 (Sat, 02 Jul 2016)
Log Message:
-----------
uplatex (1jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/uplatex/base/README.md
trunk/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
trunk/Master/texmf-dist/source/uplatex/base/Makefile
trunk/Master/texmf-dist/source/uplatex/base/plcore.dtx
trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx
trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
trunk/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
Modified: trunk/Master/texmf-dist/doc/uplatex/base/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/uplatex/base/README.md 2016-07-01 22:02:45 UTC (rev 41593)
+++ trunk/Master/texmf-dist/doc/uplatex/base/README.md 2016-07-01 22:02:58 UTC (rev 41594)
@@ -17,6 +17,6 @@
## Release Date
-2016-06-19
+2016-07-01
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/uplatex/base/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/Makefile 2016-07-01 22:02:45 UTC (rev 41593)
+++ trunk/Master/texmf-dist/source/uplatex/base/Makefile 2016-07-01 22:02:58 UTC (rev 41594)
@@ -49,7 +49,7 @@
dvipdfmx $(FONTMAP) upldoc.dvi
rm *.aux *.log upldoc.toc upldoc.idx upldoc.ind upldoc.ilg
rm upldoc.glo upldoc.gls *.dvi upldoc.tex Xins.ins
- rm *.cfg upldoc.dic mkpldoc.sh dstcheck.pl
+ rm ltxdoc.cfg upldoc.dic mkpldoc.sh dstcheck.pl
.PHONY: clean
clean:
Modified: trunk/Master/texmf-dist/source/uplatex/base/plcore.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/plcore.dtx 2016-07-01 22:02:45 UTC (rev 41593)
+++ trunk/Master/texmf-dist/source/uplatex/base/plcore.dtx 2016-07-01 22:02:58 UTC (rev 41594)
@@ -10,7 +10,7 @@
%
% \fi
%
-% \CheckSum{1269}
+% \CheckSum{1292}
%% \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
%% Lower-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
@@ -59,6 +59,7 @@
% \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2<C<$,=L$`LdBj$r=$@5(B}
% \changes{v1.2e}{2016/05/20}{\file{fltrace}$B%Q%C%1!<%8$N(Bp\LaTeX{}$BHG(B
% $B$H$7$F(B\file{pfltrace}$B%Q%C%1!<%8$r?7 at _(B}
+% \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B}
% \fi
%
% \iffalse
@@ -65,7 +66,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2016/05/20 v1.2e pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2016/06/30 v1.2f pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -763,7 +764,42 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\AtBeginDvi}
+% p\LaTeX{}$B$N=PNO%k!<%A%s$N(B|\@outputpage|$B$G$O!"(B|\shipout|$B$9$k(Bvbox$B$NCf?H$K(B
+% |\yoko|$B$r;XDj$7$F$$$^$9!#$3$N$?$a!"(B|\AtBeginDocument{\AtBeginDvi{}}|$B$H$$$&(B
+% $B%3!<%I$r=q$/$H(B\texttt{Incompatible direction list can't be unboxed.}$B$H$$$&(B
+% $B%(%i!<$,=P$F$7$^$$$^$9!#(B
%
+% $B$=$3$G!"%3%_%e%K%F%#HG(Bp\LaTeX{}$B$G$O!V(B|\shipout|$B$G(B|\yoko|$B$,;XDj$5$l$F$$$k!W(B
+% $B$3$H$r:,5r$H$7$F(B
+% \begin{center}
+% |\@begindvibox|$B$O!J6u$G$J$$8B$j!K>o$K2#AH$G$J$1$l$P$J$i$J$$(B
+% \end{center}
+% $B$H2>Dj$7$^$9!#$3$N2>Dj$K=>$$!"(B|\AtBeginDvi|$B$r:FDj5A$7$^$9!#(B
+% \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B}
+% \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2016/07/01}{\AtBeginDvi}
+%<platexrelease> {Fix for incompatible direction}%
+%<*plcore|platexrelease>
+\def \AtBeginDvi #1{%
+ \global \setbox \@begindvibox
+ \vbox{\yoko \unvbox \@begindvibox #1}%
+}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\AtBeginDvi}
+%<platexrelease> {Fix for incompatible direction}%
+%<platexrelease>\def \AtBeginDvi #1{%
+%<platexrelease> \global \setbox \@begindvibox
+%<platexrelease> \vbox{\unvbox \@begindvibox #1}%
+%<platexrelease>}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+% \end{macrocode}
+% \end{macro}
+%
+%
% \subsection{$B5SCm%^%/%m(B}
% $B5SCm$rAH$_N)$F$kItJ,$N%^%/%m$r:FDj5A$7$^$9!#(B
% $B<g$J=$@5E@$O!"=DAH%b!<%I$G$NF0:n$NDI2C$G$9!#(B
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx 2016-07-01 22:02:45 UTC (rev 41593)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplfonts.dtx 2016-07-01 22:02:58 UTC (rev 41594)
@@ -14,7 +14,7 @@
%
% \fi
%
-% \CheckSum{2029}
+% \CheckSum{2061}
%% \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
%% Lower-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
@@ -79,6 +79,10 @@
% 周囲に\cs{xkanjiskip}が入らなくなっていたのを修正。}
% \changes{v1.6c-u00}{2016/06/06}{p\LaTeX{}の変更に追随。}
% \changes{v1.6d}{2016/06/19}{アクセント付き文字をさらに修正(forum:1951)}
+% \changes{v1.6d-u00}{2016/06/19}{p\LaTeX{}の変更に追随。}
+% \changes{v1.6e}{2016/06/26}{v1.6a以降の修正で全てのアクセント付き文字で
+% トラブルが相次いだため、いったんパッチを除去。}
+% \changes{v1.6e-u00}{2016/06/29}{p\LaTeX{}の変更に追随。}
% \fi
%
% \iffalse
@@ -85,7 +89,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{uplfonts.dtx}[2016/06/19 v1.6d-u00 upLaTeX New Font Selection Scheme]
+\ProvidesFile{uplfonts.dtx}[2016/06/29 v1.6e-u00 upLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{uplfonts.dtx}
@@ -1647,7 +1651,7 @@
% \begin{macrocode}
%<*pldefs>
\ProvidesFile{upldefs.ltx}
- [2016/06/19 v1.6d-u00 upLaTeX Kernel (Default settings)]
+ [2016/06/29 v1.6e-u00 upLaTeX Kernel (Default settings)]
%</pldefs>
% \end{macrocode}
%
@@ -1654,11 +1658,7 @@
% \subsection{合成文字}
% \LaTeXe{}のカーネルのコードをそのまま使うと、p\TeX{}のベースライン
% 補正量がゼロでないときに合成文字がおかしくなっていたため、対策します。
-% \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text at composite}
-%<platexrelease> {Fix for non-zero baselineshift}%
-%<*pldefs|platexrelease>
-% \end{macrocode}
+%
% \begin{macro}{\g at tlastchart@}
% \TeX\ Live 2015で追加された\cs{lastnodechar}を利用して、
% 「直前の文字」の符号位置を得るコードです。\cs{lastnodechar}が未定義の場合は
@@ -1665,9 +1665,19 @@
% $-1$が返ります。
% \changes{v1.6c}{2016/06/06}{マクロ追加}
% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\g at tlastchart@}
+%<platexrelease> {Added \g at tlastchart@}%
+%<*pldefs|platexrelease>
\def\g at tlastchart@#1{#1\ifx\lastnodechar\@undefined\m at ne\else\lastnodechar\fi}
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\g at tlastchart@}
+%<platexrelease> {Added \g at tlastchart@}%
+%<platexrelease>\let\g at tlastchart@\@undefined
+%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
+%
% \begin{macro}{\pltx at isletter}
% 第一引数のマクロ(|#1|)の置換テキストが、カテゴリコード11か12の文字トークン1文字であった
% 場合に第二引数の内容に展開され、そうでない場合は第三引数の内容に展開されます。
@@ -1674,6 +1684,9 @@
% \changes{v1.6c}{2016/06/06}{マクロ追加}
% \changes{v1.6d}{2016/06/19}{アクセント付き文字をさらに修正(forum:1951)}
% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx at isletter}
+%<platexrelease> {Added \pltx at isletter}%
+%<*pldefs|platexrelease>
\def\pltx at mark{\pltx at mark@}
\let\pltx at scanstop\relax
\long\def\pltx at cond#1\fi{%
@@ -1692,77 +1705,30 @@
\pltx at cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
{\@firstoftwo}{\@secondoftwo}%
}{\@secondoftwo}}
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx at isletter}
+%<platexrelease> {Added \pltx at isletter}%
+%<platexrelease>\let\pltx at isletter\@undefined
+%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
+%
% \begin{macro}{\@text at composite}
-% \begin{macro}{\@text at composite@x}
+% 合成文字の内部命令です。v1.6aで誤って\LaTeX{}の定義を上書きしてしまいました
+% が、v1.6cで外しました。
% \changes{v1.6a}{2016/04/01}{ベースライン補正量が0でないときに
-% \cs{AA}など一部の合成文字がおかしくなることへの対応。}
-% \changes{v1.6c}{2016/06/06}{v1.6aでの修正で\'e など全てのアクセント付き文字で
-% 周囲に\cs{xkanjiskip}が入らなくなっていたのを修正。}
+% \cs{AA}など一部の合成文字がおかしくなることに対応するため再定義}
+% \changes{v1.6c}{2016/06/06}{v1.6aでの誤った再定義を削除(forum:1941)}
% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text at composite}
+%<platexrelease> {Wrong fix for non-zero baselineshift}%
%<platexrelease>\def\@text at composite#1#2#3\@text at composite{%
%<platexrelease> \expandafter\@text at composite@x
%<platexrelease> \csname\string#1-\string#2\endcsname}
-\def\@text at composite@x#1#2{%
- \ifx#1\relax
- #2%
- \else\pltx at isletter{#1}{#1}{%
- \begingroup
- \setbox\z@\hbox\bgroup%
- \ybaselineshift\z@\tbaselineshift\z@
- #1%
- \g at tlastchart@\@tempcntb
- \xdef\pltx at composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
- \aftergroup\pltx at composite@temp
- \egroup
-% \end{macrocode}
-% \begin{macrocode}
- \ifnum\@tempcntb<\z@
- \@tempdima=\iftdir
- \ifmdir
- \ifmmode\tbaselineshift\else\ybaselineshift\fi
- \else
- \tbaselineshift
- \fi
- \else
- \ybaselineshift
- \fi
- \@tempcntb=\@cclvi
- \else\@tempdima=\z@
- \fi
-% \end{macrocode}
-% アクセントが付く「本体の文字」が欧文文字と推測される場合には、
-% 一旦数式モードに入ることによって\cs{xkanjiskip}が前後に入るようにします。
-% 必要なら、数式モードの前後に\cs{null}を補って\cs{xkanjiskip}の挿入を抑制します。
-% \begin{macrocode}
- \ifnum\@tempcntb<\@cclvi
- \ifnum\@tempcntb>\m at 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 at ne\ifnum\@tempcntb<\@cclvi
- \ifnum\xspcode\@tempcntb<2\hbox{}\fi
- \fi\fi
-% \end{macrocode}
-% \begin{macrocode}
- \else
- \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
- \else\lower\@tempdima\box\z@\fi
- \fi
- \endgroup}%
- \fi
-}
-%</pldefs|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{2016/04/17}{\@text at composite}
-%<platexrelease> {Fix for non-zero baselineshift}%
-%<platexrelease>\let\g at tlastchart@\@undefined
-%<platexrelease>\let\pltx at isletter\@undefined
+%<platexrelease> {Wrong fix for non-zero baselineshift}%
%<platexrelease>\def\@text at composite#1#2#3#{%
%<platexrelease> \begingroup
%<platexrelease> \setbox\z@=\hbox\bgroup%
@@ -1769,8 +1735,86 @@
%<platexrelease> \ybaselineshift\z@\tbaselineshift\z@
%<platexrelease> \expandafter\@text at composite@x
%<platexrelease> \csname\string#1-\string#2\endcsname}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text at composite}
+%<platexrelease> {Wrong fix for non-zero baselineshift}%
+%<platexrelease>\def\@text at composite#1#2#3\@text at composite{%
+%<platexrelease> \expandafter\@text at composite@x
+%<platexrelease> \csname\string#1-\string#2\endcsname}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@text at composite@x}
+% 合成文字の内部命令です。|\g at tlastchart@|と|\pltx at isletter|を使います。
+% \changes{v1.6a}{2016/04/01}{ベースライン補正量が0でないときに
+% \cs{AA}など一部の合成文字がおかしくなることへの対応。}
+% \changes{v1.6c}{2016/06/06}{v1.6aでの修正で\'e など全てのアクセント付き文字で
+% 周囲に\cs{xkanjiskip}が入らなくなっていたのを修正。}
+% \changes{v1.6e}{2016/06/26}{v1.6a以降の修正で全てのアクセント付き文字で
+% トラブルが相次いだため、いったんパッチを除去。}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/07/01}{\@text at composite@x}
+%<platexrelease> {Fix for non-zero baselineshift}%
+%<platexrelease>\def\@text at composite@x#1{%
+%<platexrelease> \ifx#1\relax
+%<platexrelease> \expandafter\@secondoftwo
+%<platexrelease> \else
+%<platexrelease> \expandafter\@firstoftwo
+%<platexrelease> \fi
+%<platexrelease> #1}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text at composite@x}
+%<platexrelease> {Fix for non-zero baselineshift}%
%<platexrelease>\def\@text at composite@x#1#2{%
%<platexrelease> \ifx#1\relax
+%<platexrelease> #2%
+%<platexrelease> \else\pltx at isletter{#1}{#1}{%
+%<platexrelease> \begingroup
+%<platexrelease> \setbox\z@\hbox\bgroup%
+%<platexrelease> \ybaselineshift\z@\tbaselineshift\z@
+%<platexrelease> #1%
+%<platexrelease> \g at tlastchart@\@tempcntb
+%<platexrelease> \xdef\pltx at composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
+%<platexrelease> \aftergroup\pltx at composite@temp
+%<platexrelease> \egroup
+%<platexrelease> \ifnum\@tempcntb<\z@
+%<platexrelease> \@tempdima=\iftdir
+%<platexrelease> \ifmdir
+%<platexrelease> \ifmmode\tbaselineshift\else\ybaselineshift\fi
+%<platexrelease> \else
+%<platexrelease> \tbaselineshift
+%<platexrelease> \fi
+%<platexrelease> \else
+%<platexrelease> \ybaselineshift
+%<platexrelease> \fi
+%<platexrelease> \@tempcntb=\@cclvi
+%<platexrelease> \else\@tempdima=\z@
+%<platexrelease> \fi
+%<platexrelease> \ifnum\@tempcntb<\@cclvi
+%<platexrelease> \ifnum\@tempcntb>\m at ne\ifnum\@tempcntb<\@cclvi
+%<platexrelease> \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi
+%<platexrelease> \fi\fi
+%<platexrelease> \begingroup\mathsurround\z@$%
+%<platexrelease> \ifx\textbaselineshiftfactor\@undefined\else
+%<platexrelease> \textbaselineshiftfactor\z@\fi
+%<platexrelease> \box\z@
+%<platexrelease> $\endgroup%
+%<platexrelease> \ifnum\@tempcntb>\m at ne\ifnum\@tempcntb<\@cclvi
+%<platexrelease> \ifnum\xspcode\@tempcntb<2\hbox{}\fi
+%<platexrelease> \fi\fi
+%<platexrelease> \else
+%<platexrelease> \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
+%<platexrelease> \else\lower\@tempdima\box\z@\fi
+%<platexrelease> \fi
+%<platexrelease> \endgroup}%
+%<platexrelease> \fi
+%<platexrelease>}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@text at composite@x}
+%<platexrelease> {Fix for non-zero baselineshift}%
+%<platexrelease>\def\@text at composite@x#1#2{%
+%<platexrelease> \ifx#1\relax
%<platexrelease> \expandafter\@secondoftwo
%<platexrelease> \else
%<platexrelease> \expandafter\@firstoftwo
@@ -1790,13 +1834,8 @@
%<platexrelease> \box\z@
%<platexrelease> \endgroup}
%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text at composite}
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text at composite@x}
%<platexrelease> {Fix for non-zero baselineshift}%
-%<platexrelease>\let\g at tlastchart@\@undefined
-%<platexrelease>\let\pltx at isletter\@undefined
-%<platexrelease>\def\@text at composite#1#2#3\@text at composite{%
-%<platexrelease> \expandafter\@text at composite@x
-%<platexrelease> \csname\string#1-\string#2\endcsname}
%<platexrelease>\def\@text at composite@x#1{%
%<platexrelease> \ifx#1\relax
%<platexrelease> \expandafter\@secondoftwo
@@ -1808,7 +1847,6 @@
%<*pldefs>
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \subsection{イタリック補正}
% \changes{v1.3i}{2000/07/13}{\cs{text..}コマンドの左側に\cs{xkanjiskip}が
Modified: trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx
===================================================================
--- trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx 2016-07-01 22:02:45 UTC (rev 41593)
+++ trunk/Master/texmf-dist/source/uplatex/base/uplvers.dtx 2016-07-01 22:02:58 UTC (rev 41594)
@@ -14,7 +14,7 @@
%
% \fi
%
-% \CheckSum{194}
+% \CheckSum{201}
%% \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
%% Lower-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
@@ -72,12 +72,13 @@
% 使われた場合に明確なエラーを出すようにした。}
% \changes{v1.0x}{2016/06/19}{パッチレベルを\file{plvers.dtx}で設定}
% \changes{v1.0x-u01}{2016/06/19}{p\LaTeX{}の変更に追随。}
+% \changes{v1.0y-u01}{2016/06/27}{uplatex.cfgの読み込みを追加}
% \fi
%
% \iffalse
%<*driver>
% \fi
-\ProvidesFile{uplvers.dtx}[2016/06/19 v1.0x-u01 upLaTeX Kernel (Version Info)]
+\ProvidesFile{uplvers.dtx}[2016/06/29 v1.0y-u01 upLaTeX Kernel (Version Info)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{uplvers.dtx}
@@ -141,10 +142,10 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2016/06/10u01}
+ {2016/07/01u01}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch at level{1}
+\def\ppatch at level{0}
%</plcore>
% \end{macrocode}
% \end{macro}
@@ -303,6 +304,21 @@
% \end{macrocode}
% \end{macro}
%
+% 起動時にuplatex.cfgがある場合、それを読み込むようにします。
+% \changes{v1.0y-u01}{2016/06/29}{uplatex.cfgの読み込みを追加}
+% \begin{macrocode}
+%<*plfinal>
+\everyjob\expandafter{%
+ \the\everyjob
+ \IfFileExists{uplatex.cfg}{%
+ \typeout{*************************^^J%
+ * Loading uplatex.cfg.^^J%
+ *************************}%
+ \input{uplatex.cfg}}{}%
+}
+%</plfinal>
+% \end{macrocode}
+%
% \LaTeXe{}が提供するlatexreleaseパッケージが読み込まれていて、
% かつp\LaTeXe{}が提供するplatexreleaseパッケージが読み込まれていない
% 場合は、警告を出します。
Modified: trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx 2016-07-01 22:02:45 UTC (rev 41593)
+++ trunk/Master/texmf-dist/tex/uplatex/base/uplcore.ltx 2016-07-01 22:02:58 UTC (rev 41594)
@@ -35,8 +35,8 @@
%%
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2016/06/10u01}
-\def\ppatch at level{1}
+ {2016/07/01u01}
+\def\ppatch at level{0}
\def\plIncludeInRelease#1{\kernel at 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}{}{%
Modified: trunk/Master/texmf-dist/tex/uplatex/base/upldefs.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/uplatex/base/upldefs.ltx 2016-07-01 22:02:45 UTC (rev 41593)
+++ trunk/Master/texmf-dist/tex/uplatex/base/upldefs.ltx 2016-07-01 22:02:58 UTC (rev 41594)
@@ -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 at tlastchart@#1{#1\ifx\lastnodechar\@undefined\m at ne\else\lastnodechar\fi}
\def\pltx at mark{\pltx at mark@}
\let\pltx at scanstop\relax
@@ -51,50 +51,6 @@
\pltx at cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
{\@firstoftwo}{\@secondoftwo}%
}{\@secondoftwo}}
-\def\@text at composite@x#1#2{%
- \ifx#1\relax
- #2%
- \else\pltx at isletter{#1}{#1}{%
- \begingroup
- \setbox\z@\hbox\bgroup%
- \ybaselineshift\z@\tbaselineshift\z@
- #1%
- \g at tlastchart@\@tempcntb
- \xdef\pltx at composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
- \aftergroup\pltx at 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 at 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 at 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 at nocorr@ #1#2\nocorr#3\@nil {%
\let \check at icl \relax% \maybe at ic から変更
\def \check at icr {\ifvmode \else \aftergroup \maybe at ic \fi}%
More information about the tex-live-commits
mailing list