beta 2012.05.22 16:12

1 files changed, 27 insertions, 20 deletions

diff --git a/tex/context/base/core-sys.mkiv b/tex/context/base/core-sys.mkiv
index 88e0ebf23..66f2a4380 100644
--- a/tex/context/base/core-sys.mkiv
+++ b/tex/context/base/core-sys.mkiv
@@ -212,31 +212,38 @@
       \dotaghighlight}
      {\dostoptagged}}
 
+\unexpanded\def\defineexpandable
+  {\doifnextoptionalelse
+     {\syst_basics_define_yes\def}%
+     {\syst_basics_define_nop\def}}
+
 \unexpanded\def\define
-  {\doifnextoptionalelse\syst_basics_define_yes\syst_basics_define_nop}
+  {\doifnextoptionalelse
+     {\syst_basics_define_yes{\unexpanded\def}}%
+     {\syst_basics_define_nop{\unexpanded\def}}}
 
-\unexpanded\def\syst_basics_define_yes[#1]#2#3%
+\unexpanded\def\syst_basics_define_yes#1[#2]#3#4%
+  {\ifdefined#3%
+     \showmessage\m!system4{\string#3}%
+   \fi
+   \ifcase0#2\relax
+     #1#3{#4}\or
+     #1#3##1{#4}\or
+     #1#3##1##2{#4}\or
+     #1#3##1##2##3{#4}\or
+     #1#3##1##2##3##4{#4}\or
+     #1#3##1##2##3##4##5{#4}\or
+     #1#3##1##2##3##4##5##6{#4}\or
+     #1#3##1##2##3##4##5##6##7{#4}\or
+     #1#3##1##2##3##4##5##6##7##8{#4}\or
+     #1#3##1##2##3##4##5##6##7##8##9{#4}\else
+     #1#3{#4}\fi}
+
+\unexpanded\def\syst_basics_define_nop#1#2#3%
   {\ifdefined#2%
      \showmessage\m!system4{\string#2}%
    \fi
-   \ifcase0#1\relax
-     \def#2{#3}\or
-     \def#2##1{#3}\or
-     \def#2##1##2{#3}\or
-     \def#2##1##2##3{#3}\or
-     \def#2##1##2##3##4{#3}\or
-     \def#2##1##2##3##4##5{#3}\or
-     \def#2##1##2##3##4##5##6{#3}\or
-     \def#2##1##2##3##4##5##6##7{#3}\or
-     \def#2##1##2##3##4##5##6##7##8{#3}\or
-     \def#2##1##2##3##4##5##6##7##8##9{#3}\else
-     \def#2{#3}\fi}
-
-\unexpanded\def\syst_basics_define_nop#1#2%
-  {\ifdefined#1%
-     \showmessage\m!system4{\string#1}%
-   \fi
-   \def#1{#2}}
+   #1#2{#3}}
 
 % \startluacode
 %     local contextsprint, ctxcatcodes = context.sprint, tex.ctxcatcodes