1 files changed, 19 insertions, 14 deletions
diff --git a/tex/context/base/mkiv/page-txt.mkvi b/tex/context/base/mkiv/page-txt.mkvi
index b043b60c7..97668c143 100644
--- a/tex/context/base/mkiv/page-txt.mkvi
+++ b/tex/context/base/mkiv/page-txt.mkvi
@@ -98,8 +98,8 @@
   {\expandafter\normalgdef\csname\??layouttextsreset#vertical\endcsname{\page_layouts_set_element_status_normal#vertical}}
 
 \def\page_layouts_set_element_status_normal#vertical%
-  {\global\expandafter\let\csname\namedlayoutelementhash#vertical\c!state\endcsname\v!normal
-   \global\expandafter\let\csname\??layouttextsreset#vertical\endcsname\relax
+  {\expandafter\glet\csname\namedlayoutelementhash#vertical\c!state\endcsname\v!normal
+   \expandafter\glet\csname\??layouttextsreset#vertical\endcsname\relax
    \page_layouts_synchronize_element{#vertical}}
 
 \def\page_layouts_synchronize_element#vertical%
@@ -527,10 +527,10 @@
         \page_layouts_place_text_line_right
         \page_layouts_place_text_line_left
       \namedlayoutelementparameter\currentlayouttextline\c!after
-      \kern\zeropoint}% keep the \dp, beware of \vtops, never change this!
+      \vkern\zeropoint}% keep the \dp, beware of \vtops, never change this!
    \dp\b_page_layouts_element\zeropoint
    \box\b_page_layouts_element
-   \vskip-#height\relax}
+   \vkern-#height\relax}
 
 \let\page_layouts_extra_at_margin_left \plusone
 \let\page_layouts_extra_at_margin_right\plustwo
@@ -831,21 +831,21 @@
       \calculatereducedvsizes
       \swapmargins
       \offinterlineskip
-      \vskip\dimexpr-\topheight-\topdistance\relax
+      \vkern\dimexpr-\topheight-\topdistance\relax
       \the\toptextcontent
-      \vskip\dimexpr\topheight+\topdistance\relax
+      \vkern\dimexpr\topheight+\topdistance\relax
       \the\headertextcontent
-      \vskip\dimexpr\headerheight+\headerdistance+\textdistance\relax
+      \vkern\dimexpr\headerheight+\headerdistance+\textdistance\relax
       \anch_positions_place_anchors
-      \vskip\dimexpr-\textdistance-\textheight\relax
+      \vkern\dimexpr-\textdistance-\textheight\relax
       \the\texttextcontent
-      \vskip\textheight
+      \vkern\textheight
       \the\everyendoftextbody
-      \vskip\footerdistance
+      \vkern\footerdistance
       \the\footertextcontent
-      \vskip\dimexpr\footerheight+\bottomdistance\relax
+      \vkern\dimexpr\footerheight+\bottomdistance\relax
       \the\bottomtextcontent
-      \vskip\bottomheight
+      \vkern\bottomheight
       \vfilll}%
   \smashbox\b_page_layouts_element
   \box\b_page_layouts_element}
@@ -854,16 +854,20 @@
 %     \let\page_prepare_backgrounds\gobbleoneargument
 % \fi
 
+% only for very special controlled cases or experiments:
+
+\let\page_scale_text_box\gobbleoneargument
+
 \def\page_insert_body#1#2%
   {\setbox\b_page_layouts_element\vpack
      {\offinterlineskip
       \calculatereducedvsizes
       \calculatehsizes
       \swapmargins
-      \vskip\dimexpr\headerheight+\headerdistance+\textdistance\relax
+      \vkern\dimexpr\headerheight+\headerdistance+\textdistance\relax
       \dontleavehmode
      %\page_prepare_backgrounds{#2}%
-      \hbox to \makeupwidth
+      \hpack to \makeupwidth
         {\begingroup
            \swapmargins
            \goleftonpage
@@ -880,6 +884,7 @@
          \settextpagecontent\b_page_layouts_element{#1}{#2}%
          \page_backgrounds_add_to_text\b_page_layouts_element
          \page_grids_add_to_box\b_page_layouts_element
+         \page_scale_text_box\b_page_layouts_element
          \box\b_page_layouts_element
          \begingroup
            \ifdim\rightmarginwidth>\zeropoint