summaryrefslogtreecommitdiff
path: root/tex/context/base/mkxl
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/base/mkxl')
-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/lpdf-emb.lmt4
-rw-r--r--tex/context/base/mkxl/strc-mat.mkxl12
-rw-r--r--tex/context/base/mkxl/syst-ini.mkxl3
5 files changed, 13 insertions, 10 deletions
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