From 58c7c9288160407c874930aac789ef6ef3faa6b5 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Tue, 10 Sep 2019 21:16:35 +0200
Subject: 2019-09-10 20:11:00

---
 tex/context/base/mkiv/page-pcl.mkiv | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/tex/context/base/mkiv/page-pcl.mkiv b/tex/context/base/mkiv/page-pcl.mkiv
index 3cb5bf1c8..61c542e1c 100644
--- a/tex/context/base/mkiv/page-pcl.mkiv
+++ b/tex/context/base/mkiv/page-pcl.mkiv
@@ -94,7 +94,9 @@
    \else
      \numexpr\c_page_col_n_of_columns-\plusone\relax
      \dimexpr\d_page_col_column_width+\d_page_col_distance\relax
-   \fi}
+   \fi
+   % consistent with mixed:
+   \textwidth\d_page_col_column_width}
 
 %D \unknown
 
@@ -729,9 +731,6 @@
     \setuevalue{\e!stop \currentpagecolumns}{\stoppagecolumns}%
 \to \everydefinepagecolumns
 
-\ifdefined \columnwidth    \else \newdimen\columnwidth    \fi
-\ifdefined \columndistance \else \newdimen\columndistance \fi
-
 \def\page_col_pickup_preceding
   {\begingroup
    \setupoutputroutine[\s!mixedcolumn]%
@@ -800,6 +799,8 @@
    %
    \columnwidth    \d_page_col_column_width
    \columndistance \d_page_col_distance
+   \nofcolumns     \c_page_col_n_of_columns
+   \textwidth      \columnwidth % kind of redundant
    %
    \nopenalties
    %
@@ -835,8 +836,6 @@
    \page_col_command_set_vsize
    \page_col_command_set_hsize
    %
-   \nofcolumns\c_page_mix_n_of_columns
-   %
    \unexpanded\def\page_col_start[##1]%
      {\page_col_start_nop}%
    %
-- 
cgit v1.2.3