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.dtx547
1 files changed, 331 insertions, 216 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.dtx b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
index 44997e6e6c1..74700eb853a 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/02/22 v2.0g
+%<OT1|T1|OMS|OML|OT4|TU|package|TS1sty> [2017/04/05 v2.0i
%<OT1|T1|OMS|OML|OT4|TS1|TU> Standard LaTeX file]
%<package|TS1sty> Standard LaTeX package]
%
%<*driver>
% \fi
\ProvidesFile{ltoutenc.dtx}
- [2017/02/22 v2.0g LaTeX Kernel (font encodings)]
+ [2017/04/05 v2.0i LaTeX Kernel (font encodings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutenc.dtx}
@@ -857,6 +857,10 @@
% \changes{v1.7z}{1996/05/23}
% {Modified to cope with new \cs{add@accent} command: required
% removal of check for one argument-command}
+% \changes{v2.0h}{2017/02/24}{%
+% add check whether the accent command is defined for this encoding}
+% \changes{v2.0i}{2017/04/05}{%
+% Declare accent command if not already declared when declaring a composite.}
% \begin{macro}{\DeclareTextComposite}
% \changes{v1.7l}{1995/06/09}{Rewrote \cs{DeclareTextComposite} to
% define the composite as a no-argument command rather than a
@@ -878,8 +882,18 @@
% previous definition of |\T1\foo|. Finally, we define |\\T1\foo-a|
% to expand to |bar|.
% \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2017/04/15}{\DeclareTextCompositeCommand}
+%<latexrelease> {test for undeclared accent}%
+%<*2ekernel|latexrelease>
\def\DeclareTextCompositeCommand#1#2#3#4{%
\expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
+ \ifx\reserved@a\relax
+ \DeclareTextCommand#1{#2}{%
+ \@latex@error{\string#1 undeclared in encoding #2}\@eha}%
+ \@latex@info{Composite with undeclared \string#1 in encoding #2}%
+ \expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
+ \fi
\expandafter\expandafter\expandafter\ifx
\expandafter\@car\reserved@a\relax\relax\@nil \@text@composite \else
\edef\reserved@b##1{%
@@ -892,7 +906,31 @@
\expandafter\reserved@b\expandafter{\reserved@a{##1}}%
\fi
\expandafter\def\csname\expandafter\string\csname
- #2\endcsname\string#1-\string#3\@empty\endcsname{#4}}
+ #2\endcsname\string#1-\string#3\@empty\endcsname{#4}%
+ }
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}{\DeclareTextCompositeCommand}
+%<latexrelease> {test for undeclared accent}%
+%<latexrelease>\def\DeclareTextCompositeCommand#1#2#3#4{%
+%<latexrelease> \expandafter\let\expandafter\reserved@a
+%<latexrelease> \csname#2\string#1\endcsname
+%<latexrelease> \expandafter\expandafter\expandafter\ifx
+%<latexrelease> \expandafter\@car\reserved@a\relax\relax\@nil
+%<latexrelease> \@text@composite \else
+%<latexrelease> \edef\reserved@b##1{%
+%<latexrelease> \def\expandafter\noexpand
+%<latexrelease> \csname#2\string#1\endcsname####1{%
+%<latexrelease> \noexpand\@text@composite
+%<latexrelease> \expandafter\noexpand\csname#2\string#1\endcsname
+%<latexrelease> ####1\noexpand\@empty\noexpand\@text@composite
+%<latexrelease> {##1}}}%
+%<latexrelease> \expandafter\reserved@b\expandafter{\reserved@a{##1}}%
+%<latexrelease> \fi
+%<latexrelease> \expandafter\def\csname\expandafter\string\csname
+%<latexrelease> #2\endcsname\string#1-\string#3\@empty\endcsname{#4}}
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
%
% \begin{macrocode}
@@ -2134,7 +2172,6 @@
% \changes{v1.9y}{2000/01/30}{Use \cs{hmode@bgroup} where applicable
% (pr/3160)}
% \changes{v1.95}{2002/06/16}{Added \cs{textbardbl} (pr/3400)}
-% \begin{macrocode}
% \changes{v1.99}{2004/02/02}{Added \cs{textbigcircle}}
% Note that slot 13 has in places been named |\Orb|: please root
% out and destroy this impolity wherever you find it!
@@ -2654,7 +2691,7 @@
% \changes{v2.0f}{2017/02/19}{%
% declare straight quotes using new \cs{remove@tlig} command}
% \changes{v2.0g}{2017/02/22}{Fix typo introduced at 2.0f}
-%
+% \changes{v2.0h}{2017/02/24}{introduce \cs{DeclareUnicodeAccent}}%
% The TU encoding was originally introduced in the contributed
% package \texttt{fontspec} as a Unicode encoding for XeTeX and
% LuaTeX.
@@ -2781,6 +2818,42 @@
}
% \end{macrocode}
%
+% Wrapper around |\DeclareTextCompositeCommand| that uses the declared
+% composite if it exists in the current font or falls back to the default
+% definition for the TU accent if not.
+% \begin{macrocode}
+{
+\catcode\z@=11\relax
+\gdef\DeclareUnicodeComposite#1#2#3{%
+ \def\reserved@a##1##2{%
+ \DeclareTextCompositeCommand#1\UnicodeEncodingName{#2}{%
+ \iffontchar\font#3 ##2%
+ \else ##1\fi}}%
+ \expandafter\expandafter\expandafter\extract@default@composite
+ \csname\UnicodeEncodingName\string#1\endcsname{#2}\@nil
+ \bgroup
+ \lccode\z@#3 %
+ \lowercase{\egroup
+ \expandafter\reserved@a\expandafter{\reserved@b}{^^@}}}%
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\extract@default@composite#1{%
+ \ifx\@text@composite#1%
+ \expandafter\extract@default@composite@a
+ \else
+ \expandafter\extract@default@composite@b\expandafter#1%
+ \fi}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\extract@default@composite@a#1\@text@composite#2\@nil{%
+ \def\reserved@b{#2}}
+\def\extract@default@composite@b#1#2\@nil{%
+ \def\reserved@b{#1#2}}
+% \end{macrocode}
+%
% \begin{macrocode}
\DeclareTextCommand\textquotesingle \UnicodeEncodingName{%
\remove@tlig{"0027}}
@@ -2853,8 +2926,6 @@
\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{\textasciicaron} \UnicodeEncodingName{"02C7}
\DeclareTextSymbol{\textasciibreve} \UnicodeEncodingName{"02D8}
@@ -2862,8 +2933,6 @@
\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}
@@ -2944,222 +3013,268 @@
\DeclareUnicodeAccent{\'} \UnicodeEncodingName{"0301}
\DeclareUnicodeAccent{\^} \UnicodeEncodingName{"0302}
\DeclareUnicodeAccent{\~} \UnicodeEncodingName{"0303}
+\DeclareUnicodeAccent{\=} \UnicodeEncodingName{"0304}
+\DeclareUnicodeAccent{\u} \UnicodeEncodingName{"0306}
+\DeclareUnicodeAccent{\.} \UnicodeEncodingName{"0307}
\DeclareUnicodeAccent{\"} \UnicodeEncodingName{"0308}
-\DeclareUnicodeAccent{\H} \UnicodeEncodingName{"030B}
\DeclareUnicodeAccent{\r} \UnicodeEncodingName{"030A}
+\DeclareUnicodeAccent{\H} \UnicodeEncodingName{"030B}
\DeclareUnicodeAccent{\v} \UnicodeEncodingName{"030C}
-\DeclareUnicodeAccent{\u} \UnicodeEncodingName{"0306}
-\DeclareUnicodeAccent{\=} \UnicodeEncodingName{"0304}
-\DeclareUnicodeAccent{\.} \UnicodeEncodingName{"0307}
\DeclareUnicodeAccent{\b} \UnicodeEncodingName{"0332}
-\DeclareUnicodeAccent{\c} \UnicodeEncodingName{"0327}
\DeclareUnicodeAccent{\d} \UnicodeEncodingName{"0323}
+\DeclareUnicodeAccent{\c} \UnicodeEncodingName{"0327}
\DeclareUnicodeAccent{\k} \UnicodeEncodingName{"0328}
+\DeclareTextCommand\textcommabelow \UnicodeEncodingName[1]
+ {\hmode@bgroup\ooalign{\null#1\crcr\hidewidth\raise-.31ex
+ \hbox{\check@mathfonts\fontsize\ssf@size\z@
+ \math@fontsfalse\selectfont,}\hidewidth}\egroup}
% \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}
-\DeclareTextComposite{\~} \UnicodeEncodingName{A}{"00C3}
-\DeclareTextComposite{\"} \UnicodeEncodingName{A}{"00C4}
-\DeclareTextComposite{\r} \UnicodeEncodingName{A}{"00C5}
-\DeclareTextComposite{\c} \UnicodeEncodingName{C}{"00C7}
-\DeclareTextComposite{\`} \UnicodeEncodingName{E}{"00C8}
-\DeclareTextComposite{\'} \UnicodeEncodingName{E}{"00C9}
-\DeclareTextComposite{\^} \UnicodeEncodingName{E}{"00CA}
-\DeclareTextComposite{\"} \UnicodeEncodingName{E}{"00CB}
-\DeclareTextComposite{\`} \UnicodeEncodingName{I}{"00CC}
-\DeclareTextComposite{\'} \UnicodeEncodingName{I}{"00CD}
-\DeclareTextComposite{\^} \UnicodeEncodingName{I}{"00CE}
-\DeclareTextComposite{\"} \UnicodeEncodingName{I}{"00CF}
-\DeclareTextComposite{\~} \UnicodeEncodingName{N}{"00D1}
-\DeclareTextComposite{\`} \UnicodeEncodingName{O}{"00D2}
-\DeclareTextComposite{\'} \UnicodeEncodingName{O}{"00D3}
-\DeclareTextComposite{\^} \UnicodeEncodingName{O}{"00D4}
-\DeclareTextComposite{\~} \UnicodeEncodingName{O}{"00D5}
-\DeclareTextComposite{\"} \UnicodeEncodingName{O}{"00D6}
-\DeclareTextComposite{\`} \UnicodeEncodingName{U}{"00D9}
-\DeclareTextComposite{\'} \UnicodeEncodingName{U}{"00DA}
-\DeclareTextComposite{\^} \UnicodeEncodingName{U}{"00DB}
-\DeclareTextComposite{\"} \UnicodeEncodingName{U}{"00DC}
-\DeclareTextComposite{\'} \UnicodeEncodingName{Y}{"00DD}
-\DeclareTextComposite{\`} \UnicodeEncodingName{a}{"00E0}
-\DeclareTextComposite{\'} \UnicodeEncodingName{a}{"00E1}
-\DeclareTextComposite{\^} \UnicodeEncodingName{a}{"00E2}
-\DeclareTextComposite{\~} \UnicodeEncodingName{a}{"00E3}
-\DeclareTextComposite{\"} \UnicodeEncodingName{a}{"00E4}
-\DeclareTextComposite{\r} \UnicodeEncodingName{a}{"00E5}
-\DeclareTextComposite{\c} \UnicodeEncodingName{c}{"00E7}
-\DeclareTextComposite{\`} \UnicodeEncodingName{e}{"00E8}
-\DeclareTextComposite{\'} \UnicodeEncodingName{e}{"00E9}
-\DeclareTextComposite{\^} \UnicodeEncodingName{e}{"00EA}
-\DeclareTextComposite{\"} \UnicodeEncodingName{e}{"00EB}
-\DeclareTextComposite{\`} \UnicodeEncodingName\i {"00EC}
-\DeclareTextComposite{\`} \UnicodeEncodingName{i}{"00EC}
-\DeclareTextComposite{\'} \UnicodeEncodingName\i {"00ED}
-\DeclareTextComposite{\'} \UnicodeEncodingName{i}{"00ED}
-\DeclareTextComposite{\^} \UnicodeEncodingName\i {"00EE}
-\DeclareTextComposite{\^} \UnicodeEncodingName{i}{"00EE}
-\DeclareTextComposite{\"} \UnicodeEncodingName\i {"00EF}
-\DeclareTextComposite{\"} \UnicodeEncodingName{i}{"00EF}
-\DeclareTextComposite{\~} \UnicodeEncodingName{n}{"00F1}
-\DeclareTextComposite{\`} \UnicodeEncodingName{o}{"00F2}
-\DeclareTextComposite{\'} \UnicodeEncodingName{o}{"00F3}
-\DeclareTextComposite{\^} \UnicodeEncodingName{o}{"00F4}
-\DeclareTextComposite{\~} \UnicodeEncodingName{o}{"00F5}
-\DeclareTextComposite{\"} \UnicodeEncodingName{o}{"00F6}
-\DeclareTextComposite{\`} \UnicodeEncodingName{u}{"00F9}
-\DeclareTextComposite{\'} \UnicodeEncodingName{u}{"00FA}
-\DeclareTextComposite{\^} \UnicodeEncodingName{u}{"00FB}
-\DeclareTextComposite{\"} \UnicodeEncodingName{u}{"00FC}
-\DeclareTextComposite{\'} \UnicodeEncodingName{y}{"00FD}
-\DeclareTextComposite{\"} \UnicodeEncodingName{y}{"00FF}
-\DeclareTextComposite{\=} \UnicodeEncodingName{A}{"0100}
-\DeclareTextComposite{\=} \UnicodeEncodingName{a}{"0101}
-\DeclareTextComposite{\u} \UnicodeEncodingName{A}{"0102}
-\DeclareTextComposite{\u} \UnicodeEncodingName{a}{"0103}
-\DeclareTextComposite{\k} \UnicodeEncodingName{A}{"0104}
-\DeclareTextComposite{\k} \UnicodeEncodingName{a}{"0105}
-\DeclareTextComposite{\'} \UnicodeEncodingName{C}{"0106}
-\DeclareTextComposite{\'} \UnicodeEncodingName{c}{"0107}
-\DeclareTextComposite{\^} \UnicodeEncodingName{C}{"0108}
-\DeclareTextComposite{\^} \UnicodeEncodingName{c}{"0109}
-\DeclareTextComposite{\.} \UnicodeEncodingName{C}{"010A}
-\DeclareTextComposite{\.} \UnicodeEncodingName{c}{"010B}
-\DeclareTextComposite{\v} \UnicodeEncodingName{C}{"010C}
-\DeclareTextComposite{\v} \UnicodeEncodingName{c}{"010D}
-\DeclareTextComposite{\v} \UnicodeEncodingName{D}{"010E}
-\DeclareTextComposite{\v} \UnicodeEncodingName{d}{"010F}
-\DeclareTextComposite{\=} \UnicodeEncodingName{E}{"0112}
-\DeclareTextComposite{\=} \UnicodeEncodingName{e}{"0113}
-\DeclareTextComposite{\u} \UnicodeEncodingName{E}{"0114}
-\DeclareTextComposite{\u} \UnicodeEncodingName{e}{"0115}
-\DeclareTextComposite{\.} \UnicodeEncodingName{E}{"0116}
-\DeclareTextComposite{\.} \UnicodeEncodingName{e}{"0117}
-\DeclareTextComposite{\k} \UnicodeEncodingName{E}{"0118}
-\DeclareTextComposite{\k} \UnicodeEncodingName{e}{"0119}
-\DeclareTextComposite{\v} \UnicodeEncodingName{E}{"011A}
-\DeclareTextComposite{\v} \UnicodeEncodingName{e}{"011B}
-\DeclareTextComposite{\^} \UnicodeEncodingName{G}{"011C}
-\DeclareTextComposite{\^} \UnicodeEncodingName{g}{"011D}
-\DeclareTextComposite{\u} \UnicodeEncodingName{G}{"011E}
-\DeclareTextComposite{\u} \UnicodeEncodingName{g}{"011F}
-\DeclareTextComposite{\.} \UnicodeEncodingName{G}{"0120}
-\DeclareTextComposite{\.} \UnicodeEncodingName{g}{"0121}
-\DeclareTextComposite{\c} \UnicodeEncodingName{G}{"0122}
-\DeclareTextComposite{\c} \UnicodeEncodingName{g}{"0123}
-\DeclareTextComposite{\^} \UnicodeEncodingName{H}{"0124}
-\DeclareTextComposite{\^} \UnicodeEncodingName{h}{"0125}
-\DeclareTextComposite{\~} \UnicodeEncodingName{I}{"0128}
-\DeclareTextComposite{\~} \UnicodeEncodingName\i {"0129}
-\DeclareTextComposite{\~} \UnicodeEncodingName{i}{"0129}
-\DeclareTextComposite{\=} \UnicodeEncodingName{I}{"012A}
-\DeclareTextComposite{\=} \UnicodeEncodingName\i {"012B}
-\DeclareTextComposite{\=} \UnicodeEncodingName{i}{"012B}
-\DeclareTextComposite{\u} \UnicodeEncodingName{I}{"012C}
-\DeclareTextComposite{\u} \UnicodeEncodingName\i {"012D}
-\DeclareTextComposite{\u} \UnicodeEncodingName{i}{"012D}
-\DeclareTextComposite{\k} \UnicodeEncodingName{I}{"012E}
-\DeclareTextComposite{\k} \UnicodeEncodingName\i {"012F}
-\DeclareTextComposite{\k} \UnicodeEncodingName{i}{"012F}
-\DeclareTextComposite{\.} \UnicodeEncodingName{I}{"0130}
-\DeclareTextComposite{\^} \UnicodeEncodingName{J}{"0134}
-\DeclareTextComposite{\^} \UnicodeEncodingName\j {"0135}
-\DeclareTextComposite{\^} \UnicodeEncodingName{j}{"0135}
-\DeclareTextComposite{\c} \UnicodeEncodingName{K}{"0136}
-\DeclareTextComposite{\c} \UnicodeEncodingName{k}{"0137}
-\DeclareTextComposite{\'} \UnicodeEncodingName{L}{"0139}
-\DeclareTextComposite{\'} \UnicodeEncodingName{l}{"013A}
-\DeclareTextComposite{\c} \UnicodeEncodingName{L}{"013B}
-\DeclareTextComposite{\c} \UnicodeEncodingName{l}{"013C}
-\DeclareTextComposite{\v} \UnicodeEncodingName{L}{"013D}
-\DeclareTextComposite{\v} \UnicodeEncodingName{l}{"013E}
-\DeclareTextComposite{\'} \UnicodeEncodingName{N}{"0143}
-\DeclareTextComposite{\'} \UnicodeEncodingName{n}{"0144}
-\DeclareTextComposite{\c} \UnicodeEncodingName{N}{"0145}
-\DeclareTextComposite{\c} \UnicodeEncodingName{n}{"0146}
-\DeclareTextComposite{\v} \UnicodeEncodingName{N}{"0147}
-\DeclareTextComposite{\v} \UnicodeEncodingName{n}{"0148}
-\DeclareTextComposite{\=} \UnicodeEncodingName{O}{"014C}
-\DeclareTextComposite{\=} \UnicodeEncodingName{o}{"014D}
-\DeclareTextComposite{\u} \UnicodeEncodingName{O}{"014E}
-\DeclareTextComposite{\u} \UnicodeEncodingName{o}{"014F}
-\DeclareTextComposite{\H} \UnicodeEncodingName{O}{"0150}
-\DeclareTextComposite{\H} \UnicodeEncodingName{o}{"0151}
-\DeclareTextComposite{\'} \UnicodeEncodingName{R}{"0154}
-\DeclareTextComposite{\'} \UnicodeEncodingName{r}{"0155}
-\DeclareTextComposite{\c} \UnicodeEncodingName{R}{"0156}
-\DeclareTextComposite{\c} \UnicodeEncodingName{r}{"0157}
-\DeclareTextComposite{\v} \UnicodeEncodingName{R}{"0158}
-\DeclareTextComposite{\v} \UnicodeEncodingName{r}{"0159}
-\DeclareTextComposite{\'} \UnicodeEncodingName{S}{"015A}
-\DeclareTextComposite{\'} \UnicodeEncodingName{s}{"015B}
-\DeclareTextComposite{\^} \UnicodeEncodingName{S}{"015C}
-\DeclareTextComposite{\^} \UnicodeEncodingName{s}{"015D}
-\DeclareTextComposite{\c} \UnicodeEncodingName{S}{"015E}
-\DeclareTextComposite{\c} \UnicodeEncodingName{s}{"015F}
-\DeclareTextComposite{\v} \UnicodeEncodingName{S}{"0160}
-\DeclareTextComposite{\v} \UnicodeEncodingName{s}{"0161}
-\DeclareTextComposite{\c} \UnicodeEncodingName{T}{"0162}
-\DeclareTextComposite{\c} \UnicodeEncodingName{t}{"0163}
-\DeclareTextComposite{\v} \UnicodeEncodingName{T}{"0164}
-\DeclareTextComposite{\v} \UnicodeEncodingName{t}{"0165}
-\DeclareTextComposite{\~} \UnicodeEncodingName{U}{"0168}
-\DeclareTextComposite{\~} \UnicodeEncodingName{u}{"0169}
-\DeclareTextComposite{\=} \UnicodeEncodingName{U}{"016A}
-\DeclareTextComposite{\=} \UnicodeEncodingName{u}{"016B}
-\DeclareTextComposite{\u} \UnicodeEncodingName{U}{"016C}
-\DeclareTextComposite{\u} \UnicodeEncodingName{u}{"016D}
-\DeclareTextComposite{\r} \UnicodeEncodingName{U}{"016E}
-\DeclareTextComposite{\r} \UnicodeEncodingName{u}{"016F}
-\DeclareTextComposite{\H} \UnicodeEncodingName{U}{"0170}
-\DeclareTextComposite{\H} \UnicodeEncodingName{u}{"0171}
-\DeclareTextComposite{\k} \UnicodeEncodingName{U}{"0172}
-\DeclareTextComposite{\k} \UnicodeEncodingName{u}{"0173}
-\DeclareTextComposite{\^} \UnicodeEncodingName{W}{"0174}
-\DeclareTextComposite{\^} \UnicodeEncodingName{w}{"0175}
-\DeclareTextComposite{\^} \UnicodeEncodingName{Y}{"0176}
-\DeclareTextComposite{\^} \UnicodeEncodingName{y}{"0177}
-\DeclareTextComposite{\"} \UnicodeEncodingName{Y}{"0178}
-\DeclareTextComposite{\'} \UnicodeEncodingName{Z}{"0179}
-\DeclareTextComposite{\'} \UnicodeEncodingName{z}{"017A}
-\DeclareTextComposite{\.} \UnicodeEncodingName{Z}{"017B}
-\DeclareTextComposite{\.} \UnicodeEncodingName{z}{"017C}
-\DeclareTextComposite{\v} \UnicodeEncodingName{Z}{"017D}
-\DeclareTextComposite{\v} \UnicodeEncodingName{z}{"017E}
-\DeclareTextComposite{\v} \UnicodeEncodingName{A}{"01CD}
-\DeclareTextComposite{\v} \UnicodeEncodingName{a}{"01CE}
-\DeclareTextComposite{\v} \UnicodeEncodingName{I}{"01CF}
-\DeclareTextComposite{\v} \UnicodeEncodingName\i {"01D0}
-\DeclareTextComposite{\v} \UnicodeEncodingName{i}{"01D0}
-\DeclareTextComposite{\v} \UnicodeEncodingName{O}{"01D1}
-\DeclareTextComposite{\v} \UnicodeEncodingName{o}{"01D2}
-\DeclareTextComposite{\v} \UnicodeEncodingName{U}{"01D3}
-\DeclareTextComposite{\v} \UnicodeEncodingName{u}{"01D4}
-\DeclareTextComposite{\=} \UnicodeEncodingName\AE{"01E2}
-\DeclareTextComposite{\=} \UnicodeEncodingName\ae{"01E3}
-\DeclareTextComposite{\v} \UnicodeEncodingName{G}{"01E6}
-\DeclareTextComposite{\v} \UnicodeEncodingName{g}{"01E7}
-\DeclareTextComposite{\v} \UnicodeEncodingName{K}{"01E8}
-\DeclareTextComposite{\v} \UnicodeEncodingName{k}{"01E9}
-\DeclareTextComposite{\k} \UnicodeEncodingName{O}{"01EA}
-\DeclareTextComposite{\k} \UnicodeEncodingName{o}{"01EB}
-\DeclareTextComposite{\v} \UnicodeEncodingName\j {"01F0}
-\DeclareTextComposite{\v} \UnicodeEncodingName{j}{"01F0}
-\DeclareTextComposite{\'} \UnicodeEncodingName{G}{"01F4}
-\DeclareTextComposite{\'} \UnicodeEncodingName{g}{"01F5}
-\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{S}{"0218}
-\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{s}{"0219}
-\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{T}{"021A}
-\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{t}{"021B}
-\DeclareTextComposite{\.} \UnicodeEncodingName{B}{"1E02}
-\DeclareTextComposite{\.} \UnicodeEncodingName{b}{"1E03}
+\DeclareUnicodeComposite{\^} {}{"005E}
+\DeclareUnicodeComposite{\~} {}{"007E}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareUnicodeComposite{\`} {A}{"00C0}
+\DeclareUnicodeComposite{\'} {A}{"00C1}
+\DeclareUnicodeComposite{\^} {A}{"00C2}
+\DeclareUnicodeComposite{\~} {A}{"00C3}
+\DeclareUnicodeComposite{\"} {A}{"00C4}
+\DeclareUnicodeComposite{\r} {A}{"00C5}
+\DeclareUnicodeComposite{\c} {C}{"00C7}
+\DeclareUnicodeComposite{\`} {E}{"00C8}
+\DeclareUnicodeComposite{\'} {E}{"00C9}
+\DeclareUnicodeComposite{\^} {E}{"00CA}
+\DeclareUnicodeComposite{\"} {E}{"00CB}
+\DeclareUnicodeComposite{\`} {I}{"00CC}
+\DeclareUnicodeComposite{\'} {I}{"00CD}
+\DeclareUnicodeComposite{\^} {I}{"00CE}
+\DeclareUnicodeComposite{\"} {I}{"00CF}
+\DeclareUnicodeComposite{\~} {N}{"00D1}
+\DeclareUnicodeComposite{\`} {O}{"00D2}
+\DeclareUnicodeComposite{\'} {O}{"00D3}
+\DeclareUnicodeComposite{\^} {O}{"00D4}
+\DeclareUnicodeComposite{\~} {O}{"00D5}
+\DeclareUnicodeComposite{\"} {O}{"00D6}
+\DeclareUnicodeComposite{\`} {U}{"00D9}
+\DeclareUnicodeComposite{\'} {U}{"00DA}
+\DeclareUnicodeComposite{\^} {U}{"00DB}
+\DeclareUnicodeComposite{\"} {U}{"00DC}
+\DeclareUnicodeComposite{\'} {Y}{"00DD}
+\DeclareUnicodeComposite{\`} {a}{"00E0}
+\DeclareUnicodeComposite{\'} {a}{"00E1}
+\DeclareUnicodeComposite{\^} {a}{"00E2}
+\DeclareUnicodeComposite{\~} {a}{"00E3}
+\DeclareUnicodeComposite{\"} {a}{"00E4}
+\DeclareUnicodeComposite{\r} {a}{"00E5}
+\DeclareUnicodeComposite{\c} {c}{"00E7}
+\DeclareUnicodeComposite{\`} {e}{"00E8}
+\DeclareUnicodeComposite{\'} {e}{"00E9}
+\DeclareUnicodeComposite{\^} {e}{"00EA}
+\DeclareUnicodeComposite{\"} {e}{"00EB}
+\DeclareUnicodeComposite{\`} \i {"00EC}
+\DeclareUnicodeComposite{\`} {i}{"00EC}
+\DeclareUnicodeComposite{\'} \i {"00ED}
+\DeclareUnicodeComposite{\'} {i}{"00ED}
+\DeclareUnicodeComposite{\^} \i {"00EE}
+\DeclareUnicodeComposite{\^} {i}{"00EE}
+\DeclareUnicodeComposite{\"} \i {"00EF}
+\DeclareUnicodeComposite{\"} {i}{"00EF}
+\DeclareUnicodeComposite{\~} {n}{"00F1}
+\DeclareUnicodeComposite{\`} {o}{"00F2}
+\DeclareUnicodeComposite{\'} {o}{"00F3}
+\DeclareUnicodeComposite{\^} {o}{"00F4}
+\DeclareUnicodeComposite{\~} {o}{"00F5}
+\DeclareUnicodeComposite{\"} {o}{"00F6}
+\DeclareUnicodeComposite{\`} {u}{"00F9}
+\DeclareUnicodeComposite{\'} {u}{"00FA}
+\DeclareUnicodeComposite{\^} {u}{"00FB}
+\DeclareUnicodeComposite{\"} {u}{"00FC}
+\DeclareUnicodeComposite{\'} {y}{"00FD}
+\DeclareUnicodeComposite{\"} {y}{"00FF}
+\DeclareUnicodeComposite{\=} {A}{"0100}
+\DeclareUnicodeComposite{\=} {a}{"0101}
+\DeclareUnicodeComposite{\u} {A}{"0102}
+\DeclareUnicodeComposite{\u} {a}{"0103}
+\DeclareUnicodeComposite{\k} {A}{"0104}
+\DeclareUnicodeComposite{\k} {a}{"0105}
+\DeclareUnicodeComposite{\'} {C}{"0106}
+\DeclareUnicodeComposite{\'} {c}{"0107}
+\DeclareUnicodeComposite{\^} {C}{"0108}
+\DeclareUnicodeComposite{\^} {c}{"0109}
+\DeclareUnicodeComposite{\.} {C}{"010A}
+\DeclareUnicodeComposite{\.} {c}{"010B}
+\DeclareUnicodeComposite{\v} {C}{"010C}
+\DeclareUnicodeComposite{\v} {c}{"010D}
+\DeclareUnicodeComposite{\v} {D}{"010E}
+\DeclareUnicodeComposite{\v} {d}{"010F}
+\DeclareUnicodeComposite{\=} {E}{"0112}
+\DeclareUnicodeComposite{\=} {e}{"0113}
+\DeclareUnicodeComposite{\u} {E}{"0114}
+\DeclareUnicodeComposite{\u} {e}{"0115}
+\DeclareUnicodeComposite{\.} {E}{"0116}
+\DeclareUnicodeComposite{\.} {e}{"0117}
+\DeclareUnicodeComposite{\k} {E}{"0118}
+\DeclareUnicodeComposite{\k} {e}{"0119}
+\DeclareUnicodeComposite{\v} {E}{"011A}
+\DeclareUnicodeComposite{\v} {e}{"011B}
+\DeclareUnicodeComposite{\^} {G}{"011C}
+\DeclareUnicodeComposite{\^} {g}{"011D}
+\DeclareUnicodeComposite{\u} {G}{"011E}
+\DeclareUnicodeComposite{\u} {g}{"011F}
+\DeclareUnicodeComposite{\.} {G}{"0120}
+\DeclareUnicodeComposite{\.} {g}{"0121}
+\DeclareUnicodeComposite{\c} {G}{"0122}
+\DeclareUnicodeComposite{\c} {g}{"0123}
+\DeclareUnicodeComposite{\^} {H}{"0124}
+\DeclareUnicodeComposite{\^} {h}{"0125}
+\DeclareUnicodeComposite{\~} {I}{"0128}
+\DeclareUnicodeComposite{\~} \i {"0129}
+\DeclareUnicodeComposite{\~} {i}{"0129}
+\DeclareUnicodeComposite{\=} {I}{"012A}
+\DeclareUnicodeComposite{\=} \i {"012B}
+\DeclareUnicodeComposite{\=} {i}{"012B}
+\DeclareUnicodeComposite{\u} {I}{"012C}
+\DeclareUnicodeComposite{\u} \i {"012D}
+\DeclareUnicodeComposite{\u} {i}{"012D}
+\DeclareUnicodeComposite{\k} {I}{"012E}
+\DeclareUnicodeComposite{\k} \i {"012F}
+\DeclareUnicodeComposite{\k} {i}{"012F}
+\DeclareUnicodeComposite{\.} {I}{"0130}
+\DeclareUnicodeComposite{\^} {J}{"0134}
+\DeclareUnicodeComposite{\^} \j {"0135}
+\DeclareUnicodeComposite{\^} {j}{"0135}
+\DeclareUnicodeComposite{\c} {K}{"0136}
+\DeclareUnicodeComposite{\c} {k}{"0137}
+\DeclareUnicodeComposite{\'} {L}{"0139}
+\DeclareUnicodeComposite{\'} {l}{"013A}
+\DeclareUnicodeComposite{\c} {L}{"013B}
+\DeclareUnicodeComposite{\c} {l}{"013C}
+\DeclareUnicodeComposite{\v} {L}{"013D}
+\DeclareUnicodeComposite{\v} {l}{"013E}
+\DeclareUnicodeComposite{\'} {N}{"0143}
+\DeclareUnicodeComposite{\'} {n}{"0144}
+\DeclareUnicodeComposite{\c} {N}{"0145}
+\DeclareUnicodeComposite{\c} {n}{"0146}
+\DeclareUnicodeComposite{\v} {N}{"0147}
+\DeclareUnicodeComposite{\v} {n}{"0148}
+\DeclareUnicodeComposite{\=} {O}{"014C}
+\DeclareUnicodeComposite{\=} {o}{"014D}
+\DeclareUnicodeComposite{\u} {O}{"014E}
+\DeclareUnicodeComposite{\u} {o}{"014F}
+\DeclareUnicodeComposite{\H} {O}{"0150}
+\DeclareUnicodeComposite{\H} {o}{"0151}
+\DeclareUnicodeComposite{\'} {R}{"0154}
+\DeclareUnicodeComposite{\'} {r}{"0155}
+\DeclareUnicodeComposite{\c} {R}{"0156}
+\DeclareUnicodeComposite{\c} {r}{"0157}
+\DeclareUnicodeComposite{\v} {R}{"0158}
+\DeclareUnicodeComposite{\v} {r}{"0159}
+\DeclareUnicodeComposite{\'} {S}{"015A}
+\DeclareUnicodeComposite{\'} {s}{"015B}
+\DeclareUnicodeComposite{\^} {S}{"015C}
+\DeclareUnicodeComposite{\^} {s}{"015D}
+\DeclareUnicodeComposite{\c} {S}{"015E}
+\DeclareUnicodeComposite{\c} {s}{"015F}
+\DeclareUnicodeComposite{\v} {S}{"0160}
+\DeclareUnicodeComposite{\v} {s}{"0161}
+\DeclareUnicodeComposite{\c} {T}{"0162}
+\DeclareUnicodeComposite{\c} {t}{"0163}
+\DeclareUnicodeComposite{\v} {T}{"0164}
+\DeclareUnicodeComposite{\v} {t}{"0165}
+\DeclareUnicodeComposite{\~} {U}{"0168}
+\DeclareUnicodeComposite{\~} {u}{"0169}
+\DeclareUnicodeComposite{\=} {U}{"016A}
+\DeclareUnicodeComposite{\=} {u}{"016B}
+\DeclareUnicodeComposite{\u} {U}{"016C}
+\DeclareUnicodeComposite{\u} {u}{"016D}
+\DeclareUnicodeComposite{\r} {U}{"016E}
+\DeclareUnicodeComposite{\r} {u}{"016F}
+\DeclareUnicodeComposite{\H} {U}{"0170}
+\DeclareUnicodeComposite{\H} {u}{"0171}
+\DeclareUnicodeComposite{\k} {U}{"0172}
+\DeclareUnicodeComposite{\k} {u}{"0173}
+\DeclareUnicodeComposite{\^} {W}{"0174}
+\DeclareUnicodeComposite{\^} {w}{"0175}
+\DeclareUnicodeComposite{\^} {Y}{"0176}
+\DeclareUnicodeComposite{\^} {y}{"0177}
+\DeclareUnicodeComposite{\"} {Y}{"0178}
+\DeclareUnicodeComposite{\'} {Z}{"0179}
+\DeclareUnicodeComposite{\'} {z}{"017A}
+\DeclareUnicodeComposite{\.} {Z}{"017B}
+\DeclareUnicodeComposite{\.} {z}{"017C}
+\DeclareUnicodeComposite{\v} {Z}{"017D}
+\DeclareUnicodeComposite{\v} {z}{"017E}
+\DeclareUnicodeComposite{\v} {A}{"01CD}
+\DeclareUnicodeComposite{\v} {a}{"01CE}
+\DeclareUnicodeComposite{\v} {I}{"01CF}
+\DeclareUnicodeComposite{\v} \i {"01D0}
+\DeclareUnicodeComposite{\v} {i}{"01D0}
+\DeclareUnicodeComposite{\v} {O}{"01D1}
+\DeclareUnicodeComposite{\v} {o}{"01D2}
+\DeclareUnicodeComposite{\v} {U}{"01D3}
+\DeclareUnicodeComposite{\v} {u}{"01D4}
+\DeclareUnicodeComposite{\=} \AE{"01E2}
+\DeclareUnicodeComposite{\=} \ae{"01E3}
+\DeclareUnicodeComposite{\v} {G}{"01E6}
+\DeclareUnicodeComposite{\v} {g}{"01E7}
+\DeclareUnicodeComposite{\v} {K}{"01E8}
+\DeclareUnicodeComposite{\v} {k}{"01E9}
+\DeclareUnicodeComposite{\k} {O}{"01EA}
+\DeclareUnicodeComposite{\k} {o}{"01EB}
+\DeclareUnicodeComposite{\v} \j {"01F0}
+\DeclareUnicodeComposite{\v} {j}{"01F0}
+\DeclareUnicodeComposite{\'} {G}{"01F4}
+\DeclareUnicodeComposite{\'} {g}{"01F5}
+\DeclareUnicodeComposite{\textcommabelow}{S}{"0218}
+\DeclareUnicodeComposite{\textcommabelow}{s}{"0219}
+\DeclareUnicodeComposite{\textcommabelow}{T}{"021A}
+\DeclareUnicodeComposite{\textcommabelow}{t}{"021B}
+\DeclareUnicodeComposite{\=} {Y}{"0232}
+\DeclareUnicodeComposite{\=} {y}{"0232}
+\DeclareUnicodeComposite{\.} {B}{"1E02}
+\DeclareUnicodeComposite{\.} {b}{"1E03}
+\DeclareUnicodeComposite{\d} {B}{"1E04}
+\DeclareUnicodeComposite{\d} {b}{"1E05}
+\DeclareUnicodeComposite{\d} {D}{"1E0C}
+\DeclareUnicodeComposite{\d} {d}{"1E0D}
+\DeclareUnicodeComposite{\=} {G}{"1E20}
+\DeclareUnicodeComposite{\=} {g}{"1E21}
+\DeclareUnicodeComposite{\d} {H}{"1E24}
+\DeclareUnicodeComposite{\d} {h}{"1E25}
+\DeclareUnicodeComposite{\d} {K}{"1E32}
+\DeclareUnicodeComposite{\d} {k}{"1E33}
+\DeclareUnicodeComposite{\d} {L}{"1E36}
+\DeclareUnicodeComposite{\d} {l}{"1E37}
+\DeclareUnicodeComposite{\d} {M}{"1E42}
+\DeclareUnicodeComposite{\d} {m}{"1E43}
+\DeclareUnicodeComposite{\d} {N}{"1E46}
+\DeclareUnicodeComposite{\d} {n}{"1E47}
+\DeclareUnicodeComposite{\d} {R}{"1E5A}
+\DeclareUnicodeComposite{\d} {r}{"1E5B}
+\DeclareUnicodeComposite{\d} {S}{"1E62}
+\DeclareUnicodeComposite{\d} {s}{"1E63}
+\DeclareUnicodeComposite{\d} {T}{"1E6C}
+\DeclareUnicodeComposite{\d} {t}{"1E6D}
+\DeclareUnicodeComposite{\d} {V}{"1E7E}
+\DeclareUnicodeComposite{\d} {v}{"1E7F}
+\DeclareUnicodeComposite{\d} {W}{"1E88}
+\DeclareUnicodeComposite{\d} {w}{"1E89}
+\DeclareUnicodeComposite{\d} {Z}{"1E92}
+\DeclareUnicodeComposite{\d} {z}{"1E93}
+\DeclareUnicodeComposite{\d} {A}{"1EA0}
+\DeclareUnicodeComposite{\d} {a}{"1EA1}
+\DeclareUnicodeComposite{\d} {E}{"1EB8}
+\DeclareUnicodeComposite{\d} {e}{"1EB9}
+\DeclareUnicodeComposite{\d} {I}{"1ECA}
+\DeclareUnicodeComposite{\d} {i}{"1ECB}
+\DeclareUnicodeComposite{\d} {O}{"1ECC}
+\DeclareUnicodeComposite{\d} {o}{"1ECD}
+\DeclareUnicodeComposite{\d} {U}{"1EE4}
+\DeclareUnicodeComposite{\d} {u}{"1EE5}
+\DeclareUnicodeComposite{\d} {Y}{"1EF4}
+\DeclareUnicodeComposite{\d} {y}{"1EF5}
% \end{macrocode}
%
% \begin{macrocode}