stable 2006.11.16 12:02

1 files changed, 29 insertions, 15 deletions

diff --git a/tex/context/base/x-res-08.tex b/tex/context/base/x-res-08.tex
index e73885166..548933123 100644
--- a/tex/context/base/x-res-08.tex
+++ b/tex/context/base/x-res-08.tex
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+%D TODO: make rlxtools callable from texexec (class), speeds up things.
+
 %D Experimental module!
 %D
 %D \starttyping
@@ -52,16 +54,19 @@
 \let\figurefileprefix    \empty
 
 \def\XMLfeedbackresource#1#2%
-  {\convertcommand\currentresourcecomment\to\currentresourcecomment
+  {\begingroup
+   \convertcommand\currentresourcecomment\to\currentresourcecomment
+   \doifnothing\figurefilefile{\edef\figurefilefile{\figurefilename.\figurefiletype}}%
    \immediate\write\XMLrllog
      {\writtenXMLelement{\XMLrlprefix usage}%
-        {\writtenXMLelement{\XMLrlprefix         type}{#2}%
-         \writtenXMLelement{\XMLrlprefix        state}{#1}%
+        {\writtenXMLelement{\XMLrlprefix         type}{#2}% 'figure' not the type in \extenalfigure
+         \writtenXMLelement{\XMLrlprefix        state}{#1}% 'missing' 'found' etc
          \ifx\figurefilelabel\empty
            \ifx\figurelabel\s!dummy \else % otherwise label equals filename
              \writtenXMLelementcs{\XMLrlprefix  label}\figurelabel
            \fi
-           \writtenXMLelementcs{\XMLrlprefix     file}\figurefilename
+           \writtenXMLelementcs{\XMLrlprefix     file}\figurefilefile % complete name
+           \writtenXMLelementcs{\XMLrlprefix     name}\figurefilename % no suffix
            \writtenXMLelementcs{\XMLrlprefix   suffix}\figurefiletype
          \else
            % \figurefilelabel is set in x-res-04 and since
@@ -84,10 +89,11 @@
          \ifconditional\externalfigureflush
            \writtenXMLelementcs{\XMLrlprefix    width}\figurewidth
            \writtenXMLelementcs{\XMLrlprefix   height}\figureheight
-         \fi}}}
+         \fi}}%
+   \endgroup}
 
 \def\XMLfeedbackexternalfigure
-  {\externalfigureflush\doifmodeelse{*\v!figure}%
+  {\doifmodeelse{*\v!figure}%
      {\XMLfeedbackresource{found}}%
      {\XMLfeedbackresource{\ifconditional\externalfigureflush missing\else registered\fi}}%
      {figure}}
@@ -96,15 +102,23 @@
   [rl:manipulate]
   [file=rlxtools.rlx]
 
-\startsetups[rl:manipulate]
-
-% \immediatewriteutilitycommand{\writestatus{system}{we force multiple runs at \normaltime}}
-
-  \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}}
-
-\stopsetups
+% \startsetups[rl:manipulate]
+%   \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}}
+% \stopsetups
+%
+% no longer need for \setups[rl:manipulate]
+
+\ifx\nofconversionfigures\undefined \chardef\nofconversionfigures\plusone \fi
+
+\appendtoks
+  \ifcase\nofconversionfigures\else
+    \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
 
 \appendtoks \openXMLresourcelog  \to \everystarttext
 \appendtoks \closeXMLresourcelog \to \everystoptext