diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/base/latex.ltx')
| -rw-r--r-- | Master/texmf-dist/tex/latex/base/latex.ltx | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index afaa50e1839..f8c54ef0da1 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -703,7 +703,7 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2016/02/01} + {2016/03/31} \def\patch@level{0} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -3414,7 +3414,8 @@ Type H <return> for immediate help.}% \multiply\count@\sixt@@n \advance\count\tw@-\count@ \if\relax\noexpand#1% is command? - \edef\reserved@a{\noexpand\in@{\string\mathaccent}{\meaning#1}}% + \edef\reserved@a{\noexpand\in@ + {\expandafter\@gobble\string\mathaccent}{\meaning#1}}% \reserved@a \ifin@ \expandafter\set@mathaccent @@ -3456,7 +3457,8 @@ Type H <return> for immediate help.}% \multiply\count@\sixt@@n \advance\count\tw@-\count@ \if\relax\noexpand#1% is command? - \edef\reserved@a{\noexpand\in@{\string\mathchar}{\meaning#1}}% + \edef\reserved@a + {\noexpand\in@{\expandafter\@gobble\string\mathchar}{\meaning#1}}% \reserved@a \ifin@ \expandafter\set@mathsymbol @@ -3536,7 +3538,8 @@ Type H <return> for immediate help.}% \advance\count\tw@-\count@ \edef\reserved@d{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}% % - \edef\reserved@a{\noexpand\in@{\string\delimiter}{\meaning#1}}% + \edef\reserved@a{\noexpand\in@ + {\expandafter\@gobble\string\delimiter}{\meaning#1}}% \reserved@a \ifin@ \expandafter\set@mathdelimiter @@ -3613,7 +3616,8 @@ Type H <return> for immediate help.}% \relax \let#1\radical \fi - \edef\reserved@a{\noexpand\in@{\string\radical}{\meaning#1}}% + \edef\reserved@a{\noexpand\in@ + {\expandafter\@gobble\string\radical}{\meaning#1}}% \reserved@a \ifin@ \expandafter\in@\csname sym#2\expandafter\endcsname @@ -5611,17 +5615,23 @@ Type H <return> for immediate help.}% size unavailable}} \gdef\@put#1#2#3{\raise #2\hb@xt@\z@{\hskip #1#3\hss}} \gdef\oval(#1,#2){\@ifnextchar[{\@oval(#1,#2)}{\@oval(#1,#2)[]}} +\newif\if@ovvline \@ovvlinetrue +\newif\if@ovhline \@ovhlinetrue \gdef\@oval(#1,#2)[#3]{\begingroup\boxmaxdepth \maxdimen \@ovttrue \@ovbtrue \@ovltrue \@ovrtrue + \@ovvlinefalse \@ovhlinefalse \@tfor\reserved@a :=#3\do{\csname @ov\reserved@a false\endcsname}% - \@ovxx - #1\unitlength \@ovyy #2\unitlength - \@tempdimb \ifdim \@ovyy >\@ovxx \@ovxx\else \@ovyy \fi + \@ovxx #1\unitlength + \@ovyy #2\unitlength + \@tempdimb \ifdim \@ovyy >\@ovxx \@ovxx \@ovvlinetrue + \else \@ovyy \ifdim \@ovyy =\@ovxx \else \@ovhlinetrue \fi\fi \advance \@tempdimb -2\p@ \@getcirc \@tempdimb \@ovro \ht\@tempboxa \@ovri \dp\@tempboxa \@ovdx\@ovxx \advance\@ovdx -\@tempdima \divide\@ovdx \tw@ \@ovdy\@ovyy \advance\@ovdy -\@tempdima \divide\@ovdy \tw@ + \ifdim \@ovdx >\z@ \@ovhlinetrue \fi + \ifdim \@ovdy >\z@ \@ovvlinetrue \fi \@circlefnt \setbox\@tempboxa \hbox{\if@ovr \@ovvert32\kern -\@tempdima \fi \if@ovl \kern \@ovxx \@ovvert01\kern -\@tempdima \kern -\@ovxx \fi @@ -5634,13 +5644,15 @@ Type H <return> for immediate help.}% \if@ovb \@tempcntb \@tempcnta \advance \@tempcntb #1\relax \kern -\@ovro \hbox{\char \@tempcntb}\nointerlineskip \else \kern \@ovri \kern \@ovdy \fi - \leaders\vrule \@width \@wholewidth\vfil \nointerlineskip + \if@ovvline \leaders\vrule \@width \@wholewidth \fi + \vfil \nointerlineskip \if@ovt \@tempcntb \@tempcnta \advance \@tempcntb #2\relax \hbox{\char \@tempcntb}% \else \kern \@ovdy \kern \@ovro \fi}} \gdef\@ovhorz{\hb@xt@\@ovxx{\kern \@ovro \if@ovr \else \kern \@ovdx \fi - \leaders \hrule \@height \@wholewidth \hfil + \if@ovhline \leaders \hrule \@height \@wholewidth \fi + \hfil \if@ovl \else \kern \@ovdx \fi \kern \@ovri}} \gdef\circle{\@inmatherr\circle\@ifstar\@dot\@circle} |