summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex/base/plcore.ltx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-28 22:03:37 +0000
committerKarl Berry <karl@freefriends.org>2018-07-28 22:03:37 +0000
commitdb827062ede9c88ec0639994c70098c8eb351b27 (patch)
tree6cb79bbd9a4ffb1b1992226f1e13f436286c27f2 /Master/texmf-dist/tex/platex/base/plcore.ltx
parent153ab8e88d3102533018637c752b6fa57fa6a663 (diff)
platex (28jul18)
git-svn-id: svn://tug.org/texlive/trunk@48293 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/plcore.ltx')
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx82
1 files changed, 79 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 5da961f7a26..9628bf64596 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -33,7 +33,7 @@
\fi
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2018-05-20}
+ {2018-07-28}
\def\ppatch@level{0}
\edef\platexBANNER{\noexpand\platexNILa
\the\everyjob % LaTeX banner and delayed codes
@@ -738,11 +738,39 @@
\else\tbaselineshift\fi
\else\ybaselineshift\fi
\vbox{\hrule\@width.3em}}
+\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex%
+ \ialign{##\crcr#1\crcr}}}
+\def\pltx@oalign#1{\ifmmode
+ \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex%
+ \ialign{##\crcr#1\crcr}}%
+\else
+ \iftdir\ybaselineshift\tbaselineshift\fi
+ \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex%
+ \ialign{##\crcr#1\crcr}}}$%
+\fi}
+\def\pltx@saved@ltx@sh@ft #1{%
+ \dimen@ #1%
+ \kern \strip@pt
+ \fontdimen1\font \dimen@
+ } % kern by #1 times the current slant
+\def\pltx@ltx@sh@ft #1{%
+ \ybaselineshift\z@
+ \dimen@ #1%
+ \kern \strip@pt
+ \fontdimen1\font \dimen@
+ } % kern by #1 times the current slant
\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
\def\pltx@mark{\pltx@mark@}
\let\pltx@scanstop\relax
\long\def\pltx@cond#1\fi{%
#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\def\pltx@pdfencA{PD1}
+\def\pltx@composite@chkenc{%
+ \ifx\pltx@pdfencA\f@encoding
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
\long\def\pltx@isletter#1{%
\expandafter\pltx@isletter@i#1\pltx@scanstop}
\long\def\pltx@isletter@i#1\pltx@scanstop{%
@@ -755,8 +783,56 @@
\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
\pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
\pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
- {\@firstoftwo}{\@secondoftwo}%
- }{\@secondoftwo}}
+ {\@firstoftwo}{\pltx@composite@chkenc}%
+ }{\pltx@composite@chkenc}}
+\def\pltx@saved@text@composite@x#1{%
+ \ifx#1\relax
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ #1}
+\def\pltx@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<\@cclvi
+ \ifnum\@tempcntb>\m@ne
+ \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi
+ \fi
+ \begingroup\m@th$%
+ \ifx\textbaselineshiftfactor\@undefined\else
+ \textbaselineshiftfactor\z@\fi
+ \box\z@
+ $\endgroup
+ \ifnum\@tempcntb>\m@ne
+ \ifnum\xspcode\@tempcntb<2\null\fi
+ \fi
+ \else
+ {\ybaselineshift\z@\tbaselineshift\z@#1}%
+ \fi
+ \endgroup}%
+ \fi
+}
+\DeclareRobustCommand\fixcompositeaccent{%
+ \let\oalign\pltx@oalign
+ \let\ltx@sh@ft\pltx@ltx@sh@ft
+ \let\@text@composite@x\pltx@text@composite@x
+}
+\DeclareRobustCommand\nofixcompositeaccent{%
+ \let\oalign\pltx@saved@oalign
+ \let\ltx@sh@ft\pltx@saved@ltx@sh@ft
+ \let\@text@composite@x\pltx@saved@text@composite@x
+}
+\nofixcompositeaccent
%% File: plcore.dtx
\def\NeedsTeXFormat#1{%
\def\reserved@a{#1}%