From a274872832cdd1e71ce4b019858c61c5a77c6b98 Mon Sep 17 00:00:00 2001
From: Context Git Mirror Bot <phg42.2a@gmail.com>
Date: Tue, 31 May 2016 09:46:19 +0200
Subject: 2016-05-31 09:07:00

---
 tex/context/base/mkiv/spac-lin.mkiv | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'tex/context/base/mkiv/spac-lin.mkiv')

diff --git a/tex/context/base/mkiv/spac-lin.mkiv b/tex/context/base/mkiv/spac-lin.mkiv
index c4c6eb6d9..6558cb111 100644
--- a/tex/context/base/mkiv/spac-lin.mkiv
+++ b/tex/context/base/mkiv/spac-lin.mkiv
@@ -61,7 +61,7 @@
 
 \appendtoks
    \setuevalue{\e!start\currentlines}{\spac_lines_start[\currentlines]}%
-   \setuevalue{\e!stop \currentlines}{\spac_lines_stop}%
+   \letvalue  {\e!stop \currentlines }\spac_lines_stop
 \to \everydefinelines
 
 \unexpanded\def\spac_lines_start[#1]%
@@ -107,14 +107,17 @@
 
 \def\spac_lines_after_first_obeyed_line_a % tzt two pass, like itemize
   {\linesparameter\c!command
+   \linesparameter\c!left
    \glet\spac_after_first_obeyed_line\spac_lines_after_first_obeyed_line_b}
 
 \def\spac_lines_after_first_obeyed_line_b
   {\spac_lines_break
-   \linesparameter\c!command}
+   \linesparameter\c!command
+   \linesparameter\c!left}
 
 \def\spac_lines_obeyed_line
-  {\dostoptagged
+  {\ifdone\linesparameter\c!right\fi
+   \dostoptagged % can be a dummy one as we don't look ahead
    \par
    \dostarttagged\t!line\empty
    \futurelet\next\spac_lines_between}
@@ -128,9 +131,13 @@
    \egroup}
 
 \def\spac_lines_between
-  {\doifelsemeaning\next\obeyedline % brrr
-     {\linesparameter\c!inbetween}
-     {\spac_after_first_obeyed_line}}
+  {\ifx\next\spac_lines_stop
+     \donefalse
+   \else
+     \doifelsemeaning\next\obeyedline % brrr
+       {\donefalse\linesparameter\c!inbetween}
+       {\donetrue\spac_after_first_obeyed_line}%
+   \fi}
 
 \definelines[\v!lines]
 
-- 
cgit v1.2.3