latex2e (22jan17)

git-svn-id: svn://tug.org/texlive/trunk@43024 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2017-01-22 23:37:33 +0000
committer: Karl Berry <karl@freefriends.org> 2017-01-22 23:37:33 +0000
commit: b2ba0afced5c10391750914c16a2aa06cfaa6a96 (patch)
tree: 8a87b0b92f0038639e1078486bb4c2a56bcea2d3
parent: bc46c8f4627710df445115626d25161dcb2df985 (diff)
165 files changed, 3823 insertions, 628 deletions
diff --git a/Master/texmf-dist/doc/latex/amsmath/README.txt b/Master/texmf-dist/doc/latex/amsmath/README.txt
index fc209bade8e..059e46a4468 100644
--- a/Master/texmf-dist/doc/latex/amsmath/README.txt
+++ b/Master/texmf-dist/doc/latex/amsmath/README.txt
@@ -1,4 +1,4 @@
-README for amsmath 2.15d [2016/06/28]
+README for amsmath 2.16a [2016/11/05]
            American Mathematical Society, LaTeX3 Project
 
 Copyright 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society.
@@ -33,17 +33,28 @@ developed by the American Mathematical Society and released for general
 use as a service to the mathematical community. A number of smaller
 auxiliary packages are also distributed with the amsmath package.
 
+Effective in 2016, maintenance of amsmath was transferred from AMS to
+the LaTeX3 Project; as amsmath is considered a "required" package, this
+centralizes control over the core LaTeX components.
+
 ========================================================================
 II. INSTALLATION AND GETTING STARTED
 
-In order to use amsmath you need to have TeX installed first. TeX is
-not an AMS product. For information on getting TeX see one of the
-following:
+In order to use amsmath you need to have TeX installed first.
+For information on getting TeX see one of the following:
 
     http://www.tug.org/
     http://www.ams.org/tex/tex-resources
 
-If you are installing amsmath manually, see install.txt.
+It is recommended to install a comprehensive distribution, such as
+TeX Live, MiKTeX for Windows, or MacTeX for Macintosh.
+As part of the "required" LaTeX package subset, amsmath
+will already be available if one of these distributions is chosen,
+
+If you are installing amsmath manually, the most recent version
+will be available from the CTAN archives
+https://www.ctan.org/pkg/amsmath
+
 
 The primary documentation for amsmath is in
 
@@ -56,30 +67,42 @@ Additional documentation files include:
     technote.pdf
     testmath.pdf
 
-which are included in the collection.
+which are included in the collection.  All of these can be accessed
+easily with most distributions by entering "texdoc filename" at the
+command line, or via "TeXdoc Online" at http://texdoc.net .
 
 ========================================================================
 III. SUBMITTING BUG REPORTS
 
-Technical support is available via the addresses listed above.  Bug
-reports should be submitted using the standard LaTeX bug reporting
-system: Execute the command
+Bug reports should be submitted using the standard LaTeX bug reporting
+system:
+
+See the form at
 
-    latex latexbug.tex
+http://www.latex-project.org/bugs/
 
 and follow the resulting instructions. Select "amslatex" when asked
 for a category.
 
+Questions regarding usage can be posted at http://tex.stackexchange.com .
+Check first to see whether your question has already been answered.
+
 ========================================================================
 IV. REMARKS ON THIS RELEASE
 
-Version 2.15 adds some compatibility with luatex 0.87 and fixes to
-\dots handling.
+Version 2.16 adds some control over spacing around aligned/gathered and
+adjustments to the generalized fraction code so that it works in xetex.
 
 ========================================================================
 V. CHANGE LOG (REVERSE CHRONOLOGICAL ORDER)
 
 
+2016-11-05 amsmath.dtx 2.16a
+     alignedleftspace[yes|no|yesifneg] package options
+     New genfrac implementation for XeTeX and LuaTeX
+     Delete obsolete install.txt file.
+     
+     
 2016-06-28 amsmath.dtx 2.15d
      avoid error on \dots \left ....
 
@@ -157,3 +180,8 @@ V. CHANGE LOG (REVERSE CHRONOLOGICAL ORDER)
        inside indented lists (displaywidth < columnwidth). Changed the
        multline/fleqn/leqno indent to match mathmargin when possible
        instead of always just using multlinetaggap.
+
+The file diffs-m.txt contains information on development and changes
+prior to 2000.
+
+[end]
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf b/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf
index 17dc6444ce3..ebd7c524339 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amscd.pdf b/Master/texmf-dist/doc/latex/amsmath/amscd.pdf
index 24d90f0b6a3..51168374d0a 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amscd.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amscd.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf b/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf
index 3e2587e68f3..39fd0f25529 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf b/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf
index 0c30d9724cd..56f205f15ba 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex b/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex
index abb532cccb8..d787f87c55f 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex
+++ b/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex
@@ -1,42 +1,28 @@
-%%% ====================================================================
-%%%  @LaTeX-file{
-%%%     filename        = "amsldoc.tex",
-%%%     version         = "2.09",
-%%%     date            = "2004/04/06",
-%%%     time            = "15:13:33 EDT",
-%%%     checksum        = "39446 2620 11111 93831",
-%%%     author          = "American Mathematical Society",
-%%%     address         = "American Mathematical Society,
-%%%                        Technical Support,
-%%%                        Electronic Products and Services,
-%%%                        P. O. Box 6248,
-%%%                        Providence, RI 02940,
-%%%                        USA",
-%%%     telephone       = "401-455-4080 or (in the USA and Canada)
-%%%                        800-321-4AMS (321-4267)",
-%%%     FAX             = "401-331-3842",
-%%%     email           = "tech-support@ams.org (Internet)",
-%%%     copyright       = "Copyright 1999 American Mathematical Society,
-%%%                        all rights reserved.  Copying of this file is
-%%%                        authorized only if either:
-%%%                        (1) you make absolutely no changes to your copy,
-%%%                        including name; OR
-%%%                        (2) if you do make changes, you first rename it
-%%%                        to some other name.",
-%%%     supported       = "yes",
-%%%     keywords        = "latex, amsmath",
-%%%     abstract        = "This file is the source file for the user's
-%%%                        guide of the \LaTeX{} package amsmath .",
-%%%     docstring       = "The checksum field above contains a CRC-16
-%%%                        checksum as the first value, followed by the
-%%%                        equivalent of the standard UNIX wc (word
-%%%                        count) utility output of lines, words, and
-%%%                        characters.  This is produced by Robert
-%%%                        Solovay's checksum utility.",
-%%%  }
-%%% ====================================================================
+%
+% Copyright 1995, 2000, 2013 American Mathematical Society.
+% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%
+% This work 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 work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is the LaTeX3 Project.
+%
 \documentclass[leqno,titlepage,openany]{amsldoc}[1999/12/13]
 
