diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/m-database.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/m-database.mkiv | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/context/base/m-database.mkiv b/Master/texmf-dist/tex/context/base/m-database.mkiv index cef0aa81554..0285d3bcd1b 100644 --- a/Master/texmf-dist/tex/context/base/m-database.mkiv +++ b/Master/texmf-dist/tex/context/base/m-database.mkiv @@ -17,11 +17,6 @@ \unprotect -\def\c!first {first} -\def\c!last {last} -\def\c!quotechar {quotechar} -\def\c!commentchar {commentchar} - \definenamespace [db] [type=module, @@ -36,6 +31,7 @@ [\c!separator={,}, \c!quotechar=, \c!commentchar=, + \c!strip=\v!no, \c!before=, \c!after=, \c!first=, @@ -48,7 +44,7 @@ \setupdatabase [\c!separator={,}] -\def\doprocessdatabase#1#2#3% +\def\module_database_process#1#2#3% {\edef\currentdatabasetype{#1}% \edef\currentdatabase {#2}% \edef\currentdatabasename{#3}% @@ -60,6 +56,7 @@ name = "\currentdatabase", type = "\currentdatabasetype", database = "\currentdatabasename", + strip = "\databaseparameter\c!strip", separator = \!!bs\databaseparameter\c!separator \!!es, quotechar = \!!bs\databaseparameter\c!quotechar \!!es, commentchar = \!!bs\databaseparameter\c!commentchar\!!es, @@ -73,32 +70,34 @@ command = \!!bs\databaseparameter\c!command \!!es, }}} -\unexpanded\def\processdatabasebuffer{\dodoubleempty\doprocessdatabasebuffer} -\unexpanded\def\processdatabasefile {\dodoubleempty\doprocessdatabasefile } +\unexpanded\def\processdatabasebuffer{\dodoubleempty\module_database_process_buffer} +\unexpanded\def\processdatabasefile {\dodoubleempty\module_database_process_file} -\def\doprocessdatabasebuffer[#1][#2]{\doprocessdatabase{buffer}{#1}{#2}} -\def\doprocessdatabasefile [#1][#2]{\doprocessdatabase{file} {#1}{#2}} +\def\module_database_process_buffer[#1][#2]{\module_database_process{buffer}{#1}{#2}} +\def\module_database_process_file [#1][#2]{\module_database_process{file} {#1}{#2}} % for old times sake: -\def\defineseparatedlist {\dodoubleempty\dodefineseparatedlist } -\def\processseparatedfile{\dodoubleempty\doprocessseparatedfile} +\unexpanded\def\defineseparatedlist {\dodoubleempty\module_database_separated_list_define} +\unexpanded\def\processseparatedfile{\dodoubleempty\module_database_separated_list_process} -\def\dodefineseparatedlist[#1][#2]% +\def\module_database_separated_list_define[#1][#2]% {\definedatabase[#1][#2]% \setuvalue{\e!start#1}{\grabbufferdatadirect{#1}{\e!start#1}{\e!stop#1}}% \setuvalue{\e!stop#1}{\processdatabasebuffer[#1][#1]}} -\def\processseparatedfile[#1][#2]% +\def\module_database_separated_list_process[#1][#2]% {\processdatabasefile[#1][#2]} -\def\startseparatedlist[#1]% to be interfaced - {\def\stopseparatedlist{\processdatabasebuffer[#1][#1]}% +\unexpanded\def\startseparatedlist[#1]% to be interfaced + {\unexpanded\def\stopseparatedlist{\processdatabasebuffer[#1][#1]}% \grabbufferdatadirect{#1}{startseparatedlist}{stopseparatedlist}} +\let\setupseparatedlist\setupdatabase + \protect -\doifnotmode{demo}{\endinput} +\continueifinputfile{m-database.mkiv} \starttext |