1 files changed, 20 insertions, 13 deletions
diff --git a/tex/context/base/pack-lyr.mkiv b/tex/context/base/pack-lyr.mkiv
index a891c998d..a847dec67 100644
--- a/tex/context/base/pack-lyr.mkiv
+++ b/tex/context/base/pack-lyr.mkiv
@@ -101,9 +101,6 @@
 
 \def\layeranchor{\currentlayer:\the\realpageno}
 
-\unexpanded\def\anch_mark_anchor_box#1%
-  {\ctxcommand{markregionbox(\number#1,"\layeranchor")}} % needs an hbox
-
 \let\p_pack_layers_doublesided\empty
 \let\p_pack_layers_state      \empty
 \let\p_pack_layers_option     \empty
@@ -229,7 +226,7 @@
    \else\ifthirdargument
      \pack_layers_set_indeed[#1][#2][#3]%
    \else
-     \doifassignmentelse{#2}
+     \doifelseassignment{#2}
        {\pack_layers_set_indeed[#1][][#2]}%
        {\pack_layers_set_indeed[#1][#2][]}%
    \fi\fi}
@@ -323,7 +320,7 @@
   {\dodoubleargument\pack_layers_define_preset}
 
 \def\pack_layers_define_preset[#1][#2]%
-  {\doifassignmentelse{#2}
+  {\doifelseassignment{#2}
      {\setvalue{\??layerpreset#1}{\setupcurrentlayer[#2]}}
      {\setvalue{\??layerpreset#1}{\csname\??layerpreset#2\endcsname}}}
 
@@ -510,6 +507,8 @@
      \expandafter\secondoftwoarguments
    \fi}
 
+\let\doiflayerdataelse\doifelselayerdata
+
 %D \macros
 %D  {flushlayer}
 %D
@@ -610,7 +609,7 @@
 %      {\setlayoutcomponentattribute{\v!layer:#2}}%
 %      \resetlayoutcomponentattribute
 %    \ifx\p_pack_layers_option\v!test \ruledvbox \else \vbox \fi \ifx\p_pack_layers_method\v!overlay to \overlayheight \fi \layoutcomponentboxattribute
-%      {\hbox \ifx\p_pack_layers_method\v!overlay to \overlaywidth \fi
+%      {\hbox \ifx\p_pack_layers_method\v!overlay to \d_overlay_width \fi
 %         {\edef\currentlayer{#2\the\realpageno}% local
 %          \edef\p_pack_layers_position{\layerparameter\c!position}% local
 %          \ifx\p_pack_layers_position\v!yes
@@ -669,15 +668,15 @@
        \pack_layers_positioned_box_nop
      \fi
    % todo: method=offset => overlayoffset right/down (handy for backgrounds with offset)
-   \doifoverlayelse{#2}%
+   \doifelseoverlay{#2}%
      {\setlayoutcomponentattribute{\v!layer:#2}}%
      \resetlayoutcomponentattribute
    % we have conflicting demands: some mechanisms want ll anchoring .. I need to figure this out
    % an dmaybe we will have 'origin=bottom' or so
    \setbox\nextbox
-   \ifx\p_pack_layers_option\v!test \ruledvbox \else \vbox \fi \ifx\p_pack_layers_method\v!overlay to \overlayheight \fi \layoutcomponentboxattribute
+   \ifx\p_pack_layers_option\v!test \ruledvbox \else \vbox \fi \ifx\p_pack_layers_method\v!overlay to \d_overlay_height \fi \layoutcomponentboxattribute
      {\pack_layers_top_fill
-      \hbox \ifx\p_pack_layers_method\v!overlay to \overlaywidth \fi
+      \hbox \ifx\p_pack_layers_method\v!overlay to \d_overlay_width \fi
         {\box\nextbox
          \hss}%
       \pack_layers_bottom_fill}%
@@ -687,7 +686,7 @@
    \ifx\p_pack_layers_position\v!yes
      \edef\p_pack_layers_region{\layerparameter\c!region}%
      \ifx\p_pack_layers_region\empty \else
-       \anch_mark_anchor_box\nextbox
+       \anch_mark_tagged_box\nextbox\layeranchor
      \fi
    \fi
    \box\nextbox
@@ -724,12 +723,20 @@
 
 \unexpanded\def\composedlayer#1{\flushlayer[#1]}
 
+% \unexpanded\def\tightlayer[#1]%
+%   {\hbox
+%      {\def\currentlayer{#1}% todo: left/right
+%       \setbox\nextbox\emptybox
+%       \hsize\layerparameter\c!width
+%       \vsize\layerparameter\c!height
+%       \composedlayer{#1}}}
+
 \unexpanded\def\tightlayer[#1]%
   {\hbox
      {\def\currentlayer{#1}% todo: left/right
-      \setbox\nextbox\emptybox       % hoogte/breedte are \wd\nextbox/\ht\nextbox
-      \hsize\layerparameter\c!width  % \overlaywidth   = \hsize
-      \vsize\layerparameter\c!height % \overlaywheight = \vsize
+      \setbox\nextbox\emptybox
+      \d_overlay_width \layerparameter\c!width
+      \d_overlay_height\layerparameter\c!height
       \composedlayer{#1}}}
 
 \let\placelayer\flushlayer