16 files changed, 63 insertions, 31 deletions
diff --git a/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf b/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf
index 6221eb58c..4034627eb 100644
--- a/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf
+++ b/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index fa0d41815..36e08264d 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -13,7 +13,7 @@
 
 % it's about time to clean up this file ...
 
-\newcontextversion{2007.02.20 12:00}
+\newcontextversion{2007.02.21 11:55}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 86277019f..b9a4d7f9c 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -42,7 +42,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2007.02.20 12:00}
+\edef\contextversion{2007.02.21 11:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-ctx.tex b/tex/context/base/core-ctx.tex
index 9cd3de2b9..64f6b82ae 100644
--- a/tex/context/base/core-ctx.tex
+++ b/tex/context/base/core-ctx.tex
@@ -184,10 +184,12 @@
    \the\everybeforereadfile
    \ifcase\preprocessstate
      % no checking or not found when using method 1
-     \normalinput\readfilename
+%      \normalinput\readfilename
+     \inputgivenfile\readfilename
    \or
      % found when using method 1 or 2
-     \normalinput\readfilename\preprocesssuffix
+%      \normalinput\readfilename\preprocesssuffix
+     \inputgivenfile{\readfilename\preprocesssuffix}%
    \or
      % not found when using method 2
    \fi
diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex
index ed893fa42..194959bfd 100644
--- a/tex/context/base/core-fig.tex
+++ b/tex/context/base/core-fig.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%  todo: directory : system -> \allinputpaths
+%  todo: directory : system -> \allinputpaths (so that we can \usesubpath)
 
 %D It may be that some functionality got lost. If it concerns
 %D defined features, let me know and it will be sorted out.
@@ -908,6 +908,7 @@
      \resetwantedconversionvariables
      \doifsomething\@@efconversion
        {\global\advance\nofconversionfigures\plusone
+        \doshowfigurestate{n-of-conversions : \number\nofconversionfigures}%
         \edef\wantedfigureconversion{\@@efconversion}%
         \edef\wantedconversioncache {\@@efcache}%
         \edef\wantedconversionprefix{\@@efprefix}%
@@ -915,8 +916,8 @@
         \processcommacommand[\figurepathlist]\dolocatefigureconversionfile
         \ifcase\figurestatus
           \doshowfigurestate{remark : no conversion file found}%
-       \else
-         \doshowfigurestate{remark : conversion file found}%
+        \else
+          \doshowfigurestate{remark : conversion file found}%
           \chardef\figurestatus\zerocount
         \fi
         \let\wantedconversionname\wantedfigurename
@@ -924,12 +925,23 @@
         \ifx\wantedconversioncache\empty
           \let \wantedfigurepath \wantedconversionpath
         \else
-          \edef\wantedfigurepath{\wantedconversionpath/\@@efcache}%
+          \checkfilename\@@efcache
+          \ifnum\kindoffile=\plusone
+            \let\wantedfigurepath\@@efcache % root related path
+          \else
+            \edef\wantedfigurepath{\wantedconversionpath/\@@efcache}%
+          \fi
         \fi
         \let\wantedfiguretype    \empty
         \let\wantedfiguretypelist\figuretypes % hm, why needed
         \doshowfigurestate{conversion path : \wantedconversionpath}%
         \doshowfigurestate{conversion name : \wantedconversionname}}%
+\ifx\figurepathlist\empty
+    \let\figurepathlist\wantedfigurepath
+\else
+    \edef\figurepathlist{\wantedfigurepath,\figurepathlist}%
+\fi
+        \doshowfigurestate{new figure path : \wantedfigurepath}%
    \fi}
 
 \def\dolocatefigureconversionfile#1%
diff --git a/tex/context/base/supp-fil.mkii b/tex/context/base/supp-fil.mkii
index 56810f826..56ff7962a 100644
--- a/tex/context/base/supp-fil.mkii
+++ b/tex/context/base/supp-fil.mkii
@@ -13,6 +13,9 @@
 
 \unprotect
 
