stable 2006.06.09 13:05

10 files changed, 45 insertions, 34 deletions

diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 93b9257d4..69ebcd593 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2006.06.07 23:34}
+\newcontextversion{2006.06.09 13:05}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
@@ -97,26 +97,28 @@
 \def\getRLIfiguredimensions#1%
   {\let\rliwidth \!!zeropoint
    \let\rliheight\!!zeropoint
-   \doiffileelse\@@effilenametype
-     {\doiffileelse{\@@effilenametype.rli}
-        {}
-        {% let's try runtime running first
-         \writestatus\m!figures{using rlxtools to determine size of \@@effilenametype}%
-         \executesystemcommand{texmfstart rlxtools --identify \@@effilenametype}}%
-      \doiffileelse{\@@effilenametype.rli}
-        {}
-        {% we assume that runtime running failed
-         \installprogram{texmfstart rlxtools --identify \@@effilenametype}}%
-      \startnointerference
-      \startXMLmapping[rli]%
-        \startXMLignore
-        \processXMLfile{\@@effilenametype.rli}%
-        \edef\rliwidth {\XMLflush{rl:width}}%
-        \edef\rliheight{\XMLflush{rl:height}}%
-        \stopXMLignore
-      \stopXMLmapping
-      \stopnointerference}
-     {}}
+   \doifelsenothing\@@efconversion
+     {\doiffileelse\@@effilenametype
+        {\doiffileelse{\@@effilenametype.rli}
+           {}
+           {% let's try runtime running first
+            \writestatus\m!figures{using rlxtools to determine size of \@@effilenametype}%
+            \executesystemcommand{texmfstart rlxtools --identify \@@effilenametype}}%
+         \doiffileelse{\@@effilenametype.rli}
+           {}
+           {% we assume that runtime running failed
+            \installprogram{texmfstart rlxtools --identify \@@effilenametype}}%
+         \startnointerference
+         \startXMLmapping[rli]%
+           \startXMLignore
+           \processXMLfile{\@@effilenametype.rli}%
+           \edef\rliwidth {\XMLflush{rl:width}}%
+           \edef\rliheight{\XMLflush{rl:height}}%
+           \stopXMLignore
+         \stopXMLmapping
+         \stopnointerference}
+        {}}
+     {}} % no rli when rlx conversion is in place
 
 \def\getfiguredimensionsC
   {\ifcase\figurestatus\ifcase\figurefilemode\else
@@ -244,9 +246,11 @@
 
 \def\docheckprepfile
   {\ifcase\preprocessmethod
+     \iftracefiles\writestatus\m!systems{preprocessing - not needed}\fi
      % no preprocessing
    \or
      % only check for existence
+     \iftracefiles\writestatus\m!systems{preprocessing - check exitence of \readfilename\preprocesssuffix}\fi
      \doiffileexistselse{\readfilename\preprocesssuffix}
        {\chardef\preprocessstate\plusone}
        \donothing
@@ -256,14 +260,21 @@
      \splitfilename\readfilename
      \ifx\splitofftype\empty
        % saveguard and speed up
+       \iftracefiles\writestatus\m!systems{preprocessing - no suffix}\fi
        \egroup
      \else
-       \doifdefinedelse{fp..\splitoffname.\splitofftype}
+       \iftracefiles\writestatus\m!systems{preprocessing - check presence of \readfilename\preprocesssuffix}\fi
+       \doifdefinedelse{fp..\readfilename}
          {\egroup
           \doiffileexistselse{\readfilename\preprocesssuffix}
             {\chardef\preprocessstate\plusone}
             {\chardef\preprocessstate\plustwo}}%
-         {\egroup}%
+         {\doifdefinedelse{fp..\splitoffname.\splitofftype}
+            {\egroup
+             \doiffileexistselse{\readfilename\preprocesssuffix}
+               {\chardef\preprocessstate\plusone}
+               {\chardef\preprocessstate\plustwo}}%
+            {\egroup}}%
      \fi
    \fi}
 
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index e9cd937bd..8deeb434c 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
-\def\contextversion{2006.06.07 23:34}
+\def\contextversion{2006.06.09 13:05}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/x-res-08.tex b/tex/context/base/x-res-08.tex
index 5dfa6b6fa..e73885166 100644
--- a/tex/context/base/x-res-08.tex
+++ b/tex/context/base/x-res-08.tex
@@ -82,8 +82,8 @@
          \fi
          \writtenXMLelementcs{\XMLrlprefix    comment}\currentresourcecomment
          \ifconditional\externalfigureflush
-           \writtenXMLelementcs{\XMLrlprefix      width}\figurewidth
-           \writtenXMLelementcs{\XMLrlprefix     height}\figureheight
+           \writtenXMLelementcs{\XMLrlprefix    width}\figurewidth
+           \writtenXMLelementcs{\XMLrlprefix   height}\figureheight
          \fi}}}
 
 \def\XMLfeedbackexternalfigure
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index ce759a8dc..a4b077bae 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="2006.05.28 13:28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.06.09 13:05">
 
   <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 3dccf33f0..8e9d30ff2 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="2006.05.28 13:28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.06.09 13:05">
 
   <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 cbc0a9929..0fe262c0e 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="2006.05.28 13:28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.06.09 13:05">
 
   <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 92acb8763..f8156e14e 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="2006.05.28 13:28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.06.09 13:05">
 
   <cd:variables>
     <cd:variable name="one" value="un"/>
@@ -732,7 +732,7 @@
     <cd:variable name="week" value="semaine"/>
     <cd:variable name="weekday" value="joursemaine"/>
     <cd:variable name="WEEKDAY" value="JOURSEMAINE"/>
-    <cd:variable name="random" value="aléatoire"/>
+    <cd:variable name="random" value="aleatoire"/>
     <cd:variable name="white" value="blanc"/>
     <cd:variable name="very" value="tres"/>
     <cd:variable name="verytolerant" value="trestolerant"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 15c189e85..6e281b78a 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="2006.05.28 13:28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.06.09 13:05">
 
   <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 746d7473e..f780a39d2 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="2006.05.28 13:28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.06.09 13:05">
 
   <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 142b422e5..a1d740f38 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="2006.05.28 13:28">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.06.09 13:05">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>