+\def\MaintainedByLaTeXTeam#1{%
+\begin{center}%
+\fbox{\fbox{\begin{tabular}{@{}l@{}}%
+This file is maintained by the \LaTeX{} Project team.\\%
+Bug reports can be opened (category \texttt{#1}) at\\%
+\url{http://latex-project.org/bugs.html}.\end{tabular}}}\end{center}}
+
 \ifx\UndEfiNed\url
   \ClassError{amsldoc}{%
     This version of amsldoc.tex must be processed\MessageBreak
@@ -44,8 +30,11 @@
 \fi
 
 \title{User's Guide for the \pkg{amsmath} Package (Version~2.0)}
-\author{American Mathematical Society}
-\date{1999-12-13 (revised 2002-02-25)}
+\author{American Mathematical Society, \LaTeX3 Project}
+\date{1999-12-13 (revised 2002-02-25, 2016-11-14)}
+\makeatletter
+\def\@thanks{\bigskip\MaintainedByLaTeXTeam{amslatex}}
+\makeatother
 
 %    Use the amsmath package and amscd package in order to print
 %    examples.
@@ -184,12 +173,20 @@
 \DeclareMathOperator{\End}{End}
 \DeclareMathOperator{\xxx}{xxx}
 
+\usepackage{hyperref}
+\hypersetup{pdfborder=0 0 0}
+\makeatletter
+\let\oldcs\cs
+\def\cs#1{\texorpdfstring{\oldcs{#1}}{\@backslashchar\@backslashchar#1}}
+\let\cn\cs
+\makeatother
 \begin{document}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \frontmatter
 
 \maketitle
+
 \pagestyle{headings}
 \tableofcontents
 \cleardoublepage % for better page number placement
@@ -321,6 +318,12 @@ equation.
 
 \end{description}
 
+\begin{description}
+\item[\opt{alignedleftspaceyes}]
+\item[\opt{alignedleftspaceno}]
+\item[\opt{alignedleftspaceyesifneg}]
+\end{description}
+
 To use one of these package options, put the option name in the optional
 argument of the \cn{usepackage} command\mdash e.g.,
 \verb"\usepackage[intlimits]{amsmath}".
@@ -342,6 +345,25 @@ equations!centering}
 
 \end{description}
 
+Three options have been added to control the space to the left of
+\env{aligned} and \env{gathered} environments. Prior to the 2017 release
+a thin space was added to the left but not the right of these constructs.
+This appears to have been an accidental feature of the implementation and
+was typically corrected by prefixing the environments with \cn{\!}.
+
+The new default behavior is aimed to ensure that the environments do
+not have a thin space added in most cases, and that existing documents
+using |\!\begin{aligned}| continue to work as before.
+
+\begin{description}
+\item[\opt{alignedleftspaceyes}] Always add \cn{\,} to the left of \env{aligned} and \env{gathered}.
+\item[\opt{alignedleftspaceno}] Never add \cn{\,} to the left of \env{aligned} and \env{gathered}.
+\item[\opt{alignedleftspaceyesifneg}] Only add \cn{\,} if the environment is prefixed by negative space. (New default behavior.)
+\end{description}
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \chapter{Displayed equations}
 
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf b/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf
index baa99a3c86b..7310f769bf7 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf b/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf
index 838762ec888..b6143285329 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amstext.pdf b/Master/texmf-dist/doc/latex/amsmath/amstext.pdf
index d24d343a5b6..00f52652242 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amstext.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amstext.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf b/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf
index dcf40a00699..38aa355e1c6 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/install.txt b/Master/texmf-dist/doc/latex/amsmath/install.txt
deleted file mode 100644
index c8cfdef9677..00000000000
--- a/Master/texmf-dist/doc/latex/amsmath/install.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-install.txt for amsmath 2.15 [2016/02/20]
-
-Copyright 2004, 2013 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
-
-This work 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 work has the LPPL maintenance status `maintained'.
-
-The Current Maintainer of this work is the LaTeX3 Project.
-
-
-===========================================================================
-
-If you have a relatively up-do-date TeX system that complies with the
-TeX Directory Structure (TDS) standard, installing according to the
-instructions in section I below is the easiest method.  See
-
-    http://www.tug.org/tds/tds.pdf
-
-for details on the TDS standard.  If your TeX system does not comply
-with the TDS standard, please contact the manufacturer of your TeX
-system for details on how to install third-party TeX packages.
-
-The first step is to identify the TEXMF folder that contains files used
-by LaTeX. To do this, look for the file article.cls. If you find, e.g.,
-
-    /usr/local/share/texmf/tex/latex/base/article.cls
-
-then we will define TEXMF to mean /usr/local/share/texmf (everything
-before the tex/latex/base part). On a Windows system the file location
-will probably be something like
-
-    c:\sw\texmf\tex\latex\base\article.cls
-
-Then we define TEXMF to mean c:\sw\texmf. In the following instructions,
-wherever you see "TEXMF" substitute the folder name determined in this
-way.
-
-If this terminology does not make sense to you, seek assistance from a
-friend or colleague, or from the company that you bought your TeX
-system from, or contact us at one of the above addresses.
-
-========================================================================
-I. Installing the easy way.
-
-1. Download the following archive file:
-
-   ftp://ftp.ams.org/pub/tex/amsmath.zip
-
-2. View the following files to assess the effects of the upgrade on
-your system:
-
-  README
-  install.txt (this file)
-  diffs-m.txt
-
-3. Backup the old version of AMS-LaTeX, preferably by moving it out of the
-TEXMF tree.
-
-4. Extract files from the .zip archive using your favorite unzip tool,
-setting the extraction target directory to the texmf root directory.
-
-5. To check the end result, you should find that you now have amsmath.sty
-in the following location
-
-  TEXMF/tex/latex/amsmath/amsmath.sty
-
-Some TeX systems also use a database to keep track of TeX input files.
-If this database is not updated, your TeX system might not find the
-newly installed files.  Consult your TeX system's documentation to
-determine how to update this database.
-
-6. Some files will appear in both the source area and another area.
-This is because the source form and the in-use form are identical.
-As distributed, the files in the source/latex/ams* areas comprise a
-complete copy of the distribution from which all the other files can
-be regenerated if need be. If you need to conserve disk space, you
-could delete the files in the source area, since they are not needed
-for normal use.
-
-========================================================================
-II. Installing the not-so-easy way.
-
-Download amsmath.zip from http://www.ctan.org
-
-Make the following directories, if not already present:
-
-  TEXMF/source/latex/amsmath
-  TEXMF/tex/latex/amsmath
-  TEXMF/doc/latex/amsmath
-
-Backup your old AMS-LaTeX files if they are installed, preferably moving them
-out of the TEXMF tree.
-
-******** revise -- pdf file amsldoc will be included in distrib
-
-Create a temporary directory and generate documentation files (these assume
-a UNIX TeX installation):
-
-  - make directory /tmp/amsmath
-  - unzip -d /tmp/amscls amsmath.zip
-  - cd /tmp/amsmath
-  - Run latex on the file ams-m1.ins to produce .cls and .sty files
-  - Run latex on *.tex
-  - [optional] Run latex on *.dtx (technical documentation)
-  - move *.dvi, *.pdf, *.tex to TEXMF/doc/latex/amsmath
-  - [optional] move *.dtx to TEXMF/doc/latex/amsmath
-  - [optional] convert .dvi to .ps or .pdf
-  - move *.sty and *.cls to TEXMF/tex/latex/amsmath
-  - delete /tmp/amsmath
-
-Some TeX systems also use a database to keep track of TeX input files.
-If this database is not updated, your TeX system might not find the
-newly installed files.  Consult your system's documentation to determine
-how to update this database.
diff --git a/Master/texmf-dist/doc/latex/amsmath/manifest.txt b/Master/texmf-dist/doc/latex/amsmath/manifest.txt
index df356a2955a..ee6b8e3238d 100644
--- a/Master/texmf-dist/doc/latex/amsmath/manifest.txt
+++ b/Master/texmf-dist/doc/latex/amsmath/manifest.txt
@@ -24,7 +24,6 @@ amsxtra.dtx
 amsxtra.ins
 amsxtra.pdf
 diffs-m.txt
-install.txt
 subeqn.pdf
 subeqn.tex
 technote.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf b/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf
index 833bffa2fcc..381924bdc2c 100644
--- a/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/technote.pdf b/Master/texmf-dist/doc/latex/amsmath/technote.pdf
index b1f95bb3f15..067bdc4692c 100644
--- a/Master/texmf-dist/doc/latex/amsmath/technote.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/technote.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/testmath.pdf b/Master/texmf-dist/doc/latex/amsmath/testmath.pdf
index 2dfe1bde259..045c64b9791 100644
--- a/Master/texmf-dist/doc/latex/amsmath/testmath.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/testmath.pdf
diff --git a/Master/texmf-dist/doc/latex/base/README.txt b/Master/texmf-dist/doc/latex/base/README.txt
index 50f02266d26..735fa192eba 100644
--- a/Master/texmf-dist/doc/latex/base/README.txt
+++ b/Master/texmf-dist/doc/latex/base/README.txt
@@ -1,6 +1,6 @@
                        LaTeX Distribution Guide
                       
-                            2016/03/31
+                            2017/01/01
 
 
 WELCOME TO LaTeX!
diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf
index b8a486b4a0f..efee678dd6d 100644
--- a/Master/texmf-dist/doc/latex/base/alltt.pdf
+++ b/Master/texmf-dist/doc/latex/base/alltt.pdf
diff --git a/Master/texmf-dist/doc/latex/base/cfgguide.pdf b/Master/texmf-dist/doc/latex/base/cfgguide.pdf
index f3aec3bc32a..5920394ec14 100644
--- a/Master/texmf-dist/doc/latex/base/cfgguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/cfgguide.pdf
diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt
index c70b1bfe8a0..17b56034354 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -4,6 +4,85 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+
+#########################
+# 2017/01/01  Release
+#########################
+
+
+2017-01-20  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltluatex.dtx: work around luaotfload issues 382 and 387
+
+2017-01-10  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltfssbas.dtx: Add version of \showhyphens that works in XeTeX.
+
+2016-12-30  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltluatex.dtx: build_page_insert callback and documentation updates.
+
+2016-12-29  David Carlisle  <latex-bugs@latex-project.org>
+
+	* latexrelease.dtx: re-instate the old 2014 version of
+	fixltx2e.sty protected by \IncludeInRelease guards
+
+	* ltboxes.dtx, ltmath.dtx: undefine internal MakeRobust commands
+	for latexrelease
+
+2016-12-11  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltoutenc.dtx:  add TU encoding
+
+2016-12-03  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltluatex.dtx, fontdef.dtx: Add support for defaulting to TU encoding
+
+2016-11-18  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltvers.dtx: 2017/01/01
+
+2016-11-17  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltluatex.dtx call_edit callback added
+
+2016-11-09  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltclass.dtx: modify \ifx tests in \@onefilewithoptions
+	(latex/4497)
+
+2016-11-07  David Carlisle  <latex-bugs@latex-project.org>
+
+	* source2e.tex: Give a bit more space for section numbers
+	in the toc (eg 19.10, 74.17.2)
+
+2016-10-16  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltplain.dtx: luatex allows \language up to 16383,
+	and unlike pdftex gives an error for \language16384
+	(rather than treating it as 0)
+
+2016-10-15  Joseph Wright   <latex-bugs@latex-project.org>
+
+        * ltdirchk.dtx: Require e-TeX
+
+2016-10-04  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltoutput.dtx: Avoid deadcycles error building float pages
+          with negative sized floats
+
+2016-10-02  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltclass.dtx: update to ignore spaces between options in
+	\ExecuteOptions and in the option clash checking.
+
+	* ltvers.dtx: 2016/12/01 release (perhaps)
+
+2016-09-15  David Carlisle  <latex-bugs@latex-project.org>
+
+	* ltsect.dtx: documentation update, default section depth
+	is chapter=0.
+
 #########################
 # 2016/03/31 PL 3 Release
 #########################
diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf
index 1f215eee8a5..0a7ccf9867e 100644
--- a/Master/texmf-dist/doc/latex/base/classes.pdf
+++ b/Master/texmf-dist/doc/latex/base/classes.pdf
diff --git a/Master/texmf-dist/doc/latex/base/clsguide.pdf b/Master/texmf-dist/doc/latex/base/clsguide.pdf
index 333bd3a2512..4a18496236b 100644
--- a/Master/texmf-dist/doc/latex/base/clsguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/clsguide.pdf
diff --git a/Master/texmf-dist/doc/latex/base/clsguide.tex b/Master/texmf-dist/doc/latex/base/clsguide.tex
index 91066dc6048..c90bc539b26 100644
--- a/Master/texmf-dist/doc/latex/base/clsguide.tex
+++ b/Master/texmf-dist/doc/latex/base/clsguide.tex
@@ -914,7 +914,7 @@ These commands are for use \emph{only} in class files, they cannot be
 used in packages files;
 they can be used at most once within a class file.
  
-The use of|\LoadClass| is the same as
+The use of |\LoadClass| is the same as
 the use of |\documentclass| to load a class file.
 
 Examples:
@@ -1031,7 +1031,7 @@ those of the following two (documented above, in \ref{Sec:loadf}):
    \LoadClassWithOptions
    \RequirePackageWithOptions
 \end{verbatim}
-The command|\RequirePackageWithOptions| is similar to
+The command |\RequirePackageWithOptions| is similar to
 |\RequirePackage|, but it always loads the required package with
 exactly the same option list as that being used by the current class
 or package, rather than with any option explicitly supplied or passed
@@ -1386,7 +1386,7 @@ contain whole paragraphs of text.
      \arg{definition}
 \end{decl}
 This command takes the same arguments as |\newcommand| but it declares
-a robust command, even if some code within the\m{definition} is
+a robust command, even if some code within the \m{definition} is
 fragile.  You can use this command to define new robust commands, or
 to redefine existing commands and make them robust.  A log is put into
 the transcript file if a command is redefined.
diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf
index c522e2cd6fa..ff572dedac3 100644
--- a/Master/texmf-dist/doc/latex/base/cmfonts.pdf
+++ b/Master/texmf-dist/doc/latex/base/cmfonts.pdf
diff --git a/Master/texmf-dist/doc/latex/base/cyrguide.pdf b/Master/texmf-dist/doc/latex/base/cyrguide.pdf
index 372647e3610..f4c5d595b52 100644
--- a/Master/texmf-dist/doc/latex/base/cyrguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/cyrguide.pdf
diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf
index 2e183feaf0f..749c58f6197 100644
--- a/Master/texmf-dist/doc/latex/base/doc.pdf
+++ b/Master/texmf-dist/doc/latex/base/doc.pdf
diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf
index 5f4d873fbcb..7c5cfdd5d06 100644
--- a/Master/texmf-dist/doc/latex/base/docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/base/docstrip.pdf
diff --git a/Master/texmf-dist/doc/latex/base/encguide.pdf b/Master/texmf-dist/doc/latex/base/encguide.pdf
index 1891291d2a5..d0121f4dff2 100644
--- a/Master/texmf-dist/doc/latex/base/encguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/encguide.pdf
diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf
index a371b7f4a7e..54423584d04 100644
--- a/Master/texmf-dist/doc/latex/base/exscale.pdf
+++ b/Master/texmf-dist/doc/latex/base/exscale.pdf
diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf
index 8f6cefea69a..46bf25e8879 100644
--- a/Master/texmf-dist/doc/latex/base/fix-cm.pdf
+++ b/Master/texmf-dist/doc/latex/base/fix-cm.pdf
diff --git a/Master/texmf-dist/doc/latex/base/fntguide.pdf b/Master/texmf-dist/doc/latex/base/fntguide.pdf
index c9d6a14296f..eded5c48f91 100644
--- a/Master/texmf-dist/doc/latex/base/fntguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/fntguide.pdf
diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf
index f016351d5ed..06645cde186 100644
--- a/Master/texmf-dist/doc/latex/base/graphpap.pdf
+++ b/Master/texmf-dist/doc/latex/base/graphpap.pdf
diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf
index b915a792d3c..4a0efdf7f35 100644
--- a/Master/texmf-dist/doc/latex/base/ifthen.pdf
+++ b/Master/texmf-dist/doc/latex/base/ifthen.pdf
diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf
index 2a444bf0a22..3c21d7cd80a 100644
--- a/Master/texmf-dist/doc/latex/base/inputenc.pdf
+++ b/Master/texmf-dist/doc/latex/base/inputenc.pdf
diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.pdf b/Master/texmf-dist/doc/latex/base/latexchanges.pdf
index 88faf333fb2..af764e2e0fa 100644
--- a/Master/texmf-dist/doc/latex/base/latexchanges.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexchanges.pdf
diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.tex b/Master/texmf-dist/doc/latex/base/latexchanges.tex
index d0e23c03178..a448d078179 100644
--- a/Master/texmf-dist/doc/latex/base/latexchanges.tex
+++ b/Master/texmf-dist/doc/latex/base/latexchanges.tex
@@ -70,6 +70,32 @@ policy. Improvements and bug fixes will be made to the format sources,
 with the \Lpack{latexrelease} package being available to revert
 changes to use definitions from an earlier format.
 
+
+\section{Changes  introduced in 2017/01/01}
+
+A new test is added during format making that e\TeX\ extensions are
+available. As Noted in \LaTeX\ news, e\TeX\ will now be required to
+build \LaTeX.
+ 
+Further updates tracking changes for Lua\TeX~ 1.0.
+
+Thhe definition of \verb|\showhyphens| is changed in formats built
+with Xe-\TeX, as the original version, inherited from plain \TeX\ does
+not work with Xe-\TeX.
+
+Changes to the default encoding used by Lua\TeX\ and Xe\TeX formats to
+be TU (Unicode) rather than OT1 (7 bit legacy \TeX\ encoding).
+
+\section{Changes  introduced in 2016/03/31 patch~3}
+Fixes to \verb|\newinsert| and \verb|\extrafloats|.
+
+\section{Changes  introduced in 2016/03/31 patch~2}
+Adjustments to \verb|\c{g}| in OT1 encoding.
+
+\section{Changes  introduced in 2016/03/31 patch~1}
+Adjust the upper limit for Character Class allocation in Xe-\TeX\ to
+4096 to match a change in Xe-\TeX.
+
 \section{Changes  introduced in 2016/03/31}
 Modify picture mode as suggested in latex/4452 to avoid leaders of
 almost zero length.
@@ -207,7 +233,7 @@ Allocates commands to use the extended  e-\TeX\ mark mechanism.
 
 Xe-\TeX\ only, previously in the Xe-\LaTeX\ format, but added via
 |xelatex.ini| not part of the core release. 
-Allocates commands to use the xe-\TeX\ character class mechanism.
+Allocates commands to use the Xe-\TeX\ character class mechanism.
 
 
 \subsection{e-\TeX\ tracing if available}
diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf
index 7f052ec52a1..c15d206f655 100644
--- a/Master/texmf-dist/doc/latex/base/latexrelease.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexrelease.pdf
diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf
index 56b2a920c63..f078d935a18 100644
--- a/Master/texmf-dist/doc/latex/base/latexsym.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexsym.pdf
diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf
index 93f275ff72a..d2afd8b56f9 100644
--- a/Master/texmf-dist/doc/latex/base/lb2.pdf
+++ b/Master/texmf-dist/doc/latex/base/lb2.pdf
diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf
index 651108fceff..9b3d3682630 100644
--- a/Master/texmf-dist/doc/latex/base/letter.pdf
+++ b/Master/texmf-dist/doc/latex/base/letter.pdf
diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf
index 5fbc7721b8f..a7d460cc61a 100644
--- a/Master/texmf-dist/doc/latex/base/lgc2.pdf
+++ b/Master/texmf-dist/doc/latex/base/lgc2.pdf
diff --git a/Master/texmf-dist/doc/latex/base/lppl.pdf b/Master/texmf-dist/doc/latex/base/lppl.pdf
index 790fdc81c81..19f69ed19ce 100644
--- a/Master/texmf-dist/doc/latex/base/lppl.pdf
+++ b/Master/texmf-dist/doc/latex/base/lppl.pdf
diff --git a/Master/texmf-dist/doc/latex/base/ltluatex.pdf b/Master/texmf-dist/doc/latex/base/ltluatex.pdf
index 40fa1eb169a..c863f5a675f 100644
--- a/Master/texmf-dist/doc/latex/base/ltluatex.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltluatex.pdf
diff --git a/Master/texmf-dist/doc/latex/base/ltnews.pdf b/Master/texmf-dist/doc/latex/base/ltnews.pdf
index 58873ef8705..3a1d72c8fb0 100644
--- a/Master/texmf-dist/doc/latex/base/ltnews.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltnews.pdf
diff --git a/Master/texmf-dist/doc/latex/base/ltnews.tex b/Master/texmf-dist/doc/latex/base/ltnews.tex
index 50f60012ae6..c229842e8c1 100644
--- a/Master/texmf-dist/doc/latex/base/ltnews.tex
+++ b/Master/texmf-dist/doc/latex/base/ltnews.tex
@@ -33,7 +33,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltnews.tex}%
   [2015/02/16 v1.4b Master file for ltnews*.tex (LaTeX Project)]
-\providecommand*{\lastissue}{25}
+\providecommand*{\lastissue}{26}
 \InputIfFileExists{ltnews-lastissue.cfg}{}{}
 
 \RequirePackage{ifpdf}
diff --git a/Master/texmf-dist/doc/latex/base/ltx3info.pdf b/Master/texmf-dist/doc/latex/base/ltx3info.pdf
index 2d938c25d07..3b86a873b85 100644
--- a/Master/texmf-dist/doc/latex/base/ltx3info.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltx3info.pdf
diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
index b3b7d930870..127173b20d3 100644
--- a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf
index d62a5cf1011..34415d0575f 100644
--- a/Master/texmf-dist/doc/latex/base/makeindx.pdf
+++ b/Master/texmf-dist/doc/latex/base/makeindx.pdf
diff --git a/Master/texmf-dist/doc/latex/base/manual.pdf b/Master/texmf-dist/doc/latex/base/manual.pdf
index d22ddc5690c..c3aa1ef24ac 100644
--- a/Master/texmf-dist/doc/latex/base/manual.pdf
+++ b/Master/texmf-dist/doc/latex/base/manual.pdf
diff --git a/Master/texmf-dist/doc/latex/base/modguide.pdf b/Master/texmf-dist/doc/latex/base/modguide.pdf
index f660226475c..88f29f500b0 100644
--- a/Master/texmf-dist/doc/latex/base/modguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/modguide.pdf
diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf
index f0b15eb1107..70ddd08c5db 100644
--- a/Master/texmf-dist/doc/latex/base/nfssfont.pdf
+++ b/Master/texmf-dist/doc/latex/base/nfssfont.pdf
diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf
index 7e5da96fa73..6c4e277cc4f 100644
--- a/Master/texmf-dist/doc/latex/base/proc.pdf
+++ b/Master/texmf-dist/doc/latex/base/proc.pdf
diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf
index f3d0a4ad117..32b18d69c84 100644
--- a/Master/texmf-dist/doc/latex/base/slides.pdf
+++ b/Master/texmf-dist/doc/latex/base/slides.pdf
diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf
index 0307d0ce662..58d17ad610c 100644
--- a/Master/texmf-dist/doc/latex/base/slifonts.pdf
+++ b/Master/texmf-dist/doc/latex/base/slifonts.pdf
diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf
index 89d280f20f3..121fef3c3a8 100644
--- a/Master/texmf-dist/doc/latex/base/source2e.pdf
+++ b/Master/texmf-dist/doc/latex/base/source2e.pdf
diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf
index 9bbe5e0bd0b..676f2258b04 100644
--- a/Master/texmf-dist/doc/latex/base/syntonly.pdf
+++ b/Master/texmf-dist/doc/latex/base/syntonly.pdf
diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf
index 44e8711e425..c1ebce02e9d 100644
--- a/Master/texmf-dist/doc/latex/base/tlc2.pdf
+++ b/Master/texmf-dist/doc/latex/base/tlc2.pdf
diff --git a/Master/texmf-dist/doc/latex/base/usrguide.pdf b/Master/texmf-dist/doc/latex/base/usrguide.pdf
index d1119425a6c..af99adf9fb1 100644
--- a/Master/texmf-dist/doc/latex/base/usrguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/usrguide.pdf
diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
index aa79b5562e2..40899eb76b8 100644
--- a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
+++ b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf
index d16bb2a0199..2ef4779eb86 100644
--- a/Master/texmf-dist/doc/latex/base/webcomp.pdf
+++ b/Master/texmf-dist/doc/latex/base/webcomp.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/changes.txt b/Master/texmf-dist/doc/latex/graphics/changes.txt
index a82f79629d4..7de6eb9ae70 100644
--- a/Master/texmf-dist/doc/latex/graphics/changes.txt
+++ b/Master/texmf-dist/doc/latex/graphics/changes.txt
@@ -4,6 +4,25 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2016-12-23  David Carlisle  <latex-bugs@latex-project.org>
+
+	* grfguide.tex: fix the a.ps example file to match the Bounding box
+	change from 2014 (Rolf Niepraschk)
+
+2016-11-18  David Carlisle  <latex-bugs@latex-project.org>
+
+	* grfguide.tex: Updates to drivers section, and add a note about xcolor.
+
+2016-10-09  David Carlisle  <latex-bugs@latex-project.org>
+
+	* graphics.dtx: Avoid arithmetic overflow on very small lengths
+	eg 5sp/2sp http://tex.stackexchange.com/q/328825
+
+2016-08-11  David Carlisle  <latex-bugs@latex-project.org>
+
+	* rotating.dtx: Fix name of examples file reference in the
+	documentation (rotex.tex not examples.tex)
+
 2016-07-10  David Carlisle  <latex-bugs@latex-project.org>
 
 	* graphics-drivers.ins: stop generating dvips.def
diff --git a/Master/texmf-dist/doc/latex/graphics/color.pdf b/Master/texmf-dist/doc/latex/graphics/color.pdf
index d69d9d0413b..eab26a7bb83 100644
--- a/Master/texmf-dist/doc/latex/graphics/color.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/color.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/drivers.pdf b/Master/texmf-dist/doc/latex/graphics/drivers.pdf
index fc7dc41b526..75a40ae1e62 100644
--- a/Master/texmf-dist/doc/latex/graphics/drivers.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/drivers.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
index caaa5f6344f..a629e488d01 100644
--- a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/graphics.pdf b/Master/texmf-dist/doc/latex/graphics/graphics.pdf
index 649f8cc4e4c..f3c2f636df3 100644
--- a/Master/texmf-dist/doc/latex/graphics/graphics.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/graphics.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
index b1007bd555c..109e5c2cf70 100644
--- a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
index 46849ce1f3d..c62b8253ac9 100644
--- a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/grfguide.tex b/Master/texmf-dist/doc/latex/graphics/grfguide.tex
index fc35793960b..193282900b9 100644
--- a/Master/texmf-dist/doc/latex/graphics/grfguide.tex
+++ b/Master/texmf-dist/doc/latex/graphics/grfguide.tex
@@ -11,12 +11,12 @@
 \begin{filecontents*}{a.ps}
 %!
 %%BoundingBox:0 0 72 72
-100 100 moveto
+0 0 moveto
 72 72 rlineto
 72 neg 0 rlineto
 72 72 neg rlineto
 stroke
-100 100 moveto
+0 0 moveto
 /Times-Roman findfont
 72 scalefont
 setfont
@@ -168,8 +168,8 @@ startxref
 %% Just as an example, and to make sure, in case some
 %% driver option has not declared a default rule for
 %% .ps files:
-\DeclareGraphicsRule{.ps}{eps}{.ps}{}
-\DeclareGraphicsExtensions{.pdf,.ps}
+%\DeclareGraphicsRule{.ps}{eps}{.ps}{}
+%\DeclareGraphicsExtensions{.pdf,.ps}
 %% Which means:
 %% .ps files are (to be treated as) EncapsulatedPostScript
 %% files. The .ps file is to be read for the BoundingBox.
@@ -190,7 +190,7 @@ startxref
 \begin{document}
 \title{Packages in the `graphics' bundle}
 \author{D. P. Carlisle \and The \LaTeX3 Project}
-\date{2016/05/22}
+\date{2016/12/23}
 
 \maketitle
 
@@ -210,69 +210,66 @@ even the internal method of accessing these extensions varies between
 drivers. Consequently all these packages take options such as
 `|dvips|' to specify which driver is being used.
 
-You should to set up a site default for these
-options, for the driver that you normally use. Suppose that you wish for
+Normally you should \emph{not} specify the driver option explicitly
+in the document, but allow it to be defaulted automatically.
+This allows the document to be portable between different systems.
+
+Your \TeX\ distribution should have included |graphics.cfg| and
+|color.cfg| configuration files to specify these defaults.
+Standard versions of the configuration files are maintained by the
+\LaTeX\ Project and distributed in the CTAN |graphics-cfg| collection.
+
+For special requirements you may edit a copy of these |cfg| files
+to set up a site default for these options. Suppose that you wish
 the \package{color} package to always default to use specials for the
-PostScript driver, |dvipsone|. In that case create a file |color.cfg|
+PostScript driver, |dvisvgm|. In that case, create a file |color.cfg|
 containing the line:\\
-|\ExecuteOptions{dvipsone}|\\
+|\ExecuteOptions{dvisvgm}|\\
 Normally you will want an identical file |graphics.cfg| to set a similar
 default for the graphics packages.
 
 The following driver options are declared in the packages.
+The matching definition files (\emph{driver}|.def|)
+are now also maintained by the \LaTeX\ project,
+but distributed separately, in the CTAN |graphics-def| collection.
 \begin{quote}\raggedright
-  |dvips|, |xdvi|, |dvipdf|, |dvipdfm|, |dvipdfmx|, |pdftex|,
-  |dvipsone|, |dviwindo|, |emtex|, |dviwin|, |pctexps|, |pctexwin|,
-  |pctexhp|, |pctex32|, |truetex|, |tcidvi|, |vtex|, |oztex|,
-  |textures|, |xetex|
+  |dvipdfmx|, |dvips|, |dvisvgm|, |luatex|, |pdftex|, |xetex|
 \end{quote}
-Note that the \LaTeX\ Team does not maintain these drivers; we merely
-provide a way for a particular driver to work with the graphics
-packages.
 
-If you use a driver that is not in the list above you may add an option
-for that driver by putting the appropriate |\DeclareOption| line into
-|graphics.cfg| and |color.cfg|, before making it the default option
-with |\ExecuteOptions|, as described above.
 
-For example to add the option `|dvi2ps|' for the original Unix dvi to
-ps driver, and to make that the default, you just need configuration
-files looking like:
-\begin{verbatim}
-\DeclareOption{dvi2ps}{\def\Gin@driver{dvi2ps.def}}
-\ExecuteOptions{dvi2ps}
-\end{verbatim}
+The following two options are also supported, they do not correspond
+to separate definition files, but are essentially aliases for the
+|dvips| option (and |monochrome| in the case of |xdvi|).
+\begin{quote}\raggedright
+ |xdvi|,  |oztex|
+\end{quote}
 
-There is a suitable |dvi2ps.def| file in the standard distribution.
-It is not enabled by default as it is not well tested as the driver is
-no longer available to me. The following driver files are similarly
-distributed but not enabled by default.
+The following set of options are supported by these packages
+with associated driver files extracted from the |drivers.dtx|
+documented source in this bundle. These are now, mainly of historic
+interest but the documented sources do contain some useful code
+and advice if you need to produce a new definition file for a new
+driver or \TeX\ system. |drivers.dtx| also contains documented
+sources for older driver files that are no longer extracted.
 \begin{quote}\raggedright
- |dvi2ps|, |dvialw|, |dvilaser|, |dvitops|, |psprint|, |pubps|, |ln|
+ |dvipdf|, |dvipdfm|, |dviwin|, |dvipsone|,
+ |emtex|, |pctexps|, |pctexwin|,  |pctexhp|, |pctex32|,
+ |truetex|, |tcidvi|, |vtex|
 \end{quote}
 
-Most of these driver files are generated from the source file
-|drivers.dtx|. That file has the sources for other versions (for
-example older versions of dvips and textures) which are not generated
-by default.
-
-Different \TeX\ systems support different drivers and the drivers are
-usually maintained by the developers of the \TeX\ variants or
-post-processors. Hence they are always linked to some program and
-since the \TeX\ distributors decide which programs they support, it is
-up to them to make sure the necessary drivers are included with their
-distribution. The graphics bundle contains the installation file
-|graphics-drivers.ins| which can be used to extract drivers from
-|drivers.dtx| but we cannot guarantee that these are up to date. Not
-all of the aforementioned drivers are available in |drivers.dtx| (some
-like |pdftex| and |dvipdfm| can be found on CTAN).
-
-If you use a driver that is not covered by any of these possibilities,
-you may try to write a |.def| file by analogy with one of the existing
-ones, and then specify a suitable option in |graphics.cfg| and
-|color.cfg|, as for the above example of |dvi2ps|.
-
-\section{Colour}
+The final driver option is an alias for |dvipsone|.
+\begin{quote}\raggedright
+  |dviwindo|
+\end{quote}
+  
+
+\section[Colour]{Colour\footnote{%
+The basic \package{color} package functionality described here
+will be enough for many uses, however a much extended version
+is available in the contributed \package{xcolor} package, distributed
+and maintained separately. All the color commands described here are
+also available if you specify \package{xcolor} in your document.}%
+}
 The colour support is built around the idea of a system of
 \emph{Colour Models}. The Colour models supported by a driver vary,
 but typically include
@@ -796,11 +793,8 @@ the \LaTeXe\ primitive |\input@path|. A list of directories, each in a
 |{}| group (even if there is only one in the list). For example:\\
   |\graphicspath{{eps/}{tiff/}}|\\
  would cause the system to look in the subdirectories |eps| and |tiff|
- of the current directory. This is unix syntax, on a Mac it would be:\\
- |\graphicspath{{:eps:}{:tiff:}}|\\
- Note the differing conventions, an initial |:| is needed on Macintosh
- systems to denote the current folder, whereas on unix an initial |/|
- would denote the top level `root' directory.
+ of the current directory. (All modern \TeX{} systems use |/|
+ as the directory separator, even on Windows.)
 
  The default setting of this path is
  |\input@path| that is: graphics files will be found wherever \TeX\
diff --git a/Master/texmf-dist/doc/latex/graphics/keyval.pdf b/Master/texmf-dist/doc/latex/graphics/keyval.pdf
index bd0ea56d6fd..799678bd358 100644
--- a/Master/texmf-dist/doc/latex/graphics/keyval.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/keyval.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/lscape.pdf b/Master/texmf-dist/doc/latex/graphics/lscape.pdf
index 7212c62b9b1..e4fe8680d25 100644
--- a/Master/texmf-dist/doc/latex/graphics/lscape.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/lscape.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/rotating.pdf b/Master/texmf-dist/doc/latex/graphics/rotating.pdf
index c2d7663074d..5b789e322ea 100644
--- a/Master/texmf-dist/doc/latex/graphics/rotating.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/rotating.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/rotex.pdf b/Master/texmf-dist/doc/latex/graphics/rotex.pdf
index b895b5478fc..6bfff318236 100644
--- a/Master/texmf-dist/doc/latex/graphics/rotex.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/rotex.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/trig.pdf b/Master/texmf-dist/doc/latex/graphics/trig.pdf
index 1cc22c81138..31a9f1bb784 100644
--- a/Master/texmf-dist/doc/latex/graphics/trig.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/trig.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
index b2d07fac7a1..685bd725d70 100644
--- a/Master/texmf-dist/doc/latex/tools/afterpage.pdf
+++ b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf
index 904e072ba1c..6c98e90ddb9 100644
--- a/Master/texmf-dist/doc/latex/tools/array.pdf
+++ b/Master/texmf-dist/doc/latex/tools/array.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf
index 15d20c0591d..8f8da0070e3 100644
--- a/Master/texmf-dist/doc/latex/tools/bm.pdf
+++ b/Master/texmf-dist/doc/latex/tools/bm.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf
index a20be0e5656..663c1c9577b 100644
--- a/Master/texmf-dist/doc/latex/tools/calc.pdf
+++ b/Master/texmf-dist/doc/latex/tools/calc.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt
index fa74649a553..1329cf49d5c 100644
--- a/Master/texmf-dist/doc/latex/tools/changes.txt
+++ b/Master/texmf-dist/doc/latex/tools/changes.txt
@@ -5,6 +5,16 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2017-01-16  David Carlisle  <latex-bugs@latex-project.org>
+
+	* bm.dtx: further fixes to luatex code branch for
+	http://tex.stackexchange.com/questions/349001
+
+2016-10-06  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* array.dtx: Fixed a 25 year old bug that surfaced for the first time.
+	\@halignto needs to be managed locally (pr/4488)
+
 2016-07-07  David Carlisle  <latex-bugs@latex-project.org>
 
 	* bm.dtx: additional tests to cope with luatex's new treatment of
diff --git a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
index e47dc0d2bf4..9dd44705fec 100644
--- a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
+++ b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf
index 56f81f5beef..2cf497d5fe0 100644
--- a/Master/texmf-dist/doc/latex/tools/delarray.pdf
+++ b/Master/texmf-dist/doc/latex/tools/delarray.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
index 2779096f467..ae741fa54d9 100644
--- a/Master/texmf-dist/doc/latex/tools/enumerate.pdf
+++ b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
index 27dc30947e9..5e9dd12995d 100644
--- a/Master/texmf-dist/doc/latex/tools/fileerr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
index 84b9c3ae149..57393a4261e 100644
--- a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
index 75ba1dc6ecb..1d9508db0ac 100644
--- a/Master/texmf-dist/doc/latex/tools/ftnright.pdf
+++ b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf
index 4175d9d8385..c312771d440 100644
--- a/Master/texmf-dist/doc/latex/tools/hhline.pdf
+++ b/Master/texmf-dist/doc/latex/tools/hhline.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
index deddab09ef1..726649169f0 100644
--- a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
+++ b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf
index 4a483602fcc..06307b036c8 100644
--- a/Master/texmf-dist/doc/latex/tools/layout.pdf
+++ b/Master/texmf-dist/doc/latex/tools/layout.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf
index 065e4dd3954..c4afae24ea0 100644
--- a/Master/texmf-dist/doc/latex/tools/longtable.pdf
+++ b/Master/texmf-dist/doc/latex/tools/longtable.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf
index 3cdbdd72812..2df8c7dacf9 100644
--- a/Master/texmf-dist/doc/latex/tools/multicol.pdf
+++ b/Master/texmf-dist/doc/latex/tools/multicol.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
index 765ac166c12..a9e236316c6 100644
--- a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
+++ b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/shellesc.pdf b/Master/texmf-dist/doc/latex/tools/shellesc.pdf
index d1086cc8aa0..4a16e5b4519 100644
--- a/Master/texmf-dist/doc/latex/tools/shellesc.pdf
+++ b/Master/texmf-dist/doc/latex/tools/shellesc.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
index eca1a81da17..53ddd619a45 100644
--- a/Master/texmf-dist/doc/latex/tools/showkeys.pdf
+++ b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
index 5d2aa49c554..dcf7c7fde97 100644
--- a/Master/texmf-dist/doc/latex/tools/somedefs.pdf
+++ b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
index fab3ad84dfd..0b22a6a814a 100644
--- a/Master/texmf-dist/doc/latex/tools/tabularx.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf
index 8dab383ddc8..b6dbf4dcef2 100644
--- a/Master/texmf-dist/doc/latex/tools/theorem.pdf
+++ b/Master/texmf-dist/doc/latex/tools/theorem.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/tlb-shellesc-001.pdf b/Master/texmf-dist/doc/latex/tools/tlb-shellesc-001.pdf
deleted file mode 100644
index 4c66a7d7890..00000000000
--- a/Master/texmf-dist/doc/latex/tools/tlb-shellesc-001.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
index 031a552bc1e..f04d72631dd 100644
--- a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf
index 07811b1c90e..045a567e0bd 100644
--- a/Master/texmf-dist/doc/latex/tools/trace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/trace.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf
index 08c92d50adb..048aaf609b2 100644
--- a/Master/texmf-dist/doc/latex/tools/varioref.pdf
+++ b/Master/texmf-dist/doc/latex/tools/varioref.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
index 0907e189f6a..e2800dc108e 100644
--- a/Master/texmf-dist/doc/latex/tools/verbatim.pdf
+++ b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf
index ec2bd3536e8..11c83d45f22 100644
--- a/Master/texmf-dist/doc/latex/tools/xr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xr.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf
index e94bbbc7306..d2fde9a9fe6 100644
--- a/Master/texmf-dist/doc/latex/tools/xspace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xspace.pdf
diff --git a/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx b/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx
index 0cb877b225c..213d995347f 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %\fi
 %
 % \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
 %
 % \MakeShortVerb\|
 %
diff --git a/Master/texmf-dist/source/latex/amsmath/amscd.dtx b/Master/texmf-dist/source/latex/amsmath/amscd.dtx
index 10009e4815e..8dab799b486 100644
--- a/Master/texmf-dist/source/latex/amsmath/amscd.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amscd.dtx
@@ -41,7 +41,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %\fi
 %
 % \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
 %
 % \MakeShortVerb\|
 % \newcommand{\operatorname}[1]{\mathop{\mathrm{#1}}}
diff --git a/Master/texmf-dist/source/latex/amsmath/amsgen.dtx b/Master/texmf-dist/source/latex/amsmath/amsgen.dtx
index e3c50bde63c..7cc1b11bbc0 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsgen.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsgen.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 % \fi
 %
 % \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
 %
 % \MakeShortVerb\|
 %
diff --git a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
index 21368f69bde..64b3d8073fc 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
@@ -35,7 +35,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 \begin{document}
 \title{The \pkg{amsmath} package}
 \author{Frank Mittelbach\and Rainer Sch\"opf\and Michael Downes\and
-  David M. Jones}
+  David M. Jones\and David Carlisle}
 \date{Version \fileversion, \filedate}
 \providecommand{\histnote}{}
 \renewenvironment{histnote}{%
@@ -49,7 +49,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %\fi
 %
 % \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
 %
 % \MakeShortVerb\|
 %
@@ -74,7 +74,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
 [1994/12/01]% LaTeX date must be December 1994 or later
-\ProvidesPackage{amsmath}[2016/06/28 v2.15d AMS math features]
+\ProvidesPackage{amsmath}[2016/11/05 v2.16a AMS math features]
 %    \end{macrocode}
 %
 % \section{Catcode defenses}
@@ -217,12 +217,51 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    alternative is to penalize a lot of other users with a known
 %    handicap.
 %
+% \section{Spacing around \cn{aligned} and \cn{gathered}}
+%
+%    [dpc, 2016] Option to control the space to the left of aligned and gathered.
+%
+%   Previously \cn{aligned} and \cn{gathered} inserted a thin space on
+%   their left but not their right, there is no good reason for this
+%   that anyone can remember, it has just always been that way
+%   inherited from amstex. The usual advice to authors has bben to use
+%   |\!\begin{aligned}| to get better spacing.
+%
+% Here introduce:
+%
+% \opt{alignedleftspaceyes} to keep the behaviour of adding this space.
+%
+% \opt{alignedleftspaceno} to disable adding this space.
+%
+% \opt{alignedleftspaceyesifneg} the new default behaviour, do not add
+% the space unless the environment is preceded by a negative skip or
+% kern, so that |\!\begin{aligned}| works as before.
+%
+% \changes{v2.16a}{2016/11/05}{New options to control aligned spacing}
+%    \begin{macrocode}
+\DeclareOption{alignedleftspaceyes}{\def\alignedspace@left{\null\,}}
+\DeclareOption{alignedleftspaceno}{\def\alignedspace@left{\null}}
+\DeclareOption{alignedleftspaceyesifneg}{%
+\def\alignedspace@left{%
+  \edef\@tempa{\expandafter\@car\the\lastskip\@nil}%
+  \if-\@tempa\null\,%
+  \else
+    \edef\@tempa{\expandafter\@car\the\lastkern\@nil}%
+    \if-\@tempa\null\,%
+    \else\null
+    \fi
+  \fi}%
+}
+%    \end{macrocode}
+%
+%
 %    \begin{macrocode}
 \DeclareOption{?}{}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ExecuteOptions{nointlimits,sumlimits,namelimits,centertags}
+\ExecuteOptions{%
+  nointlimits,sumlimits,namelimits,centertags,alignedleftspaceyesifneg}
 %    \end{macrocode}
 %    The \cs{par} after \cs{ProcessOptions} is to ensure the correct
 %    line number on screen if an error occurs during option processing;
@@ -542,6 +581,8 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    \end{macrocode}
 %
 %  \begin{macro}{\genfrac}
+% \changes{v2.16a}{2016/11/05}{New genfrac implementation for extended
+% TeXs}
 %    This command provides access to \tex/'s generalized fraction
 %    primitives. Args: \arg{1} left delim, \arg{2} right delim, \arg{3}
 %    line thickness, \arg{4} mathstyle override, \arg{5} numerator,
@@ -550,6 +591,22 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    fraction primitive. Any of those four args could be empty, and when
 %    empty the obvious defaults are selected (no delimiters, default
 %    line thickness (normally .4pt), and no mathstyle override).
+%
+%    the |withdelims| primitives do not work in xetex with OpenType
+%    fonts, and the relevant font dimen parameters are often not set
+%    in luatex as theer are no matching values in the OpenType Math
+%    table, so here we use variants that use the font parameters if
+%    they are set, but scale using |\left\right| rather than the
+%    |withdelims| primitives.
+%
+%    \begin{macrocode}
+\ifx\directlua\@undefined
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\ifx\XeTeXcharclass\@undefined
+%    \end{macrocode}
+% Classic version
 %    \begin{macrocode}
 \DeclareRobustCommand{\genfrac}[4]{%
   \def\@tempa{#1#2}%
@@ -558,6 +615,98 @@ Foreign command \@backslashchar#1;\MessageBreak
     \ifx\@tempa\@empty \else withdelims\fi\endcsname}
   \@tempb{#1#2#3}}
 %    \end{macrocode}
+%
+%    \begin{macrocode}
+\else   
+%    \end{macrocode}
+%     XeTeX version
+%    \begin{macrocode}
+\def\genfrac@rule#1#2#3#4{%
+\hbox{$\left#1\vcenter{\hrule \@width\z@
+                       \@height 
+                       \ifdim\fontdimen#2#3\tw@=\z@
+                       #4\fontdimen6#3\tw@
+                       \else
+                       \fontdimen#2#3\tw@
+                       \fi
+                      }\right.$}}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\genfrac@choice#1#2{%
+\ifx @#2@\else
+{\delimitershortfall\z@\delimiterfactor\@m
+ \mathsurround\z@\nulldelimiterspace\z@
+\ifx c#1\kern-\nulldelimiterspace\fi
+\mathchoice
+{\genfrac@rule{#2}{20}\textfont{2.39}}%
+{\genfrac@rule{#2}{21}\textfont{1}}%
+{\genfrac@rule{#2}{21}\scriptfont{1.45}}%
+{\genfrac@rule{#2}{21}\scriptscriptfont{1.35}}%
+}%
+\ifx o#1\kern-\nulldelimiterspace\fi
+\fi
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\DeclareRobustCommand{\genfrac}[6]{{%
+\@mathstyle{#4}%
+\genfrac@choice o{#1}%
+{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}%
+\genfrac@choice c{#2}%
+}}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\fi
+\else
+%    \end{macrocode}
+% LuaTeX version
+%    \begin{macrocode}
+\def\genfrac@rule#1#2#3{%
+\hbox{$\left#1\vcenter{\hrule \@width\z@
+                       \@height 
+                       \ifdim\Umathfractiondelsize#2=\z@
+                       #3\fontdimen6#3\tw@
+                       \else
+                       \Umathfractiondelsize#2%
+                       \fi
+                      }\right.$}}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\genfrac@choice#1#2{%
+\ifx @#2@\else
+{\delimitershortfall\z@\delimiterfactor\@m
+ \mathsurround\z@\nulldelimiterspace\z@
+\ifx c#1\kern-\nulldelimiterspace\fi
+\mathchoice
+{\genfrac@rule{#2}\displaystyle{2.39}}%
+{\genfrac@rule{#2}\textstyle{1}}%
+{\genfrac@rule{#2}\scriptstyle{1.45}}%
+{\genfrac@rule{#2}\scriptscriptstyle{1.35}}%
+}%
+\ifx o#1\kern-\nulldelimiterspace\fi
+\fi
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\DeclareRobustCommand{\genfrac}[6]{{%
+\@mathstyle{#4}%
+\genfrac@choice o{#1}%
+{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}%
+\genfrac@choice c{#2}%
+}}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\fi
+%    \end{macrocode}
+%
+% End of test for Lua\TeX/Xe\TeX.
+%
 %    \cs{@genfrac} takes the preceding arguments and reads the
 %    numerator and denominator. Note that there's no convenient way to
 %    make the numerator and denominator \emph{contents}
@@ -927,8 +1076,8 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    \begin{macrocode}
          \xdef\meaning@{\meaning\@let@token. .........}%
 %    \end{macrocode}
-% In previous versions \verb|\long| macros were not seen
-% bad as this file uses \verb|\(re)newcommand| for \verb|\implies| etc.
+% In previous versions \verb|\long| macros were not seen by the lokkahead.
+% That was bad as this file uses \verb|\(re)newcommand| for \verb|\implies| etc.
 %    \begin{macrocode}
          \xdef\meaning@@{\@xp\striplong@\meaning@\relax\meaning@}%
 %    \end{macrocode}
@@ -3424,7 +3573,7 @@ and fix things up.}
 %    algorithm that can cause an equation to be shifted all the way over
 %    to the margin.
 %    \begin{macrocode}
-    \null\,%
+    \alignedspace@left
     \if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup
         \maxfields@#2\relax
         \ifnum\maxfields@>\m@ne
@@ -3551,7 +3700,7 @@ and fix things up.}
     \RIfM@\else
         \nonmatherr@{\begin{gathered}}%
     \fi
-    \null\,%
+    \alignedspace@left
     \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup
         \Let@ \chardef\dspbrk@context\@ne \restore@math@cr
         \spread@equation
diff --git a/Master/texmf-dist/source/latex/amsmath/amsopn.dtx b/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
index 7ab916387bd..f3709e6ddc2 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
@@ -41,7 +41,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %\fi
 %
 % \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
 %
 % \MakeShortVerb\|
 %
diff --git a/Master/texmf-dist/source/latex/amsmath/amstext.dtx b/Master/texmf-dist/source/latex/amsmath/amstext.dtx
index dae31efd464..2a3691d2ef9 100644
--- a/Master/texmf-dist/source/latex/amsmath/amstext.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amstext.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 % \fi
 %
 % \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
 %
 % \MakeShortVerb\|
 %
diff --git a/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx b/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx
index c9abb4585f3..4a436116c7c 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %\fi
 %
 % \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
 %
 % \MakeShortVerb\|
 %
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}.
diff --git a/Master/texmf-dist/source/latex/base/latexrelease.dtx b/Master/texmf-dist/source/latex/base/latexrelease.dtx
index 8cb0028b363..15be21a45cc 100644
--- a/Master/texmf-dist/source/latex/base/latexrelease.dtx
+++ b/Master/texmf-dist/source/latex/base/latexrelease.dtx
@@ -34,12 +34,12 @@
 %</dtx>
 %<driver>\ProvidesFile{latexrelease.drv}
 %<fixltx2e>\ProvidesPackage{fixltx2e}
-%<fixltx2e>   [2015/06/22 v2.0b fixes to LaTeX (obsolete)]
+%<fixltx2e>   [2016/12/29 v2.1a fixes to LaTeX (obsolete)]
 %<latexrelease>\ProvidesPackage{latexrelease}
 %<*!fixltx2e>
 % \fi
 %         \ProvidesFile{latexrelease.dtx}
-          [2016/07/04 v1.0g LaTeX release emulation and tests]
+          [2016/12/29 v1.0h LaTeX release emulation and tests]
 % \iffalse
 %</!fixltx2e>
 %<*driver>
@@ -470,11 +470,512 @@ of this package available from CTAN}
 % Generate a stub \Lpack{fixltx2e} package:
 %    \begin{macrocode}
 %<*fixltx2e>
+\IncludeInRelease{2015/01/01}{\fixltxe}{Old fixltx2e package}
 \NeedsTeXFormat{LaTeX2e}
 \PackageWarningNoLine{fixltx2e}{%
 fixltx2e is not required with releases after 2015\MessageBreak
 All fixes are now in the LaTeX kernel.\MessageBreak
 See the latexrelease package for details}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}{\fixltxe}{Old fixltx2e package}
+\def\@outputdblcol{%
+  \if@firstcolumn
+    \global\@firstcolumnfalse
+    \global\setbox\@leftcolumn\copy\@outputbox
+    \splitmaxdepth\maxdimen
+    \vbadness\maxdimen
+     \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+     \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+    \toks@\expandafter{\topmark}%
+    \xdef\@firstcoltopmark{\the\toks@}%
+    \toks@\expandafter{\splitfirstmark}%
+    \xdef\@firstcolfirstmark{\the\toks@}%
+    \ifx\@firstcolfirstmark\@empty
+      \global\let\@setmarks\relax
+    \else
+      \gdef\@setmarks{%
+        \let\firstmark\@firstcolfirstmark
+        \let\topmark\@firstcoltopmark}%
+    \fi
+  \else
+    \global\@firstcolumntrue
+    \setbox\@outputbox\vbox{%
+     \hb@xt@\textwidth{%
+        \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+        \hfil
+        {\normalcolor\vrule \@width\columnseprule}%
+        \hfil
+       \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
+  \@combinedblfloats
+    \@setmarks
+    \@outputpage
+    \begingroup
+      \@dblfloatplacement
+      \@startdblcolumn
+      \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}%
+    \endgroup
+  \fi}
+\def\end@dblfloat{%
+  \if@twocolumn
+    \@endfloatbox
+    \ifnum\@floatpenalty <\z@
+      \@largefloatcheck
+      \global\dp\@currbox1sp %
+      \@cons\@currlist\@currbox
+      \ifnum\@floatpenalty <-\@Mii
+        \penalty -\@Miv
+        \@tempdima\prevdepth
+        \vbox{}%
+        \prevdepth\@tempdima
+        \penalty\@floatpenalty
+      \else
+        \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack
+      \fi
+    \fi
+  \else
+    \end@float
+  \fi
+}
+\def\@testwrongwidth #1{%
+  \ifdim\dp#1=\f@depth
+  \else
+    \global\@testtrue
+  \fi}
+\let\f@depth\z@
+\def\@dblfloatplacement{\global\@dbltopnum\c@dbltopnumber
+   \global\@dbltoproom \dbltopfraction\@colht
+   \@textmin \@colht
+   \advance \@textmin -\@dbltoproom
+   \@fpmin \dblfloatpagefraction\textheight
+   \@fptop \@dblfptop
+   \@fpsep \@dblfpsep
+   \@fpbot \@dblfpbot
+   \def\f@depth{1sp}}
+\def \@doclearpage {%
+     \ifvoid\footins
+       \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
+       \setbox\@tempboxa\box\@cclv
+       \xdef\@deferlist{\@toplist\@botlist\@deferlist}%
+       \global \let \@toplist \@empty
+       \global \let \@botlist \@empty
+       \global \@colroom \@colht
+       \ifx \@currlist\@empty
+       \else
+          \@latexerr{Float(s) lost}\@ehb
+          \global \let \@currlist \@empty
+       \fi
+       \@makefcolumn\@deferlist
+       \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
+       \if@twocolumn
+         \if@firstcolumn
+           \xdef\@deferlist{\@dbltoplist\@deferlist}%
+           \global \let \@dbltoplist \@empty
+           \global \@colht \textheight
+           \begingroup
+              \@dblfloatplacement
+              \@makefcolumn\@deferlist
+              \@whilesw\if@fcolmade \fi{\@outputpage
+                                        \@makefcolumn\@deferlist}%
+           \endgroup
+         \else
+           \vbox{}\clearpage
+         \fi
+       \fi
+       \ifx\@deferlist\@empty \else\clearpage \fi
+     \else
+       \setbox\@cclv\vbox{\box\@cclv\vfil}%
+       \@makecol\@opcol
+       \clearpage
+     \fi
+}
+\def \@startdblcolumn {%
+  \@tryfcolumn \@deferlist
+  \if@fcolmade
+  \else
+    \begingroup
+      \let \reserved@b \@deferlist
+      \global \let \@deferlist \@empty
+      \let \@elt \@sdblcolelt
+      \reserved@b
+    \endgroup
+  \fi
+}
+\def\@addtonextcol{%
+  \begingroup
+   \@insertfalse
+   \@setfloattypecounts
+   \ifnum \@fpstype=8
+   \else
+     \ifnum \@fpstype=24
+     \else
+       \@flsettextmin
+       \@reqcolroom \ht\@currbox
+       \advance \@reqcolroom \@textmin
+       \ifdim \@colroom>\@reqcolroom
+         \@flsetnum \@colnum
+         \ifnum\@colnum>\z@
+            \@bitor\@currtype\@deferlist
+            \@testwrongwidth\@currbox
+            \if@test
+            \else
+              \@addtotoporbot
+            \fi
+         \fi
+       \fi
+     \fi
+   \fi
+   \if@insert
+   \else
+     \@cons\@deferlist\@currbox
+   \fi
+  \endgroup
+}
+\def\@addtodblcol{%
+  \begingroup
+   \@insertfalse
+   \@setfloattypecounts
+   \@getfpsbit \tw@
+   \ifodd\@tempcnta
+     \@flsetnum \@dbltopnum
+     \ifnum \@dbltopnum>\z@
+       \@tempswafalse
+       \ifdim \@dbltoproom>\ht\@currbox
+         \@tempswatrue
+       \else
+         \ifnum \@fpstype<\sixt@@n
+           \advance \@dbltoproom \@textmin
+           \ifdim \@dbltoproom>\ht\@currbox
+             \@tempswatrue
+           \fi
+           \advance \@dbltoproom -\@textmin
+         \fi
+       \fi
+       \if@tempswa
+           \@bitor \@currtype \@deferlist
+          \@testwrongwidth\@currbox
+           \if@test
+           \else
+              \@tempdima -\ht\@currbox
+              \advance\@tempdima
+                -\ifx \@dbltoplist\@empty \dbltextfloatsep \else
+                                          \dblfloatsep \fi
+              \global \advance \@dbltoproom \@tempdima
+              \global \advance \@colht \@tempdima
+              \global \advance \@dbltopnum \m@ne
+              \@cons \@dbltoplist \@currbox
+              \@inserttrue
+           \fi
+       \fi
+     \fi
+   \fi
+   \if@insert
+   \else
+     \@cons\@deferlist\@currbox
+   \fi
+  \endgroup
+}
+\def \@addtocurcol {%
+   \@insertfalse
+   \@setfloattypecounts
+   \ifnum \@fpstype=8
+   \else
+     \ifnum \@fpstype=24
+     \else
+       \@flsettextmin
+       \advance \@textmin \@textfloatsheight
+       \@reqcolroom \@pageht
+       \ifdim \@textmin>\@reqcolroom
+         \@reqcolroom \@textmin
+       \fi
+       \advance \@reqcolroom \ht\@currbox
+       \ifdim \@colroom>\@reqcolroom
+         \@flsetnum \@colnum
+         \ifnum \@colnum>\z@
+           \@bitor\@currtype\@deferlist
+          \@testwrongwidth\@currbox
+           \if@test
+           \else
+             \@bitor\@currtype\@botlist
+             \if@test
+               \@addtobot
+             \else
+               \ifodd \count\@currbox
+                 \advance \@reqcolroom \intextsep
+                 \ifdim \@colroom>\@reqcolroom
+                   \global \advance \@colnum \m@ne
+                   \global \advance \@textfloatsheight \ht\@currbox
+                   \global \advance \@textfloatsheight 2\intextsep
+                   \@cons \@midlist \@currbox
+                   \if@nobreak
+                     \nobreak
+                     \@nobreakfalse
+                     \everypar{}%
+                   \else
+                     \addpenalty \interlinepenalty
+                   \fi
+                   \vskip \intextsep
+                   \box\@currbox
+                   \penalty\interlinepenalty
+                   \vskip\intextsep
+                   \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi
+                   \outputpenalty \z@
+                   \@inserttrue
+                 \fi
+               \fi
+               \if@insert
+               \else
+                 \@addtotoporbot
+               \fi
+             \fi
+           \fi
+         \fi
+       \fi
+     \fi
+   \fi
+   \if@insert
+   \else
+     \@resethfps
+     \@cons\@deferlist\@currbox
+   \fi
+}
+\def\@xtryfc #1{%
+  \@next\reserved@a\@trylist{}{}%
+  \@currtype \count #1%
+  \divide\@currtype\@xxxii
+  \multiply\@currtype\@xxxii
+  \@bitor \@currtype \@failedlist
+  \@testfp #1%
+  \@testwrongwidth #1%
+  \ifdim \ht #1>\@colht
+     \@testtrue
+  \fi
+  \if@test
+    \@cons\@failedlist #1%
+  \else
+    \@ytryfc #1%
+  \fi}
+\def\@ztryfc #1{%
+  \@tempcnta\count #1%
+  \divide\@tempcnta\@xxxii
+  \multiply\@tempcnta\@xxxii
+  \@bitor \@tempcnta {\@failedlist \@flfail}%
+  \@testfp #1%
+  \@testwrongwidth #1%
+  \@tempdimb\@tempdima
+  \advance\@tempdimb\ht #1%
+  \advance\@tempdimb\@fpsep
+  \ifdim \@tempdimb >\@colht
+    \@testtrue
+  \fi
+  \if@test
+    \@cons\@flfail #1%
+  \else
+    \@cons\@flsucceed #1%
+    \@tempdima\@tempdimb
+  \fi}
+\def\@{\spacefactor\@m{}}
+\def\@tempa#1#2{#1#2\relax}
+\ifx\setlength\@tempa
+  \def\setlength#1#2{#1 #2\relax}
+\fi
+\def\addpenalty#1{%
+  \ifvmode
+    \if@minipage
+    \else
+      \if@nobreak
+      \else
+        \ifdim\lastskip=\z@
+          \penalty#1\relax
+        \else
+          \@tempskipb\lastskip
+          \begingroup
+            \advance \@tempskipb
+              \ifdim\prevdepth>\maxdepth\maxdepth\else
+                 \ifdim \prevdepth = -\@m\p@ \z@ \else \prevdepth \fi
+               \fi
+             \vskip -\@tempskipb
+             \penalty#1%
+             \vskip\@tempskipb
+          \endgroup
+          \vskip -\@tempskipb
+          \vskip \@tempskipb
+        \fi
+      \fi
+    \fi
+  \else
+    \@noitemerr
+  \fi}
+\def\@fnsymbol#1{%
+   \ifcase#1\or \TextOrMath\textasteriskcentered *\or
+   \TextOrMath \textdagger \dagger\or
+   \TextOrMath \textdaggerdbl \ddagger \or
+   \TextOrMath \textsection  \mathsection\or
+   \TextOrMath \textparagraph \mathparagraph\or
+   \TextOrMath \textbardbl \|\or
+   \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or
+   \TextOrMath {\textdagger\textdagger}{\dagger\dagger}\or
+   \TextOrMath {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}\else
+   \@ctrerr \fi
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+\DeclareRobustCommand\TextOrMath{%
+  \ifmmode  \expandafter\@secondoftwo
+  \else     \expandafter\@firstoftwo  \fi}
+\protected@edef\TextOrMath#1#2{\TextOrMath{#1}{#2}}
+\else
+\protected\expandafter\def\csname TextOrMath\space\endcsname{%
+  \ifmmode  \expandafter\@secondoftwo
+  \else     \expandafter\@firstoftwo  \fi}
+\edef\TextOrMath#1#2{%
+  \expandafter\noexpand\csname TextOrMath\space\endcsname
+  {#1}{#2}}
+\fi
+\def\@esphack{%
+  \relax
+  \ifhmode
+    \spacefactor\@savsf
+    \ifdim\@savsk>\z@
+      \nobreak \hskip\z@skip  % <------
+      \ignorespaces
+    \fi
+  \fi}
+\def\@Esphack{%
+  \relax
+  \ifhmode
+    \spacefactor\@savsf
+    \ifdim\@savsk>\z@
+      \nobreak \hskip\z@skip  % <------
+      \@ignoretrue
+      \ignorespaces
+    \fi
+   \fi}
+\DeclareRobustCommand\em
+        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
+                       \eminnershape \else \itshape \fi}
+\def\eminnershape{\upshape}
+\DeclareRobustCommand*\textsubscript[1]{%
+  \@textsubscript{\selectfont#1}}
+\def\@textsubscript#1{%
+  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+\def\@DeclareMathSizes #1#2#3#4#5{%
+  \@defaultunits\dimen@ #2pt\relax\@nnil
+  \if $#3$%
+    \expandafter\let\csname S@\strip@pt\dimen@\endcsname\math@fontsfalse
+  \else
+    \@defaultunits\dimen@ii #3pt\relax\@nnil
+    \@defaultunits\@tempdima #4pt\relax\@nnil
+    \@defaultunits\@tempdimb #5pt\relax\@nnil
+    \toks@{#1}%
+    \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{%
+      \gdef\noexpand\tf@size{\strip@pt\dimen@ii}%
+      \gdef\noexpand\sf@size{\strip@pt\@tempdima}%
+      \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}%
+      \the\toks@
+    }%
+  \fi
+}
+\providecommand*\MakeRobust[1]{%
+  \@ifundefined{\expandafter\@gobble\string#1}{%
+    \@latex@error{The control sequence `\string#1' is undefined!%
+      \MessageBreak There is nothing here to make robust}%
+    \@eha
+  }%
+  {%
+    \@ifundefined{\expandafter\@gobble\string#1\space}%
+    {%
+      \expandafter\let\csname
+      \expandafter\@gobble\string#1\space\endcsname=#1%
+      \edef\reserved@a{\string#1}%
+      \def\reserved@b{#1}%
+      \edef\reserved@b{\expandafter\strip@prefix\meaning\reserved@b}%
+      \edef#1{%
+        \ifx\reserved@a\reserved@b
+          \noexpand\x@protect\noexpand#1%
+        \fi
+        \noexpand\protect\expandafter\noexpand
+        \csname\expandafter\@gobble\string#1\space\endcsname}%
+    }%
+    {\@latex@info{The control sequence `\string#1' is already robust}}%
+   }%
+}
+\MakeRobust\(
+\MakeRobust\)
+\MakeRobust\[
+\MakeRobust\]
+\MakeRobust\makebox
+\MakeRobust\savebox
+\MakeRobust\framebox
+\MakeRobust\parbox
+\MakeRobust\rule
+\MakeRobust\raisebox
+\def\@xfloat #1[#2]{%
+  \@nodocument
+  \def \@captype {#1}%
+   \def \@fps {#2}%
+   \@onelevel@sanitize \@fps
+   \def \reserved@b {!}%
+   \ifx \reserved@b \@fps
+     \@fpsadddefault
+   \else
+     \ifx \@fps \@empty
+       \@fpsadddefault
+     \fi
+   \fi
+   \ifhmode
+     \@bsphack
+     \@floatpenalty -\@Mii
+   \else
+     \@floatpenalty-\@Miii
+   \fi
+  \ifinner
+     \@parmoderr\@floatpenalty\z@
+  \else
+    \@next\@currbox\@freelist
+      {%
+       \@tempcnta \sixt@@n
+       \expandafter \@tfor \expandafter \reserved@a
+         \expandafter :\expandafter =\@fps
+         \do
+          {%
+           \if \reserved@a h%
+             \ifodd \@tempcnta
+             \else
+               \advance \@tempcnta \@ne
+             \fi
+           \else\if \reserved@a t%
+             \@setfpsbit \tw@
+           \else\if \reserved@a b%
+             \@setfpsbit 4%
+           \else\if \reserved@a p%
+             \@setfpsbit 8%
+           \else\if \reserved@a !%
+             \ifnum \@tempcnta>15
+               \advance\@tempcnta -\sixt@@n\relax
+             \fi
+           \else
+             \@latex@error{Unknown float option `\reserved@a'}%
+             {Option `\reserved@a' ignored and `p' used.}%
+             \@setfpsbit 8%
+           \fi\fi\fi\fi\fi
+           }%
+       \@tempcntb \csname ftype@\@captype \endcsname
+       \multiply \@tempcntb \@xxxii
+       \advance \@tempcnta \@tempcntb
+       \global \count\@currbox \@tempcnta
+       }%
+    \@fltovf
+  \fi
+  \global \setbox\@currbox
+    \color@vbox
+      \normalcolor
+      \vbox \bgroup
+        \hsize\columnwidth
+        \@parboxrestore
+        \@floatboxreset
+}
+ \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}
+\EndIncludeInRelease
 %</fixltx2e>
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/base/latexrelease.ins b/Master/texmf-dist/source/latex/base/latexrelease.ins
index cd7ac93ff36..f9091499f8f 100644
--- a/Master/texmf-dist/source/latex/base/latexrelease.ins
+++ b/Master/texmf-dist/source/latex/base/latexrelease.ins
@@ -91,6 +91,7 @@ extension .ins) which are part of the distribution.
   \from{ltlength.dtx}    {latexrelease}%
   \from{ltfloat.dtx}     {latexrelease}%
   \from{ltoutput.dtx}    {latexrelease}%
+  \from{ltclass.dtx}     {latexrelease}%
   \from{ltspace.dtx}     {latexrelease}%
   \from{ltplain.dtx}     {latexrelease}%
   \from{ltfssdcl.dtx}    {latexrelease}%
diff --git a/Master/texmf-dist/source/latex/base/ltboxes.dtx b/Master/texmf-dist/source/latex/base/ltboxes.dtx
index 2c0115a2d2b..c631a1f9cbb 100644
--- a/Master/texmf-dist/source/latex/base/ltboxes.dtx
+++ b/Master/texmf-dist/source/latex/base/ltboxes.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltboxes.dtx}
-             [2015/01/08 v1.1h LaTeX Kernel (Box Commands)]
+             [2016/12/29 v1.2a LaTeX Kernel (Box Commands)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltboxes.dtx}
@@ -252,6 +252,7 @@
 %<latexrelease>  \@ifnextchar(%)
 %<latexrelease>    \@makepicbox
 %<latexrelease>    {\@ifnextchar[\@makebox\mbox}}%
+%<latexrelease>\expandafter\let\csname makebox \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
@@ -465,6 +466,7 @@
 %<latexrelease>\def\savebox#1{%
 %<latexrelease>  \@ifnextchar(%)
 %<latexrelease>    {\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}}%
+%<latexrelease>\expandafter\let\csname savebox \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
@@ -661,6 +663,7 @@
 %<latexrelease>\def\framebox{%
 %<latexrelease>  \@ifnextchar(%)
 %<latexrelease>    \@framepicbox{\@ifnextchar[\@framebox\fbox}}%
+%<latexrelease>\expandafter\let\csname framebox \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
@@ -775,6 +778,7 @@
 %<latexrelease>  \@ifnextchar[%]
 %<latexrelease>    \@iparbox
 %<latexrelease>    {\@iiiparbox c\relax[s]}}%
+%<latexrelease>\expandafter\let\csname parbox \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
@@ -1066,6 +1070,7 @@
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>                 {\rule}{Make \rule robust}%
 %<latexrelease>\def\rule{\@ifnextchar[\@rule{\@rule[\z@]}}%
+%<latexrelease>\expandafter\let\csname rule \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
@@ -1126,6 +1131,7 @@
 %<latexrelease>\def\raisebox#1{%
 %<latexrelease>  \leavevmode
 %<latexrelease>  \@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}}
+%<latexrelease>\expandafter\let\csname raisebox \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx
index 988f9beb888..ecbcbfff2cf 100644
--- a/Master/texmf-dist/source/latex/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex/base/ltclass.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltclass.dtx}
-             [2016/06/20 v1.1j LaTeX Kernel (Class & Package Interface)]
+             [2016/11/09 v1.2b LaTeX Kernel (Class & Package Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltclass.dtx}
@@ -662,9 +662,18 @@
 % \changes{v1.1i}{2011/08/19}
 %         {Re-jig definition after more stringent \cs{in@} test.}
 %    \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2017/01/01}%
+%<latexrelease>                 {\@if@pti@ns}{Spaces in option clash check}%
+%<*2ekernel|latexrelease>
 \def\@if@pti@ns#1#2{%
  \let\reserved@a\@firstoftwo
- \@for\reserved@b:=#2\do{%
+%    \end{macrocode}
+% \changes{v1.2a}{2016/10/02}
+%         {Ignore spaces while checking for option clash}
+%    \begin{macrocode}
+ \edef\reserved@b{\zap@space#2 \@empty}%
+ \@for\reserved@b:=\reserved@b\do{%
    \ifx\reserved@b\@empty
    \else
      \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}%
@@ -675,6 +684,28 @@
    \fi
  }%
  \reserved@a}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\@if@pti@ns}{Spaces in option clash check}%
