7 files changed, 39 insertions, 21 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 1844779fd..a02511e2c 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.05.11 11:34}
+\newcontextversion{2022.07.06 21:34}
 
 %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 a520470b2..385df8685 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.05.11 11:34}
+\edef\contextversion{2022.07.06 21:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii
index 5af147f70..e7987a2d6 100644
--- a/tex/context/base/mkii/mult-cs.mkii
+++ b/tex/context/base/mkii/mult-cs.mkii
@@ -641,6 +641,7 @@
 % definitions for interface constants for language cs
 %
 \setinterfaceconstant{action}{akce}
+\setinterfaceconstant{adaptive}{adaptive}
 \setinterfaceconstant{address}{adresa}
 \setinterfaceconstant{after}{po}
 \setinterfaceconstant{afterhead}{pohlavicce}
@@ -1053,6 +1054,8 @@
 \setinterfaceconstant{numberconversionset}{numberconversionset}
 \setinterfaceconstant{numberdistance}{numberdistance}
 \setinterfaceconstant{numbering}{cislovani}
+\setinterfaceconstant{numberlocation}{numberlocation}
+\setinterfaceconstant{numbermethod}{numbermethod}
 \setinterfaceconstant{numberorder}{numberorder}
 \setinterfaceconstant{numberprefix}{numberprefix}
 \setinterfaceconstant{numbersegments}{numbersegments}
@@ -1063,6 +1066,7 @@
 \setinterfaceconstant{numberstopper}{numberstopper}
 \setinterfaceconstant{numberstrut}{numberstrut}
 \setinterfaceconstant{numberstyle}{stylcisla}
+\setinterfaceconstant{numberthreshold}{numberthreshold}
 \setinterfaceconstant{numberwidth}{numberwidth}
 \setinterfaceconstant{nx}{nx}
 \setinterfaceconstant{ny}{ny}
@@ -1234,6 +1238,8 @@
 \setinterfaceconstant{small}{male}
 \setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures}
 \setinterfaceconstant{smallcapsfont}{smallcapsfont}
+\setinterfaceconstant{snap}{snap}
+\setinterfaceconstant{snapstep}{snapstep}
 \setinterfaceconstant{solution}{solution}
 \setinterfaceconstant{sort}{sort}
 \setinterfaceconstant{sorttype}{sorttype}
diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii
index 2a00dba9b..cb26f8c65 100644
--- a/tex/context/base/mkii/mult-en.mkii
+++ b/tex/context/base/mkii/mult-en.mkii
@@ -870,6 +870,7 @@
 \setinterfaceconstant{frameradius}{frameradius}
 \setinterfaceconstant{frames}{frames}
 \setinterfaceconstant{freeregion}{freeregion}
+\setinterfaceconstant{freezespacing}{freezespacing}
 \setinterfaceconstant{from}{from}
 \setinterfaceconstant{functioncolor}{functioncolor}
 \setinterfaceconstant{functionstyle}{functionstyle}
@@ -950,6 +951,7 @@
 \setinterfaceconstant{lastpubsep}{lastpubsep}
 \setinterfaceconstant{layout}{layout}
 \setinterfaceconstant{left}{left}
+\setinterfaceconstant{leftclass}{leftclass}
 \setinterfaceconstant{leftcolor}{leftcolor}
 \setinterfaceconstant{leftcompoundhyphen}{leftcompoundhyphen}
 \setinterfaceconstant{leftedge}{leftedge}
@@ -1008,6 +1010,7 @@
 \setinterfaceconstant{menu}{menu}
 \setinterfaceconstant{method}{method}
 \setinterfaceconstant{middle}{middle}
+\setinterfaceconstant{middleclass}{middleclass}
 \setinterfaceconstant{middlecolor}{middlecolor}
 \setinterfaceconstant{middlecommand}{middlecommand}
 \setinterfaceconstant{middlesource}{middlesource}
@@ -1054,6 +1057,8 @@
 \setinterfaceconstant{numberconversionset}{numberconversionset}
 \setinterfaceconstant{numberdistance}{numberdistance}
 \setinterfaceconstant{numbering}{numbering}
+\setinterfaceconstant{numberlocation}{numberlocation}
+\setinterfaceconstant{numbermethod}{numbermethod}
 \setinterfaceconstant{numberorder}{numberorder}
 \setinterfaceconstant{numberprefix}{numberprefix}
 \setinterfaceconstant{numbersegments}{numbersegments}
@@ -1064,6 +1069,7 @@
 \setinterfaceconstant{numberstopper}{numberstopper}
 \setinterfaceconstant{numberstrut}{numberstrut}
 \setinterfaceconstant{numberstyle}{numberstyle}
+\setinterfaceconstant{numberthreshold}{numberthreshold}
 \setinterfaceconstant{numberwidth}{numberwidth}
 \setinterfaceconstant{nx}{nx}
 \setinterfaceconstant{ny}{ny}
@@ -1117,6 +1123,7 @@
 \setinterfaceconstant{palet}{palet}
 \setinterfaceconstant{paper}{paper}
 \setinterfaceconstant{paragraph}{paragraph}
