[latex3-commits] [git/LaTeX3-latex3-latex2e] gh354: fix for #354 (e7e71b75)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh354
Link       : https://github.com/latex3/latex2e/commit/e7e71b75f397fc5d4fca5a708c5fa8a6bf346af5

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

commit e7e71b75f397fc5d4fca5a708c5fa8a6bf346af5
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jul 16 20:31:46 2020 +0200

    fix for #354


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

e7e71b75f397fc5d4fca5a708c5fa8a6bf346af5
 base/changes.txt                                           |  5 +++++
 base/ltfinal.dtx                                           |  4 ++--
 base/lthooks.dtx                                           |  2 +-
 .../github-0069.lvt => testfiles/github-0354.lvt}          | 14 +++++++++-----
 base/testfiles/github-0354.tlg                             | 13 +++++++++++++
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 24deb18d..1ef6f2cd 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2020-07-16  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltmiscen.dtx: \begin should not be long for better
+	error recovery (gh/354)
+
 2020-07-09  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* lthooks.dtx, ltshipout.dtx, ltfilehook.dtx:
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index a7b5073f..9089c8a7 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2020-07-13 v2.2e LaTeX Kernel (Final Settings)]
+             [2020-07-16 v2.2f LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -1147,7 +1147,7 @@
 %<latexrelease>                 {\ShowHook}{The hook management}%
 
 %<latexrelease>
-%<latexrelease>\DeclareRobustCommand\begin[1]{%
+%<latexrelease>\DeclareRobustCommand*\begin[1]{%
 %<latexrelease>  \@ifundefined{#1}%
 %<latexrelease>    {\def\reserved at a{\@latex at error{Environment #1 undefined}\@eha}}%
 %<latexrelease>    {\def\reserved at a{\def\@currenvir{#1}%
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 926846a7..4be91b08 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -3498,7 +3498,7 @@
 %    \end{macrocode}
 %    
 %    \begin{macrocode}
-\DeclareRobustCommand\begin[1]{%
+\DeclareRobustCommand*\begin[1]{%
   \UseHook{env/#1/before}%
   \@ifundefined{#1}%
     {\def\reserved at a{\@latex at error{Environment~#1~undefined}\@eha}}%
diff --git a/base/testfiles-legacy/github-0069.lvt b/base/testfiles/github-0354.lvt
similarity index 50%
copy from base/testfiles-legacy/github-0069.lvt
copy to base/testfiles/github-0354.lvt
index 87ec5f67..382b297d 100644
--- a/base/testfiles-legacy/github-0069.lvt
+++ b/base/testfiles/github-0354.lvt
@@ -1,17 +1,21 @@
+% \begin should complain early
+
 \documentclass{article}
 
 \input{test2e}
 
-\showoutput
+\nonstopmode
 
 \begin{document}
 
 \START
 
-\verb*|x x|
+\begin{quote)
+qqq
+\end{quote}
+
+aaa
 
-\begin{verbatim*}
- A B C
-\end{verbatim*}
+aaa
 
 \end{document}
diff --git a/base/testfiles/github-0354.tlg b/base/testfiles/github-0354.tlg
new file mode 100644
index 00000000..ff03275c
--- /dev/null
+++ b/base/testfiles/github-0354.tlg
@@ -0,0 +1,13 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+Runaway argument?
+{quote) qqq \end {quote} 
+! Paragraph ended before \begin  was complete.
+<to be read again> 
+                   \par 
+l. ...
+I suspect you've forgotten a `}', causing me to apply this
+control sequence to too much text. How can we recover?
+My plan is to forget the whole thing and hope for the best.
+[1
+] (github-0354.aux)