From 65b0b89d498caaeabf0f4fd769d7490f0cce1b74 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 20 Oct 2018 21:36:06 +0000
Subject: l3kernel (20oct18)

git-svn-id: svn://tug.org/texlive/trunk@48956 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/l3kernel/l3file.dtx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index 3ffb06807bc..fcbe47e1fe0 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -42,7 +42,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2018-10-17}
+% \date{Released 2018-10-19}
 %
 % \maketitle
 %
@@ -1608,6 +1608,7 @@
 %   {
 %     \@@_wrap_line_loop:w,
 %     \@@_wrap_line_aux:Nw,
+%     \@@_wrap_line_seven:nnnnnnn,
 %     \@@_wrap_line_end:NnnnnnnnN,
 %     \@@_wrap_line_end:nw,
 %     \@@_wrap_end_chunk:w
@@ -1632,7 +1633,9 @@
 %   |#2|--|#9| of the \texttt{line_loop} auxiliary or as one of the
 %   arguments |#2|--|#8| of the \texttt{line_end} auxiliary.  In both
 %   cases stop the assignment and work out how many characters are still
-%   needed.  The weird \cs{use_none:nnnnn} ensures that the required
+%   needed. Notice that when we have exactly seven arguments to clean up,
+%   a \cs{exp_stop_f:} has to be inserted to stop the \cs{exp:w}.
+%   The weird \cs{use_none:nnnnn} ensures that the required
 %   data is in the right place.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_wrap_line:nw #1
@@ -1666,10 +1669,11 @@
     \or: \use_none:nnnn
     \or: \use_none:nnnnn
     \or: \use_none:nnnnnn
-    \or: \use_none:nnnnnnn
+    \or: \@@_wrap_line_seven:nnnnnnn
     \fi:
     { } { } { } { } { } { } { } #3
   }
+\cs_new:Npn \@@_wrap_line_seven:nnnnnnn #1#2#3#4#5#6#7 { \exp_stop_f: }
 \cs_new:Npn \@@_wrap_line_end:NnnnnnnnN #1#2#3#4#5#6#7#8#9
   {
     #2 #3 #4 #5 #6 #7 #8
-- 
cgit v1.2.3

