beta 2010-06-23 12:49

1 files changed, 80 insertions, 58 deletions

diff --git a/tex/context/base/mult-ini.mkiv b/tex/context/base/mult-ini.mkiv
index e20548f9b..493a04cea 100644
--- a/tex/context/base/mult-ini.mkiv
+++ b/tex/context/base/mult-ini.mkiv
@@ -437,56 +437,74 @@
 \def\doignorevalue#1#2#3%
   {\dosetvalue{#1}{#2}{}}
 
-\def\dosetvalue#1#2%
-  {\let\c!internal!\c!internal!n
-   \ifcsname\k!prefix!#2\endcsname
-     \let\c!internal!\c!internal!y
-     \@EA\def\csname#1\csname\k!prefix!#2\endcsname%\endcsname
-   \else
-     \let\c!internal!\c!internal!y
-     \@EA\def\csname#1#2%\endcsname
-   \fi\endcsname}
-
-\def\dosetevalue#1#2%
-  {\let\c!internal!\c!internal!n
-   \ifcsname\k!prefix!#2\endcsname
-     \let\c!internal!\c!internal!y
-     \@EA\edef\csname#1\csname\k!prefix!#2\endcsname%\endcsname
-   \else
-     \let\c!internal!\c!internal!y
-     \@EA\edef\csname#1#2%\endcsname
-   \fi\endcsname}
-
-\def\dosetgvalue#1#2%
-  {\let\c!internal!\c!internal!n
-   \ifcsname\k!prefix!#2\endcsname
-     \let\c!internal!\c!internal!y
-     \@EA\gdef\csname#1\csname\k!prefix!#2\endcsname%\endcsname
-   \else
-     \let\c!internal!\c!internal!y
-     \@EA\gdef\csname#1#2%\endcsname
-   \fi\endcsname}
-
-\def\dosetxvalue#1#2%
-  {\let\c!internal!\c!internal!n
-   \ifcsname\k!prefix!#2\endcsname
-     \let\c!internal!\c!internal!y
-     \@EA\xdef\csname#1\csname\k!prefix!#2\endcsname%\endcsname
-   \else
-     \let\c!internal!\c!internal!y
-     \@EA\xdef\csname#1#2%\endcsname
-   \fi\endcsname}
-
-\def\docopyvalue#1#2#3% real tricky expansion, quite unreadable
-  {\let\c!internal!\c!internal!n
-   \ifcsname\k!prefix!#3\endcsname
-     \let\c!internal!\c!internal!y
-     \@EA\def\csname#1\csname\k!prefix!#3\endcsname
-       \@EA\endcsname\@EA{\csname#2\csname\k!prefix!#3\endcsname\endcsname}%
-   \else
-     \let\c!internal!\c!internal!y
-     \@EA\def\csname#1#3\@EA\endcsname\@EA{\csname#2#3\endcsname}%
-   \fi}
+% \def\dosetvalue#1#2%
+%   {\let\c!internal!\c!internal!n
+%    \ifcsname\k!prefix!#2\endcsname
+%      \let\c!internal!\c!internal!y
+%      \@EA\def\csname#1\csname\k!prefix!#2\endcsname%\endcsname
+%    \else
+%      \let\c!internal!\c!internal!y
+%      \@EA\def\csname#1#2%\endcsname
+%    \fi\endcsname}
+
+% \def\dosetevalue#1#2%
+%   {\let\c!internal!\c!internal!n
+%    \ifcsname\k!prefix!#2\endcsname
+%      \let\c!internal!\c!internal!y
+%      \@EA\edef\csname#1\csname\k!prefix!#2\endcsname%\endcsname
+%    \else
+%      \let\c!internal!\c!internal!y
+%      \@EA\edef\csname#1#2%\endcsname
+%    \fi\endcsname}
+
+% \def\dosetgvalue#1#2%
+%   {\let\c!internal!\c!internal!n
+%    \ifcsname\k!prefix!#2\endcsname
+%      \let\c!internal!\c!internal!y
+%      \@EA\gdef\csname#1\csname\k!prefix!#2\endcsname%\endcsname
+%    \else
+%      \let\c!internal!\c!internal!y
+%      \@EA\gdef\csname#1#2%\endcsname
+%    \fi\endcsname}
+
+% \def\dosetxvalue#1#2%
+%   {\let\c!internal!\c!internal!n
+%    \ifcsname\k!prefix!#2\endcsname
+%      \let\c!internal!\c!internal!y
+%      \@EA\xdef\csname#1\csname\k!prefix!#2\endcsname%\endcsname
+%    \else
+%      \let\c!internal!\c!internal!y
+%      \@EA\xdef\csname#1#2%\endcsname
+%    \fi\endcsname}
+
+% \def\docopyvalue#1#2#3% real tricky expansion, quite unreadable
+%   {\let\c!internal!\c!internal!n
+%    \ifcsname\k!prefix!#3\endcsname
+%      \let\c!internal!\c!internal!y
+%      \@EA\def\csname#1\csname\k!prefix!#3\endcsname
+%        \@EA\endcsname\@EA{\csname#2\csname\k!prefix!#3\endcsname\endcsname}%
+%    \else
+%      \let\c!internal!\c!internal!y
+%      \@EA\def\csname#1#3\@EA\endcsname\@EA{\csname#2#3\endcsname}%
+%    \fi}
+
+% \def\dosetvalue #1#2{\@EA \def\csname#1\ifcsname\k!prefix!#2\endcsname\csname\k!prefix!#2\endcsname\else#2\fi\endcsname}
+% \def\dosetevalue#1#2{\@EA\edef\csname#1\ifcsname\k!prefix!#2\endcsname\csname\k!prefix!#2\endcsname\else#2\fi\endcsname}
+% \def\dosetgvalue#1#2{\@EA\gdef\csname#1\ifcsname\k!prefix!#2\endcsname\csname\k!prefix!#2\endcsname\else#2\fi\endcsname}
+% \def\dosetxvalue#1#2{\@EA\xdef\csname#1\ifcsname\k!prefix!#2\endcsname\csname\k!prefix!#2\endcsname\else#2\fi\endcsname}
+
+% \def\docopyvalue#1#2#3% real tricky expansion, quite unreadable
+%   {\ifcsname\k!prefix!#3\endcsname
+%      \@EA\def\csname#1\csname\k!prefix!#3\endcsname\@EA\endcsname\@EA{\csname#2\csname\k!prefix!#3\endcsname\endcsname}%
+%    \else
+%      \@EA\def\csname#1#3\@EA\endcsname\@EA{\csname#2#3\endcsname}%
+%    \fi}
+
+\def\dosetvalue   #1#2{\@EA \def\csname#1#2\endcsname}
+\def\dosetevalue  #1#2{\@EA\edef\csname#1#2\endcsname}
+\def\dosetgvalue  #1#2{\@EA\gdef\csname#1#2\endcsname}
+\def\dosetxvalue  #1#2{\@EA\xdef\csname#1#2\endcsname}
+\def\docopyvalue#1#2#3{\@EA \def\csname#1#3\@EA\endcsname\@EA{\csname#2#3\endcsname}}
 
 %D We can now redefine some messages that will be
 %D introduced in the multi||lingual system module.
@@ -744,22 +762,26 @@
 %D user constants (keywords) become system variables
 %D \stopnarrower
 
-%D Anno 2003 I've forgotten why the \type {\c!internal} is
-%D still in there; it's probably a left over from the time that
+%D The \type {\c!internal} is a left over from the time that
 %D the user interface documents were not using a specification
 %D alongside a keyword specification but used a shared file in
 %D which case we need to go in both directions.
 
-\let\c!internal!y \string
-\def\c!internal!n {-}
-\let\c!internal!  \c!internal!y
-
 % temporary mkiv hack (we can best just store the whole table in memory)
 
+% \let\c!internal!y \string
+% \def\c!internal!n {-}
+% \let\c!internal!  \c!internal!y
+
+% \def\setinterfaceconstant#1#2%
+%   {\ctxlua{interfaces.setconstant("#1","#2")}%
+%    \setvalue{\c!prefix!#1}{\c!internal!#1}%
+%    \setvalue{\k!prefix!#2}{#1}}
+
 \def\setinterfaceconstant#1#2%
   {\ctxlua{interfaces.setconstant("#1","#2")}%
-   \setvalue{\c!prefix!#1}{\c!internal!#1}%
-   \setvalue{\k!prefix!#2}{#1}}
+  %\setvalue{\k!prefix!#2}{#1}%
+   \setvalue{\c!prefix!#1}{#1}}
 
 \def\setinterfacevariable#1#2%
   {\ctxlua{interfaces.setvariable("#1","#2")}%