1 files changed, 67 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex/base/fontdef.dtx b/Master/texmf-dist/source/latex/base/fontdef.dtx
index 783b177be01..83eec0d5bbd 100644
--- a/Master/texmf-dist/source/latex/base/fontdef.dtx
+++ b/Master/texmf-dist/source/latex/base/fontdef.dtx
@@ -39,7 +39,7 @@
 %<driver, >\ProvidesFile{fontdef.drv}
 % \fi
 %          \ProvidesFile{fontdef.dtx}
-           [2014/09/29 v2.3a LaTeX Kernel
+           [2016/12/03 v3.0a LaTeX Kernel
 % \iftrue  (\else
 %<text,   >(Text
 %<math,   >(Math
@@ -134,7 +134,8 @@
 %   |U|        &   unknown encoding \\
 %   |OML|      &   old \TeX{} math letters encoding \\
 %   |OMS|      &   old \TeX{} math symbols encoding \\
-%   |OMX|      &   old \TeX{} math extension symbols encoding
+%   |OMX|      &   old \TeX{} math extension symbols encoding\\
+%   |TU|      &   Unicode
 % \end{tabular}
 % \end{center}
 % Notice that some of these encodings are `old' in the sense that we
@@ -245,12 +246,17 @@
 % \changes{v2.2e}{1994/10/31}{... and moved further down}
 % \changes{v2.2f}{1994/11/07}{(DPC) Updated to use \cs{ProvidesFile}}
 % \changes{v2.2h}{1994/11/16}{(DPC) Removed \cmd\{ and \cmd\}}
+% \changes{v3.0a}{2016/12/03}{(DPC) Default to TU encoding for Unicode TeX engines}
 %    \begin{macrocode}
 \input {omlenc.def}
 \input  {t1enc.def}
 \input {ot1enc.def}       % <- should come after T1 for speed
 \input {omsenc.def}
 %    \end{macrocode}
+% \changes{v3.0a}{2016/12/03}{(DPC) Default to TU encoding for Unicode TeX engines}
+%    \begin{macrocode}
+\ifx\Umathchar\@undefined
+%    \end{macrocode}
 %
 %    We then set set the default text font encoding. This will
 %    hopefully change some day to |T1|. This setting should \emph{not}
@@ -259,6 +265,30 @@
 \fontencoding{OT1}
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+\else
+%    \end{macrocode}
+% Unicode.
+%    \begin{macrocode}
+\input {tuenc.def}
+\fontencoding{TU}
+\DeclareFontSubstitution{TU}{lmr}{m}{n}
+\begingroup
+\nfss@catcodes
+\input  {tulmr.fd}
+\input  {tulmss.fd}
+\input  {tulmtt.fd}
+\endgroup
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\DeclareFontSubstitution{TU}{lmr}{m}{n}
+%    \end{macrocode}
+% End of Unicode branch.
+%    \begin{macrocode}
+\fi
+%    \end{macrocode}
+%
 %    If different encodings for text fonts are in use one could put
 %    the common setup into |\DeclareFontEncodingDefaults|. There is
 %    now a better mechanism so using this interface is discouraged!
@@ -354,19 +384,53 @@
 %    making documents non-portable.
 %
 %
+% \begin{macro}{\encodingdefault}
 % \begin{macro}{\rmdefault}
 % \begin{macro}{\sfdefault}
 % \begin{macro}{\ttdefault}
 %    The following three definitions set up the meaning for
 %    |\rmfamily|, |\sffamily|, and |\ttfamily|.
 %    \begin{macrocode}
+%</text>
+%<*text|latexrelease>
+\ifx\Umathchar\@undefined
+\newcommand\encodingdefault{OT1}
 \newcommand\rmdefault{cmr}
 \newcommand\sfdefault{cmss}
 \newcommand\ttdefault{cmtt}
+\else
+\newcommand\encodingdefault{TU}
+\newcommand\rmdefault{lmr}\fontfamily{\rmdefault}
+\newcommand\sfdefault{lmss}
+\newcommand\ttdefault{lmtt}
+\fi
+%<latexrelease>\IncludeInRelease{2017/01/01}%
+%<latexrelease>                 {\encodingdefault}{TU encoding default}%
+%<latexrelease>\ifx\Umathchar\@undefined
+%<latexrelease>\renewcommand\encodingdefault{OT1}
+%<latexrelease>\renewcommand\rmdefault{cmr}
+%<latexrelease>\renewcommand\sfdefault{cmss}
+%<latexrelease>\renewcommand\ttdefault{cmtt}
+%<latexrelease>\else
+%<latexrelease>\renewcommand\encodingdefault{TU}
+%<latexrelease>\renewcommand\rmdefault{lmr}
+%<latexrelease>\renewcommand\sfdefault{lmss}
+%<latexrelease>\renewcommand\ttdefault{lmtt}
+%<latexrelease>\fi
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\encodingdefault}{TU encoding default}%
+%<latexrelease>\renewcommand\encodingdefault{OT1}
+%<latexrelease>\renewcommand\rmdefault{cmr}
+%<latexrelease>\renewcommand\sfdefault{cmss}
+%<latexrelease>\renewcommand\ttdefault{cmtt}
+%</text|latexrelease>
+%<*text>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\bfdefault}
 % \begin{macro}{\mddefault}
@@ -394,7 +458,6 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\encodingdefault}
 % \begin{macro}{\familydefault}
 % \begin{macro}{\seriesdefault}
 % \begin{macro}{\shapedefault}
@@ -403,8 +466,8 @@
 %    |\encodingdefault| should \emph{not} be changed and should match
 %    the setting above for |\fontencoding|. All other values can be
 %    set according to your taste.
+% \changes{v3.0a}{2016/12/03}{(DPC) Default to TU encoding for Unicode TeX engines}
 %    \begin{macrocode}
-\newcommand\encodingdefault{OT1}
 \newcommand\familydefault{\rmdefault}
 \newcommand\seriesdefault{\mddefault}
 \newcommand\shapedefault{\updefault}
@@ -412,7 +475,6 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 %
 %    This finishes the low-level setup in \texttt{fonttext.ltx}.