2022-01-15 17:31:00

16 files changed, 26 insertions, 15 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 4f48115f7..9e34a6edb 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2022.01.15 11:02}
+\newcontextversion{2022.01.15 17:29}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 10c0bc693..34d482f1a 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2022.01.15 11:02}
+\edef\contextversion{2022.01.15 17:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii
index e8314e044..b7c96b231 100644
--- a/tex/context/base/mkii/mult-en.mkii
+++ b/tex/context/base/mkii/mult-en.mkii
@@ -300,6 +300,7 @@
 \setinterfacevariable{july}{july}
 \setinterfacevariable{june}{june}
 \setinterfacevariable{keep}{keep}
+\setinterfacevariable{keeptogether}{keeptogether}
 \setinterfacevariable{kerncharacters}{kerncharacters}
 \setinterfacevariable{knockout}{knockout}
 \setinterfacevariable{label}{label}
@@ -886,6 +887,7 @@
 \setinterfaceconstant{header}{header}
 \setinterfaceconstant{headerdistance}{headerdistance}
 \setinterfaceconstant{headerstate}{headerstate}
+\setinterfaceconstant{headindenting}{headindenting}
 \setinterfaceconstant{headlabel}{headlabel}
 \setinterfaceconstant{headnumber}{headnumber}
 \setinterfaceconstant{headseparator}{headseparator}
@@ -1280,6 +1282,7 @@
 \setinterfaceconstant{synonymcommand}{synonymcommand}
 \setinterfaceconstant{synonymstyle}{synonymstyle}
 \setinterfaceconstant{tab}{tab}
+\setinterfaceconstant{target}{target}
 \setinterfaceconstant{text}{text}
 \setinterfaceconstant{textalign}{textalign}
 \setinterfaceconstant{textalternative}{textalternative}
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index cee725d43..dbfe43067 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -887,6 +887,7 @@
 \setinterfaceconstant{header}{antet}
 \setinterfaceconstant{headerdistance}{distantaantet}
 \setinterfaceconstant{headerstate}{stareantet}
+\setinterfaceconstant{headindenting}{headindenting}
 \setinterfaceconstant{headlabel}{etichetatitlu}
 \setinterfaceconstant{headnumber}{numartitlu}
 \setinterfaceconstant{headseparator}{headseparator}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 3dad09b1d..592ce5e2e 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2022.01.15 11:02}
+\newcontextversion{2022.01.15 17:29}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 23d886b1e..19dcd9266 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -49,7 +49,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2022.01.15 11:02}
+\edef\contextversion{2022.01.15 17:29}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/core-con.lua b/tex/context/base/mkiv/core-con.lua
index ea11ffcd0..95283a75e 100644
--- a/tex/context/base/mkiv/core-con.lua
+++ b/tex/context/base/mkiv/core-con.lua
@@ -127,7 +127,8 @@ local counters = allocate {
         0xE050, 0xE051, 0xE052, 0xE053, 0xE054,
         0xE055, 0xE056, 0xE057, 0xE058, 0xE059
     },
-    ['devangari'] = {
+    ['devanagari'] = {
+     -- ० १ २ ३ ४ ५ ६ ७ ८ ९
         0x0966, 0x0967, 0x0968, 0x0969, 0x096A,
         0x096B, 0x096C, 0x096D, 0x096E, 0x096F
     },
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 05f7158b9..591226fa3 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 8ab0cb237..d24583065 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 6e8f45f6d..92cc1fe7f 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2022.01.15 11:02}
+\newcontextversion{2022.01.15 17:29}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 9cd838a16..6cd516c3d 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2022.01.15 11:02}
+\immutable\edef\contextversion{2022.01.15 17:29}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/math-frc.mkxl b/tex/context/base/mkxl/math-frc.mkxl
index c7165187c..1175eef1b 100644
--- a/tex/context/base/mkxl/math-frc.mkxl
+++ b/tex/context/base/mkxl/math-frc.mkxl
@@ -282,7 +282,7 @@
 
 \protected\defcsname\??mathfractionalternative\v!inner\endcsname#1#2%
   {\math_frac_command_u
-{}%     {\expandedmathstyleparameter\mathfractionparameter}%
+     {}%     {\expandedmathstyleparameter\mathfractionparameter}%
      {\math_fraction_margin_kern
 \usemathstyleparameter\mathfractionparameter
       \m_fractions_strut_top#1%
@@ -323,7 +323,6 @@
    \endmathgroup
    \math_frac_wrapup}
 
-
 \nulldelimiterspace\zeropoint % was 1.2pt
 
 \definemathfraction[xfrac] [\c!alternative=\v!inner,\c!mathstyle=\s!script]
diff --git a/tex/context/base/mkxl/math-ini.mkxl b/tex/context/base/mkxl/math-ini.mkxl
index f0db89cf2..f65856e73 100644
--- a/tex/context/base/mkxl/math-ini.mkxl
+++ b/tex/context/base/mkxl/math-ini.mkxl
@@ -2464,12 +2464,15 @@
    \fi}
 
 \permanent\def\expandedmathstyleparameter#1%
