summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-21 23:29:27 +0000
committerKarl Berry <karl@freefriends.org>2017-02-21 23:29:27 +0000
commit516a8bbf9db95a88ce2fdd2cf3407216f67e8049 (patch)
tree8a6508ac24539e2003f1efd5c758cdcea9e6891b /Master/texmf-dist/source/latex/base
parent7714e343948bfc6ff5fd5c4b7297c229f37070fa (diff)
latex (21feb17)
git-svn-id: svn://tug.org/texlive/trunk@43287 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r--Master/texmf-dist/source/latex/base/ltluatex.dtx61
-rw-r--r--Master/texmf-dist/source/latex/base/ltoutenc.dtx85
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx2
-rw-r--r--Master/texmf-dist/source/latex/base/tulm.fdd330
-rw-r--r--Master/texmf-dist/source/latex/base/tulm.ins107
-rw-r--r--Master/texmf-dist/source/latex/base/unpack.ins2
-rw-r--r--Master/texmf-dist/source/latex/base/utf8ienc.dtx9
7 files changed, 565 insertions, 31 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltluatex.dtx b/Master/texmf-dist/source/latex/base/ltluatex.dtx
index e5f507258f3..ffde612ec4b 100644
--- a/Master/texmf-dist/source/latex/base/ltluatex.dtx
+++ b/Master/texmf-dist/source/latex/base/ltluatex.dtx
@@ -24,7 +24,7 @@
\ProvidesFile{ltluatex.dtx}
%</driver>
%<*tex>
-[2017/01/20 v1.1b
+[2017/02/18 v1.1c
%</tex>
%<plain> LuaTeX support for plain TeX (core)
%<*tex>
@@ -200,6 +200,17 @@
% The number is returned and also \meta{name} argument is added to the
% |lua.name| array at that index.
%
+% These functions all require access to a named \TeX{} count register
+% to manage their allocations. The standard names are those defined
+% above for access from \TeX{}, \emph{e.g.}~\string\e@alloc@attribute@count,
+% but these can be adjusted by defining the variable
+% \texttt{\meta{type}\_count\_name} before loading |ltluatex.lua|, for example
+% \begin{verbatim}
+% local attribute_count_name = "attributetracker"
+% require("ltluatex")
+% \end{verbatim}
+% would use a \TeX{} |\count| (|\countdef|'d token) called |attributetracker|
+% in place of \string\e@alloc@attribute@count.
%
% \subsection{Lua access to \TeX{} register numbers}
%
@@ -1080,6 +1091,7 @@ luatexbase.registernumber = registernumber
%
% \begin{macro}{new\_attribute}
% \changes{v1.0a}{2015/09/24}{Function added}
+% \changes{v1.1c}{2017/02/18}{Parameterise count used in tracking}
% As attributes are used for Lua manipulations its useful to be able
% to assign from this end.
% \begin{macrocode}
@@ -1090,20 +1102,21 @@ __index = function(t,key)
return registernumber(key) or nil
end}
)
-luatexbase.attributes=attributes
+luatexbase.attributes = attributes
% \end{macrocode}
%
% \begin{macrocode}
+local attribute_count_name = attribute_count_name or "e@alloc@attribute@count"
local function new_attribute(name)
- tex_setcount("global", "e@alloc@attribute@count",
- tex_count["e@alloc@attribute@count"] + 1)
- if tex_count["e@alloc@attribute@count"] > 65534 then
+ tex_setcount("global", attribute_count_name,
+ tex_count[attribute_count_name] + 1)
+ if tex_count[attribute_count_name] > 65534 then
luatexbase_error("No room for a new \\attribute")
end
- attributes[name]= tex_count["e@alloc@attribute@count"]
+ attributes[name]= tex_count[attribute_count_name]
luatexbase_log("Lua-only attribute " .. name .. " = " ..
- tex_count["e@alloc@attribute@count"])
- return tex_count["e@alloc@attribute@count"]
+ tex_count[attribute_count_name])
+ return tex_count[attribute_count_name]
end
luatexbase.new_attribute = new_attribute
% \end{macrocode}
@@ -1112,17 +1125,19 @@ luatexbase.new_attribute = new_attribute
% \subsection{Custom whatsit allocation}
%
% \begin{macro}{new\_whatsit}
+% \changes{v1.1c}{2017/02/18}{Parameterise count used in tracking}
% Much the same as for attribute allocation in Lua.
% \begin{macrocode}
+local whatsit_count_name = whatsit_count_name or "e@alloc@whatsit@count"
local function new_whatsit(name)
- tex_setcount("global", "e@alloc@whatsit@count",
- tex_count["e@alloc@whatsit@count"] + 1)
- if tex_count["e@alloc@whatsit@count"] > 65534 then
+ tex_setcount("global", whatsit_count_name,
+ tex_count[whatsit_count_name] + 1)
+ if tex_count[whatsit_count_name] > 65534 then
luatexbase_error("No room for a new custom whatsit")
end
luatexbase_log("Custom whatsit " .. (name or "") .. " = " ..
- tex_count["e@alloc@whatsit@count"])
- return tex_count["e@alloc@whatsit@count"]
+ tex_count[whatsit_count_name])
+ return tex_count[whatsit_count_name]
end
luatexbase.new_whatsit = new_whatsit
% \end{macrocode}
@@ -1131,18 +1146,20 @@ luatexbase.new_whatsit = new_whatsit
% \subsection{Bytecode register allocation}
%
% \begin{macro}{new\_bytecode}
+% \changes{v1.1c}{2017/02/18}{Parameterise count used in tracking}
% Much the same as for attribute allocation in Lua.
% The optional \meta{name} argument is used in the log if given.
% \begin{macrocode}
+local bytecode_count_name = bytecode_count_name or "e@alloc@bytecode@count"
local function new_bytecode(name)
- tex_setcount("global", "e@alloc@bytecode@count",
- tex_count["e@alloc@bytecode@count"] + 1)
- if tex_count["e@alloc@bytecode@count"] > 65534 then
+ tex_setcount("global", bytecode_count_name,
+ tex_count[bytecode_count_name] + 1)
+ if tex_count[bytecode_count_name] > 65534 then
luatexbase_error("No room for a new bytecode register")
end
luatexbase_log("Lua bytecode " .. (name or "") .. " = " ..
- tex_count["e@alloc@bytecode@count"])
- return tex_count["e@alloc@bytecode@count"]
+ tex_count[bytecode_count_name])
+ return tex_count[bytecode_count_name]
end
luatexbase.new_bytecode = new_bytecode
% \end{macrocode}
@@ -1151,13 +1168,15 @@ luatexbase.new_bytecode = new_bytecode
% \subsection{Lua chunk name allocation}
%
% \begin{macro}{new\_chunkname}
+% \changes{v1.1c}{2017/02/18}{Parameterise count used in tracking}
% As for bytecode registers but also store the name in the
% |lua.name| table.
% \begin{macrocode}
+local chunkname_count_name = chunkname_count_name or "e@alloc@luachunk@count"
local function new_chunkname(name)
- tex_setcount("global", "e@alloc@luachunk@count",
- tex_count["e@alloc@luachunk@count"] + 1)
- local chunkname_count = tex_count["e@alloc@luachunk@count"]
+ tex_setcount("global", chunkname_count_name,
+ tex_count[chunkname_count_name] + 1)
+ local chunkname_count = tex_count[chunkname_count_name]
chunkname_count = chunkname_count + 1
if chunkname_count > 65534 then
luatexbase_error("No room for a new chunkname")
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}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index 3f34ed040e3..739001da82e 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -95,7 +95,7 @@
{2017/01/01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{1}
+\def\patch@level{2}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/base/tulm.fdd b/Master/texmf-dist/source/latex/base/tulm.fdd
new file mode 100644
index 00000000000..28d1d24da1f
--- /dev/null
+++ b/Master/texmf-dist/source/latex/base/tulm.fdd
@@ -0,0 +1,330 @@
+% \iffalse meta-comment
+%
+% Copyright 2016-2017
+% The LaTeX3 Project and any individual authors listed elsewhere
+% in this file.
+%
+% This file is part of the LaTeX base system.
+% -------------------------------------------
+%
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This file has the LPPL maintenance status "maintained".
+%
+% The list of all files belonging to the LaTeX base distribution is
+% given in the file `manifest.txt'. See also `legal.txt' for additional
+% information.
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
+% extension .ins) which are part of the distribution.
+%
+% \fi
+%
+%\iffalse This is a META comment
+%
+% File `cmfonts.fdd'.
+% Copyright (C) 2016-2017 LaTeX3 Project
+%
+%
+%<TUlmr>\ProvidesFile{tulmr.fd}
+%<TUlmss>\ProvidesFile{tulmss.fd}
+%<TUlmssq>\ProvidesFile{tulmssq.fd}
+%<TUlmtt>\ProvidesFile{tulmtt.fd}
+%<TUlmvtt>\ProvidesFile{tulmvtt.fd}
+%<TUlmdh>\ProvidesFile{tulmdh.fd}
+%<*driver>
+ \ProvidesFile{tulm.drv}
+%</driver>
+ [2017/01/26 v1.8 Standard LaTeX font definitions for Latin Modern]
+%
+%<*driver>
+\documentclass{ltxdoc}
+\GetFileInfo{tulm.drv}
+\providecommand\dst{\expandafter{\normalfont\scshape docstrip}}
+\title{The file \texttt{tulm.fdd} for use with
+ \LaTeXe.\thanks{This file has version
+ number \fileversion, dated \filedate.}}
+\date{\filedate}\author{LaTeX3 Project}
+\addtolength\textwidth{30pt}
+\begin{document}
+\MaintainedByLaTeXTeam{latex}
+\maketitle
+ \DocInput{tulm.fdd}
+\end{document}
+%</driver>
+%
+%\fi
+%
+% \section{TUlmr}
+% \begin{macrocode}
+%<*TUlmr>
+\DeclareFontFamily{TU}{lmr}{}
+\DeclareFontShape{TU}{lmr}{m}{n}%
+ {<-5.5> \UnicodeFontFile{lmroman5-regular}{\UnicodeFontTeXLigatures}
+ <5.5-6.5> \UnicodeFontFile{lmroman6-regular}{\UnicodeFontTeXLigatures}
+ <6.5-7.5> \UnicodeFontFile{lmroman7-regular}{\UnicodeFontTeXLigatures}
+ <7.5-8.5> \UnicodeFontFile{lmroman8-regular}{\UnicodeFontTeXLigatures}
+ <8.5-9.5> \UnicodeFontFile{lmroman9-regular}{\UnicodeFontTeXLigatures}
+ <9.5-11> \UnicodeFontFile{lmroman10-regular}{\UnicodeFontTeXLigatures}
+ <11-15> \UnicodeFontFile{lmroman12-regular}{\UnicodeFontTeXLigatures}
+ <15-> \UnicodeFontFile{lmroman17-regular}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmr}{m}{sl}%
+ {<-8.5> \UnicodeFontFile{lmromanslant8-regular}{\UnicodeFontTeXLigatures}
+ <8.5-9.5> \UnicodeFontFile{lmromanslant9-regular}{\UnicodeFontTeXLigatures}
+ <9.5-11> \UnicodeFontFile{lmromanslant10-regular}{\UnicodeFontTeXLigatures}
+ <11-15> \UnicodeFontFile{lmromanslant12-regular}{\UnicodeFontTeXLigatures}
+ <15-> \UnicodeFontFile{lmromanslant17-regular}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmr}{m}{it}%
+ {<-7.5> \UnicodeFontFile{lmroman7-italic}{\UnicodeFontTeXLigatures}
+ <7.5-8.5> \UnicodeFontFile{lmroman8-italic}{\UnicodeFontTeXLigatures}
+ <8.5-9.5> \UnicodeFontFile{lmroman9-italic}{\UnicodeFontTeXLigatures}
+ <9.5-11> \UnicodeFontFile{lmroman10-italic}{\UnicodeFontTeXLigatures}
+ <11-> \UnicodeFontFile{lmroman12-italic}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmr}{m}{sc}%
+ {<-> \UnicodeFontFile{lmromancaps10-regular}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmr}{m}{ui}%
+ {<-> ec-lmu10}{}
+\DeclareFontShape{TU}{lmr}{m}{scsl}%
+ {<-> \UnicodeFontFile{lmromancaps10-oblique}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmr}{b}{n}
+ {<-> \UnicodeFontFile{lmromandemi10-regular}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmr}{b}{sl}
+ {<-> \UnicodeFontFile{lmromandemi10-oblique}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmr}{bx}{n}
+ {<-5.5> \UnicodeFontFile{lmroman5-bold}{\UnicodeFontTeXLigatures}
+ <5.5-6.5> \UnicodeFontFile{lmroman6-bold}{\UnicodeFontTeXLigatures}
+ <6.5-7.5> \UnicodeFontFile{lmroman7-bold}{\UnicodeFontTeXLigatures}
+ <7.5-8.5> \UnicodeFontFile{lmroman8-bold}{\UnicodeFontTeXLigatures}
+ <8.5-9.5> \UnicodeFontFile{lmroman9-bold}{\UnicodeFontTeXLigatures}
+ <9.5-11> \UnicodeFontFile{lmroman10-bold}{\UnicodeFontTeXLigatures}
+ <11-> \UnicodeFontFile{lmroman12-bold}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmr}{bx}{it}
+ {<-> \UnicodeFontFile{lmroman10-bolditalic}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmr}{bx}{sl}
+ {<-> \UnicodeFontFile{lmromanslant10-bold}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmr}{b}{it}
+ {<->sub * lmr/b/sl}{}
+%</TUlmr>
+% \end{macrocode}
+%
+% \section{TUlmss}
+% \begin{macrocode}
+%<*TUlmss>
+\DeclareFontFamily{TU}{lmss}{}
+\DeclareFontShape{TU}{lmss}{m}{n}
+ {<-8.5> \UnicodeFontFile{lmsans8-regular}{\UnicodeFontTeXLigatures}
+ <8.5-9.5> \UnicodeFontFile{lmsans9-regular}{\UnicodeFontTeXLigatures}
+ <9.5-11> \UnicodeFontFile{lmsans10-regular}{\UnicodeFontTeXLigatures}
+ <11-15.5> \UnicodeFontFile{lmsans12-regular}{\UnicodeFontTeXLigatures}
+ <15.5-> \UnicodeFontFile{lmsans17-regular}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmss}{m}{it}
+ {<->ssub*lmss/m/sl}{}
+\DeclareFontShape{TU}{lmss}{m}{sl}
+ {<-8.5> \UnicodeFontFile{lmsans8-oblique}{\UnicodeFontTeXLigatures}
+ <8.5-9.5> \UnicodeFontFile{lmsans9-oblique}{\UnicodeFontTeXLigatures}
+ <9.5-11> \UnicodeFontFile{lmsans10-oblique}{\UnicodeFontTeXLigatures}
+ <11-15.5> \UnicodeFontFile{lmsans12-oblique}{\UnicodeFontTeXLigatures}
+ <15.5-> \UnicodeFontFile{lmsans17-oblique}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmss}{m}{sc}
+ {<->sub*lmr/m/sc}{}
+\DeclareFontShape{TU}{lmss}{b}{n}
+ {<->ssub * lmss/bx/n}{}
+\DeclareFontShape{TU}{lmss}{b}{sl}
+ {<->ssub * lmss/bx/sl}{}
+\DeclareFontShape{TU}{lmss}{b}{it}
+ {<->ssub * lmss/bx/it}{}
+\DeclareFontShape{TU}{lmss}{sbc}{n}
+ {<-> \UnicodeFontFile{lmsansdemicond10-regular}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmss}{sbc}{sl}
+ {<-> \UnicodeFontFile{lmsansdemicond10-oblique}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmss}{sbc}{it}
+ {<->ssub*lmss/sbc/sl}{}
+\DeclareFontShape{TU}{lmss}{bx}{n}
+ {<-> \UnicodeFontFile{lmsans10-bold}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmss}{bx}{sl}
+ {<-> \UnicodeFontFile{lmsans10-boldoblique}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmss}{bx}{it}
+ {<->ssub*lmss/bx/sl}{}
+%</TUlmss>
+% \end{macrocode}
+%
+% \section{TUlmssq}
+% \begin{macrocode}
+%<*TUlmssq>
+\DeclareFontFamily{TU}{lmssq}{}
+\DeclareFontShape{TU}{lmssq}{m}{n}
+ {<-> \UnicodeFontFile{lmsansquot8-regular}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmssq}{m}{sl}
+ {<-> \UnicodeFontFile{lmsansquot8-oblique}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmssq}{bx}{n}
+ {<-> \UnicodeFontFile{lmsansquot8-bold}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmssq}{bx}{sl}
+ {<-> \UnicodeFontFile{lmsansquot8-boldoblique}{\UnicodeFontTeXLigatures}}{}
+\DeclareFontShape{TU}{lmssq}{m}{it}
+ {<->ssub*lmssq/m/sl}{}
+\DeclareFontShape{TU}{lmssq}{bx}{it}
+ {<->ssub*lmssq/bx/sl}{}
+\DeclareFontShape{TU}{lmssq}{b}{n}
+ {<->ssub * lmssq/bx/n}{}
+\DeclareFontShape{TU}{lmssq}{b}{sl}
+ {<->ssub * lmssq/bx/sl}{}
+\DeclareFontShape{TU}{lmssq}{b}{it}
+ {<->ssub * lmssq/bx/it}{}
+%</TUlmssq>
+% \end{macrocode}
+%
+% \section{TUlmtt}
+% \begin{macrocode}
+%<*TUlmtt>
+\DeclareFontFamily{TU}{lmtt}{%
+\hyphenchar \font\m@ne
+\fontdimen3\font\z@
+\fontdimen4\font\z@
+}
+\ifx\lmtt@use@light@as@normal\@empty
+\DeclareFontShape{TU}{lmtt}{sb}{n}
+ {<-8.5> \UnicodeFontFile{lmmono8-regular}{}
+ <8.5-9.5> \UnicodeFontFile{lmmono9-regular}{}
+ <9.5-11> \UnicodeFontFile{lmmono10-regular}{}
+ <11-> \UnicodeFontFile{lmmono12-regular}{}
+ }{}
+\DeclareFontShape{TU}{lmtt}{sb}{it}
+ {<-> \UnicodeFontFile{lmmono10-italic}{}}{}
+\DeclareFontShape{TU}{lmtt}{sb}{sl}
+ {<-> \UnicodeFontFile{lmmonoslant10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{sb}{sc}
+ {<-> \UnicodeFontFile{lmmonocaps10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{sb}{scsl}
+ {<-> \UnicodeFontFile{lmmonocaps10-oblique}{}}{}
+\DeclareFontShape{TU}{lmtt}{m}{n}
+ {<-> \UnicodeFontFile{lmmonolt10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{m}{it}
+ {<->sub*lmtt/l/sl}{}
+\DeclareFontShape{TU}{lmtt}{m}{sl}
+ {<-> \UnicodeFontFile{lmmonolt10-oblique}{}}{}
+\DeclareFontShape{TU}{lmtt}{c}{n}
+ {<-> \UnicodeFontFile{lmmonoltcond10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{c}{it}
+ {<->sub*lmtt/lc/sl}{}
+\DeclareFontShape{TU}{lmtt}{c}{sl}
+ {<-> \UnicodeFontFile{lmmonoltcond10-oblique}{}}{}
+\else
+\DeclareFontShape{TU}{lmtt}{m}{n}
+ {<-8.5> \UnicodeFontFile{lmmono8-regular}{}
+ <8.5-9.5> \UnicodeFontFile{lmmono9-regular}{}
+ <9.5-11> \UnicodeFontFile{lmmono10-regular}{}
+ <11-> \UnicodeFontFile{lmmono12-regular}{}
+ }{}
+\DeclareFontShape{TU}{lmtt}{m}{it}
+ {<-> \UnicodeFontFile{lmmono10-italic}{}}{}
+\DeclareFontShape{TU}{lmtt}{m}{sl}
+ {<-> \UnicodeFontFile{lmmonoslant10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{m}{sc}
+ {<-> \UnicodeFontFile{lmmonocaps10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{m}{scsl}
+ {<-> \UnicodeFontFile{lmmonocaps10-oblique}{}}{}
+\DeclareFontShape{TU}{lmtt}{l}{n}
+ {<-> \UnicodeFontFile{lmmonolt10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{l}{it}
+ {<->sub*lmtt/l/sl}{}
+\DeclareFontShape{TU}{lmtt}{l}{sl}
+ {<-> \UnicodeFontFile{lmmonolt10-oblique}{}}{}
+\DeclareFontShape{TU}{lmtt}{lc}{n}
+ {<-> \UnicodeFontFile{lmmonoltcond10-regular}{}}{}
+\DeclareFontShape{TU}{lmtt}{lc}{it}
+ {<->sub*lmtt/lc/sl}{}
+\DeclareFontShape{TU}{lmtt}{lc}{sl}
+ {<-> \UnicodeFontFile{lmmonoltcond10-oblique}{}}{}
+\fi
+\DeclareFontShape{TU}{lmtt}{b}{n}
+ {<-> \UnicodeFontFile{lmmonolt10-bold}{}}{}
+\DeclareFontShape{TU}{lmtt}{b}{it}
+ {<->sub*lmtt/b/sl}{}
+\DeclareFontShape{TU}{lmtt}{b}{sl}
+{<-> \UnicodeFontFile{lmmonolt10-boldoblique}{}}{}
+\DeclareFontShape{TU}{lmtt}{bx}{it}
+ {<->sub*lmtt/b/sl}{}
+\DeclareFontShape{TU}{lmtt}{bx}{n}
+ {<->ssub*lmtt/b/n}{}
+\DeclareFontShape{TU}{lmtt}{bx}{sl}
+ {<->ssub*lmtt/b/sl}{}
+%</TUlmtt>
+% \end{macrocode}
+%
+% \section{TUlmvtt}
+% \begin{macrocode}
+%<*TUlmvtt>
+\DeclareFontFamily{TU}{lmvtt}{}
+\ifx\lmtt@use@light@as@normal\@empty
+\DeclareFontShape{TU}{lmvtt}{sb}{n}
+ {<->\UnicodeFontFile{lmmonoprop10-regular}{}}{}
+\DeclareFontShape{TU}{lmvtt}{sb}{sl}
+ {<->\UnicodeFontFile{lmmonoprop10-oblique}{}}{}
+\DeclareFontShape{TU}{lmvtt}{sb}{it}
+ {<->sub*lmvtt/m/sl}{}
+\DeclareFontShape{TU}{lmvtt}{m}{n}
+ {<->\UnicodeFontFile{lmmonoproplt10-regular}{}}{}
+\DeclareFontShape{TU}{lmvtt}{m}{sl}
+ {<->\UnicodeFontFile{lmmonoproplt10-oblique}{}}{}
+\DeclareFontShape{TU}{lmvtt}{m}{it}
+ {<->sub*lmvtt/l/sl}{}
+\else
+\DeclareFontShape{TU}{lmvtt}{m}{n}
+ {<->\UnicodeFontFile{lmmonoprop10-regular}{}}{}
+\DeclareFontShape{TU}{lmvtt}{m}{sl}
+ {<->\UnicodeFontFile{lmmonoprop10-oblique}{}}{}
+\DeclareFontShape{TU}{lmvtt}{m}{it}
+ {<->sub*lmvtt/m/sl}{}
+\DeclareFontShape{TU}{lmvtt}{l}{n}
+ {<->\UnicodeFontFile{lmmonoproplt10-regular}{}}{}
+\DeclareFontShape{TU}{lmvtt}{l}{sl}
+ {<->\UnicodeFontFile{lmmonoproplt10-oblique}{}}{}
+\DeclareFontShape{TU}{lmvtt}{l}{it}
+ {<->sub*lmvtt/l/sl}{}
+\fi
+\DeclareFontShape{TU}{lmvtt}{b}{n}
+ {<->\UnicodeFontFile{lmmonoproplt10-bold}{}}{}
+\DeclareFontShape{TU}{lmvtt}{b}{sl}
+ {<->\UnicodeFontFile{lmmonoproplt10-boldoblique}{}}{}
+\DeclareFontShape{TU}{lmvtt}{b}{it}
+ {<->sub*lmvtt/b/sl}{}
+\DeclareFontShape{TU}{lmvtt}{bx}{n}
+ {<->ssub*lmvtt/b/n}{}
+\DeclareFontShape{TU}{lmvtt}{bx}{sl}
+ {<->ssub*lmvtt/b/sl}{}
+\DeclareFontShape{TU}{lmvtt}{bx}{it}
+ {<->sub*lmvtt/b/sl}{}
+%</TUlmvtt>
+% \end{macrocode}
+%
+% \section{TUlmdh}
+% \begin{macrocode}
+%<*TUlmdh>
+\DeclareFontFamily{TU}{lmdh}{}%
+\DeclareFontShape{TU}{lmdh}{m}{n}
+ {<-> \UnicodeFontFile{lmromandunh10-regular}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmdh}{m}{sl}
+ {<-> \UnicodeFontFile{lmromandunh10-oblique}{\UnicodeFontTeXLigatures}
+ }{}
+\DeclareFontShape{TU}{lmdh}{m}{it}
+ {<->sub*lmdh/m/sl}{}
+%</TUlmdh>
+% \end{macrocode}
+%
+%
+% \Finale
+%
diff --git a/Master/texmf-dist/source/latex/base/tulm.ins b/Master/texmf-dist/source/latex/base/tulm.ins
new file mode 100644
index 00000000000..29e14d53fed
--- /dev/null
+++ b/Master/texmf-dist/source/latex/base/tulm.ins
@@ -0,0 +1,107 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 2016-2017
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the LaTeX base system.
+%% -------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3b
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3b or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This file has the LPPL maintenance status "maintained".
+%%
+%% In particular, NO PERMISSION is granted to modify the contents of this
+%% file since it contains the legal notices that are placed in the files
+%% it generates.
+%%
+%% The list of all files belonging to the LaTeX base distribution is
+%% given in the file `manifest.txt'. See also `legal.txt' for additional
+%% information.
+%%
+%%
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+
+\input docstrip
+
+\preamble
+
+This is a generated file.
+
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+
+Copyright 1993-2016
+The LaTeX3 Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the LaTeX base system.
+--------------------------------------------------------------
+
+It may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This file may only be distributed together with a copy of the LaTeX
+base system. You may however distribute the LaTeX base system without
+such generated files.
+
+The list of all files belonging to the LaTeX base distribution is
+given in the file `manifest.txt'. See also `legal.txt' for additional
+information.
+
+In particular, permission is granted to customize the declarations in
+this file to serve the needs of your installation.
+
+However, NO PERMISSION is granted to distribute a modified version
+of this file under its original name.
+
+\endpreamble
+
+
+\keepsilent
+\usedir{tex/latex/base}
+
+\generate{\file{tulmss.fd}{\from{tulm.fdd}{TUlmss}}
+ \file{tulmssq.fd}{\from{tulm.fdd}{TUlmssq}}
+ \file{tulmr.fd}{\from{tulm.fdd}{TUlmr}}
+ \file{tulmtt.fd}{\from{tulm.fdd}{TUlmtt}}
+ \file{tulmvtt.fd}{\from{tulm.fdd}{TUlmvtt}}
+ \file{tulmdh.fd}{\from{tulm.fdd}{TUlmdh}}}
+
+
+\ifToplevel{
+\Msg{***********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* files into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space All *.fd}
+\Msg{*}
+\Msg{* To produce the documentation run the files ending with}
+\Msg{* `.fdd' through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing}
+\Msg{***********************************************************}
+}
+
+\endbatchfile
+
diff --git a/Master/texmf-dist/source/latex/base/unpack.ins b/Master/texmf-dist/source/latex/base/unpack.ins
index d3a9c322e65..d63feb0334c 100644
--- a/Master/texmf-dist/source/latex/base/unpack.ins
+++ b/Master/texmf-dist/source/latex/base/unpack.ins
@@ -94,6 +94,8 @@
\batchinput{cmfonts.ins}
+\batchinput{tulm.ins}
+
\batchinput{ec.ins}
\batchinput{latex209.ins}
diff --git a/Master/texmf-dist/source/latex/base/utf8ienc.dtx b/Master/texmf-dist/source/latex/base/utf8ienc.dtx
index 27d6612ac76..5478a029008 100644
--- a/Master/texmf-dist/source/latex/base/utf8ienc.dtx
+++ b/Master/texmf-dist/source/latex/base/utf8ienc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2016
+% Copyright 1993-2017
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -218,7 +218,7 @@
%<+ts1> \ProvidesFile{ts1enc.dfu}
%<+x2> \ProvidesFile{x2enc.dfu}
%<+all> \ProvidesFile{utf8enc.dfu}
- [2016/02/28 v1.1s UTF-8 support for inputenc]
+ [2017/01/28 v1.1t UTF-8 support for inputenc]
% \end{macrocode}
%
% \begin{macrocode}
@@ -839,6 +839,7 @@
% \changes{v1.1q}{2015/12/02}{Add remaining latin uses of accents in T1}
% \changes{v1.1r}{2015/12/03}{Add some more ogoneck cases}
% \changes{v1.1s}{2016/01/11}{Add some more caron and acute}
+% \changes{v1.1t}{2017/01/28}{Add caron cominations for GgYy}
% \begin{macrocode}
%<all,t1,ot1,ly1>\DeclareUnicodeCharacter{00A0}{\nobreakspace}
%<all,t1,ot1,ly1>\DeclareUnicodeCharacter{00A1}{\textexclamdown}
@@ -1096,6 +1097,8 @@
% \end{macrocode}
%
% \begin{macrocode}
+%<all,t1>\DeclareUnicodeCharacter{0232}{\@tabacckludge=Y}
+%<all,t1>\DeclareUnicodeCharacter{0233}{\@tabacckludge=y}
%<all,ly1,utf8>\DeclareUnicodeCharacter{02C6}{\textasciicircum}
%<all,ts1>\DeclareUnicodeCharacter{02C7}{\textasciicaron}
%<all,ly1,utf8>\DeclareUnicodeCharacter{02DC}{\textasciitilde}
@@ -1467,6 +1470,8 @@
%<all,ts1>\DeclareUnicodeCharacter{25E6}{\textopenbullet}
%<all,ts1>\DeclareUnicodeCharacter{25EF}{\textbigcircle}
%<all,ts1>\DeclareUnicodeCharacter{266A}{\textmusicalnote}
+%<all,t1>\DeclareUnicodeCharacter{1E20}{\@tabacckludge=G}
+%<all,t1>\DeclareUnicodeCharacter{1E21}{\@tabacckludge=g}
% \end{macrocode}
%
% \subsection{Notes}