[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: merge from curr-file-braces (a9114b83)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/a9114b8310db9fc597dfd3597ed549180797cd9e

>---------------------------------------------------------------

commit a9114b8310db9fc597dfd3597ed549180797cd9e
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Fri Oct 11 23:01:52 2019 +0100

    merge from curr-file-braces


>---------------------------------------------------------------

a9114b8310db9fc597dfd3597ed549180797cd9e
 base/changes.txt |  8 ++++++++
 base/ltfiles.dtx | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index edeba129..8dc09021 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,14 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+#########################
+# 2019-10-01 PL 1 Release
+#########################
+
+2019-10-11  David Carlisle  <David.Carlisle at latex-project.org>
+
+	* ltfiles.dtx: Remove One Brace group before using \string\csname in \set at curr@file.
+
 2019-10-07  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* lttab.dtx (subsection{array and tabular environments}):
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index afb085a4..a2037e22 100644
--- a/base/ltfiles.dtx
+++ b/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 at curr@file#1{%
   \begingroup
     \escapechar\m at ne
-    \xdef\@curr at file{\expandafter\string\csname #1\endcsname}%
+    \xdef\@curr at file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}%
   \endgroup
 }
 %    \end{macrocode}