+%<latexrelease>\def\@if@pti@ns#1#2{%
+%<latexrelease> \let\reserved@a\@firstoftwo
+%<latexrelease> \@for\reserved@b:=#2\do{%
+%<latexrelease>  \ifx\reserved@b\@empty
+%<latexrelease>   \else
+%<latexrelease>   \expandafter\in@\expandafter
+%<latexrelease>                   {\expandafter,\reserved@b,}{,#1,}%
+%<latexrelease>    \ifin@
+%<latexrelease>    \else
+%<latexrelease>     \let\reserved@a\@secondoftwo
+%<latexrelease>    \fi
+%<latexrelease>  \fi
+%<latexrelease> }%
+%<latexrelease> \reserved@a}
+%<*2ekernel>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \@onlypreamble\@if@pti@ns
 %    \end{macrocode}
 % \end{macro}
@@ -972,11 +1003,37 @@
 % \changes{v0.2k}{1993/12/06}
 %         {Preserve \cs{CurrentOption}.}
 %    \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2017/01/01}%
+%<latexrelease>                 {\@if@pti@ns}{Spaces in \ExecuteOptions}%
+%<*2ekernel|latexrelease>
 \def\ExecuteOptions#1{%
+%    \end{macrocode}
+% \changes{v1.2a}{2016/10/02}
+%         {Ignore spaces in argument}
+% Use |\@fortmp| here as it is anyway cleared during |\@for| loop
+% so does not change any existing names.
+%    \begin{macrocode}
+  \edef\@fortmp{\zap@space#1 \@empty}%
   \def\reserved@a##1\@nil{%
-    \@for\CurrentOption:=#1\do{\csname ds@\CurrentOption\endcsname}%
+    \@for\CurrentOption:=\@fortmp\do
+             {\csname ds@\CurrentOption\endcsname}%
     \edef\CurrentOption{##1}}%
   \expandafter\reserved@a\CurrentOption\@nil}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\@if@pti@ns}{Spaces in \ExecuteOptions}%
+%<latexrelease>\def\ExecuteOptions#1{%
+%<latexrelease>  \def\reserved@a##1\@nil{%
+%<latexrelease>    \@for\CurrentOption:=#1\do
+%<latexrelease>             {\csname ds@\CurrentOption\endcsname}%
+%<latexrelease>    \edef\CurrentOption{##1}}%
+%<latexrelease>  \expandafter\reserved@a\CurrentOption\@nil}
+%<*2ekernel>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \@onlypreamble\ExecuteOptions
 %    \end{macrocode}
 % \end{macro}
@@ -1212,7 +1269,13 @@
 %          ASAJ.}
 % \changes{v1.1h}{2007/08/05}
 %         {Prevent loss of brackets PR/3965}
+% \changes{v2.1b}{2016/11/09}
+%         {Improve \cs{ifx} tests PR/4497}
 %    \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2017/01/01}%
+%<latexrelease>        {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}%
+%<*2ekernel|latexrelease>
 \def\@fileswith@pti@ns#1[#2]#3[#4]{%
   \ifx#1\@clsextension
     \ifx\@classoptionslist\relax
@@ -1230,17 +1293,66 @@
 % (one for each package) without thrashing the parameter stack.
 %    \begin{macrocode}
     \def\reserved@b##1,{%
-      \ifx\@nil##1\relax\else
-        \ifx\relax##1\relax\else
+%    \end{macrocode}
+% If |#1| is |\@nnil| we have reached the end of the list 
+% (older version used |\@nil| here but |\@nil| is undefined so |\ifx| 
+% equal to all undefined commands)
+%    \begin{macrocode}
+      \ifx\@nnil##1\relax\else
+%    \end{macrocode}
+%  If |\ifx\@nnil##1\n@nil| is true then |#1| is (presumably) empty
+% (Older code used |\relax| which is slighly easier to get into |#1|
+% by mistake, which would spoil this test.)
+%    \begin{macrocode}
+        \ifx\@nnil##1\@nnil\else
+%    \end{macrocode}
+%
+%    \begin{macrocode}
          \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
          \noexpand\@pkgextension
         \fi
         \expandafter\reserved@b
       \fi}%
       \edef\reserved@a{\zap@space#3 \@empty}%
-      \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nil,}%
+      \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nnil,}%
   \fi
   \reserved@a}
+%</2ekernel|latexrelease>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>        {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}%
+%<latexrelease>\def\@fileswith@pti@ns#1[#2]#3[#4]{%
+%<latexrelease>  \ifx#1\@clsextension
+%<latexrelease>    \ifx\@classoptionslist\relax
+%<latexrelease>      \xdef\@classoptionslist{\zap@space#2 \@empty}%
+%<latexrelease>      \def\reserved@a{%
+%<latexrelease>        \@onefilewithoptions#3[{#2}][{#4}]#1%
+%<latexrelease>        \@documentclasshook}%
+%<latexrelease>    \else
+%<latexrelease>      \def\reserved@a{%
+%<latexrelease>        \@onefilewithoptions#3[{#2}][{#4}]#1}%
+%<latexrelease>    \fi
+%<latexrelease>  \else
+%<latexrelease>    \def\reserved@b##1,{%
+%<latexrelease>      \ifx\@nil##1\relax\else
+%<latexrelease>        \ifx\relax##1\relax\else
+%<latexrelease>         \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
+%<latexrelease>         \noexpand\@pkgextension
+%<latexrelease>        \fi
+%<latexrelease>        \expandafter\reserved@b
+%<latexrelease>      \fi}%
+%<latexrelease>      \edef\reserved@a{\zap@space#3 \@empty}%
+%<latexrelease>      \edef\reserved@a{%
+%<latexrelease>        \expandafter\reserved@b\reserved@a,\@nil,}%
+%<latexrelease>  \fi
+%<latexrelease>  \reserved@a}
+%<*2ekernel>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \@onlypreamble\@fileswith@pti@ns
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/base/ltcounts.dtx b/Master/texmf-dist/source/latex/base/ltcounts.dtx
index 474e05ebd5e..bcb5c771562 100644
--- a/Master/texmf-dist/source/latex/base/ltcounts.dtx
+++ b/Master/texmf-dist/source/latex/base/ltcounts.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltcounts.dtx}
-             [2015/06/05 v1.1i LaTeX Kernel (Counters)]
+             [2015/06/05 v1.1j LaTeX Kernel (Counters)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltcounts.dtx}
@@ -484,6 +484,7 @@
 %  \begin{macro}{\TextOrMath}
 %    \changes{v1.1h}{2015/01/11}{Add command to solve robustness
 %      issues (pr/3752) (latexrelease)}
+%    \changes{v1.1j}{2016/10/19}{Test directly for \cs{protected}}
 %    When using regular \TeX, we make this command robust so that it
 %    always selects the correct branch in an |\ifmmode| switch with
 %    the usual disadvantage of ruining kerning. For the application we
@@ -495,13 +496,13 @@
 %    side effects.
 %
 %    First some code for checking if we are running e\TeX\ but making
-%    sure not to permanently turn |\eTeXversion| into |\relax|.
+%    sure not to permanently turn |\protected| into |\relax|.
 %    \begin{macrocode}
 %</2ekernel>
 %<latexrelease>\IncludeInRelease{2015/01/01}{\TextOrMath}{\TextOrMath}%
 %<*2ekernel|latexrelease>
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname eTeXversion\endcsname\relax
+\expandafter\ifx\csname protected\endcsname\relax
 %    \end{macrocode}
 % In case of ordinary \TeX\ we define |\TextOrMath| as a robust
 % command but make sure it always grabs its arguments. If we didn't do
diff --git a/Master/texmf-dist/source/latex/base/ltdirchk.dtx b/Master/texmf-dist/source/latex/base/ltdirchk.dtx
index ba017d6ebd3..bb81a90a3e8 100644
--- a/Master/texmf-dist/source/latex/base/ltdirchk.dtx
+++ b/Master/texmf-dist/source/latex/base/ltdirchk.dtx
@@ -39,7 +39,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltdirchk.dtx}
-             [2015/10/02 v1.2a LaTeX Kernel (System Dependent Parts)]
+             [2016/10/15 v1.2b LaTeX Kernel (System Dependent Parts)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltdirchk.dtx}
@@ -294,6 +294,16 @@
 \fi
 %    \end{macrocode}
 %
+% \changes{v1.2b}{2016/10/15}{Require e\TeX{}}
+% A test can now be made for e\TeX{}.
+%    \begin{macrocode}
+%<initex>\ifx\eTeXversion\undefined
+%<initex>  \errmessage
+%<initex>    {LaTeX requires e-TeX}
+%<initex>  \expandafter\endinput
+%<initex>\fi
+%    \end{macrocode}
+%
 % That distraction over, back to the basics of a format.
 %    \begin{macrocode}
 \catcode`\#=6
diff --git a/Master/texmf-dist/source/latex/base/lterror.dtx b/Master/texmf-dist/source/latex/base/lterror.dtx
index 4ec91167b18..99ed14077a6 100644
--- a/Master/texmf-dist/source/latex/base/lterror.dtx
+++ b/Master/texmf-dist/source/latex/base/lterror.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{lterror.dtx}
-             [2015/02/21 v1.2o LaTeX Kernel (errors)]
+             [2016/10/15 v1.2p LaTeX Kernel (errors)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{lterror.dtx}
@@ -84,6 +84,8 @@
 %         {Modify autoload support}
 % \changes{v1.2o}{2015/02/21}
 %         {Removed autoload support}
+% \changes{v1.2p}{2016/10/15}
+%         {Require e\TeX{}}
 %
 % \section{Error handling}
 %
@@ -457,13 +459,9 @@ Type  H <return>  for immediate help.}%
 % \changes{v1.0d}{1994/03/28}
 %     {Remove test for \cs{inputlineno} undefined.}
 % \begin{macro}{\on@line}
-%    The message ` on input line~$n$', if possible.
+%    The message ` on input line~$n$'.
 %    \begin{macrocode}
-\ifnum\inputlineno=\m@ne
-  \let\on@line\@empty
-\else
-  \def\on@line{ on input line \the\inputlineno}
-\fi
+\def\on@line{ on input line \the\inputlineno}
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx
index 05b09ea2934..d46f3041d99 100644
--- a/Master/texmf-dist/source/latex/base/ltfinal.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfinal.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2016/04/22 v2.0q LaTeX Kernel (Final Settings)]
+             [2016/10/15 v2.0s LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -86,6 +86,8 @@
 % \changes{v1.0s}{1995/06/06}
 %         {Made \cs{MakeUppercase} and \cs{MakeLowercase} brace their
 %         argument.}
+% \changes{v2.0r}{2016/10/15}{Require e\TeX{}}
+% \changes{v2.0s}{2016/10/15}{Tidy up status of char 127}
 %
 % \subsection{Debugging}
 %
@@ -341,24 +343,24 @@
 %<latexrelease>  {\XeTeXintercharclasses}{XeTeX character classes}%
 %<latexrelease>  \ifx\XeTeXinterchartoks\undefined
 %<latexrelease>  \else
-%<latexrelease>    \input{load-unicode-xetex-classes}
-%<latexrelease>    \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
-%<latexrelease>    \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
-%<latexrelease>    \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}
-%<latexrelease>    \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace}
-%<latexrelease>    \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace}
-%<latexrelease>    \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace}
-%<latexrelease>    \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace}
-%<latexrelease>    \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace}
-%<latexrelease>    \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue}
-%<latexrelease>    \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue}
+%<latexrelease>   \input{load-unicode-xetex-classes}
+%<latexrelease>   \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
+%<latexrelease>   \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
+%<latexrelease>   \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}
+%<latexrelease>   \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace}
+%<latexrelease>   \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace}
+%<latexrelease>   \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace}
+%<latexrelease>   \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace}
+%<latexrelease>   \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace}
+%<latexrelease>   \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue}
+%<latexrelease>   \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue}
 %<latexrelease>  \fi
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
@@ -406,10 +408,8 @@
    \lccode#1=#1
 }
 \reserved@a{`\a}{`\z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"A0}{"BC}
-  \reserved@a{"E0}{"FF}
-\fi
+\reserved@a{"A0}{"BC}
+\reserved@a{"E0}{"FF}
 %    \end{macrocode}
 % The upper case characters need their |\uccode| and |\lccode| values
 % set, and their |\sfcode| set to 999.
@@ -421,10 +421,8 @@
    \sfcode#1=999
 }
 \reserved@a{`\A}{`\Z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"80}{"9C}
-  \reserved@a{"C0}{"DF}
-\fi
+\reserved@a{"80}{"9C}
+\reserved@a{"C0}{"DF}
 %    \end{macrocode}
 % Well, it would be nice if that were correct, but unfortunately, the
 % Cork encoding contains some odd slots whose uccode or lccode isn't
@@ -434,12 +432,10 @@
 \lccode`\^^Y=`\^^Y   % dotless i
 \uccode`\^^Z=`\J     % dotless j, ae in OT1
 \lccode`\^^Z=`\^^Z   % dotless j, ae in OT1
-\ifnum\inputlineno=\m@ne\else
-  \lccode`\^^9d=`\i    % dotted I
-  \uccode`\^^9d=`\^^9d % dotted I
-  \lccode`\^^9e=`\^^9e % d-bar
-  \uccode`\^^9e=`\^^d0 % d-bar
-\fi
+\lccode`\^^9d=`\i    % dotted I
+\uccode`\^^9d=`\^^9d % dotted I
+\lccode`\^^9e=`\^^9e % d-bar
+\uccode`\^^9e=`\^^d0 % d-bar
 %    \end{macrocode}
 % Finally here is one that helps hyphenation in the OT1 encoding.
 % \changes{v1.0z}{1996/10/31}
@@ -601,11 +597,6 @@
 \reserved@a{0}{`\^^H}
 \reserved@c{`\^^K}
 \reserved@a{`\^^N}{31}
