summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/base/ltclass.dtx4
-rw-r--r--Master/texmf-dist/source/latex/base/ltfiles.dtx11
-rw-r--r--Master/texmf-dist/source/latex/base/lttab.dtx8
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx2
-rw-r--r--Master/texmf-dist/source/latex/base/nfssfont.dtx6
-rw-r--r--Master/texmf-dist/source/latex/graphics/graphics.dtx35
6 files changed, 56 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx
index 3d19971701f..83aacf8ddbd 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}
- [2019/09/11 v1.3c LaTeX Kernel (Class & Package Interface)]
+ [2019/10/07 v1.3c LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -155,7 +155,7 @@
% verbatim to the file name given as the first argument, together with
% some comments about how it was produced.
%
-% The package can also be called with an optional argument which is
+% The environment can also be called with an optional argument which is
% used to alter some of its behavior: option \texttt{force} or
% \texttt{overwrite} will allow for overwriting existing files,
% option \texttt{nosearch} will only check the current directory
diff --git a/Master/texmf-dist/source/latex/base/ltfiles.dtx b/Master/texmf-dist/source/latex/base/ltfiles.dtx
index afb085a4174..a2037e221f1 100644
--- a/Master/texmf-dist/source/latex/base/ltfiles.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfiles.dtx
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfiles.dtx}
- [2019/08/27 v1.2b LaTeX Kernel (File Handling)]
+ [2019/10/11 v1.2c LaTeX Kernel (File Handling)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfiles.dtx}
@@ -706,7 +706,14 @@
% A side effect of the new code is that we will see quotes around
% file name displays where there haven't been any before.
%
+% For compatibilty with existing code using |{abc}.tex| or |{one.two}.png|
+% an initial brace group is discarded before expansion and |\string| is applied
+% The content of the brace group is discarded. This means that a leading space
+% will be lost unless protected (by |{ }| or |" "| or |\space|) but filenames
+% with a space are hopefully rare.
+%
% \changes{v1.2a}{2019/07/01}{Support UTF-8}
+% \changes{v1.2c}{2019/10/11}{Remove one brace group}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -715,7 +722,7 @@
\def\set@curr@file#1{%
\begingroup
\escapechar\m@ne
- \xdef\@curr@file{\expandafter\string\csname #1\endcsname}%
+ \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}%
\endgroup
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/lttab.dtx b/Master/texmf-dist/source/latex/base/lttab.dtx
index 646015daf3d..aa2a00390fc 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}[2019/08/27 v1.1p LaTeX Kernel (Columns)]
+\ProvidesFile{lttab.dtx}[2019/10/07 v1.1q LaTeX Kernel (Columns)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{lttab.dtx}
@@ -806,8 +806,12 @@
%
%
% \begin{macro}{\extracolsep}
+% This command needs to expand during the tabular preamble construction
+% so can't be robust.
+%
+% \changes{v1.1q}{2019/10/07}{This needs to expand}
% \begin{macrocode}
-\DeclareRobustCommand\extracolsep[1]{\tabskip #1\relax}
+\def\extracolsep#1{\tabskip #1\relax}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index 17f5f3ee5e9..d15bd784040 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -115,7 +115,7 @@
{2019-10-01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{0}
+\def\patch@level{1}
% \end{macrocode}
%
% \begin{macro}{\development@branch@name}
diff --git a/Master/texmf-dist/source/latex/base/nfssfont.dtx b/Master/texmf-dist/source/latex/base/nfssfont.dtx
index a77dfba7b3b..fc92f83451b 100644
--- a/Master/texmf-dist/source/latex/base/nfssfont.dtx
+++ b/Master/texmf-dist/source/latex/base/nfssfont.dtx
@@ -26,8 +26,8 @@
% extension .ins) which are part of the distribution.
%
% \fi
-\def\nfssfontfileversion{v2.2d}
-\def\nfssfontfiledate{2015/02/01}
+\def\nfssfontfileversion{v2.2e}
+\def\nfssfontfiledate{2019/10/12}
%
% \iffalse
@@ -258,6 +258,8 @@
\string\help\space for help [ \string\table\space\string\bye\space]:}%
\ifx\action\empty
\expandafter\table\expandafter\bye
+ \else
+ \expandafter\action
\fi
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx
index f2471e94bbb..b6de6023d44 100644
--- a/Master/texmf-dist/source/latex/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx
@@ -25,7 +25,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2019/07/20 v1.3b Standard LaTeX Graphics (DPC,SPQR)]
+ [2019/10/08 v1.3c Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -1043,6 +1043,38 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\set@curr@file}
+% \begin{macro}{\quote@name}
+% \changes{v1.3c}{2019/10/08}
+% {Definitions added for old formats}
+% \begin{macrocode}
+\def\Gin@temp#1{%
+ \begingroup
+ \escapechar\m@ne
+ \xdef\@curr@file{\expandafter\string\csname #1\endcsname}%
+ \endgroup
+}
+\ifx\set@curr@file\@Gin@temp
+ \let\set@curr@file\@undefined
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ifx\set@curr@file\@undefined
+\def\set@curr@file#1{%
+ \begingroup
+ \escapechar\m@ne
+ \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}%
+ \endgroup
+}
+\def\quote@name#1{"\quote@@name#1\@gobble""}
+\def\quote@@name#1"{#1\quote@@name}
+\def\unquote@name#1{\quote@@name#1\@gobble"}
+\fi
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \begin{macro}{\Ginclude@graphics}
% The main internal function implementing graphics file inclusion.
% |#1| is the file name.
@@ -1069,6 +1101,7 @@
\let\input@path\Ginput@path
% \end{macrocode}
% A lot of quote juggling going on here (room for improvements).
+%
% \begin{macrocode}
\set@curr@file{#1}%
\edef\uq@curr@file{\expandafter\unquote@name\expandafter{\@curr@file}}%