2023-05-08 17:39:00

17 files changed, 144 insertions, 15 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 121b11c87..3175dd98a 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{2023.05.07 16:25}
+\newcontextversion{2023.05.08 17:36}
 
 %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 de8d469ab..ba1b29308 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{2023.05.07 16:25}
+\edef\contextversion{2023.05.08 17:36}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index 659144c76..a9baf2919 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -832,6 +832,7 @@
 \setinterfaceconstant{exitoffset}{exitoffset}
 \setinterfaceconstant{expansion}{گسترش}
 \setinterfaceconstant{export}{export}
+\setinterfaceconstant{extradata}{extradata}
 \setinterfaceconstant{extras}{extras}
 \setinterfaceconstant{factor}{عامل}
 \setinterfaceconstant{fallback}{عقب‌ریختن}
@@ -955,6 +956,7 @@
 \setinterfaceconstant{lastpage}{صفحه‌آخر}
 \setinterfaceconstant{lastpagesep}{lastpagesep}
 \setinterfaceconstant{lastpubsep}{lastpubsep}
+\setinterfaceconstant{lasttextseparator}{lasttextseparator}
 \setinterfaceconstant{layout}{layout}
 \setinterfaceconstant{left}{چپ}
 \setinterfaceconstant{leftclass}{leftclass}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 866adbbe3..d262c380f 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{2023.05.07 16:25}
+\newcontextversion{2023.05.08 17:36}
 
 %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 7c688a91c..e6522ec5c 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{2023.05.07 16:25}