-%\ifnum\inputlineno=\m@ne
-  \catcode"7F=15
-%\else
-%  \reserved@a{"7F}{"FF}
-%\fi
 %    \end{macrocode}
 %
 % \subsection{Lccodes and uccodes}
@@ -636,10 +627,8 @@
    \lccode#1=#1
 }
 \reserved@a{`\a}{`\z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"A0}{"BC}
-  \reserved@a{"E0}{"FF}
-\fi
+\reserved@a{"A0}{"BC}
+\reserved@a{"E0}{"FF}
 %    \end{macrocode}
 % The upper case characters need their |\uccode| and |\lccode| values
 % set, and their |\sfcode| set to 999.
@@ -651,10 +640,8 @@
    \sfcode#1=999
 }
 \reserved@a{`\A}{`\Z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"80}{"9C}
-  \reserved@a{"C0}{"DF}
-\fi
+\reserved@a{"80}{"9C}
+\reserved@a{"C0}{"DF}
 %    \end{macrocode}
 % Well, it would be nice if that were correct, but unfortunately, the
 % Cork encoding contains some odd slots whose uccode or lccode isn't
@@ -664,12 +651,10 @@
 \lccode`\^^Y=`\^^Y   % dotless i
 \uccode`\^^Z=`\J     % dotless j, ae in OT1
 \lccode`\^^Z=`\^^Z   % dotless j, ae in OT1
-\ifnum\inputlineno=\m@ne\else
-  \lccode`\^^9d=`\i    % dotted I
-  \uccode`\^^9d=`\^^9d % dotted I
-  \lccode`\^^9e=`\^^9e % d-bar
-  \uccode`\^^9e=`\^^d0 % d-bar
-\fi
+\lccode`\^^9d=`\i    % dotted I
+\uccode`\^^9d=`\^^9d % dotted I
+\lccode`\^^9e=`\^^9e % d-bar
+\uccode`\^^9e=`\^^d0 % d-bar
 %    \end{macrocode}
 % Finally here is one that helps hyphenation in the OT1 encoding.
 % \changes{v1.0z}{1996/10/31}
@@ -890,4 +875,4 @@
 %    \end{macrocode}
 %
 % \Finale
-%
+%
+\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/base/ltfssbas.dtx b/Master/texmf-dist/source/latex/base/ltfssbas.dtx
index 4733457ae2a..61d487ef5d0 100644
--- a/Master/texmf-dist/source/latex/base/ltfssbas.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssbas.dtx
@@ -35,7 +35,7 @@
 %
 %
 \ProvidesFile{ltfssbas.dtx}
-             [2015/04/07 v3.1a LaTeX Kernel (NFSS Basic Macros)]
+             [2017/01/10 v3.2a LaTeX Kernel (NFSS Basic Macros)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -1799,10 +1799,20 @@
 %    {Use \cs{normalfont} and make colour safe, and autoloadable}
 % \changes{v3.0u}{1998/03/25}
 %    {Suppress unnecessary error when used in preamble}
+% \changes{v3.2a}{2017/01/10}
+%    {Add version of \cs{showhyphens} that works with Xe\TeX.}
 %    The |\showhyphens| command must be redefined since the version in
 %    \texttt{plain.tex} uses |\tenrm|.  We have also made some further
 %    adjustments for its use in \LaTeX.
 %    \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2017/01/01}{\showhyphens}%
+%<latexrelease>                 {XeTeX support for \showhyphens}%
+%<*2ekernel|latexrelease>
+\ifx\XeTeXcharclass\@undefined
+%    \end{macrocode}
+% Version for engines other than Xe\TeX.
+%    \begin{macrocode}
 \gdef\showhyphens#1{%
   \setbox0\vbox{%
     \color@begingroup
@@ -1812,6 +1822,95 @@
     \pretolerance\m@ne\tolerance\m@ne\hbadness\z@\showboxdepth\z@\ #1%
     \color@endgroup}}
 %    \end{macrocode}
+%    \begin{macrocode}
+\else
+%    \end{macrocode}
+% Xe\TeX\ version. When using system fonts Xe\TeX\ reports consecutive
+% runs of characters as a single item in box logging, which means the
+% standard |\showhyphens| does not work.  This version typesets the
+% text into a narrow box to force hyphenation and then reconstructs a
+% horizontal list with explicit hyphens to generate the display. Note
+% that the |lmr| OpenType font is forced, this works even if the
+% characters are not in the font as hyphenation is attempted due to
+% the width of the space and hyphen character. It may generate
+% spurious Missing Character warnings in the log, these are however
+% suppressed from the terminal output by ensuring that
+% |\tracingonline| is locally zero.
+%    \begin{macrocode}
+\long\def\showhyphens#1{%
+  \setbox0\vbox{%
+    \usefont{TU}{lmr}{m}{n}%
+    \hsize 1sp %
+    \hbadness\@M
+    \hfuzz\maxdimen
+    \tracingonline\z@
+    \everypar={}%
+    \leftskip\z@skip
+    \rightskip\z@skip
+    \parfillskip\z@skip
+    \hyphenpenalty=-\@M
+    \pretolerance\m@ne
+    \interlinepenalty\z@
+    \clubpenalty\z@
+    \widowpenalty\z@
+    \brokenpenalty1127 %
+    \setbox\z@\hbox{}%
+    \noindent
+    \hskip\z@skip
+    #1%
+    \par
+%    \end{macrocode}
+% Note here we stop the loop if made no progress, non-removable items
+% may mean that we can not process the whole list (which would be
+% testable as |\lastnodetype=-1|).
+%    \begin{macrocode}
+     \loop
+     \@tempswafalse
+     \ifnum\lastnodetype=11\unskip\@tempswatrue\fi
+     \ifnum\lastnodetype=12\unkern\@tempswatrue\fi
+     \ifnum\lastnodetype=13 %
+      \count@\lastpenalty
+      \unpenalty\@tempswatrue
+    \fi
+    \ifnum\lastnodetype=\@ne
+     \setbox\tw@\lastbox\@tempswatrue
+     \setbox0\hbox{\unhbox\tw@\unskip\unskip\unpenalty
+                   \ifnum\count@=1127 \else\ \fi
+                   \unhbox0}%
+     \count@\z@
+    \fi
+    \if@tempswa
+    \repeat
+   \hbadness\z@
+   \hsize\maxdimen
+   \showboxdepth\z@
+   \tolerance\m@ne
+   \hyphenpenalty\z@
+   \noindent\unhbox\z@
+}}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\fi
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}{\showhyphens}%
+%<latexrelease>                 {XeTeX support for \showhyphens}%
+%<latexrelease>\gdef\showhyphens#1{%
+%<latexrelease>  \setbox0\vbox{%
+%<latexrelease>    \color@begingroup
+%<latexrelease>    \everypar{}%
+%<latexrelease>    \parfillskip\z@skip\hsize\maxdimen
+%<latexrelease>    \normalfont
+%<latexrelease>    \pretolerance\m@ne\tolerance\m@ne
+%<latexrelease>    \hbadness\z@\showboxdepth\z@\ #1%
+%<latexrelease>    \color@endgroup}}
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+%    \end{macrocode}
 % \end{macro}
 %
 %
diff --git a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
index e85b435c98c..cfb3f497352 100644
--- a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
@@ -1152,7 +1152,8 @@
       \advance\count\tw@-\count@
       \if\relax\noexpand#1% is command?
         \edef\reserved@a
