summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/x-contml.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/x-contml.tex')
-rw-r--r--Master/texmf-dist/tex/context/base/x-contml.tex18
1 files changed, 11 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/context/base/x-contml.tex b/Master/texmf-dist/tex/context/base/x-contml.tex
index e1dda06c1ec..ba6762e77d6 100644
--- a/Master/texmf-dist/tex/context/base/x-contml.tex
+++ b/Master/texmf-dist/tex/context/base/x-contml.tex
@@ -80,7 +80,11 @@
\defineXMLsingular [context:compound] [token=]
{\mathortext % disc comm looks ahead, so \relax
{\doifXMLop{token}{\XMLop{token}}\compoundhyphen}%
- {\expanded{\discretionarycommand\noexpand|\XMLop{token}}|\relax}}
+ {\expanded{\directdiscretionary{\XMLop{token}}}\relax}}
+
+\defineXMLenvironmentsave [context:cp]
+ {}
+ {\expanded{\directdiscretionary{\XMLflush{cp}}}\relax}
%D \elements {p}
%D
@@ -225,7 +229,7 @@
%D The previous examples already demonstrated how we can include a graphic:
%D
%D <verbatim>
-%D <line><externalfigure file="koe" width="5cm" /></line>
+%D <line><externalfigure file="cow" width="5cm" /></line>
%D </verbatim>
%D \stopbuffer
%D
@@ -242,7 +246,7 @@
\egroup}
%D \elements {fixed}
-%D
+%D \setupexternalfigures[directory={../sample}]
%D \startbuffer
%D Something fixed will end up at the place where it defined in the input
%D stream. The main idea behind this element is that it gives you control
@@ -252,7 +256,7 @@
%D <item>
%D <fixed align="high">
%D <content>
-%D <externalfigure file="koe" frame="on" height="1cm" />
+%D <externalfigure file="cow" frame="on" height="1cm" />
%D </content>
%D </fixed>
%D </item>
@@ -275,15 +279,15 @@
\egroup}
%D \elements {float}
-%D
+%D \setupexternalfigures[directory={../sample}]
%D \startbuffer
%D A floating body will be placed at the first location available, unless
%D a location is specified. As with the <element>fixed</element> element,
-%D you can prvide a caption.
+%D you can provide a caption.
%D
%D <float type="figure">
%D <content>
-%D <externalfigure file="koe" frame="on" height="3cm" />
+%D <externalfigure file="cow" frame="on" height="3cm" />
%D </content>
%D <caption>This is a cow!</caption>
%D </float>