+\edef\contextversion{2023.05.08 17:36}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index 69655ee38..a250fdefd 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -323,6 +323,7 @@ return {
         --
         "scratchstring", "scratchstringone", "scratchstringtwo", "tempstring",
         "scratchcounter", "globalscratchcounter", "privatescratchcounter",
+        "scratchfloat", "globalscratchfloat", "privatescratchfloat",
         "scratchdimen", "globalscratchdimen", "privatescratchdimen",
         "scratchskip", "globalscratchskip", "privatescratchskip",
         "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip",
@@ -360,6 +361,7 @@ return {
         "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset",
         --
         "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix",
+        "scratchfloatone", "scratchfloattwo", "scratchfloatthree", "scratchfloatfour", "scratchfloatfive", "scratchfloatsix",
         "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix",
         "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix",
         "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix",
@@ -369,6 +371,9 @@ return {
         "scratchunicode",
         "scratchmin", "scratchmax",
         --
+        "pfsin", "pfcos", "pftan", "pfasin", "pfacos", "pfatan", "pfsinh", "pfcosh", "pftanh", "pfasinh", "pfacosh", "pfatanh",
+        "pfsqrt", "pflog", "pfexp", "pfceil", "pffloor", "pfround", "pfabs", "pfrad", "pfdeg", "pfatantwo", "pfpow", "pfmod", "pfrem",
+        --
         "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip",
         --
         "doif", "doifnot", "doifelse",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 7d6a106d1..dad92835c 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 f0e2e8ef0..25fae18e2 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 1e3f06e43..b8b8f8562 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{2023.05.07 16:25}
+\newcontextversion{2023.05.08 17:36}
 
 %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 292118662..3f878c72c 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{2023.05.07 16:25}
+\immutable\edef\contextversion{2023.05.08 17:36}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/lpdf-emb.lmt b/tex/context/base/mkxl/lpdf-emb.lmt
index 303704aa7..81e769aeb 100644
--- a/tex/context/base/mkxl/lpdf-emb.lmt
+++ b/tex/context/base/mkxl/lpdf-emb.lmt
@@ -2238,7 +2238,7 @@ function lpdf.flushfonts()
             if not parent then
                 local fontdata   = usedfonts[fontid]
                 local rawdata    = fontdata.shared and fontdata.shared.rawdata
-                local resources  = fontdata.resources
+                local resources  = fontdata.resources  -- not always there, nullfont
                 local properties = fontdata.properties -- writingmode and type3
                 local parameters = fontdata.parameters -- used in type3
 -- print("before",fontid,hash,parent,rawdata)
@@ -2265,7 +2265,7 @@ function lpdf.flushfonts()
                     parent = {
                         hash         = hash,
                         fontdata     = fontdata,
-                        filename     = resources.filename or properties.filename or "unset",
+                        filename     = (resources and resources.filename) or properties.filename or "unset",
                         indices      = { },
                         usedfonts    = { [fontid] = true },
                         used         = used,
diff --git a/tex/context/base/mkxl/strc-mat.mkxl b/tex/context/base/mkxl/strc-mat.mkxl
index 6c639bb1f..3c6772dc0 100644
--- a/tex/context/base/mkxl/strc-mat.mkxl
+++ b/tex/context/base/mkxl/strc-mat.mkxl
@@ -1152,18 +1152,18 @@
 \installcorenamespace{mathbreakhere}
 
 \def\strc_math_text_here_right#1%
-  {\localbox[\v!righttext]{\llap{#1}}}
+  {\localbox[\v!righttext]{\llap{#1\kern\leftskip}}}
 
 \def\strc_math_text_here_left#1%
-  {\localbox[\v!lefttext]{\rlap{#1}}}
+  {\localbox[\v!lefttext]{\rlap{\kern\rightskip#1}}}
 
 \def\strc_math_text_here_before#1%
   {\vadjust pre \bgroup
      \hbox to \displaywidth \bgroup
         \strut
-        \hskip\leftskip
+        \kern\leftskip
          #1\hss
-        \hskip\rightskip
+        \kern\rightskip
         \strut
      \egroup
    \egroup}
@@ -1172,9 +1172,9 @@
   {\vadjust \bgroup
      \hbox to \displaywidth \bgroup
         \strut
-        \hskip\leftskip
+        \kern\leftskip
         #1\hss
-        \hskip\rightskip
+        \kern\rightskip
         \strut
      \egroup
    \egroup}
diff --git a/tex/context/base/mkxl/syst-ini.mkxl b/tex/context/base/mkxl/syst-ini.mkxl
index d55a82175..039e9456b 100644
--- a/tex/context/base/mkxl/syst-ini.mkxl
+++ b/tex/context/base/mkxl/syst-ini.mkxl
@@ -494,6 +494,7 @@
 %D intrude on normal scratch ones.
 
 \newinteger  \scratchcounter    \newinteger  \globalscratchcounter \newinteger  \privatescratchcounter
+\newposit    \scratchfloat      \newposit    \globalscratchfloat   \newposit    \privatescratchfloat
 \newdimension\scratchdimen      \newdimension\globalscratchdimen   \newdimension\privatescratchdimen
 \newgluespec \scratchskip       \newgluespec \globalscratchskip    \newgluespec \privatescratchskip
 \newmuskip   \scratchmuskip     \newmuskip   \globalscratchmuskip  \newmuskip   \privatescratchmuskip
@@ -501,6 +502,7 @@
 \newbox      \scratchbox        \newbox      \globalscratchbox     \newbox      \privatescratchbox
 
 \newinteger  \scratchcounterone \newinteger  \scratchcountertwo    \newinteger  \scratchcounterthree
+\newposit    \scratchfloatone   \newposit    \scratchfloattwo      \newposit    \scratchfloatthree
 \newdimension\scratchdimenone   \newdimension\scratchdimentwo      \newdimension\scratchdimenthree
 \newgluespec \scratchskipone    \newgluespec \scratchskiptwo       \newgluespec \scratchskipthree
 \newmuskip   \scratchmuskipone  \newmuskip   \scratchmuskiptwo     \newmuskip   \scratchmuskipthree
@@ -508,6 +510,7 @@
 \newbox      \scratchboxone     \newbox      \scratchboxtwo        \newbox      \scratchboxthree
 
 \newinteger  \scratchcounterfour\newinteger  \scratchcounterfive   \newinteger  \scratchcountersix
+\newposit    \scratchfloatfour  \newposit    \scratchfloatfive     \newposit    \scratchfloatsix
 \newdimension\scratchdimenfour  \newdimension\scratchdimenfive     \newdimension\scratchdimensix
 \newgluespec \scratchskipfour   \newgluespec \scratchskipfive      \newgluespec \scratchskipsix
 \newmuskip   \scratchmuskipfour \newmuskip   \scratchmuskipfive    \newmuskip   \scratchmuskipsix
diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml
index d4bccab50..ce52e559e 100644
--- a/tex/context/interface/mkii/keys-pe.xml
+++ b/tex/context/interface/mkii/keys-pe.xml
@@ -838,6 +838,7 @@
 		<cd:constant name='exitoffset' value='exitoffset'/>
 		<cd:constant name='expansion' value='گسترش'/>
 		<cd:constant name='export' value='export'/>
+		<cd:constant name='extradata' value='extradata'/>
 		<cd:constant name='extras' value='extras'/>
 		<cd:constant name='factor' value='عامل'/>
 		<cd:constant name='fallback' value='عقب‌ریختن'/>
@@ -961,6 +962,7 @@
 		<cd:constant name='lastpage' value='صفحه‌آخر'/>
 		<cd:constant name='lastpagesep' value='lastpagesep'/>
 		<cd:constant name='lastpubsep' value='lastpubsep'/>
+		<cd:constant name='lasttextseparator' value='lasttextseparator'/>
 		<cd:constant name='layout' value='layout'/>
 		<cd:constant name='left' value='چپ'/>
 		<cd:constant name='leftclass' value='leftclass'/>
diff --git a/tex/context/modules/third/mtx-install-imp-modules.lua b/tex/context/modules/third/mtx-install-imp-modules.lua
new file mode 100644
index 000000000..66e986a87
--- /dev/null
+++ b/tex/context/modules/third/mtx-install-imp-modules.lua
@@ -0,0 +1,67 @@
+-- from the context garden
+
+return {
+    name = "mtx-install-imp-modules",
+    version = "1.00",
+    comment = "Third party modules",
+    author = "Hans Hagen & others",
+    copyright = "ConTeXt development team",
+    lists = {
+        ["pocketdiary"]       = { url = "modules", zips = { "Collection-of-calendars-based-on-PocketDiary-module.zip" } },
+        ["collating"]         = { url = "modules", zips = { "Environment-for-collating-marks.zip" } },
+        ["account"]           = { url = "modules", zips = { "t-account.zip" } },
+        ["algorithmic"]       = { url = "modules", zips = { "t-algorithmic.zip" } },
+        ["animation"]         = { url = "modules", zips = { "t-animation.zip" } },
+        ["annotation"]        = { url = "modules", zips = { "t-annotation.zip" } },
+        ["aquamints"]         = { url = "modules", zips = { "aquamints.zip" } },
+        ["bibmod-doc"]        = { url = "modules", zips = { "bibmod-doc.zip" } },
+     -- ["bnf-0.3"]           = { url = "modules", zips = { "t-bnf-0.3.zip" } },
+        ["bnf"]               = { url = "modules", zips = { "t-bnf.zip" } },
+        ["chromato"]          = { url = "modules", zips = { "t-chromato.zip" } },
+        ["cmscbf"]            = { url = "modules", zips = { "t-cmscbf.zip" } },
+        ["cmttbf"]            = { url = "modules", zips = { "t-cmttbf.zip" } },
+        ["crossref"]          = { url = "modules", zips = { "t-crossref.zip" } },
+        ["cyrillicnumbers"]   = { url = "modules", zips = { "t-cyrillicnumbers.zip" } },
+        ["degrade"]           = { url = "modules", zips = { "t-degrade.zip" } },
+        ["enigma"]            = { url = "modules", zips = { "enigma.zip" } },
+        ["fancybreak"]        = { url = "modules", zips = { "t-fancybreak.zip" } },
+        ["filter"]            = { url = "modules", zips = { "t-filter.zip" } },
+        ["french"]            = { url = "modules", zips = { "t-french.zip" } },
+        ["fullpage"]          = { url = "modules", zips = { "t-fullpage.zip" } },
+        ["gantt"]             = { url = "modules", zips = { "t-gantt.zip" } },
+        ["gfsdidot"]          = { url = "modules", zips = { "gfsdidot.zip" } },
+        ["gm"]                = { url = "modules", zips = { "t-gm.zip" } },
+        ["gnuplot"]           = { url = "modules", zips = { "t-gnuplot.zip" } },
+        ["greek"]             = { url = "modules", zips = { "t-greek.zip" } },
+        ["grph-downsample"]   = { url = "modules", zips = { "grph-downsample.lua.zip" } },
+        ["gs"]                = { url = "modules", zips = { "t-gs.zip" } },
+        ["high"]              = { url = "modules", zips = { "high.zip" } },
+        ["inifile"]           = { url = "modules", zips = { "t-inifile.zip" } },
+        ["karnaugh"]          = { url = "modules", zips = { "karnaugh.zip" } },
+        ["layout"]            = { url = "modules", zips = { "t-layout.zip" } },
+        ["letter"]            = { url = "modules", zips = { "t-letter.zip" } },
+        ["letterspace"]       = { url = "modules", zips = { "t-letterspace.mkiv.zip" } },
+        ["lettrine"]          = { url = "modules", zips = { "t-lettrine.zip" } },
+        ["lua-widow-control"] = { url = "modules", zips = { "lua-widow-control.zip" } },
+        ["mathsets"]          = { url = "modules", zips = { "t-mathsets.zip" } },
+        ["metaducks"]         = { url = "modules", zips = { "metaducks.zip" } },
+        ["pret-c.lua"]        = { url = "modules", zips = { "pret-c.lua.zip" } },
+        ["rst"]               = { url = "modules", zips = { "t-rst.zip" } },
+        ["rsteps"]            = { url = "modules", zips = { "t-rsteps.zip" } },
+        ["simplebib"]         = { url = "modules", zips = { "t-simplebib.zip" } },
+        ["simplefonts"]       = { url = "modules", zips = { "t-simplefonts.zip" } },
+        ["simpleslides"]      = { url = "modules", zips = { "t-simpleslides.zip" } },
+        ["stormfontsupport"]  = { url = "modules", zips = { "stormfontsupport.zip" } },
+        ["sudoku"]            = { url = "modules", zips = { "sudoku.zip" } },
+        ["taspresent"]        = { url = "modules", zips = { "t-taspresent.zip" } },
+        ["texshow"]           = { url = "modules", zips = { "u-texshow.zip" } },
+        ["title"]             = { url = "modules", zips = { "t-title.zip" } },
+        ["transliterator"]    = { url = "modules", zips = { "t-transliterator.zip" } },
+        ["typearea"]          = { url = "modules", zips = { "t-typearea.zip" } },
+        ["typescripts"]       = { url = "modules", zips = { "t-typescripts.zip" } },
+        ["urwgaramond"]       = { url = "modules", zips = { "f-urwgaramond.zip" } },
+        ["urwgothic"]         = { url = "modules", zips = { "f-urwgothic.zip" } },
+        ["vim"]               = { url = "modules", zips = { "t-vim.zip" } },
+        ["visualcounter"]     = { url = "modules", zips = { "t-visualcounter.zip" } },
+    }
+}
diff --git a/tex/context/modules/third/mtx-install-imp-tikz.lua b/tex/context/modules/third/mtx-install-imp-tikz.lua
new file mode 100644
index 000000000..77b4d903f
--- /dev/null
+++ b/tex/context/modules/third/mtx-install-imp-tikz.lua
@@ -0,0 +1,50 @@
+local function wipers(s)
+    return {
+        "tex/context/third/"    ..s.. "/**",
+        "doc/context/third/"    ..s.. "/**",
+        "source/context/third/" ..s.. "/**",
+
+        "tex/context/"          ..s.. "/**",
+        "doc/context/"          ..s.. "/**",
+        "source/context/"       ..s.. "/**",
+
+        "scripts/"              ..s.. "/**",
+    }
+end
+
+local defaults = {
+    "tex/latex/**",
+    "tex/plain/**",
+
+    "doc/latex/**",
+    "doc/plain/**",
+    "doc/generic/**",
+
+    "source/latex/**",
+    "source/plain/**",
+    "source/generic/**",
+}
+
+return {
+    name = "mtx-install-imp-tikz",
+    version = "1.00",
+    comment = "Tikz",
+    author = "Hans Hagen & others",
+    copyright = "ConTeXt development team",
+    lists = {
+        ["tikz"] = {
+            url  = "ctan",
+            zips = {
+                "graphics/pgf/base/pgf.tds.zip",
+                "graphics/pgf/contrib/pgfplots.tds.zip",
+                "graphics/pgf/contrib/circuitikz.tds.zip",
+            },
+            wipes = {
+                wipers("pgf"),
+                wipers("pgfplots"),
+                wipers("circuitikz"),
+                defaults,
+            }
+        },
+    },
+}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 86f683ce2..e3a64d42f 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  : 2023-05-07 16:25
+-- merge date  : 2023-05-08 17:36
 
 do -- begin closure to overcome local limits and interference