1 files changed, 5 insertions, 60 deletions
diff --git a/tex/context/base/mkiv/buff-ver.mkiv b/tex/context/base/mkiv/buff-ver.mkiv
index 75ee992e4..24aaa57d3 100644
--- a/tex/context/base/mkiv/buff-ver.mkiv
+++ b/tex/context/base/mkiv/buff-ver.mkiv
@@ -24,7 +24,7 @@
 \definesystemattribute[verbatimline][public]
 
 \appendtoksonce
-    \attribute\verbatimlineattribute\attributeunsetvalue
+    \c_attr_verbatimline\attributeunsetvalue
 \to \everyforgetall
 
 %D Initializations.
@@ -178,9 +178,9 @@
     \setuevalue{\e!start\currenttyping}{\buff_verbatim_typing_start{\currenttyping}}%
     \setuevalue{\e!stop \currenttyping}{\buff_verbatim_typing_stop {\currenttyping}}%
     \ifx\currenttypingparent\empty
-        \normalexpanded{\definelinenumbering[\currenttyping]}%
+      \normalexpanded{\definelinenumbering[\currenttyping]}%
     \else
-        \normalexpanded{\definelinenumbering[\currenttyping][\currenttypingparent]}%
+      \normalexpanded{\definelinenumbering[\currenttyping][\currenttypingparent]}%
     \fi
 \to \everydefinetyping
 
@@ -489,17 +489,6 @@
    \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]%
@@ -609,21 +598,6 @@
     \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
@@ -823,20 +797,6 @@
     \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]%
@@ -926,21 +886,6 @@
   {\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
@@ -977,7 +922,7 @@
 \unexpanded\def\buff_verbatim_begin_of_line
   {\ifconditional\verbatimnumberinglines
      \global\advance\nofverbatimlines\plusone
-     \attribute\verbatimlineattribute\nofverbatimlines
+     \c_attr_verbatimline\nofverbatimlines
    \fi
    \noindent
    \buff_verbatim_set_line_margin
@@ -991,7 +936,7 @@
    \obeyedline % still needed?
    \par
    \ifconditional\verbatimnumberinglines
-     \attribute\verbatimlineattribute\attributeunsetvalue
+     \c_attr_verbatimline\attributeunsetvalue
    \fi}
 
 \unexpanded\def\buff_verbatim_empty_line