1 files changed, 18 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/context/base/font-ini.mkii b/Master/texmf-dist/tex/context/base/font-ini.mkii
index f614a07cd09..89fbb5d0720 100644
--- a/Master/texmf-dist/tex/context/base/font-ini.mkii
+++ b/Master/texmf-dist/tex/context/base/font-ini.mkii
@@ -3163,12 +3163,14 @@
 \def\definefontfeature
   {\dotripleargument\dodefinefontfeature}
 
+\def\dododefinefontfeature#1%
+  {\edef\!!stringa{\ifx\!!stringa\empty\else\!!stringa,\fi\executeifdefined{\??fa#1}\empty}}
+
 \def\dodefinefontfeature[#1][#2][#3]%
   {\doifassignmentelse{#2}
      {\setevalue{\??fa#1}{#2}}
      {\let\!!stringa\empty
-      \def\mkdodefinefontfeature##1{\edef\!!stringa{\ifx\!!stringa\empty\else\!!stringa,\fi##1}}%
-      \processcommalist[#2]\mkdodefinefontfeature
+      \processcommalist[#2]\dododefinefontfeature
       \setevalue{\??fa#1}{\ifx\!!stringa\empty\else\!!stringa,\fi#3}}}
 
 \definefontfeature
@@ -3185,11 +3187,15 @@
 
 \definefontfeature % no calt
   [arabic]
-  [mode=node,language=dflt,script=arab,
+  [language=dflt,script=arab,
    init=yes,medi=yes,fina=yes,isol=yes,
    liga=yes,dlig=yes,rlig=yes,clig=yes,
    mark=yes,mkmk=yes,kern=yes,curs=yes]
 
+\definefontfeature
+  [none]
+  [features=no]
+
 %D The next auxilliary macro is an alternative to \type
 %D {\fontname}.
 
@@ -3242,11 +3248,11 @@
 %
 % newer
 
-\def\os  {\mathortext{\fam\purefamily    {oldstyle}}{\symbolicfont    {OldStyle}}}
-\def\frak{\mathortext{\fam\purefamily     {fraktur}}{\symbolicfont     {Fraktur}}}
-\def\goth{\mathortext{\fam\purefamily      {gothic}}{\symbolicfont      {Gothic}}}
-\def\cal {\mathortext{\fam\purefamily{calligraphic}}{\symbolicfont{Calligraphic}}}
-\def\bbd {\mathortext{\fam\purefamily  {blackboard}}{\symbolicfont  {Blackboard}}}
+\unexpanded\def\os  {\mathortext{\fam\purefamily    {oldstyle}}{\symbolicfont    {OldStyle}}}
+\unexpanded\def\frak{\mathortext{\fam\purefamily     {fraktur}}{\symbolicfont     {Fraktur}}}
+\unexpanded\def\goth{\mathortext{\fam\purefamily      {gothic}}{\symbolicfont      {Gothic}}}
+\unexpanded\def\cal {\mathortext{\fam\purefamily{calligraphic}}{\symbolicfont{Calligraphic}}}
+\unexpanded\def\bbd {\mathortext{\fam\purefamily  {blackboard}}{\symbolicfont  {Blackboard}}}
 
 \definefontsynonym [OldStyle]     [Serif]
 \definefontsynonym [Fraktur]      [Serif]
@@ -3262,10 +3268,10 @@
 
 \ifx\mathtext\undefined \let\mathtext\hbox \fi
 
-\def\fraktur     #1{\mathortext\domathtext\donothing{\frak#1}}
-\def\gothic      #1{\mathortext\domathtext\donothing{\goth#1}}
-\def\calligraphic#1{\mathortext\domathtext\donothing{\cal #1}}
-\def\blackboard  #1{\mathortext\domathtext\donothing{\bbd#1}}
+\unexpanded\def\fraktur     #1{\mathortext\domathtext\donothing{\frak#1}}
+\unexpanded\def\gothic      #1{\mathortext\domathtext\donothing{\goth#1}}
+\unexpanded\def\calligraphic#1{\mathortext\domathtext\donothing{\cal #1}}
+\unexpanded\def\blackboard  #1{\mathortext\domathtext\donothing{\bbd#1}}
 
 %D Torture test:
 %D