1 files changed, 16 insertions, 16 deletions
diff --git a/tex/context/base/grph-trf.mkiv b/tex/context/base/grph-trf.mkiv
index fca5c7cf6..099efa114 100644
--- a/tex/context/base/grph-trf.mkiv
+++ b/tex/context/base/grph-trf.mkiv
@@ -140,7 +140,7 @@
    %
    \d_grph_scale_dp\dp\nextbox
    \ifx\p_depth\v!no \ifzeropt\d_grph_scale_dp \else
-     \setbox\nextbox\hbox{\raise\d_grph_scale_dp\box\nextbox}% new
+     \setbox\nextbox\hpack{\raise\d_grph_scale_dp\box\nextbox}% new
      \d_grph_scale_dp\dp\nextbox
    \fi \fi
    \d_grph_scale_wd\wd\nextbox
@@ -169,7 +169,7 @@
   {\d_grph_scale_wd\finalscaleboxxscale\d_grph_scale_wd
    \d_grph_scale_ht\finalscaleboxyscale\d_grph_scale_ht
    \d_grph_scale_dp\finalscaleboxyscale\d_grph_scale_dp
-   \setbox\nextbox\hbox
+   \setbox\nextbox\hpack
      {\dostartscaling \finalscaleboxxscale \finalscaleboxyscale
       \smashedbox\nextbox
       \dostopscaling}%
@@ -300,7 +300,7 @@
   {\ifx\p_maxwidth \empty\else \edef\p_maxwidth {\the\dimexpr\p_maxwidth        }\fi
    \ifx\p_maxheight\empty\else \edef\p_maxheight{\the\dimexpr\p_maxheight       }\fi
    \ifx\p_lines    \empty\else \edef\p_height   {\the\dimexpr\p_lines\lineheight}\fi
-   \getvalue{\??scalegrid\scaleparameter\c!grid}}
+   \csname\??scalegrid\scaleparameter\c!grid\endcsname}
 
 \def\grph_scale_by_nature % where ! ! ! ! !
   {\ifx\p_width \empty\else \global\d_grph_scale_used_x_size\p_width \fi
@@ -676,13 +676,13 @@
   {\ifx\p_equalwidth\empty \else
     \scratchdimen\p_equalwidth\relax
     \ifdim\d_grph_scale_wd<\scratchdimen
-      \setbox\nextbox\hbox to \scratchdimen{\hss\box\nextbox\hss}%
+      \setbox\nextbox\hpack to \scratchdimen{\hss\box\nextbox\hss}%
     \fi
    \fi
    \ifx\p_equalheight\empty \else
      \scratchdimen\p_equalheight\relax
      \ifdim\d_grph_scale_ht<\scratchdimen
-       \setbox\nextbox\vbox to \scratchdimen{\vss\box\nextbox\vss}%
+       \setbox\nextbox\vpack to \scratchdimen{\vss\box\nextbox\vss}%
      \fi
    \fi}
 
@@ -839,7 +839,7 @@
      \scratchheight\clippingparameter\c!sy\scratchheight
      \advance\scratchyoffset \ht\nextbox
    \fi
-   \setbox\nextbox\hbox
+   \setbox\nextbox\hpack
      {\advance\scratchxoffset -\clippingparameter\c!leftoffset  \relax
       \advance\scratchyoffset -\clippingparameter\c!bottomoffset\relax
       \hskip-\scratchxoffset
@@ -848,13 +848,13 @@
    \wd\nextbox\zeropoint
    \ht\nextbox\zeropoint
    \dp\nextbox\zeropoint
-   \setbox\nextbox\hbox
+   \setbox\nextbox\hpack
      {\advance\scratchwidth \dimexpr\clippingparameter\c!leftoffset  +\clippingparameter\c!rightoffset\relax
       \advance\scratchheight\dimexpr\clippingparameter\c!bottomoffset+\clippingparameter\c!topoffset  \relax
       \dostartclipping{\clippingparameter\c!mp}\scratchwidth\scratchheight
         \box\nextbox
       \dostopclipping}%
-   \setbox\nextbox\hbox
+   \setbox\nextbox\hpack
      {\hskip-\clippingparameter\c!leftoffset
       \lower \clippingparameter\c!bottomoffset
       \box\nextbox}%
@@ -912,7 +912,7 @@
   {\scratchdimen\wd\nextbox
    % better use an hbox (if no \forgetall, leftskip etc may creep in)
    %\setbox\nextbox\vbox{\forgetall\dostartmirroring\hskip-\wd\nextbox\box\nextbox\dostopmirroring}%
-   \setbox\nextbox\hbox{\dostartmirroring\hskip-\wd\nextbox\box\nextbox\dostopmirroring}%
+   \setbox\nextbox\hpack{\dostartmirroring\hskip-\wd\nextbox\box\nextbox\dostopmirroring}%
    \wd\nextbox\scratchdimen
    \box\nextbox
    \egroup}
@@ -1100,19 +1100,19 @@
   {\csname\??rotatepreset
      \ifcsname\??rotatepreset\p_rotation_rotation\endcsname\p_rotation_rotation\else\v!default\fi
    \endcsname
-   \setbox\nextbox\vbox{\box\nextbox}% not really needed
+   \setbox\nextbox\vpack{\box\nextbox}% not really needed
    \dontcomplain
    \ifconditional\c_grph_rotate_center
      \d_grph_rotate_saved_width \wd\nextbox
      \d_grph_rotate_saved_height\ht\nextbox
      \d_grph_rotate_saved_depth \dp\nextbox
-     \setbox\nextbox\vbox{\vskip.5\ht\nextbox\hskip-.5\wd\nextbox\box\nextbox}%
+     \setbox\nextbox\vpack{\vskip.5\ht\nextbox\hskip-.5\wd\nextbox\box\nextbox}%
      \smashbox\nextbox
    \fi
    \d_grph_rotate_width \wd\nextbox
    \d_grph_rotate_height\ht\nextbox
    \d_grph_rotate_depth \dp\nextbox
-   \setbox\nextbox\vbox{\hbox{\raise\dp\nextbox\box\nextbox}}%
+   \setbox\nextbox\vpack{\hpack{\raise\dp\nextbox\box\nextbox}}%
    \d_grph_rotate_used_height \ht\nextbox
    % much of the next happens in lua (all the sin and cos) so we can do that in
    % one go if needed
@@ -1143,7 +1143,7 @@
      \fi\fi
    \fi
    \ifconditional\c_grph_rotate_center
-     \setbox\nextbox\vbox{\vskip-.5\d_grph_rotate_saved_height\hskip.5\d_grph_rotate_saved_height\box\nextbox}%
+     \setbox\nextbox\vpack{\vskip-.5\d_grph_rotate_saved_height\hskip.5\d_grph_rotate_saved_height\box\nextbox}%
      \wd\nextbox\d_grph_rotate_saved_width
      \ht\nextbox\d_grph_rotate_saved_height
      \dp\nextbox\d_grph_rotate_saved_depth
@@ -1209,9 +1209,9 @@
    \fi}
 
 \def\grph_rotate_apply
-  {\setbox\nextbox\vbox to \d_grph_rotate_y_size
+  {\setbox\nextbox\vpack to \d_grph_rotate_y_size
      {\vfill
-      \hbox to \d_grph_rotate_x_size
+      \hpack to \d_grph_rotate_x_size
         {\dostartrotation\p_rotation_rotation
            \wd\nextbox\zeropoint
            \ht\nextbox\zeropoint
@@ -1219,7 +1219,7 @@
          \dostoprotation
          \hfill}%
       \kern\d_grph_rotate_y_position}%
-   \setbox\nextbox\hbox
+   \setbox\nextbox\hpack
      {\kern\dimexpr\d_grph_rotate_x_position+\d_grph_rotate_x_offset\relax
       \lower\d_grph_rotate_y_offset\box\nextbox}}