1 files changed, 24 insertions, 18 deletions
diff --git a/tex/context/base/mkiv/buff-ver.mkiv b/tex/context/base/mkiv/buff-ver.mkiv
index 27535dba9..558049dcc 100644
--- a/tex/context/base/mkiv/buff-ver.mkiv
+++ b/tex/context/base/mkiv/buff-ver.mkiv
@@ -15,7 +15,7 @@
 
 \writestatus{loading}{ConTeXt Buffer Macros / Verbatim}
 
-\registerctxluafile{buff-ver}{1.001}
+\registerctxluafile{buff-ver}{}
 
 \unprotect
 
@@ -41,7 +41,7 @@
     \resetcharacterspacing
 \to \everyinitializeverbatim
 
-\def\setverbatimspaceskip % to be checked: must happen after font switch
+\unexpanded\def\setverbatimspaceskip % to be checked: must happen after font switch
   {\spaceskip\fontcharwd\font`x\relax
    \xspaceskip\spaceskip}
 
@@ -799,21 +799,6 @@
     \setuevalue{\e!type\currenttyping\v!buffer}{\buff_verbatim_type_buffer_class{\currenttyping}}%
 \to \everydefinetyping
 
-% \unexpanded\def\buff_verbatim_type_buffer[#1][#2]%
-%   {\begingroup
-%    \ifsecondargument
-%      \setuptyping[\v!buffer][#2]%
-%      \processcommalist[#1]{\buff_verbatim_type_buffer_indeed\v!buffer}% [name] [settings]
-%    \else\iffirstargument
-%      \doifelseassignment{#1}
-%        {\setuptyping[\v!buffer][#1]%
-%         \buff_verbatim_type_buffer_indeed\v!buffer\empty}% [settings]
-%        {\processcommalist[#1]{\buff_verbatim_type_buffer_indeed\v!buffer}}% [name]
-%    \else
-%      \buff_verbatim_type_buffer_indeed\v!buffer\empty% []
-%    \fi\fi
-%    \endgroup}
-
 \unexpanded\def\buff_verbatim_type_buffer[#1][#2]%
   {\ifsecondargument
      \setupcurrenttyping[#2]%
@@ -859,7 +844,7 @@
      tab    {\typingparameter\c!tab}%
      method {\p_buff_option}%
      escape {\typingparameter\c!escape}%
-   % nature {display}%
+     nature {display}%
    \relax
    \dostoptagged
    \endofverbatimlines
@@ -867,6 +852,27 @@
    \stoppacked
    \typingparameter\c!after}
 
+\unexpanded\def\typeinlinebuffer
+  {\dontleavehmode
+   \begingroup
+   \let\buff_verbatim_type_buffer_indeed\buff_verbatim_type_buffer_indeed_inline
+   \let\setupcurrenttyping\setupcurrenttype % a terrible hack but it saves code
+   \let\currenttype\empty
+   \dodoubleempty\buff_verbatim_type_buffer}
+
+\unexpanded\def\buff_verbatim_type_buffer_indeed_inline#1#2% category name
+  {\edef\currenttype{#1}%
+   \buff_verbatim_initialize_type_one
+   \dostarttaggedchained\t!verbatim\currenttype\??type
+   \clf_typebuffer
+     name   {#2}%
+     strip  {\v!yes}%
+     regime {\currentregime}%
+     method {\p_buff_option}%
+     nature {inline}% is default anyway
+   \relax
+   \dostoptagged}
+
 % get     : before/after of buffer
 % typing  : before/after of typing
 % process : no before/after (special case anyway)