+\setinterfaceconstant{penalties}{penalties}
 \setinterfaceconstant{period}{period}
 \setinterfaceconstant{place}{place}
 \setinterfaceconstant{placehead}{placehead}
@@ -1170,6 +1177,7 @@
 \setinterfaceconstant{reverse}{reverse}
 \setinterfaceconstant{right}{right}
 \setinterfaceconstant{rightchars}{rightchars}
+\setinterfaceconstant{rightclass}{rightclass}
 \setinterfaceconstant{rightcolor}{rightcolor}
 \setinterfaceconstant{rightcompoundhyphen}{rightcompoundhyphen}
 \setinterfaceconstant{rightedge}{rightedge}
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index 7823d3eef..08a2cbb62 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -870,6 +870,7 @@
 \setinterfaceconstant{frameradius}{شعاع‌قالب}
 \setinterfaceconstant{frames}{قالبها}
 \setinterfaceconstant{freeregion}{freeregion}
+\setinterfaceconstant{freezespacing}{freezespacing}
 \setinterfaceconstant{from}{از}
 \setinterfaceconstant{functioncolor}{functioncolor}
 \setinterfaceconstant{functionstyle}{functionstyle}
@@ -950,6 +951,7 @@
 \setinterfaceconstant{lastpubsep}{lastpubsep}
 \setinterfaceconstant{layout}{layout}
 \setinterfaceconstant{left}{چپ}
+\setinterfaceconstant{leftclass}{leftclass}
 \setinterfaceconstant{leftcolor}{رنگ‌چپ}
 \setinterfaceconstant{leftcompoundhyphen}{leftcompoundhyphen}
 \setinterfaceconstant{leftedge}{لبه‌چپ}
@@ -1008,6 +1010,7 @@
 \setinterfaceconstant{menu}{منو}
 \setinterfaceconstant{method}{روش}
 \setinterfaceconstant{middle}{میان}
+\setinterfaceconstant{middleclass}{middleclass}
 \setinterfaceconstant{middlecolor}{middlecolor}
 \setinterfaceconstant{middlecommand}{middlecommand}
 \setinterfaceconstant{middlesource}{middlesource}
@@ -1054,6 +1057,8 @@
 \setinterfaceconstant{numberconversionset}{numberconversionset}
 \setinterfaceconstant{numberdistance}{فاصله‌شماره}
 \setinterfaceconstant{numbering}{شماره‌گذاری}
+\setinterfaceconstant{numberlocation}{numberlocation}
+\setinterfaceconstant{numbermethod}{numbermethod}
 \setinterfaceconstant{numberorder}{numberorder}
 \setinterfaceconstant{numberprefix}{numberprefix}
 \setinterfaceconstant{numbersegments}{numbersegments}
@@ -1064,6 +1069,7 @@
 \setinterfaceconstant{numberstopper}{numberstopper}
 \setinterfaceconstant{numberstrut}{numberstrut}
 \setinterfaceconstant{numberstyle}{سبک‌شماره}
+\setinterfaceconstant{numberthreshold}{numberthreshold}
 \setinterfaceconstant{numberwidth}{عرض‌شماره}
 \setinterfaceconstant{nx}{nx}
 \setinterfaceconstant{ny}{ny}
@@ -1117,6 +1123,7 @@
 \setinterfaceconstant{palet}{لوح}
 \setinterfaceconstant{paper}{برگ}
 \setinterfaceconstant{paragraph}{پاراگراف}
+\setinterfaceconstant{penalties}{penalties}
 \setinterfaceconstant{period}{period}
 \setinterfaceconstant{place}{بگذار}
 \setinterfaceconstant{placehead}{بگذارسر}
@@ -1170,6 +1177,7 @@
 \setinterfaceconstant{reverse}{برعکس}
 \setinterfaceconstant{right}{راست}
 \setinterfaceconstant{rightchars}{rightchars}
+\setinterfaceconstant{rightclass}{rightclass}
 \setinterfaceconstant{rightcolor}{رنگ‌راست}
 \setinterfaceconstant{rightcompoundhyphen}{rightcompoundhyphen}
 \setinterfaceconstant{rightedge}{لبه‌راست}
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 661b94194..e52732b6b 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -1054,6 +1054,8 @@
 \setinterfaceconstant{numberconversionset}{numberconversionset}
 \setinterfaceconstant{numberdistance}{numberdistance}
 \setinterfaceconstant{numbering}{numerotare}
+\setinterfaceconstant{numberlocation}{numberlocation}
+\setinterfaceconstant{numbermethod}{numbermethod}
 \setinterfaceconstant{numberorder}{numberorder}
 \setinterfaceconstant{numberprefix}{numberprefix}
 \setinterfaceconstant{numbersegments}{numbersegments}
@@ -1064,6 +1066,7 @@
 \setinterfaceconstant{numberstopper}{numberstopper}
 \setinterfaceconstant{numberstrut}{numberstrut}
 \setinterfaceconstant{numberstyle}{stilnumar}
+\setinterfaceconstant{numberthreshold}{numberthreshold}
 \setinterfaceconstant{numberwidth}{numberwidth}
 \setinterfaceconstant{nx}{nx}
 \setinterfaceconstant{ny}{ny}
