summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base/ltoutenc.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/base/ltoutenc.dtx')
-rw-r--r--Master/texmf-dist/source/latex/base/ltoutenc.dtx85
1 files changed, 78 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.dtx b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
index 4fa67df0911..f8335e87716 100644
--- a/Master/texmf-dist/source/latex/base/ltoutenc.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
@@ -38,14 +38,14 @@
%<TU>\ProvidesFile{tuenc.def}
%<package>\ProvidesPackage{fontenc}
%<TS1sty>\ProvidesPackage{textcomp}
-%<OT1|T1|OMS|OML|OT4|TU|package|TS1sty> [2017/01/24 v2.0c
+%<OT1|T1|OMS|OML|OT4|TU|package|TS1sty> [2017/02/19 v2.0f
%<OT1|T1|OMS|OML|OT4|TS1|TU> Standard LaTeX file]
%<package|TS1sty> Standard LaTeX package]
%
%<*driver>
% \fi
\ProvidesFile{ltoutenc.dtx}
- [2017/01/24 v2.0c LaTeX Kernel (font encodings)]
+ [2017/02/19 v2.0f LaTeX Kernel (font encodings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutenc.dtx}
@@ -892,7 +892,7 @@
\expandafter\reserved@b\expandafter{\reserved@a{##1}}%
\fi
\expandafter\def\csname\expandafter\string\csname
- #2\endcsname\string#1-\string#3\endcsname{#4}}
+ #2\endcsname\string#1-\string#3\@empty\endcsname{#4}}
% \end{macrocode}
%
% \begin{macrocode}
@@ -1662,6 +1662,8 @@
% {Added \cs{r} A}
% \changes{v1.96}{2002/10/28}{%
% coding change, to follow bug fix by DEK in plain.tex (pr/3469)}
+% \changes{v2.0f}{2017/02/19}{%
+% add \cs{@empty} to guard against 3rd argument being empty}
% \begin{macrocode}
\DeclareTextCompositeCommand{\r}{OT1}{A}
{\leavevmode\setbox\z@\hbox{!}\dimen@\ht\z@\advance\dimen@-1ex%
@@ -2644,6 +2646,13 @@
% \changes{v2.0c}{2017/01/24}{TeX ligature syntax for xetex and luatex reversed}
% \changes{v2.0c}{2017/01/24}{Make \cs{textasteriskcentered} U+2217 not U+204E}
% \changes{v2.0c}{2017/01/24}{Declare TU composites for i and j}
+% \changes{v2.0d}{2017/01/24}{Declare macron composites for YyGg}
+% \changes{v2.0e}{2017/02/12}{Declare fallback code for \cs{textasteriskcentered}}
+% \changes{v2.0f}{2017/02/19}{%
+% declare composites with empty base for hat and tilde,
+% use same slots for \cs{textasciicircum} ans \cs{textasciitilde}}
+% \changes{v2.0f}{2017/02/19}{%
+% declare straight quotes using new \cs{remove@tlig} command}
%
% The TU encoding was originally introduced in the contributed
% package \texttt{fontspec} as a Unicode encoding for XeTeX and
@@ -2707,6 +2716,29 @@
% LuaTeX.
% \begin{macrocode}
\def\UnicodeFontTeXLigatures{+tlig;}
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \def\reserved@a#1{%
+ \def\@remove@tlig##1{\@remove@tlig@##1\@nil#1\@nil\relax}
+ \def\@remove@tlig@##1#1{\@remove@tlig@@##1}}
+ \edef\reserved@b{\detokenize{+tlig;}}
+ \expandafter\reserved@a\expandafter{\reserved@b}
+ \def\@remove@tlig@@#1\@nil#2\relax{#1}
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \def\remove@tlig#1{%
+ \begingroup
+ \font\remove@tlig
+ \expandafter\@remove@tlig\expandafter{\fontname\font}%
+ \remove@tlig
+ \char#1\relax
+ \endgroup
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
\fi
\else
% \end{macrocode}
@@ -2717,6 +2749,10 @@
% \end{macrocode}
%
% \begin{macrocode}
+ \def\remove@tlig#1{\XeTeXglyph\numexpr\XeTeXcharglyph#1\relax}
+% \end{macrocode}
+%
+% \begin{macrocode}
\fi
% \end{macrocode}
%
@@ -2733,7 +2769,9 @@
% Declare accent command to use a postpended combining character
% rather than the TeX |\accent| primitive
% \begin{macrocode}
-\def\add@unicode@accent#1#2{#2\char#1\relax}
+\def\add@unicode@accent#1#2{%
+ \relax\detokenize{#2}^^a0\else#2\fi
+ \char#1\relax}
% \end{macrocode}
%
% \begin{macrocode}
@@ -2743,14 +2781,25 @@
% \end{macrocode}
%
% \begin{macrocode}
+\DeclareTextCommand\textquotesingle \UnicodeEncodingName{%
+ \remove@tlig{"0027}}
+\DeclareTextCommand\textasciigrave \UnicodeEncodingName{%
+ \remove@tlig{"0060}}
+\DeclareTextCommand\textquotedbl \UnicodeEncodingName{%
+ \remove@tlig{"0022}}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareTextSymbol{\textdollar} \UnicodeEncodingName{"0024}
\DeclareTextSymbol{\textless} \UnicodeEncodingName{"003C}
\DeclareTextSymbol{\textgreater} \UnicodeEncodingName{"003E}
\DeclareTextSymbol{\textbackslash} \UnicodeEncodingName{"005C}
+\DeclareTextSymbol{\textasciicircum} \UnicodeEncodingName{"005E}
\DeclareTextSymbol{\textunderscore} \UnicodeEncodingName{"005F}
\DeclareTextSymbol{\textbraceleft} \UnicodeEncodingName{"007B}
\DeclareTextSymbol{\textbar} \UnicodeEncodingName{"007C}
\DeclareTextSymbol{\textbraceright} \UnicodeEncodingName{"007D}
+\DeclareTextSymbol{\textasciitilde} \UnicodeEncodingName{"007E}
\DeclareTextSymbol{\textexclamdown} \UnicodeEncodingName{"00A1}
\DeclareTextSymbol{\textcent} \UnicodeEncodingName{"00A2}
\DeclareTextSymbol{\textsterling} \UnicodeEncodingName{"00A3}
@@ -2803,15 +2852,17 @@
\DeclareTextSymbol{\OE} \UnicodeEncodingName{"0152}
\DeclareTextSymbol{\oe} \UnicodeEncodingName{"0153}
\DeclareTextSymbol{\textflorin} \UnicodeEncodingName{"0192}
+\DeclareTextComposite{\=} \UnicodeEncodingName{Y}{"0232}
+\DeclareTextComposite{\=} \UnicodeEncodingName{y}{"0232}
\DeclareTextSymbol{\j} \UnicodeEncodingName{"0237}
-\DeclareTextSymbol{\textasciicircum} \UnicodeEncodingName{"02C6}
\DeclareTextSymbol{\textasciicaron} \UnicodeEncodingName{"02C7}
-\DeclareTextSymbol{\textasciitilde} \UnicodeEncodingName{"02DC}
\DeclareTextSymbol{\textasciibreve} \UnicodeEncodingName{"02D8}
\DeclareTextSymbol{\textacutedbl} \UnicodeEncodingName{"02DD}
\DeclareTextSymbol{\textgravedbl} \UnicodeEncodingName{"02F5}
\DeclareTextSymbol{\texttildelow} \UnicodeEncodingName{"02F7}
\DeclareTextSymbol{\textbaht} \UnicodeEncodingName{"0E3F}
+\DeclareTextComposite{\=} \UnicodeEncodingName{G}{"1E20}
+\DeclareTextComposite{\=} \UnicodeEncodingName{g}{"1E21}
\DeclareTextSymbol{\SS} \UnicodeEncodingName{"1E9E}
\DeclareTextSymbol{\textcompwordmark} \UnicodeEncodingName{"200C}
\DeclareTextSymbol{\textendash} \UnicodeEncodingName{"2013}
@@ -2858,7 +2909,22 @@
\DeclareTextSymbol{\textrightarrow} \UnicodeEncodingName{"2192}
\DeclareTextSymbol{\textdownarrow} \UnicodeEncodingName{"2193}
\DeclareTextSymbol{\textminus} \UnicodeEncodingName{"2212}
-\DeclareTextSymbol{\textasteriskcentered}\UnicodeEncodingName{"2217}
+% \end{macrocode}
+% Not all fonts have U+2217 but using U+002A requires some adjustment.
+% \begin{macrocode}
+\DeclareTextCommand{\textasteriskcentered}\UnicodeEncodingName{%
+ \iffontchar\font"2217 \char"2217 \else
+ \begingroup
+ \fontsize
+ {\the\dimexpr1.2\dimexpr\f@size pt\relax}%
+ {\f@baselineskip}%
+ \selectfont
+ \raisebox{-0.6ex}[\dimexpr\height-0.6ex][0pt]{*}%
+ \endgroup
+ \fi
+}
+% \end{macrocode}
+% \begin{macrocode}
\DeclareTextSymbol{\textsurd} \UnicodeEncodingName{"221A}
\DeclareTextSymbol{\textlangle} \UnicodeEncodingName{"2329}
\DeclareTextSymbol{\textrangle} \UnicodeEncodingName{"232A}
@@ -2891,6 +2957,11 @@
% \end{macrocode}
%
% \begin{macrocode}
+\DeclareTextComposite{\^} \UnicodeEncodingName {}{"005E}
+\DeclareTextComposite{\~} \UnicodeEncodingName {}{"007E}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareTextComposite{\`} \UnicodeEncodingName{A}{"00C0}
\DeclareTextComposite{\'} \UnicodeEncodingName{A}{"00C1}
\DeclareTextComposite{\^} \UnicodeEncodingName{A}{"00C2}