From caee9d5ac3c65f78671a9786318358cd647247eb Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Sat, 18 May 2019 11:17:14 +0200
Subject: 2019-05-18 10:50:00

---
 tex/context/base/mkiv/page-cst.mkiv | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'tex/context/base/mkiv/page-cst.mkiv')

diff --git a/tex/context/base/mkiv/page-cst.mkiv b/tex/context/base/mkiv/page-cst.mkiv
index 37df4e8b1..8fd02c870 100644
--- a/tex/context/base/mkiv/page-cst.mkiv
+++ b/tex/context/base/mkiv/page-cst.mkiv
@@ -221,6 +221,7 @@
   {\begingroup
    \letdummyparameter\c!c\zerocount
    \letdummyparameter\c!r\zerocount
+   \letdummyparameter\c!method\v!here
    \letdummyparameter\c!option\v!none
    \getdummyparameters[#1]%
    \dowithnextboxcs\page_grd_set_indeed\hbox}
@@ -231,6 +232,7 @@
      c      \dummyparameter\c!c
      r      \dummyparameter\c!r
      box    \nextbox
+     method {\dummyparameter\c!method}
      option {\dummyparameter\c!option}
    }%
    \ifcase\c_page_grd_reserved_state
@@ -250,6 +252,7 @@
    \fi
    \endgroup}
 
+
 \unexpanded\def\page_grd_command_set_vsize
   {\clf_setvsizecolumnset{\currentpagegrid}%
    \ifdim\d_page_grd_gap_height<\lineheight
@@ -640,11 +643,12 @@
    \edef\currentpagegridspan{#1}%
    \clf_sethsizecolumnspan{\currentpagegrid}\pagegridspanparameter\c!n\relax
    \setbox\scratchbox\hbox\bgroup\inheritedpagegridspanframed\bgroup
+     \def\page_grd_span_stop{\page_grd_span_stop_indeed{#2}}%
      \usepagegridspanstyleandcolor\c!style\c!color
      \pagegridspanparameter\c!before
      \ignorespaces}
 
-\unexpanded\def\stoppagegridspan
+\unexpanded\def\page_grd_span_stop_indeed#1%
   {\removeunwantedspaces
    \par
    \verticalstrut
@@ -653,11 +657,14 @@
    \endgraf
    \pagegridspanparameter\c!after
    \egroup\egroup
-   \setpagegrid{\box\scratchbox}%
+   \setpagegrid[#1]{\box\scratchbox}%
    % todo: push into slot
    \egroup
    \endgraf}
 
+\unexpanded\def\stoppagegridspan % indirectness permits aliasing
+  {\page_grd_span_stop}
+
 \def\pagegridspanwidth#1% assumes equal distances
   {\the\dimexpr
      #1\d_page_grd_column_width
-- 
cgit v1.2.3