-  {\ifcsname\??mathstyle#1\c!mathstyle\endcsname
+  {\normalexpanded{\noexpand\math_style_set_expanded{#1\c!mathstyle}}}
+
+\def\math_style_set_expanded#1%
+  {\ifcsname\??mathstyle#1e\endcsname
      \lastnamedcs
-   \orelse\ifcsname\??mathstylecache#1\c!mathstyle\endcsname
+   \orelse\ifcsname\??mathstylecache#1\endcsname
      \lastnamedcs
    \else
-     \math_style_set_mathstyle_mathstylecache#1%
+     \math_style_set_mathstyle_mathstylecache{#1}%
    \fi}
 
 \permanent\protected\def\usemathstyleparameter#1%
@@ -2492,14 +2495,14 @@
 
 \def\math_style_set_mathstyle_mathstylecache#1%
   {\beginlocalcontrol % so we can expand
-   \edef\m_math_style_asked{#1\c!mathstyle}%
+   \edef\m_math_style_asked{#1}%
    \c_math_styles_state_style  \zerocount
    \c_math_styles_state_cramped\zerocount
    \c_math_styles_state_size   \zerocount
    \rawprocesscommacommand[\m_math_style_asked]\math_style_collect
    \gletcsname\??mathstylecache\m_math_style_asked\normalexpanded{\endcsname\math_style_add_to_cache_choice}%
    \endlocalcontrol
-   \csname\??mathstylecache#1\c!mathstyle\endcsname}
+   \csname\??mathstylecache#1\endcsname}
 
 % \letcsname\??mathstyle     \??mathstyle     \endcsname\math_style_set_mathstyle_mathstyle      % still needed?
 % \letcsname\??mathstylecache\??mathstylecache\endcsname\math_style_set_mathstyle_mathstylecache % still needed?
diff --git a/tex/context/interface/mkii/keys-en.xml b/tex/context/interface/mkii/keys-en.xml
index 9f4fbcbc0..fc401d9d4 100644
--- a/tex/context/interface/mkii/keys-en.xml
+++ b/tex/context/interface/mkii/keys-en.xml
@@ -303,6 +303,7 @@
 		<cd:variable name='july' value='july'/>
 		<cd:variable name='june' value='june'/>
 		<cd:variable name='keep' value='keep'/>
+		<cd:variable name='keeptogether' value='keeptogether'/>
 		<cd:variable name='kerncharacters' value='kerncharacters'/>
 		<cd:variable name='knockout' value='knockout'/>
 		<cd:variable name='label' value='label'/>
@@ -892,6 +893,7 @@
 		<cd:constant name='header' value='header'/>
 		<cd:constant name='headerdistance' value='headerdistance'/>
 		<cd:constant name='headerstate' value='headerstate'/>
+		<cd:constant name='headindenting' value='headindenting'/>
 		<cd:constant name='headlabel' value='headlabel'/>
 		<cd:constant name='headnumber' value='headnumber'/>
 		<cd:constant name='headseparator' value='headseparator'/>
@@ -1286,6 +1288,7 @@
 		<cd:constant name='synonymcommand' value='synonymcommand'/>
 		<cd:constant name='synonymstyle' value='synonymstyle'/>
 		<cd:constant name='tab' value='tab'/>
+		<cd:constant name='target' value='target'/>
 		<cd:constant name='text' value='text'/>
 		<cd:constant name='textalign' value='textalign'/>
 		<cd:constant name='textalternative' value='textalternative'/>
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index 824015281..5656f3aad 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -893,6 +893,7 @@
 		<cd:constant name='header' value='antet'/>
 		<cd:constant name='headerdistance' value='distantaantet'/>
 		<cd:constant name='headerstate' value='stareantet'/>
+		<cd:constant name='headindenting' value='headindenting'/>
 		<cd:constant name='headlabel' value='etichetatitlu'/>
 		<cd:constant name='headnumber' value='numartitlu'/>
 		<cd:constant name='headseparator' value='headseparator'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 926ffeb64..61fd2abed 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2022-01-15 11:02
+-- merge date  : 2022-01-15 17:29
 
 do -- begin closure to overcome local limits and interference