1 files changed, 32 insertions, 33 deletions
diff --git a/tex/context/base/x-contml.tex b/tex/context/base/x-contml.tex
index 9f3fe6fd2..ed2e069f8 100644
--- a/tex/context/base/x-contml.tex
+++ b/tex/context/base/x-contml.tex
@@ -97,7 +97,7 @@
 %D
 %D \showelements [context] [references]
 
-\defineXMLpickup [context:pageref] [label=] {\at}     {[\XMLop{label}]}
+\defineXMLpickup [context:pageref] [label=] {\op}     {[\XMLop{label}]}
 \defineXMLpickup [context:textref] [label=] {\in}     {[\XMLop{label}]}
 \defineXMLpickup [context:lineref] [label=] {\inline} {[\XMLop{label}]}
 
@@ -201,8 +201,10 @@
 
 \defineXMLenvironment [context:itemize] [type=,packed=]
   {\let\XMLoptions\empty
-   \doifsomethingXMLop{type}{\addtocommalist{\XMLop{type}}\XMLoptions}%
-   \doifXMLop{packed}{yes}{\addtocommalist{packed}\XMLoptions}%
+   \doifsomethingXMLop{type}
+     {\addtocommalist{\XMLop{type}}\XMLoptions}
+   \doifXMLop{packed}{yes}
+     {\addtocommalist{packed}\XMLoptions}
    \expanded{\startitemize[\XMLoptions]}}
   {\stopitemize}
 
@@ -210,28 +212,6 @@
   {\expanded{\item[\XMLop{label}]}}
   {\endgraf}
 
-%D \elements {externalfigure}
-%D
-%D \startbuffer
-%D The previous examples already demonstrated how we can include a graphic:
-%D
-%D <verbatim>
-%D <line><externalfigure file="koe" width="5cm" /></line>
-%D </verbatim>
-%D \stopbuffer
-%D
-%D \showelements [context] [externalfigure]
-
-\defineXMLsingular [context:externalfigure] [\??ef] [base=,label=,file=]
-  {\bgroup % \getXMLta \expandXMLta \expandXMLtp{file}%
-   \expandXMLta
-   \getXMLta % expand entities first
-   \doifelsenothing{\XMLtp{label}}
-     {\expanded{\externalfigure[\XMLtp{file}][\XMLta]}}
-     {\doifsomething{\XMLtp{base}}{\usefigurebase[\XMLtp{base}]}%
-      \expanded{\externalfigure[\XMLtp{label}][\XMLta]}}
-   \egroup}
-
 %D \elements {fixed}
 %D
 %D \startbuffer
@@ -256,12 +236,12 @@
   {\bgroup
    \defineXMLsave[context:caption]
    \defineXMLsave[context:content]}
-  {\expanded{\startfixed[\XMLop{location}]}%
-     \doifXMLdataelse{context:caption}
-       {\startcombination[1*1]
-          {\XMLflush{context:content}} {\XMLflush{context:caption}}
-        \stopcombination}
-       {\XMLflush{context:content}}%
+  {\expanded{\startfixed[\XMLop{location}]}
+   \doifXMLdataelse{context:caption}
+     {\startcombination[1*1]
+        {\XMLflush{context:content}} {\XMLflush{context:caption}}
+      \stopcombination}
+     {\XMLflush{context:content}}
    \stopfixed
    \egroup}
 
@@ -292,6 +272,27 @@
         {\XMLflush{context:caption}} {\XMLflush{context:content}}}
    \egroup}
 
+%D \elements {externalfigure}
+%D
+%D \startbuffer
+%D The previous examples already demonstrated how we can include a graphic:
+%D
+%D <verbatim>
+%D <line><externalfigure file="koe" width="5cm" /></line>
+%D </verbatim>
+%D \stopbuffer
+%D
+%D \showelements [context] [externalfigure]
+
+\defineXMLsingular [context:externalfigure] [\??ef] [base=,label=,file=]
+  {\bgroup % \getXMLta \expandXMLta \expandXMLtp{file}%
+   \expandXMLta \getXMLta % expand entities first
+   \doifelsenothing{\XMLtp{label}}
+     {\expanded{\externalfigure[\XMLtp{file}][\XMLta]}}
+     {\doifsomething{\XMLtp{base}}{\usefigurebase[\XMLtp{base}]}%
+      \expanded{\externalfigure[\XMLtp{label}][\XMLta]}}
+   \egroup}
+
 %D \elements {quotation,quote}
 %D
 %D \startbuffer
@@ -476,5 +477,3 @@
 
 \defineXMLpickup [combinationcaption]
   {\appendtoks\bgroup}{\egroup\to\scratchtoks}
-
-\endinput