-          {\noexpand\in@{\expandafter\@gobble\string\mathchar}{\meaning#1}}%
+          {\noexpand\in@{\expandafter\@gobble\string\mathchar}%
+                        {\meaning#1}}%
         \reserved@a
         \ifin@
           \expandafter\set@mathsymbol
diff --git a/Master/texmf-dist/source/latex/base/ltfssini.dtx b/Master/texmf-dist/source/latex/base/ltfssini.dtx
index a4b0bfac34e..17f8a3f71ee 100644
--- a/Master/texmf-dist/source/latex/base/ltfssini.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssini.dtx
@@ -36,7 +36,7 @@
 %
 %
 \ProvidesFile{ltfssini.dtx}
-             [2015/01/09 v3.1a LaTeX Kernel (NFSS Initialisation)]
+             [2016/10/15 v3.1b LaTeX Kernel (NFSS Initialisation)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -78,7 +78,8 @@
 %      {(DPC) Fix documentation typos}
 % \changes{v3.0a}{1995/05/24}
 %      {(DPC) Make file from previous file, lfonts.dtx 1995/05/23 v2.2e}
-%
+% \changes{v3.1b}{2016/10/15}
+%      {Require e\TeX{}}
 %
 %
 % \section{NFSS Initialisation}
@@ -501,33 +502,6 @@
 % \changes{v3.0h}{1996/12/06}
 %      {(DPC) Remove *** from messages internal/2338}
 %    \begin{macrocode}
-\ifnum\inputlineno=\m@ne
-%    \end{macrocode}
-% Still using \TeX2. need a configuration file to avoid setting the 8bit
-% characters.
-%    \begin{macrocode}
-\InputIfFileExists{fonttext.cfg}
-           {\typeout{====================================^^J%
-                     ^^J%
-                      Local config file fonttext.cfg used^^J%
-                     ^^J%
-                     ====================================}%
-             \def\@addtofilelist##1{\xdef\@filelist{\@filelist,##1}}%
-            }
-           {\typeout{!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
-                     !^^J%
-                     ! You MUST use a fonttext.cfg file!^^J%
-                     ! As you are still using TeX2!!!!!^^J%
-                     !^^J%
-                     ! See the documentation file tex2.txt^^J%
-                     !^^J%
-                     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}%
-                    \batchmode \@@end}
-\else
-%    \end{macrocode}
-% With \TeX3 can use the standard |ltx| file if no configuration file
-% exists.
-%    \begin{macrocode}
 \InputIfFileExists{fonttext.cfg}
            {\typeout{====================================^^J%
                      ^^J%
@@ -537,7 +511,6 @@
              \def\@addtofilelist##1{\xdef\@filelist{\@filelist,##1}}%
             }
            {\input{fonttext.ltx}}
-\fi
 \let\@addtofilelist\@gobble
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/base/ltluatex.dtx b/Master/texmf-dist/source/latex/base/ltluatex.dtx
index c8a432f08ec..e5f507258f3 100644
--- a/Master/texmf-dist/source/latex/base/ltluatex.dtx
+++ b/Master/texmf-dist/source/latex/base/ltluatex.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2015 2016
+% Copyright 2015 2017
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -24,7 +24,7 @@
 \ProvidesFile{ltluatex.dtx}
 %</driver>
 %<*tex>
-[2016/03/13 v1.0n
+[2017/01/20 v1.1b
 %</tex>
 %<plain>  LuaTeX support for plain TeX (core)
 %<*tex>
@@ -802,6 +802,46 @@
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
+% In \verb|\everyjob|, if luaotfload is available, load it and switch to TU.
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2017/01/01}%
+%<latexrelease>                 {\fontencoding}{TU in everyjob}%
+%<latexrelease>\fontencoding{TU}\let\encodingdefault\f@encoding
+%<latexrelease>\ifx\directlua\@undefined\else
+%<2ekernel>\everyjob\expandafter{%
+%<2ekernel>  \the\everyjob
+%<*2ekernel,latexrelease>
+  \directlua{%
+%% Horrible hack, locally reset the luatex version number
+%% This is not required for the source version of luaotfload
+%% but is required due to an error in the version check in the
+%% public version (January 2017)
+%% https://github.com/lualatex/luaotfload/issues/387
+%% It is expected that this will be removed before TeXLive 2017
+  local tmp_version=tex.luatexversion %
+  tex.luatexversion=199 %
+  if xpcall(function ()%
+             require('luaotfload-main')%
+            end,texio.write_nl) then %
+  local _void = luaotfload.main ()%
+  else %
+  texio.write_nl('Error in luaotfload: reverting to OT1')%
+  tex.print('\string\\def\string\\encodingdefault{OT1}')%
+  end %
+  tex.luatexversion=tmp_version%
+  }%
+  \let\f@encoding\encodingdefault
+  \expandafter\let\csname ver@luaotfload.sty\endcsname\fmtversion
+%</2ekernel,latexrelease>
+%<latexrelease>\fi
+%<2ekernel>  }
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\fontencoding}{TU in everyjob}%
+%<latexrelease>\fontencoding{OT1}\let\encodingdefault\f@encoding
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %<2ekernel|latexrelease>\fi
 %</2ekernel|tex|latexrelease>
@@ -1161,7 +1201,7 @@ local types = {
 %    \end{macrocode}
 %
 % Now, list all predefined callbacks with their current type, based on the
-% Lua\TeX{} manual version~0.80. A full list of the currently-available
+% Lua\TeX{} manual version~1.01. A full list of the currently-available
 % callbacks can be obtained using
 %  \begin{verbatim}
 %    \directlua{
@@ -1176,7 +1216,7 @@ local types = {
 %    \begin{macrocode}
 local callbacktypes = callbacktypes or {
 %    \end{macrocode}
-%   Section 4.1.1: file discovery callbacks.
+%   Section 8.2: file discovery callbacks.
 %    \begin{macrocode}
   find_read_file     = exclusive,
   find_write_file    = exclusive,
@@ -1194,7 +1234,7 @@ local callbacktypes = callbacktypes or {
   find_type1_file    = data,
   find_image_file    = data,
 %    \end{macrocode}
-% Section 4.1.2: file reading callbacks.
+%
 %    \begin{macrocode}
   open_read_file     = exclusive,
   read_font_file     = exclusive,
@@ -1215,14 +1255,14 @@ local callbacktypes = callbacktypes or {
   find_cidmap_file   = data,
   read_cidmap_file   = exclusive,
 %    \end{macrocode}
-% Section 4.1.3: data processing callbacks.
+% Section 8.3: data processing callbacks.
 % \changes{v1.0m}{2016/02/11}{token\_filter removed}
 %    \begin{macrocode}
   process_input_buffer  = data,
   process_output_buffer = data,
   process_jobname       = data,
 %    \end{macrocode}
-% Section 4.1.4: node list processing callbacks.
+% Section 8.4: node list processing callbacks.
 % \changes{v1.0m}{2016/02/11}
 % {process\_rule, [hv]pack\_quality  append\_to\_vlist\_filter added}
 % \changes{v1.0n}{2016/03/13}{insert\_local\_par added}
@@ -1230,6 +1270,7 @@ local callbacktypes = callbacktypes or {
 %    \begin{macrocode}
   contribute_filter      = simple,
   buildpage_filter       = simple,
+  build_page_insert      = exclusive,
   pre_linebreak_filter   = list,
   linebreak_filter       = list,
   append_to_vlist_filter = list,
@@ -1246,8 +1287,9 @@ local callbacktypes = callbacktypes or {
   insert_local_par       = simple,
   mlist_to_hlist         = list,
 %    \end{macrocode}
-% Section 4.1.5: information reporting callbacks.
+% Section 8.5: information reporting callbacks.
 % \changes{v1.0m}{2016/02/11}{show\_warning\_message added}
+% \changes{v1.0p}{2016/11/17}{call\_edit added}
 %    \begin{macrocode}
   pre_dump             = simple,
   start_run            = simple,
@@ -1260,13 +1302,14 @@ local callbacktypes = callbacktypes or {
   show_lua_error_hook  = simple,
   start_file           = simple,
   stop_file            = simple,
+  call_edit            = simple,
 %    \end{macrocode}
-% Section 4.1.6: PDF-related callbacks.
+% Section 8.6: PDF-related callbacks.
 %    \begin{macrocode}
   finish_pdffile = data,
   finish_pdfpage = data,
 %    \end{macrocode}
-% Section 4.1.7: font-related callbacks.
+% Section 8.7: font-related callbacks.
 %    \begin{macrocode}
   define_font = exclusive,
 %    \end{macrocode}
@@ -1301,6 +1344,33 @@ end
 % More precisely, the functions below are used to generate a specialized
 % function (closure) for a given callback, which is the actual handler.
 %
+%
+% The way the functions are combined together depends on
+% the type of the callback. There are currently 4 types of callback, depending
+% on the calling convention of the functions the callback can hold:
+% \begin{description}
+%   \item[simple] is for functions that don't return anything: they are called
+%     in order, all with the same argument;
+%   \item[data] is for functions receiving a piece of data of any type
+%     except node list head (and possibly other arguments) and returning it
+%     (possibly modified): the functions are called in order, and each is
+%     passed the return value of the previous (and the other arguments
+%     untouched, if any). The return value is that of the last function;
+%   \item[list] is a specialized variant of \emph{data} for functions
+%     filtering node lists. Such functions may return either the head of a
+%     modified node list, or the boolean values |true| or |false|. The
+%     functions are chained the same way as for \emph{data} except that for
+%     the following. If
+%     one function returns |false|, then |false| is immediately returned and
+%     the following functions are \emph{not} called. If one function returns
+%     |true|, then the same head is passed to the next function. If all
+%     functions return |true|, then |true| is returned, otherwise the return
+%     value of the last function not returning |true| is used.
+%   \item[exclusive] is for functions with more complex signatures; functions in
+%     this type of callback are \emph{not} combined: An error is raised if
+%     a second callback is registered..
+% \end{description}
+%
 % Handler for |data| callbacks.
 %    \begin{macrocode}
 local function data_handler(name)
@@ -1393,7 +1463,7 @@ local function create_callback(name, ctype, default)
   end
   if callbacktypes[name] then
     luatexbase_error("Unable to create callback `" .. name ..
-                     "':\ncallback type disallowed as name")
+                     "':\ncallback is already defined")
   end
   if default ~= false and type (default) ~= "function" then
     luatexbase_error("Unable to create callback `" .. name ..
diff --git a/Master/texmf-dist/source/latex/base/ltmath.dtx b/Master/texmf-dist/source/latex/base/ltmath.dtx
index ae6d19ae37b..f0080e38568 100644
--- a/Master/texmf-dist/source/latex/base/ltmath.dtx
+++ b/Master/texmf-dist/source/latex/base/ltmath.dtx
@@ -31,14 +31,14 @@
 %
 %<leqno>\ProvidesFile{leqno.clo}
 %<fleqn>\ProvidesFile{fleqn.clo}
-%<leqno,fleqn>        [2015/03/31 v1.1i Standard LaTeX option
+%<leqno,fleqn>        [2016/12/29 v1.2a Standard LaTeX option
 %<leqno>                                   (left equation numbers)]
 %<fleqn>                                   (flush left equations)]
 %
 %<*driver>
 % \fi
 \ProvidesFile{ltmath.dtx}
-              [2015/03/11 v1.1i LaTeX Kernel (Math Setup)]
+              [2016/12/29 v1.2a LaTeX Kernel (Math Setup)]
 % \iffalse
 %</driver>
 %
@@ -537,8 +537,10 @@
 %<latexrelease>\IncludeInRelease{0000/00/00}{\(}{Make \( robust}%
 %<latexrelease>\def\({%
 %<latexrelease>  \relax\ifmmode\@badmath\else$\fi}%
+%<latexrelease>\expandafter\let\csname\string( \endcsname\@undefined
 %<latexrelease>\def\){%
 %<latexrelease>  \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}%
+%<latexrelease>\expandafter\let\csname\string) \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
@@ -600,6 +602,7 @@
 %<latexrelease>      $$%%$$ BRACE MATCH HACK
 %<latexrelease>   \fi
 %<latexrelease>}%
+%<latexrelease>\expandafter\let\csname\string[ \endcsname\@undefined
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -615,6 +618,7 @@
 %<latexrelease>   \fi
 %<latexrelease>   \ignorespaces
 %<latexrelease>}%
+%<latexrelease>\expandafter\let\csname\string] \endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/ltnews26.tex b/Master/texmf-dist/source/latex/base/ltnews26.tex
new file mode 100644
index 00000000000..3213303ad2e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/base/ltnews26.tex
@@ -0,0 +1,239 @@
+% \iffalse meta-comment
+%
+% Copyright 2016
+% 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
+% Filename: ltnews26.tex
+%
+% This is issue 26 of LaTeX News.
+
+\documentclass{ltnews}
+\usepackage[T1]{fontenc}
+
+\usepackage{lmodern,url,hologo}
+
+\publicationmonth{January}
+\publicationyear{2017}
+
+\publicationissue{26}
+
+\begin{document}
+
+\maketitle
+\tableofcontents
+
+\setlength\rightskip{0pt plus 3em}
+\section{\eTeX{}}
+
+In \LaTeX{} News~16 (December 2003) the team announced
+\begin{quotation}
+We expect that within the next two years, releases of \LaTeX{} will
+change modestly in order to run best under an extended \TeX{} engine
+that contains the \eTeX{} primitives, e.g., \eTeX{} or pdf\TeX{}.
+\end{quotation}
+and also said
+\begin{quotation}
+Although the current release does not \emph{require} \eTeX{} features, we
+certainly recommend using an extended \TeX{}, especially if you need to debug
+macros.
+\end{quotation}
+
+For many years the team have worked on the basis that users will have \eTeX{}
+available but had not revisited the above statements formally. As of the
+January 2017 release of \LaTeXe{}, \eTeX{} is \emph{required} to build the
+format, and attempting to build a format without the extensions will fail.
+
+Practically, modern \TeX{} distributions provide the extensions in all engines
+other than the ``pure'' Knuth \texttt{tex}, and indeed parts of the
+format-building process already require \eTeX{}, most notably some of the UTF-8
+hyphenation patterns. As such, there should be no noticeable effect on users of
+this change.
+
+The team expect to make wider use of \eTeX{} within the kernel in future;
+details will be announced where they impact on end users in a visible way.
+
+\section{Default Encodings in \hologo{XeLaTeX} and \hologo{LuaLaTeX}}
+The default encoding in \LaTeX\ has always been the original
+128-character encoding \texttt{OT1}.  For Unicode based \TeX\ engines, this
+is not really suitable, and is especially problematic with
+\hologo{XeLaTeX} as in the major distributions this is built with
+Unicode based hyphenation patterns in the format.  In practice this has
+not been a major problem as documents use the contributed
+\textsf{fontspec} package in order to switch to a
+Unicode encoded font.
+
+In this release we are adding \texttt{TU} as a new supported
+encoding in addition to the previously supported encodings such as \texttt{OT1}
+and \texttt{T1}. This denotes a Unicode based font encoding. It is essentially
+the same as the \texttt{TU} encoding that has been on trial with the
+experimental \texttt{tuenc} option to \textsf{fontspec} for the past
+year.
+
+The \hologo{XeLaTeX} and \hologo{LuaLaTeX} formats will now default
+to \texttt{TU} encoding and \texttt{lmr} (Latin Modern) family. In the
+case of \hologo{LuaLaTeX} the contributed \textsf{luaotfload} Lua
+module will be loaded at the start of each run to enable the loading
+of OpenType fonts.
+
+The \textsf{fontspec} package is being adjusted in a companion release
+to recognise the new encoding default arrangements.
+
+Note that in practice no font supports the full Unicode range, and so
+\texttt{TU} encoded fonts, unlike fonts specified for \texttt{T1}, may be
+expected to be incomplete in various ways. In the current release the file
+\texttt{tuenc.def} that implements the \texttt{TU} encoding-specific commands
+has made some basic assumptions for (for example) default handling of
+accent commands, and the set of command names is derived from the
+command names used for the UTF-8 support in the \textsf{inputenc} package,
+restricted roughly to the character ranges classically provided by
+the \texttt{T1} and \texttt{TS1} encodings, but is part of a longer term plan
+seen over recent releases to increase support for Unicode based \TeX\ engines
+into the core \LaTeX\ support.
+
+
+
+If for any reason you need to process a document with the previous
+default \texttt{OT1} encoding, you may switch encoding in the usual ways, for
+example
+\begin{verbatim}
+\usepackage[OT1]{fontenc}
+\end{verbatim}
+or you may roll back all the changes for this release by starting the
+document with
+\begin{verbatim}
+\RequirePackage[2016/12/31]{latexrelease}
+\end{verbatim}
+
+\section{\cs{showhyphens} in \hologo{XeLaTeX}}
+Due to the way \hologo{XeLaTeX} interfaces to font libraries, the
+standard definition of \cs{showhyphens} does not work.  A variant
+definition has been available in the contributed \textsf{xltxtra}
+package, however a (slightly different) definition for \cs{showhyphens}
+is now included in \hologo{XeLaTeX} by default. As usual
+this change will be undone if an earlier
+release is specified using the \textsf{latexrelease} package.
+
+\section{The \textsf{fixltx2e} Package}
+As described in \LaTeX{} News~22, the \textsf{fixltx2e} package has become
+obsolete with the new update policy. Since 2015 it has just made a
+warning and exited.  In this release we have re-introduced all
+the code from the original fixes in the 2014 \LaTeX\ but guarded by
+\verb|\IncludeInRelease{2015/01/01}|.
+So for current releases \textsf{fixltx2e} still just makes a warning
+but for old releases, whether that is an old format, or a format with
+the version date reset via  the \textsf{latexrelease} package, the
+fixes in the original \textsf{fixltx2e} will be applied.
+
+This improves the ability to run old documents in a way compatible
+with contemporary formats. If you have a 2014 document that used
+\verb|\usepackage{fixltx2e}| and you add
+\verb|\RequirePackage[2014/01/01]{latexrelease}| and process it with the
+current format then \textsf{latexrelease} will undo most changes made
+since 2014, but now when the document includes \textsf{fixltx2e} it
+will act like a 2014 version of the package and apply the code fixes,
+not just give a warning that the package is obsolete.
+
+\section{The \textsf{latexbug} package}
+
+As explained in more detail
+at the \LaTeX\ Project
+  website\footnote{\url{https://www.latex-project.org/bugs/}}
+a new package, \textsf{latexbug}, has been produced to help produce
+test files to accompany bug reports on the core \LaTeX\ distribution.
+This is being published separately to CTAN at the same time as this
+release. By using the \textsf{latexbug} package you can easily check
+that the packages involved in the test are all part of the core
+release. The \LaTeX\ project can not handle bug reports on contributed
+packages, which should be directed to the package maintainer as given
+in the package documentation.
+
+\section{Updates to \textsf{amsmath}}
+The \textsf{amsmath} package has two updates at this release.
+\begin{itemize}
+\item The spacing to the left of the \texttt{aligned} and
+  \texttt{gathered} environments has been fixed: the spurious thin
+  space is no longer added by default. Package options control this
+  to revert to the original behaviour where required; see the
+  \textsf{amsldoc} guide for further details. 
+\item The large delimiters around generalised fractions (for example
+  in the \cs{binom} construct) did not work in previous releases if
+  using \hologo{LuaTeX} or \hologo{XeTeX} with OpenType math fonts. This is
+  related to the lack of specific metrics for this use in the OpenType Math
+  table. In principle \hologo{LuaTeX} has two additional named metrics
+  to control the delimiters but these are not initialised by default,
+  and in \hologo{XeTeX} it does not seem possible to make them work at all.
+  So for Unicode \TeX\ systems, a new implementation of
+  \cs{genfrac} is used at this release that uses \verb|\left\right|
+  internally but parameterised to give spacing as close to the
+  original as possible. The implementation in (pdf)\TeX\ is
+  unaffected.
+\end{itemize}
+
+\section{Updates to \textsf{tools}}
+The \textsf{array} package has been updated to fix a longstanding but
+previously unreported issue with unwanted interactions between tables
+in the page head or foot and the body of the page, as reported in
+\href{http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=tools/4488}{PR
+  tools/4488}.
+There is also an update to the \hologo{LuaTeX} support in \textsf{bm}.
+
+\section{An addendum to the release changes in 2015}
+
+In 2015 we announced the introduction of the roll-back\slash
+roll-forward concept to manage bug fixes and additions to core
+\LaTeX{} in a manageable way. We also announced at that time
+that we now incorporate all fixes from \textsf{fixltx2e} into the
+kernel (as the old mechanism produced problems instead of improving
+the situation). Refer to
+\href{https://www.latex-project.org/news/latex2e-news/ltnews22.pdf}{\texttt{ltnews22.pdf}}
+for details.
+
+One of the fixes from \textsf{fixltx2e} was for a glaring bug in
+\cs{addvspace} that was originally detected in the mid-nineties and
+back then added to the \textsf{fixltx2e} support package. In certain
+situations \cs{addvspace} would result in a page/column break below
+the baseline of the last line. As a result documents using
+\cs{flushbottom} would show a clear misalignment (even more prominent
+when typesetting in two-column mode).
+
+Starting with release 2015/01/01 this is now finally corrected already
+in the kernel and not only in \textsf{fixltx2e}.  In nearly all
+circumstances this will either make no difference to existing
+documents, or it will locally improve the visual appearence of that
+document without changing anything on other pages.  However, by the
+nature of the change it is also possible that there are further
+non-local changes to the page breaks due to the different break
+positions introduced by the fix.
+
+Thus, for documents that have been written before 2015 and that should
+be preserved unchanged at all costs you may have to add
+\begin{verbatim}
+\RequirePackage[2014/01/01]{latexrelease}
+\end{verbatim}
+at the top of the document, to roll back the format to a date before
+the policy change.
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.dtx b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
index c96b2578937..9d91b47cc5a 100644
--- a/Master/texmf-dist/source/latex/base/ltoutenc.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
@@ -35,16 +35,17 @@
 %<OML>\ProvidesFile{omlenc.def}
 %<OT4>\ProvidesFile{ot4enc.def}
 %<TS1>\ProvidesFile{ts1enc.def}[2001/06/05 v3.0e (jk/car/fm)
+%<TU>\ProvidesFile{tuenc.def}
 %<package>\ProvidesPackage{fontenc}
 %<TS1sty>\ProvidesPackage{textcomp}
-%<OT1|T1|OMS|OML|OT4|package|TS1sty> [2016/06/19 v1.99m
-%<OT1|T1|OMS|OML|OT4|TS1>         Standard LaTeX file]
+%<OT1|T1|OMS|OML|OT4|TU|package|TS1sty> [2016/12/11 v2.0a
+%<OT1|T1|OMS|OML|OT4|TS1|TU>         Standard LaTeX file]
 %<package|TS1sty>                 Standard LaTeX package]
 %
 %<*driver>
 % \fi
 \ProvidesFile{ltoutenc.dtx}
-             [2016/06/19 v1.99m LaTeX Kernel (font encodings)]
+             [2016/12/11 v2.0a LaTeX Kernel (font encodings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutenc.dtx}
@@ -498,6 +499,8 @@
 %                   the OT1 encoding, created by B.~Jackowski and
 %                   M.~Ry\'cko for use with the Polish version of
 %                   Computer Modern and Computer Concrete.\\
+%      |TU|       & generates |tuenc.def| for Unicode font
+%                   encoding. \\
 %      |package|  & generates |fontenc.sty| for
 %                   selecting encodings. \\
 %      |2ekernel| & for the kernel commands.\\
@@ -1090,7 +1093,7 @@
 %
 %
 % \begin{macro}{\UndeclareTextCommand}
-%    This command safely removes and encoding specific declaration
+%    This command safely removes an encoding specific declaration
 %    for a given encoding. It is helpful if one intends to use the
 %    default definition always and therefore wants to get rid of
 %    a declaration for some specific encoding.
@@ -1457,7 +1460,7 @@
 \let\ldots\dots
 %    \end{macrocode}
 % \changes{v1.99m}{2015/02/16}{Added \cs{textcommabelow} latex/4414}
-% Default definition of comma below.
+% Default definition of the commabelow accent.
 %    \begin{macrocode}
 %</2ekernel>
 %<latexrelease>\IncludeInRelease{2015/10/01}{\textcommabelow}{comma accent}%
@@ -1470,20 +1473,29 @@
 %</2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{0000/00/00}{\textcommabelow}{comma accent}%
 %<latexrelease>\let\textcommabelow\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-G\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-K\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-k\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-L\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-l\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-N\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-n\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-R\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-r\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-G\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-K\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-k\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-L\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-l\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-N\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-n\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-R\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-r\endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
 % \changes{v1.99n}{2015/02/16}{Added \cs{textcommaabove}}
-% Default definition of comma above (E.G.).
+% Default definition of the commaabove accent(E.G.).
 %    \begin{macrocode}
 %<latexrelease>\IncludeInRelease{2016/02/01}{\textcommaabove}{comma above}%
 %<*2ekernel|latexrelease>
@@ -1503,8 +1515,10 @@
 %</2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{0000/00/00}{\textcommaabove}{comma above}%
 %<latexrelease>\let\textcommaabove\@undefined
-%<latexrelease>\expandafter\let\csname\string\OT1\string\c-g\endcsname\@undefined
-%<latexrelease>\expandafter\let\csname\string\T1\string\c-g\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\OT1\string\c-g\endcsname\@undefined
+%<latexrelease>\expandafter
+%<latexrelease>  \let\csname\string\T1\string\c-g\endcsname\@undefined
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
@@ -2623,6 +2637,440 @@
 %</TS1>
 %    \end{macrocode}
 %
+% \subsection{Definitions for the TU encoding}
+%
+% \changes{v2.0a}{2016/12/11/04}{Added TU encoding}
+%
+% The TU encoding was originally introduced in the contributed
+% package \texttt{fontspec} as a Unicode encoding for XeTeX and
+% LuaTeX.
+%
+% Normally for these engines, the input consists of Unicode characters
+% encoded in UTF-8. There is therefore little need to use the
+% traditional (ASCII) encoding-specific commands
+%
+% However, sometimes (e.g. for backwards compatibility) it can be
+% useful to access these Unicode characters via such ASCII-based
+% markup. The commands provided here
+% Cover the characters in the T1 and TS1 encodings, but specified in
+% Unicode position. Almost all the command names have been
+% mechanically extracted form the \texttt{inputenc} UTF-8 support,
+% which is essentially doing a reverse mapping from UTF-8 data to
+% \LaTeX\ LICR commands.
+%
+% A few additional names for character which were supported in the
+% original \texttt{fontspec} version of this file have also been
+% added, even though they are not currently in the default
+% \texttt{inputenc} UTF-8 declarations.
+%
+%    \begin{macrocode}
+%<*TU>
+%    \end{macrocode}
+% In the base interface the Unicode encoding is always known as TU
+% But we parameterise the encoding name to allow for modelling
+% differences in Unicode support by different fonts.
+%    \begin{macrocode}
+\providecommand\UnicodeEncodingName{TU}
+%    \end{macrocode}
+% As the Unicode encoding, TU, is only currently available with XeTeX
+% or LuaTeX, we detect these engines first, and make adjustments for the
+% differing font loading syntax. For other engines, we issue a warning
+% then abort this file, switching back to T1 encoding.
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname directlua\endcsname\relax
+%    \end{macrocode}
+%
+% Not LuaTeX or XeTeX, abort with a warning.
+%    \begin{macrocode}
+    \PackageWarningNoLine{fontenc}
+      {\UnicodeEncodingName\space
+       encoding is only available with XeTeX and LuaTeX.\MessageBreak
+       Defaulting to T1 encoding}
+      \def\encodingdefault{T1}
+    \expandafter\expandafter\expandafter\endinput
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+  \else
+%    \end{macrocode}
+%
+% LuaTeX.
+%    \begin{macrocode}
+    \def\UnicodeFontTeXLigatures{mapping=tex-text;}
+  \fi
+\else
+%    \end{macrocode}
+%
+% XeTeX
+%    \begin{macrocode}
+  \def\UnicodeFontTeXLigatures{+tlig;} % "+trep;" no longer needed
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\fi
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\UnicodeFontFile#1#2{"[#1]:#2"}
+\def\UnicodeFontName#1#2{"#1:#2"}
+%    \end{macrocode}
+%
+% Declare the encoding
+%    \begin{macrocode}
+\DeclareFontEncoding\UnicodeEncodingName{}{}
+%    \end{macrocode}
+%
+% 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}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\DeclareUnicodeAccent#1#2#3{%
+  \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\DeclareTextSymbol{\textexclamdown}      \UnicodeEncodingName{"00A1}
+\DeclareTextSymbol{\textcent}            \UnicodeEncodingName{"00A2}
+\DeclareTextSymbol{\textsterling}        \UnicodeEncodingName{"00A3}
+\DeclareTextSymbol{\textcurrency}        \UnicodeEncodingName{"00A4}
+\DeclareTextSymbol{\textyen}             \UnicodeEncodingName{"00A5}
+\DeclareTextSymbol{\textbrokenbar}       \UnicodeEncodingName{"00A6}
+\DeclareTextSymbol{\textsection}         \UnicodeEncodingName{"00A7}
+\DeclareTextSymbol{\textasciidieresis}   \UnicodeEncodingName{"00A8}
+\DeclareTextSymbol{\textcopyright}       \UnicodeEncodingName{"00A9}
+\DeclareTextSymbol{\textordfeminine}     \UnicodeEncodingName{"00AA}
+\DeclareTextSymbol{\guillemotleft}       \UnicodeEncodingName{"00AB}
+\DeclareTextSymbol{\textlnot}            \UnicodeEncodingName{"00AC}
+\DeclareTextSymbol{\textregistered}      \UnicodeEncodingName{"00AE}
+\DeclareTextSymbol{\textasciimacron}     \UnicodeEncodingName{"00AF}
+\DeclareTextSymbol{\textdegree}          \UnicodeEncodingName{"00B0}
+\DeclareTextSymbol{\textpm}              \UnicodeEncodingName{"00B1}
+\DeclareTextSymbol{\texttwosuperior}     \UnicodeEncodingName{"00B2}
+\DeclareTextSymbol{\textthreesuperior}   \UnicodeEncodingName{"00B3}
+\DeclareTextSymbol{\textasciiacute}      \UnicodeEncodingName{"00B4}
+\DeclareTextSymbol{\textmu}              \UnicodeEncodingName{"00B5}
+\DeclareTextSymbol{\textparagraph}       \UnicodeEncodingName{"00B6}
+\DeclareTextSymbol{\textperiodcentered}  \UnicodeEncodingName{"00B7}
+\DeclareTextSymbol{\textonesuperior}     \UnicodeEncodingName{"00B9}
+\DeclareTextSymbol{\textordmasculine}    \UnicodeEncodingName{"00BA}
+\DeclareTextSymbol{\guillemotright}      \UnicodeEncodingName{"00BB}
+\DeclareTextSymbol{\textonequarter}      \UnicodeEncodingName{"00BC}
+\DeclareTextSymbol{\textonehalf}         \UnicodeEncodingName{"00BD}
+\DeclareTextSymbol{\textthreequarters}   \UnicodeEncodingName{"00BE}
+\DeclareTextSymbol{\textquestiondown}    \UnicodeEncodingName{"00BF}
+\DeclareTextSymbol{\AE}                  \UnicodeEncodingName{"00C6}
+\DeclareTextSymbol{\DH}                  \UnicodeEncodingName{"00D0}
+\DeclareTextSymbol{\texttimes}           \UnicodeEncodingName{"00D7}
+\DeclareTextSymbol{\O}                   \UnicodeEncodingName{"00D8}
+\DeclareTextSymbol{\TH}                  \UnicodeEncodingName{"00DE}
+\DeclareTextSymbol{\ss}                  \UnicodeEncodingName{"00DF}
+\DeclareTextSymbol{\ae}                  \UnicodeEncodingName{"00E6}
+\DeclareTextSymbol{\dh}                  \UnicodeEncodingName{"00F0}
+\DeclareTextSymbol{\textdiv}             \UnicodeEncodingName{"00F7}
+\DeclareTextSymbol{\o}                   \UnicodeEncodingName{"00F8}
+\DeclareTextSymbol{\th}                  \UnicodeEncodingName{"00FE}
+\DeclareTextSymbol{\DJ}                  \UnicodeEncodingName{"0110}
+\DeclareTextSymbol{\dj}                  \UnicodeEncodingName{"0111}
+\DeclareTextSymbol{\i}                   \UnicodeEncodingName{"0131}
+\DeclareTextSymbol{\IJ}                  \UnicodeEncodingName{"0132}
+\DeclareTextSymbol{\ij}                  \UnicodeEncodingName{"0133}
+\DeclareTextSymbol{\L}                   \UnicodeEncodingName{"0141}
+\DeclareTextSymbol{\l}                   \UnicodeEncodingName{"0142}
+\DeclareTextSymbol{\NG}                  \UnicodeEncodingName{"014A}
+\DeclareTextSymbol{\ng}                  \UnicodeEncodingName{"014B}
+\DeclareTextSymbol{\OE}                  \UnicodeEncodingName{"0152}
+\DeclareTextSymbol{\oe}                  \UnicodeEncodingName{"0153}
+\DeclareTextSymbol{\textflorin}          \UnicodeEncodingName{"0192}
+\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}
+\DeclareTextSymbol{\SS}                  \UnicodeEncodingName{"1E9E}
+\DeclareTextSymbol{\textcompwordmark}    \UnicodeEncodingName{"200C}
+\DeclareTextSymbol{\textendash}          \UnicodeEncodingName{"2013}
+\DeclareTextSymbol{\textemdash}          \UnicodeEncodingName{"2014}
+\DeclareTextSymbol{\textbardbl}          \UnicodeEncodingName{"2016}
+\DeclareTextSymbol{\textquoteleft}       \UnicodeEncodingName{"2018}
+\DeclareTextSymbol{\textquoteright}      \UnicodeEncodingName{"2019}
+\DeclareTextSymbol{\quotesinglbase}      \UnicodeEncodingName{"201A}
+\DeclareTextSymbol{\textquotedblleft}    \UnicodeEncodingName{"201C}
+\DeclareTextSymbol{\textquotedblright}   \UnicodeEncodingName{"201D}
+\DeclareTextSymbol{\quotedblbase}        \UnicodeEncodingName{"201E}
+\DeclareTextSymbol{\textdagger}          \UnicodeEncodingName{"2020}
+\DeclareTextSymbol{\textdaggerdbl}       \UnicodeEncodingName{"2021}
+\DeclareTextSymbol{\textbullet}          \UnicodeEncodingName{"2022}
+\DeclareTextSymbol{\textellipsis}        \UnicodeEncodingName{"2026}
+\DeclareTextSymbol{\textperthousand}     \UnicodeEncodingName{"2030}
+\DeclareTextSymbol{\textpertenthousand}  \UnicodeEncodingName{"2031}
+\DeclareTextSymbol{\guilsinglleft}       \UnicodeEncodingName{"2039}
+\DeclareTextSymbol{\guilsinglright}      \UnicodeEncodingName{"203A}
+\DeclareTextSymbol{\textreferencemark}   \UnicodeEncodingName{"203B}
+\DeclareTextSymbol{\textinterrobang}     \UnicodeEncodingName{"203D}
+\DeclareTextSymbol{\textfractionsolidus} \UnicodeEncodingName{"2044}
+\DeclareTextSymbol{\textlquill}          \UnicodeEncodingName{"2045}
+\DeclareTextSymbol{\textrquill}          \UnicodeEncodingName{"2046}
+\DeclareTextSymbol{\textasteriskcentered}\UnicodeEncodingName{"204E}
+\DeclareTextSymbol{\textdiscount}        \UnicodeEncodingName{"2052}
+\DeclareTextSymbol{\textcolonmonetary}   \UnicodeEncodingName{"20A1}
+\DeclareTextSymbol{\textlira}            \UnicodeEncodingName{"20A4}
+\DeclareTextSymbol{\textnaira}           \UnicodeEncodingName{"20A6}
+\DeclareTextSymbol{\textwon}             \UnicodeEncodingName{"20A9}
+\DeclareTextSymbol{\textdong}            \UnicodeEncodingName{"20AB}
+\DeclareTextSymbol{\texteuro}            \UnicodeEncodingName{"20AC}
+\DeclareTextSymbol{\textpeso}            \UnicodeEncodingName{"20B1}
+\DeclareTextSymbol{\textcelsius}         \UnicodeEncodingName{"2103}
+\DeclareTextSymbol{\textnumero}          \UnicodeEncodingName{"2116}
+\DeclareTextSymbol{\textcircledP}        \UnicodeEncodingName{"2117}
+\DeclareTextSymbol{\textrecipe}          \UnicodeEncodingName{"211E}
+\DeclareTextSymbol{\textservicemark}     \UnicodeEncodingName{"2120}
+\DeclareTextSymbol{\texttrademark}       \UnicodeEncodingName{"2122}
+\DeclareTextSymbol{\textohm}             \UnicodeEncodingName{"2126}
+\DeclareTextSymbol{\textmho}             \UnicodeEncodingName{"2127}
+\DeclareTextSymbol{\textestimated}       \UnicodeEncodingName{"212E}
+\DeclareTextSymbol{\textleftarrow}       \UnicodeEncodingName{"2190}
+\DeclareTextSymbol{\textuparrow}         \UnicodeEncodingName{"2191}
+\DeclareTextSymbol{\textrightarrow}      \UnicodeEncodingName{"2192}
+\DeclareTextSymbol{\textdownarrow}       \UnicodeEncodingName{"2193}
+\DeclareTextSymbol{\textminus}           \UnicodeEncodingName{"2212}
+\DeclareTextSymbol{\textsurd}            \UnicodeEncodingName{"221A}
+\DeclareTextSymbol{\textlangle}          \UnicodeEncodingName{"2329}
+\DeclareTextSymbol{\textrangle}          \UnicodeEncodingName{"232A}
+\DeclareTextSymbol{\textblank}           \UnicodeEncodingName{"2422}
+\DeclareTextSymbol{\textvisiblespace}    \UnicodeEncodingName{"2423}
+\DeclareTextSymbol{\textopenbullet}      \UnicodeEncodingName{"25E6}
+\DeclareTextSymbol{\textbigcircle}       \UnicodeEncodingName{"25EF}
+\DeclareTextSymbol{\textmusicalnote}     \UnicodeEncodingName{"266A}
+\DeclareTextSymbol{\textmarried}         \UnicodeEncodingName{"26AD}
+\DeclareTextSymbol{\textdivorced}        \UnicodeEncodingName{"26AE}
+\DeclareTextSymbol{\textinterrobangdown} \UnicodeEncodingName{"2E18}
+%    \end{macrocode}
+% Accents must be declared before the composites that use them.
+%    \begin{macrocode}
+\DeclareUnicodeAccent{\`}                \UnicodeEncodingName{"0300}
+\DeclareUnicodeAccent{\'}                \UnicodeEncodingName{"0301}
+\DeclareUnicodeAccent{\^}                \UnicodeEncodingName{"0302}
+\DeclareUnicodeAccent{\~}                \UnicodeEncodingName{"0303}
+\DeclareUnicodeAccent{\"}                \UnicodeEncodingName{"0308}
+\DeclareUnicodeAccent{\H}                \UnicodeEncodingName{"030B}
+\DeclareUnicodeAccent{\r}                \UnicodeEncodingName{"030A}
+\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{\k}                \UnicodeEncodingName{"0328}
+%    \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 {"00ED}
+\DeclareTextComposite{\^}             \UnicodeEncodingName\i {"00EE}
+\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}{"012A}
+\DeclareTextComposite{\=}             \UnicodeEncodingName\i {"012B}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{I}{"012C}
+\DeclareTextComposite{\u}             \UnicodeEncodingName\i {"012D}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{I}{"012E}
+\DeclareTextComposite{\k}             \UnicodeEncodingName\i {"012F}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{I}{"0130}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{J}{"0134}
+\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{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{\'}             \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}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%</TU>
+%    \end{macrocode}
+%
 % \section{Package files}
 %
 % \changes{v1.9h}{1997/12/17}{Added section.}
diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.ins b/Master/texmf-dist/source/latex/base/ltoutenc.ins
index 2f38af2c972..4fafb5b6379 100644
--- a/Master/texmf-dist/source/latex/base/ltoutenc.ins
+++ b/Master/texmf-dist/source/latex/base/ltoutenc.ins
@@ -91,6 +91,8 @@ extension .ins) which are part of the distribution.
      \from{ltoutenc.dtx}{OT4}}
   \file{ts1enc.def}{
      \from{ltoutenc.dtx}{TS1}}
+  \file{tuenc.def}{
+     \from{ltoutenc.dtx}{TU}}
   \file{textcomp.sty}{
      \from{ltoutenc.dtx}{TS1sty}}
   \file{fontenc.sty}{
diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx
index 8c716bb5c96..df2d7233e23 100644
--- a/Master/texmf-dist/source/latex/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx
@@ -30,14 +30,14 @@
 %%% From File: ltoutput.dtx
 %<flafter>\ProvidesPackage{flafter}
 %<fltrace>\ProvidesPackage{fltrace}
-%<flafter,fltrace>       [2015/09/05 v1.3a
+%<flafter,fltrace>       [2016/10/04 v1.3b
 %<flafter>                  Standard LaTeX floats after reference (FMi)]
 %<fltrace>                  Tracing LaTeX floats algorithm (FMi)]
 %
 %<*driver>
 % \fi
 \ProvidesFile{ltoutput.dtx}
-             [2015/09/05 v1.3a LaTeX Kernel (Output Routine)]
+             [2016/10/04 v1.3b LaTeX Kernel (Output Routine)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutput.dtx}
@@ -4468,10 +4468,18 @@
 % Only tracing has been added to these.
 %
 %    \begin{macrocode}
-%<*2ekernel|fltrace>
+%<latexrelease|fltrace>\IncludeInRelease{2017/01/01}%
+%<latexrelease|fltrace>  {\@makefcolumn}{negative height floats}%
+%<*2ekernel|fltrace|latexrelease>
 \def\@makefcolumn #1{%
   \begingroup
-    \@fpmin \z@
+%    \end{macrocode}
+% \changes{v1.3b}{2017/01/01}{make fpmin negative so ignored even if float height is negative}
+%    \begin{macrocode}
+    \@fpmin -\maxdimen
+%    \end{macrocode}
+%
+%    \begin{macrocode}
     \let \@testfp \@gobble
     \@tryfcolumn #1%
   \endgroup
@@ -4484,6 +4492,29 @@
 %</trace>
 }
 %    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease|fltrace>\EndIncludeInRelease
+%<latexrelease|fltrace>\IncludeInRelease{0000/00/00}%
+%<latexrelease|fltrace>  {\@makefcolumn}{negative height floats}%
+%<latexrelease|fltrace>\def\@makefcolumn #1{%
+%<latexrelease|fltrace>  \begingroup
+%<latexrelease|fltrace>    \@fpmin \z@
+%<latexrelease|fltrace>    \let \@testfp \@gobble
+%<latexrelease|fltrace>    \@tryfcolumn #1%
+%<latexrelease|fltrace>  \endgroup
+%<*trace>
+%<latexrelease|fltrace>  \if@fcolmade
+%<latexrelease|fltrace>    \fl@trace{PAGE: in \string\clearpage
+%<latexrelease|fltrace>                    \if@twocolumn ---twocolumn\fi---}%
+%<latexrelease|fltrace>    \fl@trace{----- float column/page completed
+%<latexrelease|fltrace>                    from \string#1}%
+%<latexrelease|fltrace>  \fi
+%</trace>
+%<latexrelease|fltrace>}
+%<latexrelease|fltrace>\EndIncludeInRelease
+%</2ekernel|fltrace|latexrelease>
+%    \end{macrocode}
 % This will line up the last baselines in the two
 % columns provided they are constructed in the normal way: \ie ending
 % in a skip of minus the original depth, with |\@textbottom| adding
@@ -4493,7 +4524,6 @@
 % \changes{1.2g}{2000/07/12}{Ensure that rule is in \cs{normalcolor}}
 % \changes{v1.2m}{2014/12/30}{Command updated (latexrelease)}
 %    \begin{macrocode}
-%</2ekernel|fltrace>
 %<latexrelease|fltrace>\IncludeInRelease{2015/01/01}%
 %<latexrelease|fltrace>  {\@outputdblcol}{2 column marks}%
 %<*2ekernel|fltrace|latexrelease>
diff --git a/Master/texmf-dist/source/latex/base/ltplain.dtx b/Master/texmf-dist/source/latex/base/ltplain.dtx
index afe2fead63d..30d2c5c089e 100644
--- a/Master/texmf-dist/source/latex/base/ltplain.dtx
+++ b/Master/texmf-dist/source/latex/base/ltplain.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.
 %
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltplain.dtx}
-             [2016/07/29 v2.2c LaTeX Kernel (Plain TeX)]
+             [2017/01/06 v2.3b LaTeX Kernel (Plain TeX)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltplain.dtx}
@@ -73,6 +73,8 @@
 % \changes{v1.1r}{1995/10/10}{Autoload tracing code}
 % \changes{v1.1u}{1996/10/28}{(CAR) More doc changes}
 % \changes{v2.0e}{2015/02/21}{Removed autoload code}
+% \changes{v2.2d}{2016/10/15}{Require e\TeX{}}
+% \changes{v2.3b}{2016/11/06}{Drop \cs{outer} entirely}
 %
 % \section{Plain \TeX}
 %
@@ -114,7 +116,7 @@
 \catcode`\_=8 % underline and downarrow are for subscripts
 \catcode`\^^I=10 % ascii tab is a blank space
 \chardef\active=13 \catcode`\~=\active % tilde is active
-\catcode`\^^L=\active \outer\def^^L{\par}% ascii form-feed is \outer\par
+\catcode`\^^L=\active \def^^L{\par}% ascii form-feed is \par
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -384,8 +386,16 @@
 %    \begin{macrocode}
 \def\new@mathgroup
   {\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top}
-\def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
 \let\newfam\new@mathgroup
+%    \end{macrocode}
+%
+% \changes{v2.3a}{2016/10/16}{Allow languages up to 16383 in luatex}
+%    \begin{macrocode}
+\ifx\directlua\@undefined
+  \def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
+\else
+  \def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne{16384}}
+\fi
 %</2ekernel|latexrelease>
 %    \end{macrocode}
 %
@@ -809,41 +819,6 @@
 % \end{macro}
 % \end{macro}
 %
-%  \changes{v1.1p}{1995/10/02}{Move \cs{newif} to ltdefns}
-%
-%    \begin{macrocode}
-\message{compatibility for TeX 2, }
-%    \end{macrocode}
-%
-% If this file is used in an old \TeX\ we define the new features
-% of \TeX\ 3.0 as simple macros or counters so that files that uses
-% these features can be processed in such an environment
-% (They will however produce some other results).
-%
-%    \begin{macrocode}
-\ifx\@undefined\inputlineno
-  \newcount\inputlineno
-%    \end{macrocode}
-% This could be used to detect that an old \TeX\ is in force
-%    \begin{macrocode}
-  \inputlineno-1
-%    \end{macrocode}
-% Extra test for MLTeX 2, RmS 91/11/07.
-%    \begin{macrocode}
-  \ifx\@undefined\language
-    \newcount\language
-  \fi
-  \newcount\lefthyphenmin
-  \newcount\righthyphenmin
-  \newcount\errorcontextlines
-  \newcount\holdinginserts
-  \newdimen\emergencystretch
-  \newcount\badness
-  \let\noboundary\relax
-  \newcount\setlanguage
-\fi
-%    \end{macrocode}
-%
 % Assign initial values to \TeX's parameters
 %
 %    \begin{macrocode}
@@ -1186,8 +1161,10 @@
 % \LaTeX\ defines |~| in |ltdefns.dtx|.
 %
 % \begin{macro}{\slash}
+%    This generates a |/| acting a bit like |-| but still allows hyphenation
+%    in the word part preceding it (but not after).
 %    \begin{macrocode}
-\def\slash{/\penalty\exhyphenpenalty} % a `/' that acts like a `-'
+\def\slash{/\penalty\exhyphenpenalty}
 %    \end{macrocode}
 %  \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/base/ltsect.dtx b/Master/texmf-dist/source/latex/base/ltsect.dtx
index 3747d40bccc..72ca0eee21b 100644
--- a/Master/texmf-dist/source/latex/base/ltsect.dtx
+++ b/Master/texmf-dist/source/latex/base/ltsect.dtx
@@ -31,7 +31,7 @@
 %%% From File: ltsect.dtx
 %<*driver>
 % \fi
-\ProvidesFile{ltsect.dtx}[2014/09/29 v1.0z LaTeX Kernel (Sectioning)]
+\ProvidesFile{ltsect.dtx}[2016/09/29 v1.0z LaTeX Kernel (Sectioning)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltsect.dtx}
@@ -213,8 +213,8 @@
 %
 % \begin{description}
 % \item[name:] e.g., 'subsection'
-% \item[level:] a number, denoting depth of section -- e.g., chapter=1,
-%                 section = 2, etc.
+% \item[level:] a number, denoting depth of section -- e.g.,
+%                  chapter = 0, section = 1, etc.
 % \item[indent:] Indentation of heading from left margin
 % \item[beforeskip:] Absolute value = skip to leave above the heading.
 %                If negative, then paragraph indent of text following
diff --git a/Master/texmf-dist/source/latex/base/lttab.dtx b/Master/texmf-dist/source/latex/base/lttab.dtx
index 40381f30c3a..7b4e51721df 100644
--- a/Master/texmf-dist/source/latex/base/lttab.dtx
+++ b/Master/texmf-dist/source/latex/base/lttab.dtx
@@ -31,7 +31,7 @@
 %%% From File: lttab.dtx
 %<*driver>
 % \fi
-\ProvidesFile{lttab.dtx}[2015/02/21 v1.1n LaTeX Kernel (Columns)]
+\ProvidesFile{lttab.dtx}[2016/11/28 v1.1o LaTeX Kernel (Columns)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{lttab.dtx}
@@ -688,7 +688,7 @@
 %             right after a \\ command.  If followed by another \hline,
 %             then adds a \vskip of \doublerulesep.
 %
-%   \cline[i-j] : draws horizontal lines between rows covering columns
+%   \cline{i-j} : draws horizontal lines between rows covering columns
 %                 i through j, inclusive.  Multiple commands may follow
 %                 one another to provide lines covering several disjoint
 %                 columns
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index aaaf4b8fb52..eb49ec0d982 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -92,10 +92,10 @@
 %</2ekernel>
 %<latexrelease>\edef\latexreleaseversion
 %<*2ekernel|latexrelease>
-   {2016/03/31}
+   {2017/01/01}
 %</2ekernel|latexrelease>
 %<*2ekernel>
-\def\patch@level{3}
+\def\patch@level{0}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx
index c77b88a6ebf..4958cdfdea5 100644
--- a/Master/texmf-dist/source/latex/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx
@@ -19,7 +19,7 @@
 %<driver> \ProvidesFile{graphics.drv}
 % \fi
 %         \ProvidesFile{graphics.dtx}
-          [2016/07/10 v1.0t  Standard LaTeX Graphics (DPC,SPQR)]
+          [2016/10/09 v1.0u  Standard LaTeX Graphics (DPC,SPQR)]
 %
 % \iffalse
 %<*driver>
@@ -163,7 +163,7 @@
 %
 % \DescribeMacro
 %   \DeclareGraphicsExtensions\marg{ext-list}\\
-% This specifies the behaviour of the system when the argument to
+% This specifies the behaviour of the system when the filename argument to
 % |\includegraphics| does not have an extension specified.
 % Here \marg{ext-list} should be a comma-separated list of file
 % extensions, each with a leading period (\texttt{.}).
@@ -1802,7 +1802,7 @@
 % |keepaspectratio| key to |\includegraphics| in the \textsf{graphicx}
 % package.
 % \changes{v0.7e}{1995/09/29}
-%     {Maco added}
+%     {Macro added}
 %    \begin{macrocode}
 \newif\ifGin@iso
 %    \end{macrocode}
@@ -1832,7 +1832,12 @@
   \fi
   \ifdim\dimen@>\z@
     \loop
-      \ifdim\dimen@<8192\p@
+%    \end{macrocode}
+%
+% \changes{v1.0u}{2016/10/09}
+%     {avoid overflow for small lengths eg 5sp divided by 2sp}
+%    \begin{macrocode}
+      \ifdim\ifnum\count@<\tw@\maxdimen\else\dimen@\fi<8192\p@
         \dimen@\tw@\dimen@
         \divide\count@\tw@
     \repeat
diff --git a/Master/texmf-dist/source/latex/graphics/rotating.dtx b/Master/texmf-dist/source/latex/graphics/rotating.dtx
index ca4c9203b77..db12ad6c3b9 100644
--- a/Master/texmf-dist/source/latex/graphics/rotating.dtx
+++ b/Master/texmf-dist/source/latex/graphics/rotating.dtx
@@ -1,7 +1,6 @@
 %
 % \iffalse
 %
-% $Id: rotating.dtx,v 1.21 2010/01/26 13:25:07 rf10 Exp rf10 $
 %
 % File: rotating.dtx
 %% Copyright 1995--1999 Sebastian Rahtz and Leonor Barroca
@@ -29,7 +28,7 @@
 \ProvidesFile{rotating.dtx}%
 %</dtx>
 %<package>\ProvidesPackage{rotating}%
-    [2016/05/22 v2.16c
+    [2016/08/11 v2.16d
 %<package>  rotated objects in LaTeX%
 %<*dtx>
             rotating package source file%
@@ -131,7 +130,7 @@
 % The command \cs{turnbox}\marg{angle}\marg{matter to turn} is a macro
 % version of the \texttt{rotate} environment.
 %
-% A set of examples is given in the file \texttt{examples.tex}
+% A set of examples is given in the file \texttt{rotex.tex}
 %
 % \subsection{Positioning}
 %
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index e31656c5e07..2a648888065 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2014
+% Copyright 1993-2016
 %
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
@@ -26,7 +26,7 @@
 %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
 %<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
 %<+package>\ProvidesPackage{array}
-%<+package>         [2014/10/28 v2.4c Tabular extension package (FMi)]
+%<+package>         [2016/10/06 v2.4d Tabular extension package (FMi)]
 %
 % \fi
 %
@@ -2126,10 +2126,15 @@
 % \begin{macro}{\@halignto}
 % \begin{macro}{\d@llarbegin}
 % \begin{macro}{\d@llarend}
-%    In order to relieve the \textsf{save stack} we assign the
-%    replacement texts for =\@halignto= globally. =\d@llar= has to be
-%    local since otherwise nested \textsf{tabular} and \textsf{array}
+%    =\d@llar= has to be
+%    locally asigned since otherwise nested \textsf{tabular} and \textsf{array}
 %    environments (via =\multicolumn=) are impossible.
+%    For 25 years or so =\@halignto= was set globally (to save space on the
+%    save stack, but that was a mistake: if there is a tabular in the
+%    output routine (e.g., in the running header) then that tabular is 
+%    able overwrite the =\@halignto=
+%    setting of a tabular in the main text resulting in a very weird error.
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
 % \changes{v2.0g}{1992/06/18}{`d@llarbegin defined on toplevel.}
 %    When the new font selection scheme is in force we have to
 %    we surround all =\halign= entries
@@ -2151,9 +2156,10 @@
 % \begin{macro}{\array}
 %    Our new definition of =\array= then reads:
 % \changes{v2.0d}{1990/08/20}{`d@llar local to preamble.}
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
 %    \begin{macrocode}
 \def\array{\col@sep\arraycolsep
-  \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\gdef\@halignto{}%
+  \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%
 %    \end{macrocode}
 %    Since there might be an optional argument we call another
 %    macro which is also used by the other environments.
@@ -2176,18 +2182,20 @@
 %    The environments \textsf{tabular} and \textsf{tabular$*$} differ
 %    only in the initialisation of the command =\@halignto=. Therefore
 %    we define
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
 %    \begin{macrocode}
-\def\tabular{\gdef\@halignto{}\@tabular}
+\def\tabular{\def\@halignto{}\@tabular}
 %    \end{macrocode}
 %     and analogously for the star form. We evaluate the argument first
 %     using =\setlength= so that users of the \texttt{calc} package can
 %     write code like\\ =\begin{tabular*}{(\columnwidth-1cm)/2}...=
 % \changes{v2.3l}{1998/05/13}{Use \cs{setlength} evaluate arg
 %      so that the calc package can be applied here (pr/2793)}
+% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
 %     \begin{macrocode}
 \expandafter\def\csname tabular*\endcsname#1{%
        \setlength\dimen@{#1}%
-       \xdef\@halignto{to\the\dimen@}\@tabular}
+       \edef\@halignto{to\the\dimen@}\@tabular}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index 785cbacce30..11b159cbde2 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.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.
@@ -22,11 +22,10 @@
 % \fi
 %
 % \iffalse
-%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016
+%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016 2017
 %% David Carlisle Frank Mittelbach
 %%
 %% Development of this package was commissioned by Y&Y Inc.
-%% http://www.yandy.com
 %
 %
 %<*dtx>
@@ -37,7 +36,7 @@
 %<driver>\ProvidesFile{bm.drv}
 % \fi
 %         \ProvidesFile{bm.dtx}
-          [2016/07/07 v1.2b Bold Symbol Support (DPC/FMi)]
+          [2017/01/16 v1.2c Bold Symbol Support (DPC/FMi)]
 %
 % \iffalse
 %<*driver>
@@ -1364,6 +1363,8 @@
 % \begin{macro}{\bm@umathchar}
 % \changes{v1.2a}{2016/02/27}
 %      {Macro added}
+% \changes{v1.2a}{2017/01/16}
+%      {Test for zero table entry (\cs{boldmath}) added}
 % Version of \verb|\bm@mathchar| for \verb|\Umathchar|, this is easier
 % as no need to take apart the number, the match class and fam are provided
 % as distinct arguments.
@@ -1371,14 +1372,17 @@
 \def\bm@umathchar#1#2#3{%
 \@tempcnta#2\relax
 \count@\bm@table
-\ifx\count@=\m@ne
-% no bold
+\ifnum\count@=\z@
+  \bm@gr@up\boldmath{\Umathchar#1 #2 #3 }%
 \else
-  \advance\@tempcnta\count@
-\fi
-\bm@xadd{\Umathchar#1\space
-                   \the\@tempcnta\space\space
-                   #3\space}}
+  \ifnum\count@=\m@ne
+  \else
+    \advance\@tempcnta\count@
+  \fi
+  \bm@xadd{\Umathchar#1\space
+                     \the\@tempcnta\space\space
+                     #3\space}%
+\fi}
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty
index 2b82aeaaac8..6835f3ce120 100644
--- a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty
+++ b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty
@@ -23,7 +23,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
 [1994/12/01]% LaTeX date must be December 1994 or later
-\ProvidesPackage{amsmath}[2016/06/28 v2.15d AMS math features]
+\ProvidesPackage{amsmath}[2016/11/05 v2.16a AMS math features]
 \edef\@temp{\catcode 96=\number\catcode 96 }
 \catcode\string `\`=12
 \def\do#1{\catcode\number`#1=\number\catcode`#1}
@@ -71,8 +71,22 @@
         \fi
     }%
 }
+\DeclareOption{alignedleftspaceyes}{\def\alignedspace@left{\null\,}}
+\DeclareOption{alignedleftspaceno}{\def\alignedspace@left{\null}}
+\DeclareOption{alignedleftspaceyesifneg}{%
+\def\alignedspace@left{%
+  \edef\@tempa{\expandafter\@car\the\lastskip\@nil}%
+  \if-\@tempa\null\,%
+  \else
+    \edef\@tempa{\expandafter\@car\the\lastkern\@nil}%
+    \if-\@tempa\null\,%
+    \else\null
+    \fi
+  \fi}%
+}
 \DeclareOption{?}{}
-\ExecuteOptions{nointlimits,sumlimits,namelimits,centertags}
+\ExecuteOptions{%
+  nointlimits,sumlimits,namelimits,centertags,alignedleftspaceyesifneg}
 \ProcessOptions\par
 \@ifpackagewith{amsmath}{?}{%
   \typeout{^^J%
@@ -202,12 +216,76 @@ Foreign command \@backslashchar#1;\MessageBreak
 \DeclareRobustCommand{\binom}{\genfrac()\z@{}}
 \newcommand{\dbinom}{\genfrac(){0pt}0}
 \newcommand{\tbinom}{\genfrac(){0pt}1}
+\ifx\directlua\@undefined
+\ifx\XeTeXcharclass\@undefined
 \DeclareRobustCommand{\genfrac}[4]{%
   \def\@tempa{#1#2}%
   \edef\@tempb{\@nx\@genfrac\@mathstyle{#4}%
     \csname @@\ifx @#3@over\else above\fi
     \ifx\@tempa\@empty \else withdelims\fi\endcsname}
   \@tempb{#1#2#3}}
+\else
+\def\genfrac@rule#1#2#3#4{%
+\hbox{$\left#1\vcenter{\hrule \@width\z@
+                       \@height
+                       \ifdim\fontdimen#2#3\tw@=\z@
+                       #4\fontdimen6#3\tw@
+                       \else
+                       \fontdimen#2#3\tw@
+                       \fi
+                      }\right.$}}
+\def\genfrac@choice#1#2{%
+\ifx @#2@\else
+{\delimitershortfall\z@\delimiterfactor\@m
+ \mathsurround\z@\nulldelimiterspace\z@
+\ifx c#1\kern-\nulldelimiterspace\fi
+\mathchoice
+{\genfrac@rule{#2}{20}\textfont{2.39}}%
+{\genfrac@rule{#2}{21}\textfont{1}}%
+{\genfrac@rule{#2}{21}\scriptfont{1.45}}%
+{\genfrac@rule{#2}{21}\scriptscriptfont{1.35}}%
+}%
+\ifx o#1\kern-\nulldelimiterspace\fi
+\fi
+}
+\DeclareRobustCommand{\genfrac}[6]{{%
+\@mathstyle{#4}%
+\genfrac@choice o{#1}%
+{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}%
+\genfrac@choice c{#2}%
+}}
+\fi
+\else
+\def\genfrac@rule#1#2#3{%
+\hbox{$\left#1\vcenter{\hrule \@width\z@
+                       \@height
+                       \ifdim\Umathfractiondelsize#2=\z@
+                       #3\fontdimen6#3\tw@
+                       \else
+                       \Umathfractiondelsize#2%
+                       \fi
+                      }\right.$}}
+\def\genfrac@choice#1#2{%
+\ifx @#2@\else
+{\delimitershortfall\z@\delimiterfactor\@m
+ \mathsurround\z@\nulldelimiterspace\z@
+\ifx c#1\kern-\nulldelimiterspace\fi
+\mathchoice
+{\genfrac@rule{#2}\displaystyle{2.39}}%
+{\genfrac@rule{#2}\textstyle{1}}%
+{\genfrac@rule{#2}\scriptstyle{1.45}}%
+{\genfrac@rule{#2}\scriptscriptstyle{1.35}}%
+}%
+\ifx o#1\kern-\nulldelimiterspace\fi
+\fi
+}
+\DeclareRobustCommand{\genfrac}[6]{{%
+\@mathstyle{#4}%
+\genfrac@choice o{#1}%
+{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}%
+\genfrac@choice c{#2}%
+}}
+\fi
 \def\@genfrac#1#2#3#4#5{{#1{\begingroup#4\endgroup#2#3\relax#5}}}
 \def\@mathstyle#1{%
   \ifx\@empty#1\@empty\relax
@@ -1264,7 +1342,7 @@ and fix things up.}
         \nonmatherr@{\begin{\@currenvir}}%
     \fi
     \savecolumn@ % Assumption: called inside a group
-    \null\,%
+    \alignedspace@left
     \if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup
         \maxfields@#2\relax
         \ifnum\maxfields@>\m@ne
@@ -1328,7 +1406,7 @@ and fix things up.}
     \RIfM@\else
         \nonmatherr@{\begin{gathered}}%
     \fi
-    \null\,%
+    \alignedspace@left
     \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup
         \Let@ \chardef\dspbrk@context\@ne \restore@math@cr
         \spread@equation
diff --git a/Master/texmf-dist/tex/latex/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
index 5b461f84165..4f5ae2220e8 100644
--- a/Master/texmf-dist/tex/latex/base/fixltx2e.sty
+++ b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
@@ -42,12 +42,513 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesPackage{fixltx2e}
-   [2015/06/22 v2.0b fixes to LaTeX (obsolete)]
+   [2016/12/29 v2.1a fixes to LaTeX (obsolete)]
+\IncludeInRelease{2015/01/01}{\fixltxe}{Old fixltx2e package}
 \NeedsTeXFormat{LaTeX2e}
 \PackageWarningNoLine{fixltx2e}{%
 fixltx2e is not required with releases after 2015\MessageBreak
 All fixes are now in the LaTeX kernel.\MessageBreak
 See the latexrelease package for details}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}{\fixltxe}{Old fixltx2e package}
+\def\@outputdblcol{%
+  \if@firstcolumn
+    \global\@firstcolumnfalse
+    \global\setbox\@leftcolumn\copy\@outputbox
+    \splitmaxdepth\maxdimen
+    \vbadness\maxdimen
+     \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+     \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+    \toks@\expandafter{\topmark}%
+    \xdef\@firstcoltopmark{\the\toks@}%
+    \toks@\expandafter{\splitfirstmark}%
+    \xdef\@firstcolfirstmark{\the\toks@}%
+    \ifx\@firstcolfirstmark\@empty
+      \global\let\@setmarks\relax
+    \else
+      \gdef\@setmarks{%
+        \let\firstmark\@firstcolfirstmark
+        \let\topmark\@firstcoltopmark}%
+    \fi
+  \else
+    \global\@firstcolumntrue
+    \setbox\@outputbox\vbox{%
+     \hb@xt@\textwidth{%
+        \hb@xt@\columnwidth{\box\@leftcolumn \hss}%
+        \hfil
+        {\normalcolor\vrule \@width\columnseprule}%
+        \hfil
+       \hb@xt@\columnwidth{\box\@outputbox \hss}}}%
+  \@combinedblfloats
+    \@setmarks
+    \@outputpage
+    \begingroup
+      \@dblfloatplacement
+      \@startdblcolumn
+      \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}%
+    \endgroup
+  \fi}
+\def\end@dblfloat{%
+  \if@twocolumn
+    \@endfloatbox
+    \ifnum\@floatpenalty <\z@
+      \@largefloatcheck
+      \global\dp\@currbox1sp %
+      \@cons\@currlist\@currbox
+      \ifnum\@floatpenalty <-\@Mii
+        \penalty -\@Miv
+        \@tempdima\prevdepth
+        \vbox{}%
+        \prevdepth\@tempdima
+        \penalty\@floatpenalty
+      \else
+        \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack
+      \fi
+    \fi
+  \else
+    \end@float
+  \fi
+}
+\def\@testwrongwidth #1{%
+  \ifdim\dp#1=\f@depth
+  \else
+    \global\@testtrue
+  \fi}
+\let\f@depth\z@
+\def\@dblfloatplacement{\global\@dbltopnum\c@dbltopnumber
+   \global\@dbltoproom \dbltopfraction\@colht
+   \@textmin \@colht
+   \advance \@textmin -\@dbltoproom
+   \@fpmin \dblfloatpagefraction\textheight
+   \@fptop \@dblfptop
+   \@fpsep \@dblfpsep
+   \@fpbot \@dblfpbot
+   \def\f@depth{1sp}}
+\def \@doclearpage {%
+     \ifvoid\footins
+       \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
+       \setbox\@tempboxa\box\@cclv
+       \xdef\@deferlist{\@toplist\@botlist\@deferlist}%
+       \global \let \@toplist \@empty
+       \global \let \@botlist \@empty
+       \global \@colroom \@colht
+       \ifx \@currlist\@empty
+       \else
+          \@latexerr{Float(s) lost}\@ehb
+          \global \let \@currlist \@empty
+       \fi
+       \@makefcolumn\@deferlist
+       \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
+       \if@twocolumn
+         \if@firstcolumn
+           \xdef\@deferlist{\@dbltoplist\@deferlist}%
+           \global \let \@dbltoplist \@empty
+           \global \@colht \textheight
+           \begingroup
+              \@dblfloatplacement
+              \@makefcolumn\@deferlist
+              \@whilesw\if@fcolmade \fi{\@outputpage
+                                        \@makefcolumn\@deferlist}%
+           \endgroup
+         \else
+           \vbox{}\clearpage
+         \fi
+       \fi
+       \ifx\@deferlist\@empty \else\clearpage \fi
+     \else
+       \setbox\@cclv\vbox{\box\@cclv\vfil}%
+       \@makecol\@opcol
+       \clearpage
+     \fi
+}
+\def \@startdblcolumn {%
+  \@tryfcolumn \@deferlist
+  \if@fcolmade
+  \else
+    \begingroup
+      \let \reserved@b \@deferlist
+      \global \let \@deferlist \@empty
+      \let \@elt \@sdblcolelt
+      \reserved@b
+    \endgroup
+  \fi
+}
+\def\@addtonextcol{%
+  \begingroup
+   \@insertfalse
+   \@setfloattypecounts
+   \ifnum \@fpstype=8
+   \else
+     \ifnum \@fpstype=24
+     \else
+       \@flsettextmin
+       \@reqcolroom \ht\@currbox
+       \advance \@reqcolroom \@textmin
+       \ifdim \@colroom>\@reqcolroom
+         \@flsetnum \@colnum
+         \ifnum\@colnum>\z@
+            \@bitor\@currtype\@deferlist
+            \@testwrongwidth\@currbox
+            \if@test
+            \else
+              \@addtotoporbot
+            \fi
+         \fi
+       \fi
+     \fi
+   \fi
+   \if@insert
+   \else
+     \@cons\@deferlist\@currbox
+   \fi
+  \endgroup
+}
+\def\@addtodblcol{%
+  \begingroup
+   \@insertfalse
+   \@setfloattypecounts
+   \@getfpsbit \tw@
+   \ifodd\@tempcnta
+     \@flsetnum \@dbltopnum
+     \ifnum \@dbltopnum>\z@
+       \@tempswafalse
+       \ifdim \@dbltoproom>\ht\@currbox
+         \@tempswatrue
+       \else
+         \ifnum \@fpstype<\sixt@@n
+           \advance \@dbltoproom \@textmin
+           \ifdim \@dbltoproom>\ht\@currbox
+             \@tempswatrue
+           \fi
+           \advance \@dbltoproom -\@textmin
+         \fi
+       \fi
+       \if@tempswa
+           \@bitor \@currtype \@deferlist
+          \@testwrongwidth\@currbox
+           \if@test
+           \else
+              \@tempdima -\ht\@currbox
+              \advance\@tempdima
+                -\ifx \@dbltoplist\@empty \dbltextfloatsep \else
+                                          \dblfloatsep \fi
+              \global \advance \@dbltoproom \@tempdima
+              \global \advance \@colht \@tempdima
+              \global \advance \@dbltopnum \m@ne
+              \@cons \@dbltoplist \@currbox
+              \@inserttrue
+           \fi
+       \fi
+     \fi
+   \fi
+   \if@insert
+   \else
+     \@cons\@deferlist\@currbox
+   \fi
+  \endgroup
+}
+\def \@addtocurcol {%
+   \@insertfalse
+   \@setfloattypecounts
+   \ifnum \@fpstype=8
+   \else
+     \ifnum \@fpstype=24
+     \else
+       \@flsettextmin
+       \advance \@textmin \@textfloatsheight
+       \@reqcolroom \@pageht
+       \ifdim \@textmin>\@reqcolroom
+         \@reqcolroom \@textmin
+       \fi
+       \advance \@reqcolroom \ht\@currbox
+       \ifdim \@colroom>\@reqcolroom
+         \@flsetnum \@colnum
+         \ifnum \@colnum>\z@
+           \@bitor\@currtype\@deferlist
+          \@testwrongwidth\@currbox
+           \if@test
+           \else
+             \@bitor\@currtype\@botlist
+             \if@test
+               \@addtobot
+             \else
+               \ifodd \count\@currbox
+                 \advance \@reqcolroom \intextsep
+                 \ifdim \@colroom>\@reqcolroom
+                   \global \advance \@colnum \m@ne
+                   \global \advance \@textfloatsheight \ht\@currbox
+                   \global \advance \@textfloatsheight 2\intextsep
+                   \@cons \@midlist \@currbox
+                   \if@nobreak
+                     \nobreak
+                     \@nobreakfalse
+                     \everypar{}%
+                   \else
+                     \addpenalty \interlinepenalty
+                   \fi
+                   \vskip \intextsep
+                   \box\@currbox
+                   \penalty\interlinepenalty
+                   \vskip\intextsep
+                   \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi
+                   \outputpenalty \z@
+                   \@inserttrue
+                 \fi
+               \fi
+               \if@insert
+               \else
+                 \@addtotoporbot
+               \fi
+             \fi
+           \fi
+         \fi
+       \fi
+     \fi
+   \fi
+   \if@insert
+   \else
+     \@resethfps
+     \@cons\@deferlist\@currbox
+   \fi
+}
+\def\@xtryfc #1{%
+  \@next\reserved@a\@trylist{}{}%
+  \@currtype \count #1%
+  \divide\@currtype\@xxxii
+  \multiply\@currtype\@xxxii
+  \@bitor \@currtype \@failedlist
+  \@testfp #1%
+  \@testwrongwidth #1%
+  \ifdim \ht #1>\@colht
+     \@testtrue
+  \fi
+  \if@test
+    \@cons\@failedlist #1%
+  \else
+    \@ytryfc #1%
+  \fi}
+\def\@ztryfc #1{%
+  \@tempcnta\count #1%
+  \divide\@tempcnta\@xxxii
+  \multiply\@tempcnta\@xxxii
+  \@bitor \@tempcnta {\@failedlist \@flfail}%
+  \@testfp #1%
+  \@testwrongwidth #1%
+  \@tempdimb\@tempdima
+  \advance\@tempdimb\ht #1%
+  \advance\@tempdimb\@fpsep
+  \ifdim \@tempdimb >\@colht
+    \@testtrue
+  \fi
+  \if@test
+    \@cons\@flfail #1%
+  \else
+    \@cons\@flsucceed #1%
+    \@tempdima\@tempdimb
+  \fi}
+\def\@{\spacefactor\@m{}}
+\def\@tempa#1#2{#1#2\relax}
+\ifx\setlength\@tempa
+  \def\setlength#1#2{#1 #2\relax}
+\fi
+\def\addpenalty#1{%
+  \ifvmode
+    \if@minipage
+    \else
+      \if@nobreak
+      \else
+        \ifdim\lastskip=\z@
+          \penalty#1\relax
+        \else
+          \@tempskipb\lastskip
+          \begingroup
+            \advance \@tempskipb
+              \ifdim\prevdepth>\maxdepth\maxdepth\else
+                 \ifdim \prevdepth = -\@m\p@ \z@ \else \prevdepth \fi
+               \fi
+             \vskip -\@tempskipb
+             \penalty#1%
+             \vskip\@tempskipb
+          \endgroup
+          \vskip -\@tempskipb
+          \vskip \@tempskipb
+        \fi
+      \fi
+    \fi
+  \else
+    \@noitemerr
+  \fi}
+\def\@fnsymbol#1{%
+   \ifcase#1\or \TextOrMath\textasteriskcentered *\or
+   \TextOrMath \textdagger \dagger\or
+   \TextOrMath \textdaggerdbl \ddagger \or
+   \TextOrMath \textsection  \mathsection\or
+   \TextOrMath \textparagraph \mathparagraph\or
+   \TextOrMath \textbardbl \|\or
+   \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or
+   \TextOrMath {\textdagger\textdagger}{\dagger\dagger}\or
+   \TextOrMath {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}\else
+   \@ctrerr \fi
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+\DeclareRobustCommand\TextOrMath{%
+  \ifmmode  \expandafter\@secondoftwo
+  \else     \expandafter\@firstoftwo  \fi}
+\protected@edef\TextOrMath#1#2{\TextOrMath{#1}{#2}}
+\else
+\protected\expandafter\def\csname TextOrMath\space\endcsname{%
+  \ifmmode  \expandafter\@secondoftwo
+  \else     \expandafter\@firstoftwo  \fi}
+\edef\TextOrMath#1#2{%
+  \expandafter\noexpand\csname TextOrMath\space\endcsname
+  {#1}{#2}}
+\fi
+\def\@esphack{%
+  \relax
+  \ifhmode
+    \spacefactor\@savsf
+    \ifdim\@savsk>\z@
+      \nobreak \hskip\z@skip  % <------
+      \ignorespaces
+    \fi
+  \fi}
+\def\@Esphack{%
+  \relax
+  \ifhmode
+    \spacefactor\@savsf
+    \ifdim\@savsk>\z@
+      \nobreak \hskip\z@skip  % <------
+      \@ignoretrue
+      \ignorespaces
+    \fi
+   \fi}
+\DeclareRobustCommand\em
+        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
+                       \eminnershape \else \itshape \fi}
+\def\eminnershape{\upshape}
+\DeclareRobustCommand*\textsubscript[1]{%
+  \@textsubscript{\selectfont#1}}
+\def\@textsubscript#1{%
+  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+\def\@DeclareMathSizes #1#2#3#4#5{%
+  \@defaultunits\dimen@ #2pt\relax\@nnil
+  \if $#3$%
+    \expandafter\let\csname S@\strip@pt\dimen@\endcsname\math@fontsfalse
+  \else
+    \@defaultunits\dimen@ii #3pt\relax\@nnil
+    \@defaultunits\@tempdima #4pt\relax\@nnil
+    \@defaultunits\@tempdimb #5pt\relax\@nnil
+    \toks@{#1}%
+    \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{%
+      \gdef\noexpand\tf@size{\strip@pt\dimen@ii}%
+      \gdef\noexpand\sf@size{\strip@pt\@tempdima}%
+      \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}%
+      \the\toks@
+    }%
+  \fi
+}
+\providecommand*\MakeRobust[1]{%
+  \@ifundefined{\expandafter\@gobble\string#1}{%
+    \@latex@error{The control sequence `\string#1' is undefined!%
+      \MessageBreak There is nothing here to make robust}%
+    \@eha
+  }%
+  {%
+    \@ifundefined{\expandafter\@gobble\string#1\space}%
+    {%
+      \expandafter\let\csname
+      \expandafter\@gobble\string#1\space\endcsname=#1%
+      \edef\reserved@a{\string#1}%
+      \def\reserved@b{#1}%
+      \edef\reserved@b{\expandafter\strip@prefix\meaning\reserved@b}%
+      \edef#1{%
+        \ifx\reserved@a\reserved@b
+          \noexpand\x@protect\noexpand#1%
+        \fi
+        \noexpand\protect\expandafter\noexpand
+        \csname\expandafter\@gobble\string#1\space\endcsname}%
+    }%
+    {\@latex@info{The control sequence `\string#1' is already robust}}%
+   }%
+}
+\MakeRobust\(
+\MakeRobust\)
+\MakeRobust\[
+\MakeRobust\]
+\MakeRobust\makebox
+\MakeRobust\savebox
+\MakeRobust\framebox
+\MakeRobust\parbox
+\MakeRobust\rule
+\MakeRobust\raisebox
+\def\@xfloat #1[#2]{%
+  \@nodocument
+  \def \@captype {#1}%
+   \def \@fps {#2}%
+   \@onelevel@sanitize \@fps
+   \def \reserved@b {!}%
+   \ifx \reserved@b \@fps
+     \@fpsadddefault
+   \else
+     \ifx \@fps \@empty
+       \@fpsadddefault
+     \fi
+   \fi
+   \ifhmode
+     \@bsphack
+     \@floatpenalty -\@Mii
+   \else
+     \@floatpenalty-\@Miii
+   \fi
+  \ifinner
+     \@parmoderr\@floatpenalty\z@
+  \else
+    \@next\@currbox\@freelist
+      {%
+       \@tempcnta \sixt@@n
+       \expandafter \@tfor \expandafter \reserved@a
+         \expandafter :\expandafter =\@fps
+         \do
+          {%
+           \if \reserved@a h%
+             \ifodd \@tempcnta
+             \else
+               \advance \@tempcnta \@ne
+             \fi
+           \else\if \reserved@a t%
+             \@setfpsbit \tw@
+           \else\if \reserved@a b%
+             \@setfpsbit 4%
+           \else\if \reserved@a p%
+             \@setfpsbit 8%
+           \else\if \reserved@a !%
+             \ifnum \@tempcnta>15
+               \advance\@tempcnta -\sixt@@n\relax
+             \fi
+           \else
+             \@latex@error{Unknown float option `\reserved@a'}%
+             {Option `\reserved@a' ignored and `p' used.}%
+             \@setfpsbit 8%
+           \fi\fi\fi\fi\fi
+           }%
+       \@tempcntb \csname ftype@\@captype \endcsname
+       \multiply \@tempcntb \@xxxii
+       \advance \@tempcnta \@tempcntb
+       \global \count\@currbox \@tempcnta
+       }%
+    \@fltovf
+  \fi
+  \global \setbox\@currbox
+    \color@vbox
+      \normalcolor
+      \vbox \bgroup
+        \hsize\columnwidth
+        \@parboxrestore
+        \@floatboxreset
+}
+ \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}
+\EndIncludeInRelease
 \endinput
 %%
 %% End of file `fixltx2e.sty'.
diff --git a/Master/texmf-dist/tex/latex/base/flafter.sty b/Master/texmf-dist/tex/latex/base/flafter.sty
index 750fcc366a8..83890eff763 100644
--- a/Master/texmf-dist/tex/latex/base/flafter.sty
+++ b/Master/texmf-dist/tex/latex/base/flafter.sty
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutput.dtx
 \ProvidesPackage{flafter}
-       [2015/09/05 v1.3a
+       [2016/10/04 v1.3b
                   Standard LaTeX floats after reference (FMi)]
 \IncludeInRelease{2015/01/01}%
   {\@addtocurcol}{float order in 2-column}%
diff --git a/Master/texmf-dist/tex/latex/base/fleqn.clo b/Master/texmf-dist/tex/latex/base/fleqn.clo
index 1212f4196b2..e070424dafc 100644
--- a/Master/texmf-dist/tex/latex/base/fleqn.clo
+++ b/Master/texmf-dist/tex/latex/base/fleqn.clo
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltmath.dtx
 \ProvidesFile{fleqn.clo}
-        [2015/03/31 v1.1i Standard LaTeX option
+        [2016/12/29 v1.2a Standard LaTeX option
                                    (flush left equations)]
 \newdimen\mathindent
 \AtEndOfClass{\mathindent\leftmargini}
diff --git a/Master/texmf-dist/tex/latex/base/fltrace.sty b/Master/texmf-dist/tex/latex/base/fltrace.sty
index 255ca166058..529383b2e96 100644
--- a/Master/texmf-dist/tex/latex/base/fltrace.sty
+++ b/Master/texmf-dist/tex/latex/base/fltrace.sty
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutput.dtx
 \ProvidesPackage{fltrace}
-       [2015/09/05 v1.3a
+       [2016/10/04 v1.3b
                   Tracing LaTeX floats algorithm (FMi)]
 \def\onecolumn{%
   \clearpage
@@ -1087,9 +1087,11 @@
                    (flcheckspace \string#1 \string#2)}%
    \fi
 }
+\IncludeInRelease{2017/01/01}%
+  {\@makefcolumn}{negative height floats}%
 \def\@makefcolumn #1{%
   \begingroup
-    \@fpmin \z@
+    \@fpmin -\maxdimen
     \let \@testfp \@gobble
     \@tryfcolumn #1%
   \endgroup
@@ -1099,6 +1101,23 @@
     \fl@trace{----- float column/page completed from \string#1}%
   \fi
 }
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+  {\@makefcolumn}{negative height floats}%
+\def\@makefcolumn #1{%
+  \begingroup
+    \@fpmin \z@
+    \let \@testfp \@gobble
+    \@tryfcolumn #1%
+  \endgroup
+  \if@fcolmade
+    \fl@trace{PAGE: in \string\clearpage
+                    \if@twocolumn ---twocolumn\fi---}%
+    \fl@trace{----- float column/page completed
+                    from \string#1}%
+  \fi
+}
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
   {\@outputdblcol}{2 column marks}%
 \def\@outputdblcol{%
diff --git a/Master/texmf-dist/tex/latex/base/fontenc.sty b/Master/texmf-dist/tex/latex/base/fontenc.sty
index 8829e7cd00e..4252a0ab93b 100644
--- a/Master/texmf-dist/tex/latex/base/fontenc.sty
+++ b/Master/texmf-dist/tex/latex/base/fontenc.sty
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesPackage{fontenc}
- [2016/06/19 v1.99m
+ [2016/12/11 v2.0a
                  Standard LaTeX package]
 \def\update@uclc@with@cyrillic{%
  \expandafter\def\expandafter\@uclclist\expandafter
diff --git a/Master/texmf-dist/tex/latex/base/fontmath.cfg b/Master/texmf-dist/tex/latex/base/fontmath.cfg
index 11085c60efe..5f289bfac53 100644
--- a/Master/texmf-dist/tex/latex/base/fontmath.cfg
+++ b/Master/texmf-dist/tex/latex/base/fontmath.cfg
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fontmath.cfg}
-           [2014/09/29 v2.3a LaTeX Kernel
+           [2016/12/03 v3.0a LaTeX Kernel
 (Uncustomised math
            font setup)]
 %%
diff --git a/Master/texmf-dist/tex/latex/base/fontmath.ltx b/Master/texmf-dist/tex/latex/base/fontmath.ltx
index 31c04ccdf7d..fceefefedb8 100644
--- a/Master/texmf-dist/tex/latex/base/fontmath.ltx
+++ b/Master/texmf-dist/tex/latex/base/fontmath.ltx
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fontmath.ltx}
-           [2014/09/29 v2.3a LaTeX Kernel
+           [2016/12/03 v3.0a LaTeX Kernel
 (Math
            font setup)]
 \typeout{=== Don't modify this file, use a .cfg file instead ===^^J}
diff --git a/Master/texmf-dist/tex/latex/base/fonttext.cfg b/Master/texmf-dist/tex/latex/base/fonttext.cfg
index dfabbb69e62..c568976ee75 100644
--- a/Master/texmf-dist/tex/latex/base/fonttext.cfg
+++ b/Master/texmf-dist/tex/latex/base/fonttext.cfg
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fonttext.cfg}
-           [2014/09/29 v2.3a LaTeX Kernel
+           [2016/12/03 v3.0a LaTeX Kernel
 (Uncustomised text
            font setup)]
 %%
diff --git a/Master/texmf-dist/tex/latex/base/fonttext.ltx b/Master/texmf-dist/tex/latex/base/fonttext.ltx
index a9a3afcd9e2..a6191f92b2f 100644
--- a/Master/texmf-dist/tex/latex/base/fonttext.ltx
+++ b/Master/texmf-dist/tex/latex/base/fonttext.ltx
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{fonttext.ltx}
-           [2014/09/29 v2.3a LaTeX Kernel
+           [2016/12/03 v3.0a LaTeX Kernel
 (Text
            font setup)]
 \typeout{=== Don't modify this file, use a .cfg file instead ===^^J}
@@ -45,7 +45,20 @@
 \input  {t1enc.def}
 \input {ot1enc.def}       % <- should come after T1 for speed
 \input {omsenc.def}
+\ifx\Umathchar\@undefined
 \fontencoding{OT1}
+\else
+\input {tuenc.def}
+\fontencoding{TU}
+\DeclareFontSubstitution{TU}{lmr}{m}{n}
+\begingroup
+\nfss@catcodes
+\input  {tulmr.fd}
+\input  {tulmss.fd}
+\input  {tulmtt.fd}
+\endgroup
+\DeclareFontSubstitution{TU}{lmr}{m}{n}
+\fi
 \DeclareFontEncodingDefaults{}{}
 \DeclareFontSubstitution{T1}{cmr}{m}{n}
 \DeclareFontSubstitution{OT1}{cmr}{m}{n}
@@ -60,16 +73,23 @@
 \input {ot1cmtt.fd}
 \endgroup
 \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+\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
 \newcommand\bfdefault{bx}
 \newcommand\mddefault{m}
 \newcommand\itdefault{it}
 \newcommand\sldefault{sl}
 \newcommand\scdefault{sc}
 \newcommand\updefault{n}
-\newcommand\encodingdefault{OT1}
 \newcommand\familydefault{\rmdefault}
 \newcommand\seriesdefault{\mddefault}
 \newcommand\shapedefault{\updefault}
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index d07e888c1a4..98f07a3dafc 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -93,6 +93,11 @@
                  tex.extraprimitives("omega", "aleph", "luatex"))}
   \fi
 \fi
+\ifx\eTeXversion\undefined
+  \errmessage
+    {LaTeX requires e-TeX}
+  \expandafter\endinput
+\fi
 \catcode`\#=6
 \catcode`\^=7
 \chardef\active=13
@@ -283,7 +288,7 @@
 \catcode`\_=8 % underline and downarrow are for subscripts
 \catcode`\^^I=10 % ascii tab is a blank space
 \chardef\active=13 \catcode`\~=\active % tilde is active
-\catcode`\^^L=\active \outer\def^^L{\par}% ascii form-feed is \outer\par
+\catcode`\^^L=\active \def^^L{\par}% ascii form-feed is \par
 \message{catcodes,}
 \def\dospecials{\do\ \do\\\do\{\do\}\do\$\do\&%
   \do\#\do\^\do\_\do\%\do\~}
@@ -345,9 +350,13 @@
 \fi
 \def\new@mathgroup
   {\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top}
-\def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
 \let\newfam\new@mathgroup
 \ifx\directlua\@undefined
+  \def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
+\else
+  \def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne{16384}}
+\fi
+\ifx\directlua\@undefined
   \ifx\widowpenalties\@undefined
     \mathchardef\e@alloc@top=255
     \let\e@alloc@chardef\chardef
@@ -468,22 +477,6 @@
 \newdimen\z@ \z@=0pt % can be used both for 0pt and 0
 \newskip\z@skip \z@skip=0pt plus0pt minus0pt
 \newbox\voidb@x % permanently void box register
-\message{compatibility for TeX 2, }
-\ifx\@undefined\inputlineno
-  \newcount\inputlineno
-  \inputlineno-1
-  \ifx\@undefined\language
-    \newcount\language
-  \fi
-  \newcount\lefthyphenmin
-  \newcount\righthyphenmin
-  \newcount\errorcontextlines
-  \newcount\holdinginserts
-  \newdimen\emergencystretch
-  \newcount\badness
-  \let\noboundary\relax
-  \newcount\setlanguage
-\fi
 \message{parameters,}
 \pretolerance=100
 \tolerance=200 % INITEX sets this to 10000
@@ -578,7 +571,7 @@
 \def\hglue{\afterassignment\hgl@\skip@=}
 \def\hgl@{\leavevmode \count@\spacefactor \vrule \@width\z@
   \nobreak\hskip\skip@ \spacefactor\count@}
-\def\slash{/\penalty\exhyphenpenalty} % a `/' that acts like a `-'
+\def\slash{/\penalty\exhyphenpenalty}
 \def\break{\penalty-\@M}
 \def\nobreak{\penalty \@M}
 \def\allowbreak{\penalty \z@}
@@ -704,8 +697,8 @@
 %%% From File: ltvers.dtx
 \def\fmtname{LaTeX2e}
 \edef\fmtversion
-   {2016/03/31}
-\def\patch@level{3}
+   {2017/01/01}
+\def\patch@level{0}
 \iffalse
 \def\reserved@a#1/#2/#3\@nil{%
   \count@\year
@@ -1288,11 +1281,7 @@ Type  H <return>  for immediate help.}%
   \@latex@info{#1\@gobble}}
 \let\c@errorcontextlines\errorcontextlines
 \c@errorcontextlines=-1
-\ifnum\inputlineno=\m@ne
-  \let\on@line\@empty
-\else
-  \def\on@line{ on input line \the\inputlineno}
-\fi
+\def\on@line{ on input line \the\inputlineno}
 \let\@warning\@latex@warning
 \let\@@warning\@latex@warning@no@line
 \global\let\@latexerr\@latex@error
@@ -2164,7 +2153,7 @@ Type  H <return>  for immediate help.}%
    \@ctrerr \fi
 }%
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname eTeXversion\endcsname\relax
+\expandafter\ifx\csname protected\endcsname\relax
 \DeclareRobustCommand\TextOrMath{%
   \ifmmode  \expandafter\@secondoftwo
   \else     \expandafter\@firstoftwo  \fi}
@@ -2588,6 +2577,7 @@ Type  H <return>  for immediate help.}%
 \ifx\noaccents@\@undefined
   \let\noaccents@\@empty
 \fi
+\ifx\XeTeXcharclass\@undefined
 \gdef\showhyphens#1{%
   \setbox0\vbox{%
     \color@begingroup
@@ -2596,6 +2586,54 @@ Type  H <return>  for immediate help.}%
     \normalfont
     \pretolerance\m@ne\tolerance\m@ne\hbadness\z@\showboxdepth\z@\ #1%
     \color@endgroup}}
+\else
+\long\def\showhyphens#1{%
+  \setbox0\vbox{%
+    \usefont{TU}{lmr}{m}{n}%
+    \hsize 1sp %
+    \hbadness\@M
+    \hfuzz\maxdimen
+    \tracingonline\z@
+    \everypar={}%
+    \leftskip\z@skip
+    \rightskip\z@skip
+    \parfillskip\z@skip
+    \hyphenpenalty=-\@M
+    \pretolerance\m@ne
+    \interlinepenalty\z@
+    \clubpenalty\z@
+    \widowpenalty\z@
+    \brokenpenalty1127 %
+    \setbox\z@\hbox{}%
+    \noindent
+    \hskip\z@skip
+    #1%
+    \par
+     \loop
+     \@tempswafalse
+     \ifnum\lastnodetype=11\unskip\@tempswatrue\fi
+     \ifnum\lastnodetype=12\unkern\@tempswatrue\fi
+     \ifnum\lastnodetype=13 %
+      \count@\lastpenalty
+      \unpenalty\@tempswatrue
+    \fi
+    \ifnum\lastnodetype=\@ne
+     \setbox\tw@\lastbox\@tempswatrue
+     \setbox0\hbox{\unhbox\tw@\unskip\unskip\unpenalty
+                   \ifnum\count@=1127 \else\ \fi
+                   \unhbox0}%
+     \count@\z@
+    \fi
+    \if@tempswa
+    \repeat
+   \hbadness\z@
+   \hsize\maxdimen
+   \showboxdepth\z@
+   \tolerance\m@ne
+   \hyphenpenalty\z@
+   \noindent\unhbox\z@
+}}
+\fi
 \long\def\addto@hook#1#2{#1\expandafter{\the#1#2}}
  \def\@vpt{5}
  \def\@vipt{6}
@@ -3460,7 +3498,8 @@ Type  H <return>  for immediate help.}%
       \advance\count\tw@-\count@
       \if\relax\noexpand#1% is command?
         \edef\reserved@a
-          {\noexpand\in@{\expandafter\@gobble\string\mathchar}{\meaning#1}}%
+          {\noexpand\in@{\expandafter\@gobble\string\mathchar}%
+                        {\meaning#1}}%
         \reserved@a
         \ifin@
           \expandafter\set@mathsymbol
@@ -3851,25 +3890,6 @@ Type  H <return>  for immediate help.}%
 \DeclareErrorFont{OT1}{cmr}{m}{n}{10}  %% don't modify this setting
                                        %% overwrite it in fontdef.cfg
                                        %% if necessary
-\ifnum\inputlineno=\m@ne
-\InputIfFileExists{fonttext.cfg}
-           {\typeout{====================================^^J%
-                     ^^J%
-                      Local config file fonttext.cfg used^^J%
-                     ^^J%
-                     ====================================}%
-             \def\@addtofilelist##1{\xdef\@filelist{\@filelist,##1}}%
-            }
-           {\typeout{!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
-                     !^^J%
-                     ! You MUST use a fonttext.cfg file!^^J%
-                     ! As you are still using TeX2!!!!!^^J%
-                     !^^J%
-                     ! See the documentation file tex2.txt^^J%
-                     !^^J%
-                     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}%
-                    \batchmode \@@end}
-\else
 \InputIfFileExists{fonttext.cfg}
            {\typeout{====================================^^J%
                      ^^J%
@@ -3879,7 +3899,6 @@ Type  H <return>  for immediate help.}%
              \def\@addtofilelist##1{\xdef\@filelist{\@filelist,##1}}%
             }
            {\input{fonttext.ltx}}
-\fi
 \let\@addtofilelist\@gobble
 \InputIfFileExists{fontmath.cfg}
            {\typeout{====================================^^J%
@@ -7388,7 +7407,7 @@ Type  H <return>  for immediate help.}%
 }
 \def\@makefcolumn #1{%
   \begingroup
-    \@fpmin \z@
+    \@fpmin -\maxdimen
     \let \@testfp \@gobble
     \@tryfcolumn #1%
   \endgroup
@@ -7546,7 +7565,8 @@ Type  H <return>  for immediate help.}%
 \@onlypreamble\@if@ptions
 \def\@if@pti@ns#1#2{%
  \let\reserved@a\@firstoftwo
- \@for\reserved@b:=#2\do{%
+ \edef\reserved@b{\zap@space#2 \@empty}%
+ \@for\reserved@b:=\reserved@b\do{%
    \ifx\reserved@b\@empty
    \else
      \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}%
@@ -7669,8 +7689,10 @@ Type  H <return>  for immediate help.}%
   \csname ds@\CurrentOption\endcsname}
 \@onlypreamble\@use@ption
 \def\ExecuteOptions#1{%
+  \edef\@fortmp{\zap@space#1 \@empty}%
   \def\reserved@a##1\@nil{%
-    \@for\CurrentOption:=#1\do{\csname ds@\CurrentOption\endcsname}%
+    \@for\CurrentOption:=\@fortmp\do
+             {\csname ds@\CurrentOption\endcsname}%
     \edef\CurrentOption{##1}}%
   \expandafter\reserved@a\CurrentOption\@nil}
 \@onlypreamble\ExecuteOptions
@@ -7766,15 +7788,15 @@ Type  H <return>  for immediate help.}%
     \fi
   \else
     \def\reserved@b##1,{%
-      \ifx\@nil##1\relax\else
-        \ifx\relax##1\relax\else
+      \ifx\@nnil##1\relax\else
+        \ifx\@nnil##1\@nnil\else
          \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
          \noexpand\@pkgextension
         \fi
         \expandafter\reserved@b
       \fi}%
       \edef\reserved@a{\zap@space#3 \@empty}%
-      \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nil,}%
+      \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nnil,}%
   \fi
   \reserved@a}
 \@onlypreamble\@fileswith@pti@ns
@@ -8142,6 +8164,30 @@ Type  H <return>  for immediate help.}%
     \directlua{require("ltluatex")}
   \endgroup
 }
+\everyjob\expandafter{%
+  \the\everyjob
+  \directlua{%
+%% Horrible hack, locally reset the luatex version number
+%% This is not required for the source version of luaotfload
+%% but is required due to an error in the version check in the
+%% public version (January 2017)
+%% https://github.com/lualatex/luaotfload/issues/387
+%% It is expected that this will be removed before TeXLive 2017
+  local tmp_version=tex.luatexversion %
+  tex.luatexversion=199 %
+  if xpcall(function ()%
+             require('luaotfload-main')%
+            end,texio.write_nl) then %
+  local _void = luaotfload.main ()%
+  else %
+  texio.write_nl('Error in luaotfload: reverting to OT1')%
+  tex.print('\string\\def\string\\encodingdefault{OT1}')%
+  end %
+  tex.luatexversion=tmp_version%
+  }%
+  \let\f@encoding\encodingdefault
+  \expandafter\let\csname ver@luaotfload.sty\endcsname\fmtversion
+  }
 \fi
 %%% From File: ltfinal.dtx
 \tracingstats1
@@ -8204,10 +8250,8 @@ Type  H <return>  for immediate help.}%
    \lccode#1=#1
 }
 \reserved@a{`\a}{`\z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"A0}{"BC}
-  \reserved@a{"E0}{"FF}
-\fi
+\reserved@a{"A0}{"BC}
+\reserved@a{"E0}{"FF}
 \def\reserved@c#1{%
    \count@=#1\advance\count@ by "20
    \uccode#1=#1
@@ -8215,20 +8259,16 @@ Type  H <return>  for immediate help.}%
    \sfcode#1=999
 }
 \reserved@a{`\A}{`\Z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"80}{"9C}
-  \reserved@a{"C0}{"DF}
-\fi
+\reserved@a{"80}{"9C}
+\reserved@a{"C0}{"DF}
 \uccode`\^^Y=`\I     % dotless i
 \lccode`\^^Y=`\^^Y   % dotless i
 \uccode`\^^Z=`\J     % dotless j, ae in OT1
 \lccode`\^^Z=`\^^Z   % dotless j, ae in OT1
-\ifnum\inputlineno=\m@ne\else
-  \lccode`\^^9d=`\i    % dotted I
-  \uccode`\^^9d=`\^^9d % dotted I
-  \lccode`\^^9e=`\^^9e % d-bar
-  \uccode`\^^9e=`\^^d0 % d-bar
-\fi
+\lccode`\^^9d=`\i    % dotted I
+\uccode`\^^9d=`\^^9d % dotted I
+\lccode`\^^9e=`\^^9e % d-bar
+\uccode`\^^9e=`\^^d0 % d-bar
 \lccode`\^^[=`\^^[   % oe in OT1
 \lccode`\- =`\-   % default hyphen char
 \lccode 127=127   % alternate hyphen char
@@ -8303,7 +8343,6 @@ Type  H <return>  for immediate help.}%
 \reserved@a{0}{`\^^H}
 \reserved@c{`\^^K}
 \reserved@a{`\^^N}{31}
-  \catcode"7F=15
 \ifnum 0%
   \ifx\Umathcode\@undefined\else 1\fi
   \ifx\XeTeXmathcode\@undefined\else 1\fi
@@ -8315,10 +8354,8 @@ Type  H <return>  for immediate help.}%
    \lccode#1=#1
 }
 \reserved@a{`\a}{`\z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"A0}{"BC}
-  \reserved@a{"E0}{"FF}
-\fi
+\reserved@a{"A0}{"BC}
+\reserved@a{"E0}{"FF}
 \def\reserved@c#1{%
    \count@=#1\advance\count@ by "20
    \uccode#1=#1
@@ -8326,20 +8363,16 @@ Type  H <return>  for immediate help.}%
    \sfcode#1=999
 }
 \reserved@a{`\A}{`\Z}
-\ifnum\inputlineno=\m@ne\else
-  \reserved@a{"80}{"9C}
-  \reserved@a{"C0}{"DF}
-\fi
+\reserved@a{"80}{"9C}
+\reserved@a{"C0}{"DF}
 \uccode`\^^Y=`\I     % dotless i
 \lccode`\^^Y=`\^^Y   % dotless i
 \uccode`\^^Z=`\J     % dotless j, ae in OT1
 \lccode`\^^Z=`\^^Z   % dotless j, ae in OT1
-\ifnum\inputlineno=\m@ne\else
-  \lccode`\^^9d=`\i    % dotted I
-  \uccode`\^^9d=`\^^9d % dotted I
-  \lccode`\^^9e=`\^^9e % d-bar
-  \uccode`\^^9e=`\^^d0 % d-bar
-\fi
+\lccode`\^^9d=`\i    % dotted I
+\uccode`\^^9d=`\^^9d % dotted I
+\lccode`\^^9e=`\^^9e % d-bar
+\uccode`\^^9e=`\^^d0 % d-bar
 \lccode`\^^[=`\^^[   % oe in OT1
 \fi % End of reset block for 8-bit engines
 \DeclareRobustCommand{\MakeUppercase}[1]{{%
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index 2b373673db6..d0c4ba71b84 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -16,6 +16,7 @@
 %% ltlength.dtx  (with options: `latexrelease')
 %% ltfloat.dtx  (with options: `latexrelease')
 %% ltoutput.dtx  (with options: `latexrelease')
+%% ltclass.dtx  (with options: `latexrelease')
 %% ltspace.dtx  (with options: `latexrelease')
 %% ltplain.dtx  (with options: `latexrelease')
 %% ltfssdcl.dtx  (with options: `latexrelease')
@@ -62,7 +63,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltvers.dtx
 \edef\latexreleaseversion
-   {2016/03/31}
+   {2017/01/01}
 \def\IncludeInRelease#1{\kernel@ifnextchar[%
   {\@IncludeInRelease{#1}}
   {\@IncludeInRelease{#1}[#1]}}
@@ -86,7 +87,7 @@
 \long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{}
 \let\EndIncludeInRelease\relax
 \ProvidesPackage{latexrelease}
-          [2016/07/04 v1.0g LaTeX release emulation and tests]
+          [2016/12/29 v1.0h LaTeX release emulation and tests]
 \NeedsTeXFormat{LaTeX2e}[1996/06/01]
 \DeclareOption*{%
   \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}%
@@ -218,6 +219,7 @@ of this package available from CTAN}
   \@ifnextchar(%)
     \@makepicbox
     {\@ifnextchar[\@makebox\mbox}}%
+\expandafter\let\csname makebox \endcsname\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\savebox}{Make \savebox robust}%
@@ -230,6 +232,7 @@ of this package available from CTAN}
 \def\savebox#1{%
   \@ifnextchar(%)
     {\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}}%
+\expandafter\let\csname savebox \endcsname\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\framebox}{Make \framebox robust}%
@@ -242,6 +245,7 @@ of this package available from CTAN}
 \def\framebox{%
   \@ifnextchar(%)
     \@framepicbox{\@ifnextchar[\@framebox\fbox}}%
+\expandafter\let\csname framebox \endcsname\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\parbox}{Make \parbox robust}%
@@ -256,6 +260,7 @@ of this package available from CTAN}
   \@ifnextchar[%]
     \@iparbox
     {\@iiiparbox c\relax[s]}}%
+\expandafter\let\csname parbox \endcsname\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\rule}{Make \rule robust}%
@@ -264,6 +269,7 @@ of this package available from CTAN}
 \IncludeInRelease{0000/00/00}%
                  {\rule}{Make \rule robust}%
 \def\rule{\@ifnextchar[\@rule{\@rule[\z@]}}%
+\expandafter\let\csname rule \endcsname\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
                  {\raisebox}{Make \raisebox robust}%
@@ -276,6 +282,7 @@ of this package available from CTAN}
 \def\raisebox#1{%
   \leavevmode
   \@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}}
+\expandafter\let\csname raisebox \endcsname\@undefined
 \EndIncludeInRelease
 %%% From File: ltmath.dtx
 \IncludeInRelease{2015/01/01}{\(}{Make \( robust}%
@@ -287,8 +294,10 @@ of this package available from CTAN}
 \IncludeInRelease{0000/00/00}{\(}{Make \( robust}%
 \def\({%
   \relax\ifmmode\@badmath\else$\fi}%
+\expandafter\let\csname\string( \endcsname\@undefined
 \def\){%
   \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}%
+\expandafter\let\csname\string) \endcsname\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{2015/01/01}{\[}{Make \[ robust}%
 \DeclareRobustCommand\[{%
@@ -327,6 +336,7 @@ of this package available from CTAN}
       $$%%$$ BRACE MATCH HACK
    \fi
 }%
+\expandafter\let\csname\string[ \endcsname\@undefined
 \def\]{%
    \relax\ifmmode
       \ifinner
@@ -339,6 +349,7 @@ of this package available from CTAN}
    \fi
    \ignorespaces
 }%
+\expandafter\let\csname\string] \endcsname\@undefined
 \EndIncludeInRelease
 %%% From File: ltpictur.dtx
 \IncludeInRelease{2016/03/31}%
@@ -435,15 +446,24 @@ of this package available from CTAN}
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}{\textcommabelow}{comma accent}%
 \let\textcommabelow\@undefined
-\expandafter\let\csname\string\T1\string\c-G\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-K\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-k\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-L\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-l\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-N\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-n\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-R\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-r\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-G\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-K\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-k\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-L\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-l\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-N\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-n\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-R\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-r\endcsname\@undefined
 \EndIncludeInRelease
 \IncludeInRelease{2016/02/01}{\textcommaabove}{comma above}%
 \DeclareTextCommandDefault\textcommaabove[1]{%
@@ -461,8 +481,10 @@ of this package available from CTAN}
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}{\textcommaabove}{comma above}%
 \let\textcommaabove\@undefined
-\expandafter\let\csname\string\OT1\string\c-g\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-g\endcsname\@undefined
+\expandafter
+  \let\csname\string\OT1\string\c-g\endcsname\@undefined
+\expandafter
+  \let\csname\string\T1\string\c-g\endcsname\@undefined
 \EndIncludeInRelease
 %%% From File: ltcounts.dtx
 \IncludeInRelease{2015/01/01}{\@stpelt}
@@ -495,7 +517,7 @@ of this package available from CTAN}
 \EndIncludeInRelease
 \IncludeInRelease{2015/01/01}{\TextOrMath}{\TextOrMath}%
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname eTeXversion\endcsname\relax
+\expandafter\ifx\csname protected\endcsname\relax
 \DeclareRobustCommand\TextOrMath{%
   \ifmmode  \expandafter\@secondoftwo
   \else     \expandafter\@firstoftwo  \fi}
@@ -1241,6 +1263,26 @@ of this package available from CTAN}
   \endgroup
 }%
 \EndIncludeInRelease
+\IncludeInRelease{2017/01/01}%
+  {\@makefcolumn}{negative height floats}%
+\def\@makefcolumn #1{%
+  \begingroup
+    \@fpmin -\maxdimen
+    \let \@testfp \@gobble
+    \@tryfcolumn #1%
+  \endgroup
+}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+  {\@makefcolumn}{negative height floats}%
+\def\@makefcolumn #1{%
+  \begingroup
+    \@fpmin \z@
+    \let \@testfp \@gobble
+    \@tryfcolumn #1%
+  \endgroup
+}
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}%
   {\@outputdblcol}{2 column marks}%
 \def\@outputdblcol{%
@@ -1314,6 +1356,112 @@ of this package available from CTAN}
   \fi
 }%
 \EndIncludeInRelease
+%%% From File: ltclass.dtx
+\IncludeInRelease{2017/01/01}%
+                 {\@if@pti@ns}{Spaces in option clash check}%
+\def\@if@pti@ns#1#2{%
+ \let\reserved@a\@firstoftwo
+ \edef\reserved@b{\zap@space#2 \@empty}%
+ \@for\reserved@b:=\reserved@b\do{%
+   \ifx\reserved@b\@empty
+   \else
+     \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}%
+     \ifin@
+     \else
+       \let\reserved@a\@secondoftwo
+     \fi
+   \fi
+ }%
+ \reserved@a}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@if@pti@ns}{Spaces in option clash check}%
+\def\@if@pti@ns#1#2{%
+ \let\reserved@a\@firstoftwo
+ \@for\reserved@b:=#2\do{%
+  \ifx\reserved@b\@empty
+   \else
+   \expandafter\in@\expandafter
+                   {\expandafter,\reserved@b,}{,#1,}%
+    \ifin@
+    \else
+     \let\reserved@a\@secondoftwo
+    \fi
+  \fi
+ }%
+ \reserved@a}
+\IncludeInRelease{2017/01/01}%
+                 {\@if@pti@ns}{Spaces in \ExecuteOptions}%
+\def\ExecuteOptions#1{%
+  \edef\@fortmp{\zap@space#1 \@empty}%
+  \def\reserved@a##1\@nil{%
+    \@for\CurrentOption:=\@fortmp\do
+             {\csname ds@\CurrentOption\endcsname}%
+    \edef\CurrentOption{##1}}%
+  \expandafter\reserved@a\CurrentOption\@nil}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\@if@pti@ns}{Spaces in \ExecuteOptions}%
+\def\ExecuteOptions#1{%
+  \def\reserved@a##1\@nil{%
+    \@for\CurrentOption:=#1\do
+             {\csname ds@\CurrentOption\endcsname}%
+    \edef\CurrentOption{##1}}%
+  \expandafter\reserved@a\CurrentOption\@nil}
+\IncludeInRelease{2017/01/01}%
+        {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}%
+\def\@fileswith@pti@ns#1[#2]#3[#4]{%
+  \ifx#1\@clsextension
+    \ifx\@classoptionslist\relax
+      \xdef\@classoptionslist{\zap@space#2 \@empty}%
+      \def\reserved@a{%
+        \@onefilewithoptions#3[{#2}][{#4}]#1%
+        \@documentclasshook}%
+    \else
+      \def\reserved@a{%
+        \@onefilewithoptions#3[{#2}][{#4}]#1}%
+    \fi
+  \else
+    \def\reserved@b##1,{%
+      \ifx\@nnil##1\relax\else
+        \ifx\@nnil##1\@nnil\else
+         \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
+         \noexpand\@pkgextension
+        \fi
+        \expandafter\reserved@b
+      \fi}%
+      \edef\reserved@a{\zap@space#3 \@empty}%
+      \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nnil,}%
+  \fi
+  \reserved@a}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+        {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}%
+\def\@fileswith@pti@ns#1[#2]#3[#4]{%
+  \ifx#1\@clsextension
+    \ifx\@classoptionslist\relax
+      \xdef\@classoptionslist{\zap@space#2 \@empty}%
+      \def\reserved@a{%
+        \@onefilewithoptions#3[{#2}][{#4}]#1%
+        \@documentclasshook}%
+    \else
+      \def\reserved@a{%
+        \@onefilewithoptions#3[{#2}][{#4}]#1}%
+    \fi
+  \else
+    \def\reserved@b##1,{%
+      \ifx\@nil##1\relax\else
+        \ifx\relax##1\relax\else
+         \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
+         \noexpand\@pkgextension
+        \fi
+        \expandafter\reserved@b
+      \fi}%
+      \edef\reserved@a{\zap@space#3 \@empty}%
+      \edef\reserved@a{%
+        \expandafter\reserved@b\reserved@a,\@nil,}%
+  \fi
+  \reserved@a}
 %%% From File: ltspace.dtx
 \IncludeInRelease{2015/10/01}%
                  {\@esphack}{hyphenation after space hack}%
@@ -1470,8 +1618,12 @@ of this package available from CTAN}
 \fi
 \def\new@mathgroup
   {\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top}
-\def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
 \let\newfam\new@mathgroup
+\ifx\directlua\@undefined
+  \def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
+\else
+  \def\newlanguage  {\e@alloc\language \chardef{\count19}\m@ne{16384}}
+\fi
 \EndIncludeInRelease
 \IncludeInRelease{0000/00/00}%
                  {\newcount}{Extended Allocation}%
@@ -1984,6 +2136,78 @@ of this package available from CTAN}
       \csname\curr@fontshape/\f@size\endcsname}%
     \pickup@font}
 \EndIncludeInRelease
+\IncludeInRelease{2017/01/01}{\showhyphens}%
+                 {XeTeX support for \showhyphens}%
+\ifx\XeTeXcharclass\@undefined
+\gdef\showhyphens#1{%
+  \setbox0\vbox{%
+    \color@begingroup
+    \everypar{}%
+    \parfillskip\z@skip\hsize\maxdimen
+    \normalfont
+    \pretolerance\m@ne\tolerance\m@ne\hbadness\z@\showboxdepth\z@\ #1%
+    \color@endgroup}}
+\else
+\long\def\showhyphens#1{%
+  \setbox0\vbox{%
+    \usefont{TU}{lmr}{m}{n}%
+    \hsize 1sp %
+    \hbadness\@M
+    \hfuzz\maxdimen
+    \tracingonline\z@
+    \everypar={}%
+    \leftskip\z@skip
+    \rightskip\z@skip
+    \parfillskip\z@skip
+    \hyphenpenalty=-\@M
+    \pretolerance\m@ne
+    \interlinepenalty\z@
+    \clubpenalty\z@
+    \widowpenalty\z@
+    \brokenpenalty1127 %
+    \setbox\z@\hbox{}%
+    \noindent
+    \hskip\z@skip
+    #1%
+    \par
+     \loop
+     \@tempswafalse
+     \ifnum\lastnodetype=11\unskip\@tempswatrue\fi
+     \ifnum\lastnodetype=12\unkern\@tempswatrue\fi
+     \ifnum\lastnodetype=13 %
+      \count@\lastpenalty
+      \unpenalty\@tempswatrue
+    \fi
+    \ifnum\lastnodetype=\@ne
+     \setbox\tw@\lastbox\@tempswatrue
+     \setbox0\hbox{\unhbox\tw@\unskip\unskip\unpenalty
+                   \ifnum\count@=1127 \else\ \fi
+                   \unhbox0}%
+     \count@\z@
+    \fi
+    \if@tempswa
+    \repeat
+   \hbadness\z@
+   \hsize\maxdimen
+   \showboxdepth\z@
+   \tolerance\m@ne
+   \hyphenpenalty\z@
+   \noindent\unhbox\z@
+}}
+\fi
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}{\showhyphens}%
+                 {XeTeX support for \showhyphens}%
+\gdef\showhyphens#1{%
+  \setbox0\vbox{%
+    \color@begingroup
+    \everypar{}%
+    \parfillskip\z@skip\hsize\maxdimen
+    \normalfont
+    \pretolerance\m@ne\tolerance\m@ne
+    \hbadness\z@\showboxdepth\z@\ #1%
+    \color@endgroup}}
+\EndIncludeInRelease
 %%% From File: ltfsscmp.dtx
 %% Copyright (C) 1989-1995 Frank Mittelbach and Rainer Sch\"opf,
 %% all rights reserved.
@@ -2307,6 +2531,37 @@ of this package available from CTAN}
 \let\e@alloc@luachunk@count\@undefined
 \directlua{luatexbase.uninstall()}
 \EndIncludeInRelease
+\IncludeInRelease{2017/01/01}%
+                 {\fontencoding}{TU in everyjob}%
+\fontencoding{TU}\let\encodingdefault\f@encoding
+\ifx\directlua\@undefined\else
+  \directlua{%
+%% Horrible hack, locally reset the luatex version number
+%% This is not required for the source version of luaotfload
+%% but is required due to an error in the version check in the
+%% public version (January 2017)
+%% https://github.com/lualatex/luaotfload/issues/387
+%% It is expected that this will be removed before TeXLive 2017
+  local tmp_version=tex.luatexversion %
+  tex.luatexversion=199 %
+  if xpcall(function ()%
+             require('luaotfload-main')%
+            end,texio.write_nl) then %
+  local _void = luaotfload.main ()%
+  else %
+  texio.write_nl('Error in luaotfload: reverting to OT1')%
+  tex.print('\string\\def\string\\encodingdefault{OT1}')%
+  end %
+  tex.luatexversion=tmp_version%
+  }%
+  \let\f@encoding\encodingdefault
+  \expandafter\let\csname ver@luaotfload.sty\endcsname\fmtversion
+\fi
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\fontencoding}{TU in everyjob}%
+\fontencoding{OT1}\let\encodingdefault\f@encoding
+\EndIncludeInRelease
 \fi
 %%% From File: ltfinal.dtx
 \IncludeInRelease{2015/01/01}%
@@ -2412,24 +2667,24 @@ of this package available from CTAN}
   {\XeTeXintercharclasses}{XeTeX character classes}%
   \ifx\XeTeXinterchartoks\undefined
   \else
-    \input{load-unicode-xetex-classes}
-    \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
-    \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
-    \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}
-    \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace}
-    \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace}
-    \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace}
-    \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace}
-    \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace}
-    \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue}
-    \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue}
-    \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue}
-    \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue}
-    \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue}
-    \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue}
-    \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue}
-    \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue}
-    \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue}
+   \input{load-unicode-xetex-classes}
+   \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
+   \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
+   \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}
+   \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace}
+   \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace}
+   \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace}
+   \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace}
+   \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace}
+   \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue}
+   \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue}
+   \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue}
+   \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue}
+   \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue}
+   \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue}
+   \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue}
+   \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue}
+   \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue}
   \fi
 \EndIncludeInRelease
 \endinput
diff --git a/Master/texmf-dist/tex/latex/base/leqno.clo b/Master/texmf-dist/tex/latex/base/leqno.clo
index 69916d1b21e..de8aa6a9570 100644
--- a/Master/texmf-dist/tex/latex/base/leqno.clo
+++ b/Master/texmf-dist/tex/latex/base/leqno.clo
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltmath.dtx
 \ProvidesFile{leqno.clo}
-        [2015/03/31 v1.1i Standard LaTeX option
+        [2016/12/29 v1.2a Standard LaTeX option
                                    (left equation numbers)]
 \renewcommand\@eqnnum{\hb@xt@.01\p@{}%
                       \rlap{\normalfont\normalcolor
diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua
index cbd933531eb..8ee866ffa16 100644
--- a/Master/texmf-dist/tex/latex/base/ltluatex.lua
+++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua
@@ -261,6 +261,7 @@ local callbacktypes = callbacktypes or {
   process_jobname       = data,
   contribute_filter      = simple,
   buildpage_filter       = simple,
+  build_page_insert      = exclusive,
   pre_linebreak_filter   = list,
   linebreak_filter       = list,
   append_to_vlist_filter = list,
@@ -287,6 +288,7 @@ local callbacktypes = callbacktypes or {
   show_lua_error_hook  = simple,
   start_file           = simple,
   stop_file            = simple,
+  call_edit            = simple,
   finish_pdffile = data,
   finish_pdfpage = data,
   define_font = exclusive,
@@ -353,7 +355,7 @@ local function create_callback(name, ctype, default)
   end
   if callbacktypes[name] then
     luatexbase_error("Unable to create callback `" .. name ..
-                     "':\ncallback type disallowed as name")
+                     "':\ncallback is already defined")
   end
   if default ~= false and type (default) ~= "function" then
     luatexbase_error("Unable to create callback `" .. name ..
diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex
index fd748d582d3..32d9335027a 100644
--- a/Master/texmf-dist/tex/latex/base/ltluatex.tex
+++ b/Master/texmf-dist/tex/latex/base/ltluatex.tex
@@ -47,7 +47,7 @@
   #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}}
 \fi
 \ProvidesFile{ltluatex.tex}
-[2016/03/13 v1.0n
+[2017/01/20 v1.1b
   LuaTeX support for plain TeX (core)
 ]
 \edef\etatcatcode{\the\catcode`\@}
diff --git a/Master/texmf-dist/tex/latex/base/omlenc.def b/Master/texmf-dist/tex/latex/base/omlenc.def
index fec56a72743..6c9f3a80ebc 100644
--- a/Master/texmf-dist/tex/latex/base/omlenc.def
+++ b/Master/texmf-dist/tex/latex/base/omlenc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{omlenc.def}
- [2016/06/19 v1.99m
+ [2016/12/11 v2.0a
          Standard LaTeX file]
 \DeclareFontEncoding{OML}{}{}
 \DeclareTextSymbol{\textless}{OML}{`\<}
diff --git a/Master/texmf-dist/tex/latex/base/omsenc.def b/Master/texmf-dist/tex/latex/base/omsenc.def
index 2e4aca88d1c..5d65c205a9c 100644
--- a/Master/texmf-dist/tex/latex/base/omsenc.def
+++ b/Master/texmf-dist/tex/latex/base/omsenc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{omsenc.def}
- [2016/06/19 v1.99m
+ [2016/12/11 v2.0a
          Standard LaTeX file]
 \DeclareFontEncoding{OMS}{}{}
 \DeclareTextSymbol{\textasteriskcentered}{OMS}{3}   % "03
diff --git a/Master/texmf-dist/tex/latex/base/ot1enc.def b/Master/texmf-dist/tex/latex/base/ot1enc.def
index 217d3db5bb9..3d5e0306ea6 100644
--- a/Master/texmf-dist/tex/latex/base/ot1enc.def
+++ b/Master/texmf-dist/tex/latex/base/ot1enc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{ot1enc.def}
- [2016/06/19 v1.99m
+ [2016/12/11 v2.0a
          Standard LaTeX file]
 \DeclareFontEncoding{OT1}{}{}
 \DeclareTextAccent{\"}{OT1}{127}
diff --git a/Master/texmf-dist/tex/latex/base/ot4enc.def b/Master/texmf-dist/tex/latex/base/ot4enc.def
index f7b8f65a1dc..b46a2150dee 100644
--- a/Master/texmf-dist/tex/latex/base/ot4enc.def
+++ b/Master/texmf-dist/tex/latex/base/ot4enc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{ot4enc.def}
- [2016/06/19 v1.99m
+ [2016/12/11 v2.0a
          Standard LaTeX file]
 \DeclareFontEncoding{OT4}{}{}
 \DeclareFontSubstitution{OT4}{cmr}{m}{n}
diff --git a/Master/texmf-dist/tex/latex/base/preload.cfg b/Master/texmf-dist/tex/latex/base/preload.cfg
index 5c36c170784..85d52fd3780 100644
--- a/Master/texmf-dist/tex/latex/base/preload.cfg
+++ b/Master/texmf-dist/tex/latex/base/preload.cfg
@@ -37,7 +37,7 @@
 %% 
 %%% From File: fontdef.dtx
 \ProvidesFile{preload.cfg}
-           [2014/09/29 v2.3a LaTeX Kernel
+           [2016/12/03 v3.0a LaTeX Kernel
 (Uncustomised preload
            font setup)]
 %%
diff --git a/Master/texmf-dist/tex/latex/base/source2e.tex b/Master/texmf-dist/tex/latex/base/source2e.tex
index be9c8a951d0..8abcd3abdce 100644
--- a/Master/texmf-dist/tex/latex/base/source2e.tex
+++ b/Master/texmf-dist/tex/latex/base/source2e.tex
@@ -127,6 +127,10 @@ page_precedence "rnaA"
                                  \fi
                                  :\levelchar #3}}%
   \@tempa\endgroup\@esphack}
+
+% Section numbers now reach eg 74.17.2 which need more space
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.8em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{3.4em}}
 \makeatother
 
 % Produce a Change Log and (2 column) Index.
diff --git a/Master/texmf-dist/tex/latex/base/t1enc.def b/Master/texmf-dist/tex/latex/base/t1enc.def
index bdd4769bcf4..358ad130583 100644
--- a/Master/texmf-dist/tex/latex/base/t1enc.def
+++ b/Master/texmf-dist/tex/latex/base/t1enc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{t1enc.def}
- [2016/06/19 v1.99m
+ [2016/12/11 v2.0a
          Standard LaTeX file]
 \DeclareFontEncoding{T1}{}{}
 \DeclareTextAccent{\`}{T1}{0}
diff --git a/Master/texmf-dist/tex/latex/base/textcomp.sty b/Master/texmf-dist/tex/latex/base/textcomp.sty
index 95b1c84e58b..3b1b1462efb 100644
--- a/Master/texmf-dist/tex/latex/base/textcomp.sty
+++ b/Master/texmf-dist/tex/latex/base/textcomp.sty
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesPackage{textcomp}
- [2016/06/19 v1.99m
+ [2016/12/11 v2.0a
                  Standard LaTeX package]
 
 \PackageInfo{textcomp}{Sub-encoding information:\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/base/tuenc.def b/Master/texmf-dist/tex/latex/base/tuenc.def
new file mode 100644
index 00000000000..9800bd7e73e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/base/tuenc.def
@@ -0,0 +1,394 @@
+%%
+%% This is file `tuenc.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ltoutenc.dtx  (with options: `TU')
+%% 
+%% 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 has the LPPL maintenance status "maintained".
+%% 
+%% 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.
+%% 
+%% 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.
+%%% From File: ltoutenc.dtx
+\ProvidesFile{tuenc.def}
+ [2016/12/11 v2.0a
+         Standard LaTeX file]
+\providecommand\UnicodeEncodingName{TU}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname directlua\endcsname\relax
+    \PackageWarningNoLine{fontenc}
+      {\UnicodeEncodingName\space
+       encoding is only available with XeTeX and LuaTeX.\MessageBreak
+       Defaulting to T1 encoding}
+      \def\encodingdefault{T1}
+    \expandafter\expandafter\expandafter\endinput
+  \else
+    \def\UnicodeFontTeXLigatures{mapping=tex-text;}
+  \fi
+\else
+  \def\UnicodeFontTeXLigatures{+tlig;} % "+trep;" no longer needed
+\fi
+\def\UnicodeFontFile#1#2{"[#1]:#2"}
+\def\UnicodeFontName#1#2{"#1:#2"}
+\DeclareFontEncoding\UnicodeEncodingName{}{}
+\def\add@unicode@accent#1#2{#2\char#1\relax}
+\def\DeclareUnicodeAccent#1#2#3{%
+  \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
+}
+\DeclareTextSymbol{\textexclamdown}      \UnicodeEncodingName{"00A1}
+\DeclareTextSymbol{\textcent}            \UnicodeEncodingName{"00A2}
+\DeclareTextSymbol{\textsterling}        \UnicodeEncodingName{"00A3}
+\DeclareTextSymbol{\textcurrency}        \UnicodeEncodingName{"00A4}
+\DeclareTextSymbol{\textyen}             \UnicodeEncodingName{"00A5}
+\DeclareTextSymbol{\textbrokenbar}       \UnicodeEncodingName{"00A6}
+\DeclareTextSymbol{\textsection}         \UnicodeEncodingName{"00A7}
+\DeclareTextSymbol{\textasciidieresis}   \UnicodeEncodingName{"00A8}
+\DeclareTextSymbol{\textcopyright}       \UnicodeEncodingName{"00A9}
+\DeclareTextSymbol{\textordfeminine}     \UnicodeEncodingName{"00AA}
+\DeclareTextSymbol{\guillemotleft}       \UnicodeEncodingName{"00AB}
+\DeclareTextSymbol{\textlnot}            \UnicodeEncodingName{"00AC}
+\DeclareTextSymbol{\textregistered}      \UnicodeEncodingName{"00AE}
+\DeclareTextSymbol{\textasciimacron}     \UnicodeEncodingName{"00AF}
+\DeclareTextSymbol{\textdegree}          \UnicodeEncodingName{"00B0}
+\DeclareTextSymbol{\textpm}              \UnicodeEncodingName{"00B1}
+\DeclareTextSymbol{\texttwosuperior}     \UnicodeEncodingName{"00B2}
+\DeclareTextSymbol{\textthreesuperior}   \UnicodeEncodingName{"00B3}
+\DeclareTextSymbol{\textasciiacute}      \UnicodeEncodingName{"00B4}
+\DeclareTextSymbol{\textmu}              \UnicodeEncodingName{"00B5}
+\DeclareTextSymbol{\textparagraph}       \UnicodeEncodingName{"00B6}
+\DeclareTextSymbol{\textperiodcentered}  \UnicodeEncodingName{"00B7}
+\DeclareTextSymbol{\textonesuperior}     \UnicodeEncodingName{"00B9}
+\DeclareTextSymbol{\textordmasculine}    \UnicodeEncodingName{"00BA}
+\DeclareTextSymbol{\guillemotright}      \UnicodeEncodingName{"00BB}
+\DeclareTextSymbol{\textonequarter}      \UnicodeEncodingName{"00BC}
+\DeclareTextSymbol{\textonehalf}         \UnicodeEncodingName{"00BD}
+\DeclareTextSymbol{\textthreequarters}   \UnicodeEncodingName{"00BE}
+\DeclareTextSymbol{\textquestiondown}    \UnicodeEncodingName{"00BF}
+\DeclareTextSymbol{\AE}                  \UnicodeEncodingName{"00C6}
+\DeclareTextSymbol{\DH}                  \UnicodeEncodingName{"00D0}
+\DeclareTextSymbol{\texttimes}           \UnicodeEncodingName{"00D7}
+\DeclareTextSymbol{\O}                   \UnicodeEncodingName{"00D8}
+\DeclareTextSymbol{\TH}                  \UnicodeEncodingName{"00DE}
+\DeclareTextSymbol{\ss}                  \UnicodeEncodingName{"00DF}
+\DeclareTextSymbol{\ae}                  \UnicodeEncodingName{"00E6}
+\DeclareTextSymbol{\dh}                  \UnicodeEncodingName{"00F0}
+\DeclareTextSymbol{\textdiv}             \UnicodeEncodingName{"00F7}
+\DeclareTextSymbol{\o}                   \UnicodeEncodingName{"00F8}
+\DeclareTextSymbol{\th}                  \UnicodeEncodingName{"00FE}
+\DeclareTextSymbol{\DJ}                  \UnicodeEncodingName{"0110}
+\DeclareTextSymbol{\dj}                  \UnicodeEncodingName{"0111}
+\DeclareTextSymbol{\i}                   \UnicodeEncodingName{"0131}
+\DeclareTextSymbol{\IJ}                  \UnicodeEncodingName{"0132}
+\DeclareTextSymbol{\ij}                  \UnicodeEncodingName{"0133}
+\DeclareTextSymbol{\L}                   \UnicodeEncodingName{"0141}
+\DeclareTextSymbol{\l}                   \UnicodeEncodingName{"0142}
+\DeclareTextSymbol{\NG}                  \UnicodeEncodingName{"014A}
+\DeclareTextSymbol{\ng}                  \UnicodeEncodingName{"014B}
+\DeclareTextSymbol{\OE}                  \UnicodeEncodingName{"0152}
+\DeclareTextSymbol{\oe}                  \UnicodeEncodingName{"0153}
+\DeclareTextSymbol{\textflorin}          \UnicodeEncodingName{"0192}
+\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}
+\DeclareTextSymbol{\SS}                  \UnicodeEncodingName{"1E9E}
+\DeclareTextSymbol{\textcompwordmark}    \UnicodeEncodingName{"200C}
+\DeclareTextSymbol{\textendash}          \UnicodeEncodingName{"2013}
+\DeclareTextSymbol{\textemdash}          \UnicodeEncodingName{"2014}
+\DeclareTextSymbol{\textbardbl}          \UnicodeEncodingName{"2016}
+\DeclareTextSymbol{\textquoteleft}       \UnicodeEncodingName{"2018}
+\DeclareTextSymbol{\textquoteright}      \UnicodeEncodingName{"2019}
+\DeclareTextSymbol{\quotesinglbase}      \UnicodeEncodingName{"201A}
+\DeclareTextSymbol{\textquotedblleft}    \UnicodeEncodingName{"201C}
+\DeclareTextSymbol{\textquotedblright}   \UnicodeEncodingName{"201D}
+\DeclareTextSymbol{\quotedblbase}        \UnicodeEncodingName{"201E}
+\DeclareTextSymbol{\textdagger}          \UnicodeEncodingName{"2020}
+\DeclareTextSymbol{\textdaggerdbl}       \UnicodeEncodingName{"2021}
+\DeclareTextSymbol{\textbullet}          \UnicodeEncodingName{"2022}
+\DeclareTextSymbol{\textellipsis}        \UnicodeEncodingName{"2026}
+\DeclareTextSymbol{\textperthousand}     \UnicodeEncodingName{"2030}
+\DeclareTextSymbol{\textpertenthousand}  \UnicodeEncodingName{"2031}
+\DeclareTextSymbol{\guilsinglleft}       \UnicodeEncodingName{"2039}
+\DeclareTextSymbol{\guilsinglright}      \UnicodeEncodingName{"203A}
+\DeclareTextSymbol{\textreferencemark}   \UnicodeEncodingName{"203B}
+\DeclareTextSymbol{\textinterrobang}     \UnicodeEncodingName{"203D}
+\DeclareTextSymbol{\textfractionsolidus} \UnicodeEncodingName{"2044}
+\DeclareTextSymbol{\textlquill}          \UnicodeEncodingName{"2045}
+\DeclareTextSymbol{\textrquill}          \UnicodeEncodingName{"2046}
+\DeclareTextSymbol{\textasteriskcentered}\UnicodeEncodingName{"204E}
+\DeclareTextSymbol{\textdiscount}        \UnicodeEncodingName{"2052}
+\DeclareTextSymbol{\textcolonmonetary}   \UnicodeEncodingName{"20A1}
+\DeclareTextSymbol{\textlira}            \UnicodeEncodingName{"20A4}
+\DeclareTextSymbol{\textnaira}           \UnicodeEncodingName{"20A6}
+\DeclareTextSymbol{\textwon}             \UnicodeEncodingName{"20A9}
+\DeclareTextSymbol{\textdong}            \UnicodeEncodingName{"20AB}
+\DeclareTextSymbol{\texteuro}            \UnicodeEncodingName{"20AC}
+\DeclareTextSymbol{\textpeso}            \UnicodeEncodingName{"20B1}
+\DeclareTextSymbol{\textcelsius}         \UnicodeEncodingName{"2103}
+\DeclareTextSymbol{\textnumero}          \UnicodeEncodingName{"2116}
+\DeclareTextSymbol{\textcircledP}        \UnicodeEncodingName{"2117}
+\DeclareTextSymbol{\textrecipe}          \UnicodeEncodingName{"211E}
+\DeclareTextSymbol{\textservicemark}     \UnicodeEncodingName{"2120}
+\DeclareTextSymbol{\texttrademark}       \UnicodeEncodingName{"2122}
+\DeclareTextSymbol{\textohm}             \UnicodeEncodingName{"2126}
+\DeclareTextSymbol{\textmho}             \UnicodeEncodingName{"2127}
+\DeclareTextSymbol{\textestimated}       \UnicodeEncodingName{"212E}
+\DeclareTextSymbol{\textleftarrow}       \UnicodeEncodingName{"2190}
+\DeclareTextSymbol{\textuparrow}         \UnicodeEncodingName{"2191}
+\DeclareTextSymbol{\textrightarrow}      \UnicodeEncodingName{"2192}
+\DeclareTextSymbol{\textdownarrow}       \UnicodeEncodingName{"2193}
+\DeclareTextSymbol{\textminus}           \UnicodeEncodingName{"2212}
+\DeclareTextSymbol{\textsurd}            \UnicodeEncodingName{"221A}
+\DeclareTextSymbol{\textlangle}          \UnicodeEncodingName{"2329}
+\DeclareTextSymbol{\textrangle}          \UnicodeEncodingName{"232A}
+\DeclareTextSymbol{\textblank}           \UnicodeEncodingName{"2422}
+\DeclareTextSymbol{\textvisiblespace}    \UnicodeEncodingName{"2423}
+\DeclareTextSymbol{\textopenbullet}      \UnicodeEncodingName{"25E6}
+\DeclareTextSymbol{\textbigcircle}       \UnicodeEncodingName{"25EF}
+\DeclareTextSymbol{\textmusicalnote}     \UnicodeEncodingName{"266A}
+\DeclareTextSymbol{\textmarried}         \UnicodeEncodingName{"26AD}
+\DeclareTextSymbol{\textdivorced}        \UnicodeEncodingName{"26AE}
+\DeclareTextSymbol{\textinterrobangdown} \UnicodeEncodingName{"2E18}
+\DeclareUnicodeAccent{\`}                \UnicodeEncodingName{"0300}
+\DeclareUnicodeAccent{\'}                \UnicodeEncodingName{"0301}
+\DeclareUnicodeAccent{\^}                \UnicodeEncodingName{"0302}
+\DeclareUnicodeAccent{\~}                \UnicodeEncodingName{"0303}
+\DeclareUnicodeAccent{\"}                \UnicodeEncodingName{"0308}
+\DeclareUnicodeAccent{\H}                \UnicodeEncodingName{"030B}
+\DeclareUnicodeAccent{\r}                \UnicodeEncodingName{"030A}
+\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{\k}                \UnicodeEncodingName{"0328}
+\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 {"00ED}
+\DeclareTextComposite{\^}             \UnicodeEncodingName\i {"00EE}
+\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}{"012A}
+\DeclareTextComposite{\=}             \UnicodeEncodingName\i {"012B}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{I}{"012C}
+\DeclareTextComposite{\u}             \UnicodeEncodingName\i {"012D}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{I}{"012E}
+\DeclareTextComposite{\k}             \UnicodeEncodingName\i {"012F}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{I}{"0130}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{J}{"0134}
+\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{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{\'}             \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}
+\endinput
+%%
+%% End of file `tuenc.def'.
diff --git a/Master/texmf-dist/tex/latex/base/tulmr.fd b/Master/texmf-dist/tex/latex/base/tulmr.fd
new file mode 100644
index 00000000000..fe637c02f75
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/base/tulmr.fd
@@ -0,0 +1,43 @@
+
+\ProvidesFile{tulmr.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\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}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/base/tulmss.fd b/Master/texmf-dist/tex/latex/base/tulmss.fd
new file mode 100644
index 00000000000..cecaba1f4c1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/base/tulmss.fd
@@ -0,0 +1,36 @@
+
+\ProvidesFile{tulmss.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\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}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/base/tulmtt.fd b/Master/texmf-dist/tex/latex/base/tulmtt.fd
new file mode 100644
index 00000000000..328dd3a7365
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/base/tulmtt.fd
@@ -0,0 +1,68 @@
+
+\ProvidesFile{tulmtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{TU}{lmtt}{\hyphenchar \font\m@ne}
+
+\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}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty
index 7b1a3a8aed1..9890aedd371 100644
--- a/Master/texmf-dist/tex/latex/graphics/graphics.sty
+++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{graphics}
-          [2016/07/10 v1.0t  Standard LaTeX Graphics (DPC,SPQR)]
+          [2016/10/09 v1.0u  Standard LaTeX Graphics (DPC,SPQR)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
  \catcode`\noexpand\"\the\catcode`\"\relax
@@ -475,7 +475,7 @@
   \fi
   \ifdim\dimen@>\z@
     \loop
-      \ifdim\dimen@<8192\p@
+      \ifdim\ifnum\count@<\tw@\maxdimen\else\dimen@\fi<8192\p@
         \dimen@\tw@\dimen@
         \divide\count@\tw@
     \repeat
diff --git a/Master/texmf-dist/tex/latex/graphics/rotating.sty b/Master/texmf-dist/tex/latex/graphics/rotating.sty
index 08fad184e88..757b61ba4d5 100644
--- a/Master/texmf-dist/tex/latex/graphics/rotating.sty
+++ b/Master/texmf-dist/tex/latex/graphics/rotating.sty
@@ -16,7 +16,7 @@
 %% Copyright 2016  LaTeX3 Project
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{rotating}%
-    [2016/05/22 v2.16c
+    [2016/08/11 v2.16d
   rotated objects in LaTeX%
         ]
 \DeclareOption{clockwise}{%
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index dc4a9c2bed8..ab21a6aca04 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -39,7 +39,7 @@
 %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{array}
-         [2014/10/28 v2.4c Tabular extension package (FMi)]
+         [2016/10/06 v2.4d Tabular extension package (FMi)]
 %%
 
 \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
@@ -214,13 +214,13 @@
 \let\d@llarbegin\begingroup
 \let\d@llarend\endgroup
 \def\array{\col@sep\arraycolsep
-  \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\gdef\@halignto{}%
+  \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%
   \@tabarray}
 \def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
-\def\tabular{\gdef\@halignto{}\@tabular}
+\def\tabular{\def\@halignto{}\@tabular}
 \expandafter\def\csname tabular*\endcsname#1{%
        \setlength\dimen@{#1}%
-       \xdef\@halignto{to\the\dimen@}\@tabular}
+       \edef\@halignto{to\the\dimen@}\@tabular}
 \def\@tabular{%
   \leavevmode
   \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup
diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty
index 235db4e1b4d..3f53cec02f5 100644
--- a/Master/texmf-dist/tex/latex/tools/bm.sty
+++ b/Master/texmf-dist/tex/latex/tools/bm.sty
@@ -34,14 +34,13 @@
 %% The list of all files belonging to the LaTeX `Tools Bundle' is
 %% given in the file `manifest.txt'.
 %% 
-%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016
+%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016 2017
 %% David Carlisle Frank Mittelbach
 %%
 %% Development of this package was commissioned by Y&Y Inc.
-%% http://www.yandy.com
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bm}
-          [2016/07/07 v1.2b Bold Symbol Support (DPC/FMi)]
+          [2017/01/16 v1.2c Bold Symbol Support (DPC/FMi)]
 \def\bm#1#2{%
   \let\bm@pmb\install@mathalphabet
   \let\bm@pmb@\getanddefine@fonts
@@ -343,13 +342,17 @@
 \def\bm@umathchar#1#2#3{%
 \@tempcnta#2\relax
 \count@\bm@table
-\ifx\count@=\m@ne
+\ifnum\count@=\z@
+  \bm@gr@up\boldmath{\Umathchar#1 #2 #3 }%
 \else
-  \advance\@tempcnta\count@
-\fi
-\bm@xadd{\Umathchar#1\space
-                   \the\@tempcnta\space\space
-                   #3\space}}
+  \ifnum\count@=\m@ne
+  \else
+    \advance\@tempcnta\count@
+  \fi
+  \bm@xadd{\Umathchar#1\space
+                     \the\@tempcnta\space\space
+                     #3\space}%
+\fi}
 \def\bm@pmb#1{%
   \bm@add{\bm@pmb@{#1}}}
 \def\bm@pmb@#1{{%
author	Karl Berry <karl@freefriends.org>	2017-01-22 23:37:33 +0000
committer	Karl Berry <karl@freefriends.org>	2017-01-22 23:37:33 +0000
commit	b2ba0afced5c10391750914c16a2aa06cfaa6a96 (patch)
tree	8a87b0b92f0038639e1078486bb4c2a56bcea2d3
parent	bc46c8f4627710df445115626d25161dcb2df985 (diff)