1 files changed, 78 insertions, 15 deletions
diff --git a/tex/context/base/mkiv/buff-ver.mkiv b/tex/context/base/mkiv/buff-ver.mkiv
index 7cf829b74..efa179d3b 100644
--- a/tex/context/base/mkiv/buff-ver.mkiv
+++ b/tex/context/base/mkiv/buff-ver.mkiv
@@ -502,12 +502,25 @@
    \buff_verbatim_setup_keep_together
    \normalexpanded{\buff_verbatim_type_block{\e!start\currenttyping}{\e!stop\currenttyping}}}
 
+% \def\buff_verbatim_typing_start_yes[#1]%
+%   {\typingparameter\c!before
+%    \startpacked[\v!blank]%
+%    \doifelseassignment{#1}
+%      {\setupcurrenttyping[#1]}
+%      {\doif\v!continue{#1}{\lettypingparameter\c!continue\v!yes}}%
+%    \buff_verbatim_setup_line_numbering
+%    \buff_verbatim_initialize_typing_one
+%    \buff_verbatim_setup_keep_together
+%    \normalexpanded{\buff_verbatim_type_block{\e!start\currenttyping}{\e!stop\currenttyping}}}
+
 \def\buff_verbatim_typing_start_yes[#1]%
   {\typingparameter\c!before
    \startpacked[\v!blank]%
-   \doifelseassignment{#1}
-     {\setupcurrenttyping[#1]}
-     {\doif\v!continue{#1}{\lettypingparameter\c!continue\v!yes}}%
+   \ifcondition\validassignment{#1}%
+     \setupcurrenttyping[#1]%
+   \else
+     \doif\v!continue{#1}{\lettypingparameter\c!continue\v!yes}%
+   \fi
    \buff_verbatim_setup_line_numbering
    \buff_verbatim_initialize_typing_one
    \buff_verbatim_setup_keep_together
@@ -610,16 +623,33 @@
     \setuevalue{\e!type\currenttyping\v!file}{\typefile[\currenttyping]}%
 \to \everydefinetyping
 
+% \def\buff_verbatim_type_file[#1][#2]#3%
+%   {\begingroup
+%    \ifsecondargument
+%      \setuptyping[#1][#2]%
+%      \buff_verbatim_type_file_checked{#1}{#3}%
+%    \else\iffirstargument
+%      \doifelseassignment{#1}
+%        {\setuptyping[\v!file][#1]%
+%         \buff_verbatim_type_file_checked\v!file{#3}}
+%        {\buff_verbatim_type_file_checked{#1}{#3}}%
+%    \else
+%      \buff_verbatim_type_file_checked\v!file{#3}%
+%    \fi\fi
+%    \endgroup}
+
 \def\buff_verbatim_type_file[#1][#2]#3%
   {\begingroup
    \ifsecondargument
      \setuptyping[#1][#2]%
      \buff_verbatim_type_file_checked{#1}{#3}%
    \else\iffirstargument
-     \doifelseassignment{#1}
-       {\setuptyping[\v!file][#1]
-        \buff_verbatim_type_file_checked\v!file{#3}}
-       {\buff_verbatim_type_file_checked{#1}{#3}}%
+     \ifcondition\validassignment{#1}%
+       \setuptyping[\v!file][#1]%
+       \buff_verbatim_type_file_checked\v!file{#3}%
+     \else
+       \buff_verbatim_type_file_checked{#1}{#3}%
+     \fi
    \else
      \buff_verbatim_type_file_checked\v!file{#3}%
    \fi\fi
@@ -806,15 +836,31 @@
     \setuevalue{\e!type\currenttyping\v!buffer}{\buff_verbatim_type_buffer_class{\currenttyping}}%
 \to \everydefinetyping
 
+% \unexpanded\def\buff_verbatim_type_buffer[#1][#2]%
+%   {\ifsecondargument
+%      \setupcurrenttyping[#2]%
+%      \processcommalist[#1]{\buff_verbatim_type_buffer_indeed\currenttyping}% [name] [settings]
+%    \else\iffirstargument
+%      \doifelseassignment{#1}
+%        {\setupcurrenttyping[#1]%
+%         \buff_verbatim_type_buffer_indeed\currenttyping\empty}% [settings]
+%        {\processcommalist[#1]{\buff_verbatim_type_buffer_indeed\currenttyping}}% [name]
+%    \else
+%      \buff_verbatim_type_buffer_indeed\currenttyping\empty% []
+%    \fi\fi
+%    \endgroup}
+
 \unexpanded\def\buff_verbatim_type_buffer[#1][#2]%
   {\ifsecondargument
      \setupcurrenttyping[#2]%
      \processcommalist[#1]{\buff_verbatim_type_buffer_indeed\currenttyping}% [name] [settings]
    \else\iffirstargument
-     \doifelseassignment{#1}
-       {\setupcurrenttyping[#1]%
-        \buff_verbatim_type_buffer_indeed\currenttyping\empty}% [settings]
-       {\processcommalist[#1]{\buff_verbatim_type_buffer_indeed\currenttyping}}% [name]
+     \ifcondition\validassignment{#1}%
+       \setupcurrenttyping[#1]%
+       \buff_verbatim_type_buffer_indeed\currenttyping\empty% [settings]
+     \else
+       \processcommalist[#1]{\buff_verbatim_type_buffer_indeed\currenttyping}% [name]
+     \fi
    \else
      \buff_verbatim_type_buffer_indeed\currenttyping\empty% []
    \fi\fi
@@ -891,16 +937,33 @@
   {\writestatus{nota bene}{\string\processbuffer\space is obsolete}%
    \dodoubleempty\buff_verbatim_process}
 
+% \def\buff_verbatim_process[#1][#2]%
+%   {\begingroup
+%    \ifsecondargument
+%      \setuptyping[\v!buffer][#2]%
+%      \processcommalist[#1]{\buff_verbatim_process_indeed\v!buffer}% [name] [settings]
+%    \else\iffirstargument
+%      \doifelseassignment{#1}
+%        {\setuptyping[\v!buffer][#1]%
+%         \buff_verbatim_process_indeed\v!buffer\empty}% [settings]
+%        {\processcommalist[#1]{\buff_verbatim_process_indeed\v!buffer}}% [name]
+%    \else
+%      \buff_verbatim_process_indeed\v!buffer\empty% []
+%    \fi\fi
+%    \endgroup}
+
 \def\buff_verbatim_process[#1][#2]%
   {\begingroup
    \ifsecondargument
      \setuptyping[\v!buffer][#2]%
      \processcommalist[#1]{\buff_verbatim_process_indeed\v!buffer}% [name] [settings]
    \else\iffirstargument
-     \doifelseassignment{#1}
-       {\setuptyping[\v!buffer][#1]%
-        \buff_verbatim_process_indeed\v!buffer\empty}% [settings]
-       {\processcommalist[#1]{\buff_verbatim_process_indeed\v!buffer}}% [name]
+     \ifcondition\validassignment{#1}%
+       \setuptyping[\v!buffer][#1]%
+       \buff_verbatim_process_indeed\v!buffer\empty% [settings]
+     \else
+       \processcommalist[#1]{\buff_verbatim_process_indeed\v!buffer}% [name]
+     \fi
    \else
      \buff_verbatim_process_indeed\v!buffer\empty% []
    \fi\fi