+\def\openinputfile #1#2{\immediate\openin #1="#2"\relax} \def\closeinputfile #1{\immediate\closein #1}
+\def\openoutputfile#1#2{\immediate\openout#1="#2"\relax} \def\closeoutputfile#1{\immediate\closeout#1}
+
 %D For the moment, we limit sanitizing to taking care of
 %D active \type {/}.
 
diff --git a/tex/context/base/supp-fil.tex b/tex/context/base/supp-fil.tex
index b41858396..222db7bd5 100644
--- a/tex/context/base/supp-fil.tex
+++ b/tex/context/base/supp-fil.tex
@@ -42,8 +42,14 @@
 %D
 %D We save a few primitives first.
 
-\let\normalwrite\write
+\let\normalwrite    \write
 \let\normalimmediate\immediate
+
+% \def\openinputfile #1#2{\immediate\openin #1="#2"\relax} \def\closeinputfile #1{\immediate\closein #1}
+% \def\openoutputfile#1#2{\immediate\openout#1="#2"\relax} \def\closeoutputfile#1{\immediate\closeout#1}
+
+\def\openinputfile #1#2{\immediate\openin #1=#2\relax} \def\closeinputfile #1{\immediate\closein #1}
+\def\openoutputfile#1#2{\immediate\openout#1=#2\relax} \def\closeoutputfile#1{\immediate\closeout#1}
 
 %D \macros
 %D   {pushendofline,popendofline}
@@ -109,7 +115,8 @@
 %D one.
 
 \def\unlinkfile#1%