diff --git a/tex/context/base/mkii/type-one.mkii b/tex/context/base/mkii/type-one.mkii
index 4f6e43745..d5e281ff7 100644
--- a/tex/context/base/mkii/type-one.mkii
+++ b/tex/context/base/mkii/type-one.mkii
@@ -2858,7 +2858,7 @@
         \definetypeface [dejavu] [rm] [serif] [dejavu] [default] [encoding=\typescripttwo]
         \definetypeface [dejavu] [ss] [sans]  [dejavu] [default] [encoding=\typescripttwo]
         \definetypeface [dejavu] [tt] [mono]  [dejavu] [default] [encoding=\typescripttwo]
-        \definetypeface [dejavu] [mm] [math]  [xits]   [default] [rscale=auto]
+        \definetypeface [dejavu] [mm] [math]  [xits]   [default]
         \loadmapfile [dejavu-truetype.map]
     \stoptypescript
 
@@ -2866,7 +2866,7 @@
         \definetypeface [dejavu-condensed] [rm] [serif] [dejavu-condensed] [default] [encoding=\typescripttwo]
         \definetypeface [dejavu-condensed] [ss] [sans]  [dejavu-condensed] [default] [encoding=\typescripttwo]
         \definetypeface [dejavu-condensed] [tt] [mono]  [dejavu-condensed] [default] [encoding=\typescripttwo]
-        \definetypeface [dejavu-condensed] [mm] [math]  [xits]             [default] [rscale=auto]
+        \definetypeface [dejavu-condensed] [mm] [math]  [xits]             [default]
         \loadmapfile [dejavu-truetype.map]
     \stoptypescript
 
@@ -2874,26 +2874,15 @@
 
 \starttypescriptcollection[gentium]
 
-    \starttypescript [serif] [gentium] [ec,texnansi,qx,t5,l7x]
-        \definefontsynonym [Gentium-Roman]       [\typescriptthree-gentiumplus-regular]     [encoding=\typescriptthree]
-        \definefontsynonym [Gentium-Italic]      [\typescriptthree-gentiumplus-italic]      [encoding=\typescriptthree]
-        \definefontsynonym [Gentium-Bold]        [\typescriptthree-gentiumbasic-bold]       [encoding=\typescriptthree]
-        \definefontsynonym [Gentium-BoldItalic]  [\typescriptthree-gentiumbasic-bolditalic] [encoding=\typescriptthree]
-        \definefontsynonym [Gentium-RomanCaps]   [\typescriptthree-gentiumplus-regular-sc]  [encoding=\typescriptthree]
-        \definefontsynonym [Gentium-Slanted]     [Gentium-Italic]
-        \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic]
-        \loadmapfile[gentium-\typescriptthree.map]
-    \stoptypescript
-
-    \starttypescript [serif] [gentium] [agr,t2a]
+    \starttypescript [serif] [gentium] [ec,texnansi,qx,t5,l7x,agr,t2a]
         \definefontsynonym [Gentium-Roman]       [\typescriptthree-gentiumplus-regular]    [encoding=\typescriptthree]
         \definefontsynonym [Gentium-Italic]      [\typescriptthree-gentiumplus-italic]     [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-Bold]        [\typescriptthree-gentiumplus-bold]       [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-BoldItalic]  [\typescriptthree-gentiumplus-bolditalic] [encoding=\typescriptthree]
         \definefontsynonym [Gentium-RomanCaps]   [\typescriptthree-gentiumplus-regular-sc] [encoding=\typescriptthree]
-        \definefontsynonym [Gentium-Bold]        [Gentium-Roman]
-        \definefontsynonym [Gentium-BoldItalic]  [Gentium-Italic]
-        \definefontsynonym [Gentium-Slanted]     [Gentium-Italic]
-        \definefontsynonym [Gentium-BoldSlanted] [Gentium-Italic]
-        \loadmapfile[gentium-\typescriptthree.map]
+        \definefontsynonym [Gentium-Slanted]     [\typescriptthree-gentiumplus-italic]     [encoding=\typescriptthree]
+        \definefontsynonym [Gentium-BoldSlanted] [\typescriptthree-gentiumplus-bolditalic] [encoding=\typescriptthree]
+        \loadmapfile[gentiumplus-\typescriptthree.map]
     \stoptypescript
 
     \starttypescript [serif] [gentium] [name]
@@ -2910,6 +2899,10 @@
 
     \starttypescript [gentium] [ec,texnansi,qx,t5,t2a,agr,l7x]
         \definetypeface [gentium] [rm] [serif] [gentium] [default] [encoding=\typescripttwo]
+        \definetypeface [gentium] [ss] [sans]  [dejavu]  [default] [encoding=\typescripttwo]
+        \definetypeface [gentium] [tt] [mono]  [dejavu]  [default] [encoding=\typescripttwo]
+        \definetypeface [gentium] [mm] [math]  [xits]    [default]
+        \loadmapfile [dejavu-truetype.map]
     \stoptypescript
 
 \stoptypescriptcollection