[latex3-commits] [git/LaTeX3-latex3-latex2e] input-nobreakspace: ~ means a tilde in a file name (fca51287)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : input-nobreakspace
Link       : https://github.com/latex3/latex2e/commit/fca5128797e2802355c2f30c704c843b6fc14e1b

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

commit fca5128797e2802355c2f30c704c843b6fc14e1b
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Tue Apr 20 16:06:51 2021 -0300

    ~ means a tilde in a file name


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

fca5128797e2802355c2f30c704c843b6fc14e1b
 base/ltfilehook.dtx                                |  7 ++-
 base/testfiles/github-0528.lvt                     | 19 ++++++++
 .../testfiles/{github-0385.tlg => github-0528.tlg} | 50 ++++++++++++++--------
 3 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index b0d647fc..e9871aa2 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -31,8 +31,8 @@
 %%% From File: ltfilehook.dtx
 %
 %    \begin{macrocode}
-\providecommand\ltfilehookversion{v1.0h}
-\providecommand\ltfilehookdate{2021/03/18}
+\providecommand\ltfilehookversion{v1.0i}
+\providecommand\ltfilehookdate{2021/04/20}
 %    \end{macrocode}
 %
 %<*driver>
@@ -1035,6 +1035,8 @@
 %   false positives.  Here we define \cs{csname\cs{endcsname}} to
 %   expand to itself to avoid it matching the definition of some other
 %   control sequence.
+%   \changes{v1.0i}{2021/04/20}
+%           {Make \string~ expand to a string (tracks change in l3kernel)}
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
@@ -1044,6 +1046,7 @@
   \begingroup
     \escapechar\m at ne
     \let\protect\string
+    \edef~{\string~}%
     \expandafter\def\csname\expandafter\endcsname
       \expandafter{\csname\endcsname}%
 %    \end{macrocode}
diff --git a/base/testfiles/github-0528.lvt b/base/testfiles/github-0528.lvt
new file mode 100644
index 00000000..4227c2bc
--- /dev/null
+++ b/base/testfiles/github-0528.lvt
@@ -0,0 +1,19 @@
+\begin{filecontents}[overwrite]{ßmy{file}$with~sp&ci#ls.tex}
+hello :)
+\end{filecontents}
+
+\input{test2e}
+
+\documentclass{article}
+\begin{document}
+
+\START
+\loggingoutput
+
+\input{ßmy{file}$with~sp&ci#ls.tex}
+
+\texttt{\input{ßmy{file}$with~sp&ci#ls.tex}}
+
+\clearpage
+
+\END
diff --git a/base/testfiles/github-0385.tlg b/base/testfiles/github-0528.tlg
similarity index 50%
copy from base/testfiles/github-0385.tlg
copy to base/testfiles/github-0528.tlg
index cfde0088..dad619d4 100644
--- a/base/testfiles/github-0385.tlg
+++ b/base/testfiles/github-0528.tlg
@@ -1,5 +1,14 @@
 This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
+(^^c3^^9fmy{file}$with~sp&ci#ls.tex)
+! Illegal parameter number in definition of \reserved at a.
+<to be read again> 
+                   l
+l. ......input{^^c3^^9fmy{file}$with~sp&ci#ls.tex}}
+You meant to type ## instead of #, right?
+Or maybe a } was forgotten somewhere earlier, and things
+are all screwed up? I'm going to assume that you meant ##.
+(^^c3^^9fmy{file}$with~sp&ci#ls.tex)
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\glue 16.0
@@ -12,34 +21,42 @@ Completed box being shipped out [1]
 ..\glue(\lineskip) 0.0
 ..\vbox(550.0+0.0)x345.0, glue set 527.9436fil
 ...\write-{}
-...\glue(\topskip) 3.05556
-...\hbox(6.94444+0.0)x345.0, glue set 305.52773fill
+...\glue(\topskip) 2.5
+...\hbox(7.5+2.5)x345.0, glue set 294.99994fil
 ....\hbox(0.0+0.0)x15.0
-....\glue 0.0 plus 1.0fill
+....\OT1/cmr/m/n/10 h
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 l
 ....\OT1/cmr/m/n/10 l
 ....\OT1/cmr/m/n/10 o
-....\OT1/cmr/m/n/10 r
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 m
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 :
+....\OT1/cmr/m/n/10 )
+....\glue 4.44444 plus 3.33331 minus 0.55556
+....\kern 0.0
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
-...\glue(\baselineskip) 5.32141
-...\hbox(6.67859+1.94444)x345.0, glue set 303.83327fill
+...\glue(\baselineskip) 2.55556
+...\hbox(6.94444+0.8333)x345.0, glue set 277.50046fil
 ....\hbox(0.0+0.0)x15.0
-....\glue 0.0 plus 1.0fill
-....\OT1/cmr/m/n/10 i
-....\OT1/cmr/m/n/10 p
-....\OT1/cmr/m/n/10 s
-....\OT1/cmr/m/n/10 u
-....\OT1/cmr/m/n/10 m
+....\OT1/cmtt/m/n/10 h
+....\OT1/cmtt/m/n/10 e
+....\OT1/cmtt/m/n/10 l
+....\OT1/cmtt/m/n/10 l
+....\OT1/cmtt/m/n/10 o
+....\glue 5.24995
+....\OT1/cmtt/m/n/10 :
+....\OT1/cmtt/m/n/10 )
+....\kern 0.0
+....\glue 10.49991
+....\kern 0.0
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-...\write1{\newlabel{foo}{{}{\thepage }}}
-...\glue -1.94444
+...\glue -0.8333
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
@@ -49,4 +66,3 @@ Completed box being shipped out [1]
 ....\glue 0.0 plus 1.0fil
 ....\OT1/cmr/m/n/10 1
 ....\glue 0.0 plus 1.0fil
-(github-0385.aux)