-  {\immediate\openout\scratchwrite=#1\immediate\closeout\scratchwrite}
+  {\openoutputfile \scratchwrite{#1}%
+   \closeoutputfile\scratchwrite}
 
 %D \macros
 %D   {writeln}
@@ -121,12 +128,12 @@
 \def\doiffileexistselse#1%
   {\doifelsenothing{#1}
      {\secondoftwoarguments}
-     {\immediate\openin\scratchread=#1\relax
+     {\openinputfile\scratchread{#1}%
       \ifeof\scratchread
-        \immediate\closein\scratchread
+        \closeinputfile\scratchread
         \expandafter\secondoftwoarguments
       \else
-        \immediate\closein\scratchread
+        \closeinputfile\scratchread
         \expandafter\firstoftwoarguments
       \fi}}
 
@@ -151,14 +158,14 @@
 \let\fileline\empty
 
 \def\doprocessfile#1#2#3%
-  {\immediate\openin#1=#2\relax
+  {\openinputfile{#1}{#2}%
    \ifeof#1%
      \fileprocessedfalse
-     \immediate\closein#1%
+     \closeinputfile#1%
    \else
      \fileprocessedtrue
      \gdef\dofinishfile
-       {\immediate\closein#1%
+       {\closeinputfile#1%
         \global\let\doprocessline\relax}%
      \gdef\doprocessline
        {\ifeof#1%
@@ -214,6 +221,8 @@
 
 \unexpanded\def\input{\normalinput}
 
+\def\inputgivenfile#1{\normalinput"#1"\relax}
+
 %D \macros
 %D   {readfile,ReadFile,maxreadlevel}
 %D
@@ -343,7 +352,8 @@
      \setxvalue{fn..\trackedfilename}{\readfilename}%
    \fi
    \the\everybeforereadfile
-   \normalinput\readfilename\relax
+%    \normalinput\readfilename\relax
+   \inputgivenfile\readfilename
    \the\everyafterreadfile}
 
 % too less:
@@ -452,11 +462,11 @@
    \checkfilename\readfilename
    \ifcase\kindoffile
      \increment\readlevel
-     \immediate\openin#1=\readfilename\relax
+     \openinputfile{#1}\readfilename
      \ifeof#1% \relax
        \ifnum\readlevel>\maxreadlevel % \relax
        \else
-         \immediate\closein#1% \relax
+         \closeinputfile#1% \relax
          \doopenin{#1}{\pathplusfile\f!parentpath{#2}}%
        \fi
      \fi
@@ -532,7 +542,8 @@
      {\gobbleoneargument}}
 
 \def\doinputonce#1%
-  {\doonlyonce{#1}{\doiffileelse{#1}{\normalinput#1\relax}\donothing}}
+%   {\doonlyonce{#1}{\doiffileelse{#1}{\normalinput#1\relax}\donothing}}
+  {\doonlyonce{#1}{\doiffileelse{#1}{\inputgivenfile{#1}}\donothing}}
 
 \def\doendinputonce#1%
   {\doifdefined{@@@#1@@@}\endinput}
diff --git a/tex/context/base/verb-ini.tex b/tex/context/base/verb-ini.tex
index 4432da3b7..f4b24d730 100644
--- a/tex/context/base/verb-ini.tex
+++ b/tex/context/base/verb-ini.tex
@@ -758,7 +758,7 @@
   {\par
    \bgroup
    \processingverbatimtrue
-   \global\verbatimlinenumber0
+   \global\verbatimlinenumber\zerocount
    \global\linepartrue
    \beginofverbatimlines
    \bgroup
@@ -779,7 +779,8 @@
    \obeycharacters
    \ignoreeofs
    \catcode`\^^M=\@@ignore % \par is already taken care of
-   \openin\verbatiminput=#1\relax
+%    \openin\verbatiminput=#1\relax
+   \openinputfile\verbatiminput{#1}%
    \skipfirstverbatimlinefalse
    \initializeverbatimline
    \def\readline%
diff --git a/tex/context/base/x-res-08.tex b/tex/context/base/x-res-08.tex
index 548933123..d90c421e1 100644
--- a/tex/context/base/x-res-08.tex
+++ b/tex/context/base/x-res-08.tex
@@ -113,12 +113,15 @@
 \ifx\nofconversionfigures\undefined \chardef\nofconversionfigures\plusone \fi
 
 \appendtoks
-  \ifcase\nofconversionfigures\else
+  \ifcase\nofconversionfigures
+    \writestatus\m!systems{not registering rlxtools (manipulator)}%
+  \else
+    \writestatus\m!systems{registering rlxtools (manipulator)}%
     \doiflocfileelse{\jobname.rlx}
       {\installprogram{texmfstart rlxtools --manipulate kpse:\jobname.rlx \jobname.rlg}}
       {\installprogram{texmfstart rlxtools --manipulate kpse:\getvariabledefault{rl:manipulate}{file}{rlxtools.rlx} \jobname.rlg}}%
   \fi
-\to \everylastshipout
+\to \everybye % \everylastshipout
 
 \appendtoks \openXMLresourcelog  \to \everystarttext
 \appendtoks \closeXMLresourcelog \to \everystoptext
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index e364f5814..0bcfe9c08 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2007.02.20 12:00">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2007.02.21 11:55">
 
   <cd:variables>
     <cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 1ae750baf..84f7d4cda 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2007.02.20 12:00">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2007.02.21 11:55">
 
   <cd:variables>
     <cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 828735868..bea0c41b8 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2007.02.20 12:00">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2007.02.21 11:55">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index 837cfe1ed..42299b771 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2007.02.20 12:00">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2007.02.21 11:55">
 
   <cd:variables>
     <cd:variable name="one" value="un"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index bf7d53907..394ae8e5b 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2007.02.20 12:00">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2007.02.21 11:55">
 
   <cd:variables>
     <cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 4bbfe8cb2..961e620c7 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2007.02.20 12:00">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2007.02.21 11:55">
 
   <cd:variables>
     <cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 731bc3da8..fee47cf19 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2007.02.20 12:00">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2007.02.21 11:55">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>