1 files changed, 30 insertions, 47 deletions
diff --git a/tex/context/base/core-syn.tex b/tex/context/base/core-syn.tex
index 3f26b973d..6d1b88c94 100644
--- a/tex/context/base/core-syn.tex
+++ b/tex/context/base/core-syn.tex
@@ -15,6 +15,13 @@
 
 \unprotect
 
+\ifx\mkdefinesortedlist\undefined
+    \let\mkdefinesortedlist      \gobbleoneargument
+    \let\mksavesortedlistentry   \gobblefourarguments
+    \let\mksavesortedlistvariable\gobblethreearguments
+    \let\mkloadsortedlist        \gobbleoneargument
+\fi
+
 % \checkdefined kan hierheen
 
 %  Formaat tex-utility-input-file <jobname.tui>:
@@ -63,16 +70,6 @@
    \def\currentsynonym{#1}%
    \definedescription  % nog eens een class van maken, net als framed
      [syndef]
-%      [\c!location=\getvalue{\??sm#1\c!location}, % todo \synonymparameter
-%       \c!width=\getvalue{\??sm#1\c!width},
-%       \c!distance=\getvalue{\??sm#1\c!distance},
-%       \c!sample=\getvalue{\??sm#1\c!sample},
-%       \c!hang=\getvalue{\??sm#1\c!hang},
-%       \c!align=\getvalue{\??sm#1\c!align},
-%       \c!before=\getvalue{\??sm#1\c!before},
-%       \c!inbetween=\getvalue{\??sm#1\c!inbetween},
-%       \c!after=\getvalue{\??sm#1\c!after},
-%       \c!indentnext=\getvalue{\??sm#1\c!indentnext},
      [\c!location=\synonymparameter\c!location,
       \c!width=\synonymparameter\c!width,
       \c!distance=\synonymparameter\c!distance,
@@ -86,7 +83,8 @@
       \c!headstyle=,
       \c!style=]%
    \setupwhitespace[\v!none]%
-   \doutilities{#1}\jobname{#2}\relax\par
+   %doutilities{#1}\jobname{#2}\relax\par % no longer \par
+   \mkloadsortedlist{#1}%
    \endgroup
    \ifutilitydone\else\nowhitespace\fi}
 
@@ -119,19 +117,9 @@
   {\begingroup  % anders in mathmode lege \hbox
    \convertexpanded{\getvalue{\??sm#1\c!expansion}}{#3}\asciisynonym
    \convertexpanded{\getvalue{\??sm#1\c!expansion}}{#4}\asciimeaning
-   \immediatewriteutility{s e {#1} {#2} {\asciisynonym} {\asciimeaning}}%
+   \mksavesortedlistentry{#1}{#2}{\asciisynonym}{\asciimeaning}%
    \endgroup}
 
-% \def\preexecutesynonym#1#2#3#4%
-%   {\ifdoinpututilities \else
-%      \dowritesynonym{#1}{#2}{#3}{#4}%
-%      \unexpanded\setgvalue{#2}{\processsynonym{#1}{#3}{#4}}%
-%    \fi}
-%
-% \def\executesynonym#1#2#3#4%
-%   {\preexecutesynonym{#1}{#2}{#3}{#4}%
-%    \processsynonym{#1}{#3}{#4}}
-
 \def\reprocesssynonym#1#2#3%
   {\processsynonym{#1}{#2}{#3}%
    \getvalue{\??sm#1\c!next}} % not formally documented
@@ -165,7 +153,7 @@
   {\bgroup
    \let\dosetsynonym\doloadsynonym
    \showmessage\m!systems{19}{#2}%
-   \doutilities{#1}\jobname\empty\relax\relax
+   \mkloadsortedlist{#1}%
    \egroup
    \setvalue{\s!check#1}##1{}}
 
@@ -190,7 +178,7 @@
 
 \def\doregistersynonymlanguage#1%
   {\savesortlanguage{\getvalue{\??sm#1\s!language}}%
-   \immediatewriteutility{s l {#1} {\getvalue{\??sm#1\s!language}}}}
+   \mksavesortedlistvariable{#1}{l}{\getvalue{\??sm#1\s!language}}}
 
 \def\dodefinesynonyms[#1][#2][#3][#4]%
   {\iffourthargument
@@ -219,7 +207,7 @@
      \doregistersynonymlanguage{#1}%
    \to \everysavesortkeys
    \presetheadtext[#2=\Word{#2}]% changes the \if...argument
-   \addutilityreset{#1}%
+   \mkdefinesortedlist{#1}%
    \setvalue{\e!setup #2\e!endsetup}{\dodoubleargument\getparameters[\??sm#1]}% to be obsolete
    \setvalue{\s!set              #1}{\dosetsynonym{#1}}%
    \setvalue{\s!reset            #1}{\doresetsynonym{#1}}%
@@ -251,7 +239,7 @@
 
 \def\dosetsort#1%
   {\setvalue{#1\s!entry}##1##2##3%
-     {\def\dowritesort####1####2####3{}%
+     {\let\dowritesort\gobblethreearguments
       \global\utilitydonetrue
       \bgroup
       \doifdefinedelse{\??so#1\c!command}
@@ -265,7 +253,8 @@
   {\whitespace           % ZONDER WITRUIMTE ETC ETC
    \begingroup
    \setupwhitespace[\v!none]%
-   \doutilities{#1}\jobname{#1}\relax\par
+   %doutilities{#1}\jobname{#1}\relax\par % brr \par
+   \mkloadsortedlist{#1}%
    \endgroup
    \ifutilitydone\else\nowhitespace\fi}
 
@@ -273,7 +262,8 @@
 %
 % \def\doplacelistofsorts#1% NOG EEN RUWE VERSIE MAKEN
 %   {\startpacked
-%    \doutilities{#1}\jobname{#1}\relax\par
+%    %doutilities{#1}\jobname{#1}\relax\par
+%    \mkloadsortedlist{#1}%
 %    \stoppacked}
 
 \def\docompletelistofsorts#1#2%
@@ -295,25 +285,12 @@
 \def\dowritesort#1#2#3%
   {\bgroup
    \convertexpanded{\getvalue{\??so#1\c!expansion}}{#3}\asciisynonym
-   \immediatewriteutility{s e {#1} {#2} {\asciisynonym} {}}%
+   \mksavesortedlistentry{#1}{#2}{\asciisynonym}{}%
    \egroup}
 
 \def\synonymentry#1%
   {\executeifdefined{#1\s!entry}\gobblethreearguments}
 
-% \def\preexecutesort#1#2#3%
-%   {\ifdoinpututilities \else
-%      \dowritesort{#1}{#2}{#3}%
-%      \unexpanded\setgvalue{#2}{\processsort{#1}{#3}{#2}}%
-%    \fi}
-%
-% \def\executesort#1#2#3%
-%   {\begingroup
-%    \let\executesort\thirdofthreearguments % Trick needed for nested logo's.
-%    \preexecutesort{#1}{#2}{#3}%
-%    \processsort{#1}{#3}{#2}%
-%    \endgroup}
-
 \def\reprocesssort#1#2#3%
   {\processsort{#1}{#2}{#3}%
    \getvalue{\??so#1\c!next}}
@@ -341,7 +318,7 @@
   {\bgroup
    \let\dosetsort\doloadsort
    \showmessage\m!systems{20}{#2}%
-   \doutilities{#1}\jobname\empty\relax\relax
+   \mkloadsortedlist{#1}%
    \egroup
    \setvalue{\s!check#1}##1{}}
 
@@ -366,7 +343,7 @@
 
 \def\doregistersortinglanguage#1%
   {\savesortlanguage{\getvalue{\??so#1\s!language}}%
-   \immediatewriteutility{s l {#1} {\getvalue{\??so#1\s!language}}}}
+   \mksavesortedlistvariable{#1}{l}{\getvalue{\??so#1\s!language}}}
 
 \def\dodefinesorting[#1][#2][#3]%
   {\getparameters[\??so#1]
@@ -390,7 +367,7 @@
    \else
      \setvalue{#1}{\dotripleempty\docomplexsort[][#1]}%
    \fi
-   \addutilityreset{#1}%
+   \mkdefinesortedlist{#1}%
    \presetheadtext[#2=\Word{#2}]% after \ifthirdargument -)
    \setvalue{\e!setup#2\e!endsetup}[##1]{\getparameters[\??so#1][##1]}% to be obsolete
    \setvalue{\s!set#1}{\dosetsort{#1}}%
@@ -408,7 +385,7 @@
 %D written by Taco.
 
 \def\processlistofsorts[#1]%
-  {\doutilities{#1}\jobname{#1}\donothing\donothing}
+  {\mkloadsortedlist{#1}}
 
 \newcounter\nofsortedalphalists
 
@@ -429,7 +406,13 @@
 %     \def\whatever{a,b,q,d,r,f}       \sortalphacommacommand\whatever \whatever \endgraf
 %     \def\whatever{ax,bx,qx,dx,rx,fx} \sortalphacommacommand\whatever \whatever \endgraf
 % \stoptext
-
+
+%D Plugins.
+
+\loadmarkfile{core-syn}
+
+%D Presets.
+
 \definesynonyms
   [\v!abbreviation]
   [\v!abbreviations]