1 files changed, 7 insertions, 37 deletions
diff --git a/tex/context/base/mkiv/page-lay.mkiv b/tex/context/base/mkiv/page-lay.mkiv
index bde86e8b1..2b801b957 100644
--- a/tex/context/base/mkiv/page-lay.mkiv
+++ b/tex/context/base/mkiv/page-lay.mkiv
@@ -363,21 +363,6 @@
 \unexpanded\def\definepapersize
   {\dotripleempty\page_paper_define_size}
 
-% \def\page_paper_define_size[#1][#2][#3]%
-%   {\edef\currentlayouttarget{#1}%
-%    \ifx\currentlayouttarget\empty
-%      % invalid target
-%    \else
-%      \doifelseassignment{#2}
-%        {\definelayouttarget[#1][#2]}
-%        {\setevalue{\??layoutpaper#1}{#2}%
-%         \ifthirdargument
-%           \setevalue{\??layoutprint#1}{#3}%
-%         \else
-%           \setevalue{\??layoutprint#1}{#2}%
-%         \fi}%
-%    \fi}
-
 \def\page_paper_define_size[#1][#2][#3]%
   {\edef\currentlayouttarget{#1}%
    \ifx\currentlayouttarget\empty
@@ -413,17 +398,6 @@
 \unexpanded\def\setuppapersize
   {\dodoubleempty\page_paper_setup_size}
 
-% \unexpanded\def\page_paper_setup_size[#1][#2]%
-%   {\iffirstargument
-%      \doifelseassignment{#1}
-%        {\page_paper_setup_size_settings[#1]}
-%        {\doifelseassignment{#2}
-%           {\page_paper_setup_size_settings_by_name[#1][#2]}
-%           {\page_paper_setup_size_change_size[#1][#2]}}%
-%    \else
-%      \page_paper_restore
-%    \fi}
-
 \unexpanded\def\page_paper_setup_size[#1][#2]%
   {\iffirstargument
      \ifcondition\validassignment{#1}%
@@ -640,10 +614,6 @@
 
 \fi
 
-\ifdefined\setups \else
-    \unexpanded\def\setups[#1]{\setdefaultpenalties}  % still needed?
-\fi
-
 \ifdefined\synchronizegridsnapping \else
     \let\synchronizegridsnapping\relax
 \fi
@@ -672,12 +642,12 @@
    \global\cutspace\layoutparameter\c!cutspace\relax
    \edef\p_page_layouts_width{\layoutparameter\c!width}%
    \ifx\p_page_layouts_width\v!middle
-     \ifdim\cutspace=\zeropoint
+     \ifzeropt\cutspace
        \global\cutspace\backspace
      \fi
      \global\makeupwidth\dimexpr\paperwidth-\backspace-\cutspace\relax
    \else\ifx\p_page_layouts_width\v!fit
-     \ifdim\cutspace=\zeropoint
+     \ifzeropt\cutspace
        \global\cutspace\backspace
      \fi
      \global\makeupwidth\dimexpr\paperwidth-\cutspace\relax
@@ -693,7 +663,7 @@
        -\scratchdimen\relax
    \else
      \global\makeupwidth\p_page_layouts_width\relax
-     \ifdim\cutspace=\zeropoint
+     \ifzeropt\cutspace
        \global\cutspace\dimexpr\paperwidth-\makeupwidth-\backspace\relax
    % \else
        % A kind of inconsistent specification, but used
@@ -703,7 +673,7 @@
      \fi
    \fi\fi
    \scratchdimen\layoutparameter\c!bottomspace\relax
-  %\ifdim\scratchdimen=\zeropoint
+  %\ifzeropt\scratchdimen
   %  \scratchdimen\topspace
   %\fi
    \global\bottomspace\layoutparameter\c!bottomspace\relax
@@ -711,12 +681,12 @@
    \ifcase\layoutlines
      \edef\p_page_layouts_height{\layoutparameter\c!height}%
      \ifx\p_page_layouts_height\v!middle
-       \ifdim\bottomspace=\zeropoint
+       \ifzeropt\bottomspace
          \global\bottomspace\topspace
        \fi
        \global\makeupheight\dimexpr\paperheight-\topspace-\bottomspace\relax
      \else\ifx\p_page_layouts_height\v!fit
-       \ifdim\bottomspace=\zeropoint
+       \ifzeropt\bottomspace
          \global\bottomspace\topspace
        \fi
        \global\makeupheight\dimexpr\paperheight-\bottomspace\relax
@@ -727,7 +697,7 @@
        \global\advance\makeupheight\dimexpr-\bottomdistance-\bottomheight-\scratchdimen\relax
      \else
        \global\makeupheight\layoutparameter\c!height\relax
-       \ifdim\bottomspace=\zeropoint
+       \ifzeropt\bottomspace
          \global\bottomspace\dimexpr\paperheight-\makeupheight-\topspace\relax
      % \else
          % inconsistent specification