summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/core-job.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/core-job.tex')
-rw-r--r--Master/texmf-dist/tex/context/base/core-job.tex109
1 files changed, 33 insertions, 76 deletions
diff --git a/Master/texmf-dist/tex/context/base/core-job.tex b/Master/texmf-dist/tex/context/base/core-job.tex
index 03d91f5a45e..d1b766392a5 100644
--- a/Master/texmf-dist/tex/context/base/core-job.tex
+++ b/Master/texmf-dist/tex/context/base/core-job.tex
@@ -60,12 +60,12 @@
\def\next{\processlocalfile\readlocfile}%
\else
\let\filepath\empty
- \def\docommando##1%
+ \def\docommand##1%
{\doiffileelse{\pathplusfile{##1}{#1}}{\donetrue\def\filepath{##1}}\donefalse
\ifdone\expandafter\quitcommalist\fi}%
\doifparentfileelse{#1} % new
- {\processcommacommand [\allinputpaths]\docommando}
- {\processcommacommand[.,\allinputpaths]\docommando}%
+ {\processcommacommand [\allinputpaths]\docommand}
+ {\processcommacommand[.,\allinputpaths]\docommand}%
\ifx\filepath\empty
\def\next{\processlocalfile\readlocfile}% fall back ../../..
\else
@@ -79,10 +79,10 @@
\@EA\secondoftwoarguments
\else
\let\filepath\empty
- \def\docommando##1%
+ \def\docommand##1%
{\doiffileelse{\pathplusfile{##1}{#1}}{\donetrue\def\filepath{##1}}\donefalse
\ifdone\expandafter\quitcommalist\fi}%
- \processcommacommand[.,\allinputpaths]\docommando
+ \processcommacommand[.,\allinputpaths]\docommand
\ifx\filepath\empty
\@EAEAEA\secondoftwoarguments
\else
@@ -93,67 +93,53 @@
\let\allinputpaths\empty
% \def\usepath[#1]%
-% {\def\docommando##1%
+% {\def\docommand##1%
% {\doifelse{##1}\v!reset
% {\let\allinputpaths\empty}
% {\addtocommalist{##1}\allinputpaths}}%
-% \processcommalist[#1]\docommando}
+% \processcommalist[#1]\docommand}
%
% \def\usesubpath[#1]% new, see webschrift for usage
% {\ifx\allinputpaths\empty
% \edef\allinputpaths{#1}%
% \else
-% \def\docommando##1%
-% {\def\dodocommando####1{\addtocommalist{##1/####1}\allinputpaths}%
-% \processcommalist[#1]\dodocommando}%
-% \processcommacommand[\allinputpaths]\docommando
+% \def\docommand##1%
+% {\def\dodocommand####1{\addtocommalist{##1/####1}\allinputpaths}%
+% \processcommalist[#1]\dodocommand}%
+% \processcommacommand[\allinputpaths]\docommand
% \fi}
%
% the following alternatives permit ../{name} i.e. braces
\def\usepath[#1]%
- {\def\docommando##1%
+ {\def\docommand##1%
{\doifelse{##1}\v!reset
{\let\allinputpaths\empty}
{\sanitizefilename#1\to\ascii
\convertcommand\ascii\to\ascii
\addtocommalist\ascii\allinputpaths}}%
- \processcommalist[#1]\docommando}
+ \processcommalist[#1]\docommand}
\def\usesubpath[#1]% test for a real long time, permits ../{name} i.e. braces
{\ifx\allinputpaths\empty
\sanitizefilename#1\to\allinputpaths
\else
- \def\docommando##1%
- {\def\dodocommando####1%
+ \def\docommand##1%
+ {\def\dodocommand####1%
{\sanitizefilename####1\to\ascii
\convertcommand\ascii\to\ascii
\addtocommalist{##1/\ascii}\allinputpaths}%
- \processcommalist[#1]\dodocommando}%
- \processcommacommand[\allinputpaths]\docommando
+ \processcommalist[#1]\dodocommand}%
+ \processcommacommand[\allinputpaths]\docommand
\fi}
\def\registerfileinfo[#1#2]#3% geen \showmessage ?
{\writestatus\m!systems{#1#2 file #3 at line \the\inputlineno}%
- % \pdfliteral{\letterpercent #1#2 file #3 at line \the\inputlineno}%
\immediatewriteutility{f #1 {#3}}}
\ifx\preloadfonts \undefined \let\preloadfonts \relax \fi
\ifx\preloadspecials\undefined \let\preloadspecials\relax \fi
-% \def\loadsystemfiles
-% {\reportprotectionstate
-% \readsysfile\f!newfilename
-% {\showmessage\m!systems2\f!newfilename}\donothing
-% \readsysfile\f!oldfilename
-% {\showmessage\m!systems2\f!oldfilename}\donothing
-% \readsysfile\f!filfilename
-% {\showmessage\m!systems2\f!filfilename}\donothing
-% \readsysfile\f!sysfilename
-% {\showmessage\m!systems2\f!sysfilename}\donothing}
-%
-% test \@@svgebied
-
\def\loadallsystemfiles#1#2%
{\ifx\@@svdirectory\empty
\readsysfile{#1}{\showmessage\m!systems2{#1}}{#2}%
@@ -167,46 +153,28 @@
\def\loadsystemfiles
{\reportprotectionstate
- \readsysfile\f!newfilename
- {\showmessage\m!systems2\f!newfilename}%
- \donothing
- \readsysfile\f!oldfilename
- {\showmessage\m!systems2\f!oldfilename}%
- \donothing
+ \readsysfile\f!newfilename{\showmessage\m!systems2\f!newfilename}\donothing
+ \readsysfile\f!oldfilename{\showmessage\m!systems2\f!oldfilename}\donothing
\loadallsystemfiles\f!filfilename
\donothing
\loadallsystemfiles\f!sysfilename
{\loadallsystemfiles{\f!sysfilename.rme}\donothing % new, fall back
- \doglobal\appendtoks
- \bgroup
- \disableXML
- \loadallsystemfiles\f!errfilename\donothing
- \egroup
+ \doglobal\appendtoks % brrr better \setcatcodetable\ctxcatcodes % % test
+ \bgroup\disableXML\loadallsystemfiles\f!errfilename\donothing\egroup
\to\everygoodbye}}
- %\loadallsystemfiles\f!modfilename
- % \donothing}
-
%D Loading of \type {cont-usr.tex} (edited by the user)
%D and \type {cont-fmt.tex} (generated by texexec).
\def\loaduserspecifications
- {\readsysfile\f!usrfilename
- {\showmessage\m!systems2\f!usrfilename}\donothing
- \readjobfile\f!fmtfilename
- {\showmessage\m!systems2\f!fmtfilename}\donothing}
+ {\readsysfile\f!usrfilename{\showmessage\m!systems2\f!usrfilename}\donothing
+ \readjobfile\f!fmtfilename{\showmessage\m!systems2\f!fmtfilename}\donothing}
%D We don't want multiple jobfiles to interfere.
-\bgroup
-\catcode`\%=\@@other
-\xdef\texcommentsymbol{%}
-\egroup
-
\def\loadoptionfile
{\readjobfile{\jobname.\f!optionextension}
{\showmessage\m!systems2{\jobname.\f!optionextension}}%
- %{\showmessage\m!systems2{\jobname.\f!optionextension}}}
{\writestatus\m!systems {no \jobname.\f!optionextension}}}
% \newevery \everyjob \EveryJob
@@ -273,8 +241,6 @@
\expandafter\finalend
\fi}
-\let\normalend\end
-
\def\finalend
{\ifnum\textlevel>\zerocount \else
\the\everybye
@@ -312,19 +278,18 @@
{\doexecutefile{#1}}
\def\useenvironment[#1]% maybe commalist
- {\environment #1 }
+ {\environment #1 \relax}
-\def\environment #1 % at outermost level only
- {\def\startenvironment ##1 {}%
+\def\environment #1 % at outermost level only (load only once)
+ {\pushmacro\startenvironment
+ \pushmacro\stopenvironment
+ \def\startenvironment ##1 {}%
\let\stopenvironment\relax
- % why not \doexecutefile ?
- \registerfileinfo[begin]{#1}%
- \dostarttextfile{#1}%
\startreadingfile
- \processfile{#1}% was : \readlocfile{#1}{}{}
+ \doexecutefileonce{#1}
\stopreadingfile
- \dostoptextfile
- \registerfileinfo[end]{#1}}
+ \popmacro\stopenvironment
+ \popmacro\startenvironment}
\def\component #1 % at outermost level only
{\dostarttextfile{#1}%
@@ -447,10 +412,10 @@
\setvalue{\e!start\v!localenvironment}[#1]%
{\let\loadedlocalenvironments\empty
- \def\docommando##1%
+ \def\docommand##1%
{\beforesplitstring##1\at.\to\someevironment
\fullexpandoneargafter\addtocommalist\someevironment\loadedlocalenvironments}%
- \processcommalist[#1]\docommando
+ \processcommalist[#1]\docommand
\fullexpandtwoargsafter\doifcommonelse % no longer next needed
{\currentproject,\currentproduct,%
\currentcomponent,\currentenvironment}
@@ -460,10 +425,6 @@
\setvalue{\v!localenvironment}#1 {\doexecutefileonce{#1}}
-% Het <pagina>-karakter (FormFeed), wordt omgezet in \par
-
-\catcode`\^^L=\@@endofline
-
% NOT TOEVOEGEN: \the\everytrace
\neverypar=\emptytoks
@@ -478,10 +439,6 @@
% \appendtoks \flushnotes \to \everydisplay
% \appendtoks \adjustsidefloatdisplaylines \to \everydisplay
-
-%D Better here than in supp-mps:
-
-\def\executesystemcommand{\immediate\write18}
% soon, when pdftex 1.22 is out in the field: