1 files changed, 7 insertions, 13 deletions
diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex
index 3427efb30..a700fcfae 100644
--- a/tex/context/base/xtag-ext.tex
+++ b/tex/context/base/xtag-ext.tex
@@ -27,11 +27,11 @@
 %D will not conflict (don't confuse this with \XML\
 %D namespaces.)
 %D
-%D \starttyping
+%D \starttypen
 %D \startXMLmapping [tag] | [-] [tag] | [+] [tag]
 %D   definitions
 %D \stopXMLmapping
-%D \stoptyping
+%D \stoptypen
 %D
 %D When a \type {[+]} is specified, the mappings will
 %D nest.
@@ -97,11 +97,11 @@
 %D
 %D Imagine something:
 %D
-%D \starttyping
+%D \starttypen
 %D \defineXMLenvironment [something]
 %D   {\startXMLmapping[whatever]}
 %D   {\stopXMLmapping}
-%D \stoptyping
+%D \stoptypen
 %D
 %D Here the \type {\stopXMLmapping} will never be reached
 %D because we are in a mapping. Therefore we need:
@@ -147,8 +147,8 @@
 % \defineXMLdirective [flowchart] [shapes] \setupFLOWshapes % [#2=#3]
 % \defineXMLdirective [flowchart] [lines] \setupFLOWlines % [#2=#3]
 
-\defineXMLprocessor [context-begin-group] {\bgroup\gobbleoneargument}
-\defineXMLprocessor [context-end-group]   {\egroup\gobbleoneargument}
+\defineXMLprocessor [context-begin-group] {\begingroup\gobbleoneargument}
+\defineXMLprocessor [context-end-group]   {\endgroup  \gobbleoneargument}
 
 % \def\XMLnspart#1:#2\empty{#1} % call ...:\empty\empty
 % \def\XMLidpart#1:#2#3\empty{\ifx#2\empty#1\else\XMLidpart#2#3\empty\empty\fi}
@@ -207,12 +207,6 @@
      \@EA\secondoftwoarguments
    \fi}
 
-\gdef\doifXMLtextelse#1% new
-  {\doiftextelse{\simplifyXMLelements#1}}
-
-\gdef\doifXMLtext#1#2% new
-  {\doiftextelse{\simplifyXMLelements#1}{#2}\donothing}
-
 \gdef\convertXMLelement#1\to#2%
   {\ifcsname\@@XMLsave:#1\endcsname
      \@EA\convertcommand\csname\@@XMLsave:#1\endcsname\to#2%
@@ -272,4 +266,4 @@
 \def\writtenXMLend      #1{</#1>}
 \def\writtenXMLempty    #1{<#1/>}
 
-\protect \endinput
+\protect \endinput
+\ No newline at end of file