1 files changed, 17 insertions, 15 deletions
diff --git a/tex/context/base/core-fnt.tex b/tex/context/base/core-fnt.tex
index b9ac85b80..b6c11dbd3 100644
--- a/tex/context/base/core-fnt.tex
+++ b/tex/context/base/core-fnt.tex
@@ -8,7 +8,7 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See licen-en.pdf for 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
 %C details. 
 
 \writestatus{loading}{Context Core Macros / Font Support}
@@ -190,7 +190,7 @@
    \uppercase{#1}%
    \egroup}
 
-\def\Word#1%
+\unexpanded\def\Word#1%
   {\doWord#1}
 
 \def\doprocesswords#1 #2\od%
@@ -201,19 +201,21 @@
 \def\processwords#1%
   {\doprocesswords#1 \od\unskip}
 
-\def\Words%
+\unexpanded\def\Words%
   {\let\processwords=\Word 
    \processwords}
 
-\def\WORD#1%
+\unexpanded\def\WORD#1%
   {\bgroup
    \the\everyuppercase
-   \def\kap#1{#1}%
-   \edef\next{#1}%
-   \uppercase\expandafter{\next}%
-   \egroup}
-
-\def\WORDS#1%
+   \def\kap##1{##1}%
+   \def\WORD##1{##1}%
+   \uppercase{#1}% No expansion here, otherwise \getvalue problems!
+%   \edef\next{#1}%
+%   \uppercase\expandafter{\next}%
+   \egroup}       
+
+\unexpanded\def\WORDS#1%
   {\WORD{#1}}
 
 %D \macros
@@ -298,12 +300,12 @@
 %D \showsetup{\y!setupunderbar}
 %D
 %D The alternatives show up as 
-%D   {\setupunderbar [variant=a]\underbar{alternative a},
-%D   {\setupunderbar [variant=b]\underbar{alternative b},
-%D   {\setupunderbar [variant=c]\underbar{alternative c}
+%D   {\setupunderbar [variant=a]\underbar{alternative a}},
+%D   {\setupunderbar [variant=b]\underbar{alternative b}},
+%D   {\setupunderbar [variant=c]\underbar{alternative c}}
 %D and 
-%D   {\setupunderbar [lijndikte=1pt]\underbar{1pt width},
-%D   {\setupunderbar [lijndikte=2pt]\underbar{2pt width}, 
+%D   {\setupunderbar [lijndikte=1pt]\underbar{1pt width}},
+%D   {\setupunderbar [lijndikte=2pt]\underbar{2pt width}}, 
 %D or whatever. Because \type{\overstrike} uses the same 
 %D method, the settings also apply to that macro.