[latex3-commits] [git/LaTeX3-latex3-latex2e] graphics-compat: brace stripping now in the format (a62aa124)

David Carlisle d.p.carlisle at gmail.com
Sat Oct 12 23:26:56 CEST 2019


Repository : https://github.com/latex3/latex2e
On branch  : graphics-compat
Link       : https://github.com/latex3/latex2e/commit/a62aa124b4a792118b7e8af39a484f504b8253fa

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

commit a62aa124b4a792118b7e8af39a484f504b8253fa
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Oct 12 22:26:56 2019 +0100

    brace stripping now in the format


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

a62aa124b4a792118b7e8af39a484f504b8253fa
 required/graphics/graphics.dtx | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/required/graphics/graphics.dtx b/required/graphics/graphics.dtx
index 6ab4190c..b6de6023 100644
--- a/required/graphics/graphics.dtx
+++ b/required/graphics/graphics.dtx
@@ -1048,11 +1048,23 @@
 % \changes{v1.3c}{2019/10/08}
 %     {Definitions added for old formats}
 %    \begin{macrocode}
+\def\Gin at temp#1{%
+  \begingroup
+    \escapechar\m at ne
+    \xdef\@curr at file{\expandafter\string\csname #1\endcsname}%
+  \endgroup
+}
+\ifx\set at curr@file\@Gin at temp
+  \let\set at curr@file\@undefined
+\fi
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \ifx\set at curr@file\@undefined
 \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
 }
 \def\quote at name#1{"\quote@@name#1\@gobble""}
@@ -1090,13 +1102,8 @@
 %    \end{macrocode}
 %    A lot of quote juggling going on here (room for improvements).
 %
-% \changes{v1.3c}{2019/10/08}
-%     {strip one brace group}
-% Earlier versions required |{foo.bar}.png| to hide dots in filenames, we support this
-% by discarding any brace group that starts the filename (this means that spaces at the
-% start of the filename are also lost).
 %    \begin{macrocode}
-  \expandafter\set at curr@file\expandafter{\@firstofone#1\@empty}%
+  \set at curr@file{#1}%
   \edef\uq at curr@file{\expandafter\unquote at name\expandafter{\@curr at file}}%
   \expandafter\filename at parse\expandafter{\uq at curr@file}%
   \edef\filename at area{\expandafter\quote at name\expandafter{\filename at area}}%





More information about the latex3-commits mailing list