1 files changed, 33 insertions, 6 deletions
diff --git a/tex/context/base/mkiv/grph-trf.mkiv b/tex/context/base/mkiv/grph-trf.mkiv
index 6bd0e65cc..35e812b3e 100644
--- a/tex/context/base/mkiv/grph-trf.mkiv
+++ b/tex/context/base/mkiv/grph-trf.mkiv
@@ -146,10 +146,10 @@
    \d_grph_scale_ht\ht\nextbox
    \d_grph_scale_dp\dp\nextbox
    %
-   \global\let\finalscaleboxxscale \!!plusone
-   \global\let\finalscaleboxyscale \!!plusone
-   \xdef      \finalscaleboxwidth {\the\d_grph_scale_wd}%
-   \xdef      \finalscaleboxheight{\the\d_grph_scale_ht}%
+   \glet\finalscaleboxxscale \!!plusone
+   \glet\finalscaleboxyscale \!!plusone
+   \xdef\finalscaleboxwidth {\the\d_grph_scale_wd}%
+   \xdef\finalscaleboxheight{\the\d_grph_scale_ht}%
    %
    \forgetall
    \dontcomplain
@@ -164,11 +164,38 @@
    \box\nextbox
    \egroup}
 
+% \def\grph_scale_apply
+%   {\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\hpack
+%      {\dostartscaling \finalscaleboxxscale \finalscaleboxyscale
+%       \smashedbox\nextbox
+%       \dostopscaling}%
+%    \wd\nextbox\d_grph_scale_wd
+%    \ht\nextbox\d_grph_scale_ht
+%    \dp\nextbox\d_grph_scale_dp}
+
 \def\grph_scale_apply
   {\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\hpack
+   \ifdim\d_grph_scale_wd=\wd\nextbox
+     \ifdim\d_grph_scale_ht=\ht\nextbox
+       \ifdim\d_grph_scale_dp=\dp\nextbox
+        % \grph_scale_apply_nop
+       \else
+          \grph_scale_apply_yes
+       \fi
+     \else
+       \grph_scale_apply_yes
+     \fi
+   \else
+     \grph_scale_apply_yes
+   \fi}
+
+\def\grph_scale_apply_yes
+  {\setbox\nextbox\hpack
      {\dostartscaling \finalscaleboxxscale \finalscaleboxyscale
       \smashedbox\nextbox
       \dostopscaling}%
@@ -871,7 +898,7 @@
    \egroup}
 
 \def\grph_rotate_finish_indeed
-  {\hbox\bgroup
+  {\hpack\bgroup
      \ifx\p_rotation_rotation\empty
        \grph_rotate_finish_nop
      \else