1 files changed, 2 insertions, 48 deletions
diff --git a/tex/context/base/mkxl/core-dat.mkxl b/tex/context/base/mkxl/core-dat.mkxl
index ab40d874c..6d7d1bd14 100644
--- a/tex/context/base/mkxl/core-dat.mkxl
+++ b/tex/context/base/mkxl/core-dat.mkxl
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=core-dat,
-%D        version=20122.04.17, % replaces core-two from 1997.03.31,
+%D        version=2021.04.17, % replaces core-two from 1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Multipass Datasets,
 %D         author=Hans Hagen,
@@ -42,7 +42,7 @@
 
 \unprotect
 
-\registerctxluafile{core-dat}{}
+\registerctxluafile{core-dat}{autosuffix}
 
 \installcorenamespace{dataset}
 
@@ -78,50 +78,4 @@
      \expandafter\clf_datasetvariable
    \fi}
 
-\installcorenamespace{pagestate}
-\installcorenamespace{pagestatecounter}
-
-\installcommandhandler \??pagestate {pagestate} \??pagestate
-
-\def\syst_pagestates_allocate
-  {\expandafter\newinteger\csname\??pagestatecounter\currentpagestate\endcsname}
-
-\appendtoks
-    \syst_pagestates_allocate
-\to \everydefinepagestate
-
-\setuppagestate
-  [\c!delay=\v!yes]
-
-\permanent\tolerant\protected\def\setpagestate[#1]#*[#2]%
-  {\begingroup
-   \edef\currentpagestate{#1}%
-   \ifcsname\??pagestatecounter\currentpagestate\endcsname
-     \scratchcounter\lastnamedcs
-     \advanceby\scratchcounter\plusone
-   \else
-     \scratchcounter\plusone
-     \syst_pagestates_allocate
-   \fi
-   \global\csname\??pagestatecounter\currentpagestate\endcsname\scratchcounter
-   \clf_setpagestate
-      name  {\currentpagestate}%
-      tag   {\ifparameter#2\or#2\else\number\scratchcounter\fi}%
-      delay {\pagestateparameter\c!delay}%
-   \relax
-   \endgroup}
-
-\permanent\protected\def\autosetpagestate#1%
-  {\setpagestate[#1]\relax}
-
-\permanent\def\autopagestatenumber#1{\begincsname\??pagestatecounter#1\endcsname}
-
-\permanent\def\pagestaterealpage     #1#2{\clf_pagestaterealpage     {#1}{#2}}
-\permanent\def\setpagestaterealpageno#1#2{\clf_setpagestaterealpageno{#1}{#2}}
-\permanent\def\pagestaterealpageorder#1#2{\clf_pagestaterealpageorder{#1}#2\relax}
-
-\permanent\def\autopagestaterealpage     #1{\clf_pagestaterealpage     {#1}{\number\autopagestatenumber{#1}}}
-\permanent\def\setautopagestaterealpageno#1{\clf_setpagestaterealpageno{#1}{\number\autopagestatenumber{#1}}}
-\permanent\def\autopagestaterealpageorder#1{\clf_pagestaterealpageorder{#1}\numexpr\autopagestatenumber{#1}\relax}
-
 \protect