1 files changed, 51 insertions, 51 deletions

diff --git a/tex/context/base/page-mbk.mkvi b/tex/context/base/page-mbk.mkvi
index 05e3cb104..ed0b45ad6 100644
--- a/tex/context/base/page-mbk.mkvi
+++ b/tex/context/base/page-mbk.mkvi
@@ -66,30 +66,30 @@
    \c!bottom=\vfill]
 
 \unexpanded\def\startmarginblock
-  {\dosingleempty\start_margin_block}
+  {\dosingleempty\page_margin_start_block}
 
-\unexpanded\def\stoptmarginblock
-  {\stop_margin_block}
+\unexpanded\def\stopmarginblock
+  {\page_margin_stop_block}
 
-\def\start_margin_block[#tag]%
+\def\page_margin_start_block[#tag]%
   {\begingroup
    \edef\currentmarginblock{#tag}%
    \doifelse{\marginblockparameter\c!state}\v!start
-     \start_margin_block_yes
-     \start_margin_block_nop}
+     \page_margin_start_block_yes
+     \page_margin_start_block_nop}
 
-\def\stop_margin_block
+\def\page_margin_stop_block
   {\doifelse{\marginblockparameter\c!state}\v!start
-     \stop_margin_block_yes
-     \stop_margin_block_nop
+     \page_margin_stop_block_yes
+     \page_margin_stop_block_nop
    \endgroup}
 
-\def\start_margin_block_yes % 2 maal \vbox ivm \unvbox elders
+\def\page_margin_start_block_yes % 2 maal \vbox ivm \unvbox elders
   {\showmessage\m!layouts4\empty
-   \global\setbox\page_margin_box\vtop\bgroup\vbox\bgroup
+   \global\setbox\b_page_margin\vtop\bgroup\vbox\bgroup
      \hsize\marginblockparameter\c!width
-     \ifvoid\page_margin_box\else
-       \unvbox\page_margin_box
+     \ifvoid\b_page_margin\else
+       \unvbox\b_page_margin
        \marginblockparameter\c!inbetween
      \fi
      \setupalign[\marginblockparameter\c!align]%
@@ -97,40 +97,40 @@
      \begstrut
      \ignorespaces}
 
-\def\stop_margin_block_yes
+\def\page_margin_stop_block_yes
   {\removeunwantedspaces
    \endstrut
    \egroup
    \egroup}
 
-\def\start_margin_block_nop
+\def\page_margin_start_block_nop
   {\showmessage\m!layouts5\empty
    \marginblockparameter\c!before
    \bgroup
    \usemarginblockstyleandcolor\c!style\c!color}
 
-\def\stop_margin_block_nop
+\def\page_margin_stop_block_nop
   {\egroup
    \marginblockparameter\c!after}
 
-\newbox\page_margin_box
-\newbox\page_margin_prepared_box
+\newbox\b_page_margin
+\newbox\b_page_margin_prepared
 
 \def\page_margin_reshape
-  {\ifdim\ht\page_margin_prepared_box>\zeropoint
+  {\ifdim\ht\b_page_margin_prepared>\zeropoint
      \beginofshapebox
-     \unvbox\page_margin_prepared_box
+     \unvbox\b_page_margin_prepared
      \endofshapebox
      \reshapebox
        {\box\shapebox}%
-     \setbox\page_margin_prepared_box\vbox to \textheight
+     \setbox\b_page_margin_prepared\vbox to \textheight
        {\marginblockparameter\c!top
         \flushshapebox
         \marginblockparameter\c!bottom}%
    \fi}
 
 \unexpanded\def\checkmarginblocks
-  {\ifvoid\page_margin_box \else
+  {\ifvoid\b_page_margin \else
      \page_margin_check_indeed
    \fi}
 
@@ -139,24 +139,24 @@
      \page_margin_prepare_box
      \csname\??marginblocklocation\marginblockparameter\c!location\endcsname
    \else
-     \global\page_margin_box\emptybox
+     \global\b_page_margin\emptybox
    \fi}
 
 \def\page_margin_prepare_box
-  {\setbox\page_margin_prepared_box\vbox
+  {\setbox\b_page_margin_prepared\vbox
      {\forgetall
       \splittopskip\topskip
-      \ifvoid\page_margin_box\else
-        \ifdim\ht\page_margin_box>\textheight
-          \vsplit\page_margin_box to \textheight
+      \ifvoid\b_page_margin\else
+        \ifdim\ht\b_page_margin>\textheight
+          \vsplit\b_page_margin to \textheight
         \else
-          \unvbox\page_margin_box
+          \unvbox\b_page_margin
         \fi
       \fi}%
    \page_margin_reshape
-   \setbox\page_margin_prepared_box\vbox
+   \setbox\b_page_margin_prepared\vbox
      {\marginblockparameter\c!before
-      \box\page_margin_prepared_box
+      \box\b_page_margin_prepared
       \marginblockparameter\c!after}}
 
 \setvalue{\??marginblocklocation\v!left    }{\page_margin_set_l_box}
@@ -170,30 +170,30 @@
                                              \page_margin_set_l_box
                                              \page_margin_set_r_box}
 
-\unexpanded\def\place_r_margin_block_yes
-  {\setbox\page_margin_prepared_box\hbox to \rightmarginwidth
+\unexpanded\def\page_margin_place_block_r_yes
+  {\setbox\b_page_margin_prepared\hbox to \rightmarginwidth
      {\marginblockparameter\c!left
-      \box\page_margin_prepared_box
+      \box\b_page_margin_prepared
       \marginblockparameter\c!right}%
-   \vsmashbox\page_margin_prepared_box
-   \box\page_margin_prepared_box}
+   \vsmashbox\b_page_margin_prepared
+   \box\b_page_margin_prepared}
 
-\unexpanded\def\place_l_margin_block_yes
-  {\setbox\page_margin_prepared_box\hbox to \leftmarginwidth
+\unexpanded\def\page_margin_place_block_l_yes
+  {\setbox\b_page_margin_prepared\hbox to \leftmarginwidth
      {\marginblockparameter\c!right
-      \box\page_margin_prepared_box
+      \box\b_page_margin_prepared
       \marginblockparameter\c!left}%
-   \vsmashbox\page_margin_prepared_box
-   \box\page_margin_prepared_box}
+   \vsmashbox\b_page_margin_prepared
+   \box\b_page_margin_prepared}
 
-\unexpanded\def\place_r_margin_block_nop{\hskip\rightmarginwidth}
-\unexpanded\def\place_l_margin_block_nop{\hskip\leftmarginwidth}
+\unexpanded\def\page_margin_place_block_r_nop{\hskip\rightmarginwidth}
+\unexpanded\def\page_margin_place_block_l_nop{\hskip\leftmarginwidth}
 
-\let\placerightmarginblock\place_r_margin_block_nop
-\let\placeleftmarginblock \place_l_margin_block_nop
+\let\placerightmarginblock\page_margin_place_block_r_nop
+\let\placeleftmarginblock \page_margin_place_block_l_nop
 
-\def\page_margin_set_r_box{\let\placerightmarginblock\place_r_margin_block_yes}
-\def\page_margin_set_l_box{\let\placeleftmarginblock \place_l_margin_block_yes}
+\def\page_margin_set_r_box{\let\placerightmarginblock\page_margin_place_block_r_yes}
+\def\page_margin_set_l_box{\let\placeleftmarginblock \page_margin_place_block_l_yes}
 
 % margin floats (keyword 'margin' in option list)
 
@@ -203,15 +203,15 @@
      \page_margin_process_float_nop}
 
 \def\page_margin_process_float_yes#options%
-  {\global\setbox\page_margin_box\vbox
+  {\global\setbox\b_page_margin\vbox
      {\hsize\marginblockparameter\c!width
-      \unvcopy\page_margin_box
-      \ifvoid\page_margin_box\else
+      \unvcopy\b_page_margin
+      \ifvoid\b_page_margin\else
         \expandafter\marginblockparameter\expandafter\c!inbetween
       \fi
       \box\floatbox
       \filbreak}%
-   \ifdim\ht\page_margin_box>\textheight
+   \ifdim\ht\b_page_margin>\textheight
    % \dosavefloatinfo % no saving done anyway
    \else
      \doinsertfloatinfo
@@ -231,7 +231,7 @@
    \fi}
 
 \appendtoks
-   \ifvoid\page_margin_box \else
+   \ifvoid\b_page_margin \else
      \writestatus\m!layouts{beware: there are left-over margin floats!}%
    \fi
 \to \everystoptext