summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/mult-prm.lua4
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin26114 -> 26107 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin254915 -> 254911 bytes
-rw-r--r--tex/context/base/mkxl/cont-new.mkxl2
-rw-r--r--tex/context/base/mkxl/context.mkxl2
-rw-r--r--tex/context/base/mkxl/meta-imp-punk.mkxl6
-rw-r--r--tex/context/base/mkxl/publ-ini.mkxl4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 15 insertions, 13 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 6c1dca8a2..ece22d7b0 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{2021.01.17 21:39}
+\newcontextversion{2021.01.18 18:15}
%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 dbe4e4249..0b84c302c 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{2021.01.17 21:39}
+\edef\contextversion{2021.01.18 18:15}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index d8dfa0fa2..6012a3fb2 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{2021.01.17 21:39}
+\newcontextversion{2021.01.18 18:15}
%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 8e697e850..edb5c2de8 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
%D {YYYY.MM.DD HH:MM} format.
\edef\contextformat {\jobname}
-\edef\contextversion{2021.01.17 21:39}
+\edef\contextversion{2021.01.18 18:15}
%D Kind of special:
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index f25625a9f..e8d0cefc4 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -302,7 +302,10 @@ return {
"glyphoptions",
"glyphscale",
"glyphscriptfield",
+ "glyphscriptscale",
+ "glyphscriptscriptscale",
"glyphstatefield",
+ "glyphtextscale",
"glyphxoffset",
"glyphxscale",
"glyphyoffset",
@@ -381,7 +384,6 @@ return {
"mathflattenmode",
"mathitalicsmode",
"mathnolimitsmode",
- "matholdmode",
"mathpenaltiesmode",
"mathrulesfam",
"mathrulesmode",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 605d8e1f1..ef1dbd7f2 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 3c5c26cb3..256f66ef8 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 8f1882ce5..715937da0 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{2021.01.17 21:39}
+\newcontextversion{2021.01.18 18:15}
%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 54b1bb730..0cc4a77ea 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{2021.01.17 21:39}
+\immutable\edef\contextversion{2021.01.18 18:15}
%overloadmode 1 % check frozen / warning
%overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/meta-imp-punk.mkxl b/tex/context/base/mkxl/meta-imp-punk.mkxl
index 050023642..b03977f39 100644
--- a/tex/context/base/mkxl/meta-imp-punk.mkxl
+++ b/tex/context/base/mkxl/meta-imp-punk.mkxl
@@ -253,14 +253,14 @@
{\darkorange \PunkH \samplefile{tufte} \par}
\stopTEXpage
-\startTEXpage[offset=10pt,width=2cm]
+\startTEXpage[offset=10pt,width=20cm]
\PunkF \enablerandomvariants
\dostepwiserecurse{1}{2000}{1}{\glyphscale#1\relax f }
\stopTEXpage
-% \setupbodyfont[dejavu]
+% \setupbodyfont[dejavu] % one first needs to load a bodyfont !
-\setupbodyfont[punk] %one first needs to load a bodyfont !
+\setupbodyfont[punk]
\startTEXpage[offset=10pt,width=20cm]
{\darkcyan \tf \samplefile{zapf} \par}
diff --git a/tex/context/base/mkxl/publ-ini.mkxl b/tex/context/base/mkxl/publ-ini.mkxl
index c9f249f83..0104cc4eb 100644
--- a/tex/context/base/mkxl/publ-ini.mkxl
+++ b/tex/context/base/mkxl/publ-ini.mkxl
@@ -798,9 +798,9 @@
\aliased\let\btxdoifsameaspreviouselse \btxdoifelsesameasprevious
\aliased\let\btxdoifcombiinlistelse \btxdoifelsecombiinlist
-\tolerant\def\publ_place_list_indeed#1#2[#3]#*[#4]%
+\tolerant\def\publ_place_list_indeed#1#2#*[#3]#*[#4]%
{\begingroup
- \ifparameters
+ \ifparameters\or\or
\let\currentbtxrendering\currentbtxspecification
\or
\ifhastok={#3}%
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 552559e96..66d6d2580 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 : 2021-01-17 21:39
+-- merge date : 2021-01-18 18:15
do -- begin closure to overcome local limits and interference