1 files changed, 51 insertions, 4 deletions
diff --git a/tex/context/base/mkiv/buff-ini.mkiv b/tex/context/base/mkiv/buff-ini.mkiv
index a8a120d90..071a18987 100644
--- a/tex/context/base/mkiv/buff-ini.mkiv
+++ b/tex/context/base/mkiv/buff-ini.mkiv
@@ -22,8 +22,8 @@
 
 \let\currentbuffer\empty
 
-\def\doifelsebuffer#1%
-  {\clf_doifelsebuffer{#1}}
+           \def\doifelsebuffer     #1{\clf_doifelsebuffer     {#1}}
+\unexpanded\def\doifelsebufferempty#1{\clf_doifelsebufferempty{#1}}
 
 \let\doifbufferelse\doifelsebuffer
 
@@ -246,12 +246,14 @@
 % \savebufferinfile[x][temp.log] % gets name: temp.log
 
 \installcorenamespace{savebuffer}
+\installcorenamespace{savebuffercounter}
 
-\installsetuponlycommandhandler \??savebuffer {savebuffer}
+\installcommandhandler \??savebuffer {savebuffer} \??savebuffer
 
 \setupsavebuffer
   [\c!list=,
    \c!file=,
+   \c!directory=,
    \c!prefix=\v!yes]
 
 \unexpanded\def\savebuffer
@@ -262,9 +264,54 @@
    \doifelseassignment{#1}
      {\setupcurrentsavebuffer[#1]}%
      {\setupcurrentsavebuffer[\c!list={#1},\c!file=#2]}%
-   \clf_savebuffer{\directsavebufferparameter\c!list}{\directsavebufferparameter\c!file}{\directsavebufferparameter\c!prefix}%
+   \clf_savebuffer % will become key/value
+     {\savebufferparameter\c!list}%
+     {\savebufferparameter\c!file}%
+     {\savebufferparameter\c!prefix}%
+     {\savebufferparameter\c!option}%
+     {\savebufferparameter\c!directory}%
    \endgroup}
 
+%D \starttyping
+%D \definesavebuffer[slide]
+%D
+%D \starttext
+%D     \startslide
+%D         \starttext
+%D     \stopslide
+%D     \startslide
+%D         slide 1
+%D     \stopslide
+%D     text 1 \par
+%D     \startslide
+%D         slide 2
+%D     \stopslide
+%D     text 2 \par
+%D     \startslide
+%D         \stoptext
+%D     \stopslide
+%D \stoptext
+%D \stoptyping
+
+\appendtoks
+    \ifcsname\e!stop\currentsavebuffer\endcsname\else
+      \definebuffer[\currentsavebuffer]%
+      \expandafter\newcount\csname\??savebuffercounter\currentsavebuffer\endcsname
+      \setuevalue{\e!stop\currentsavebuffer}{\buff_stop_save_buffer{\currentsavebuffer}}%
+      \setsavebufferparameter\c!file{\currentsavebuffer.tex}%
+    \fi
+\to \everydefinesavebuffer
+
+\protected\def\buff_stop_save_buffer#1%
+  {\edef\currentsavebuffer{#1}%
+   \global\advance\csname\??savebuffercounter\currentsavebuffer\endcsname\plusone
+   \clf_savebuffer % will become key/value
+     {\thedefinedbuffer{\currentsavebuffer}}%
+     {\savebufferparameter\c!file}%
+     {\savebufferparameter\c!prefix}%
+     {\ifnum\csname\??savebuffercounter\currentsavebuffer\endcsname>\plusone\v!append\fi}%
+     {\savebufferparameter\c!directory}}
+
 %D Experimental: no expansion of commands in buffer!
 
 % \startbuffer[what]