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/math-act.lmt15
-rw-r--r--tex/context/base/mkxl/math-ini.mkxl11
-rw-r--r--tex/context/base/mkxl/math-spa.lmt2
-rw-r--r--tex/context/base/mkxl/spac-brk.lmt1
-rw-r--r--tex/context/base/mkxl/spac-brk.mkxl18
7 files changed, 37 insertions, 14 deletions
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 81d56e507..4e2817bed 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.27 23:23}
+\newcontextversion{2023.05.28 18:55}
%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 74f8b3bfc..381453997 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.27 23:23}
+\immutable\edef\contextversion{2023.05.28 18:55}
%overloadmode 1 % check frozen / warning
%overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/math-act.lmt b/tex/context/base/mkxl/math-act.lmt
index b0243719e..8fdd6ca5a 100644
--- a/tex/context/base/mkxl/math-act.lmt
+++ b/tex/context/base/mkxl/math-act.lmt
@@ -1190,6 +1190,21 @@ do
end
+
+-- In TeX The Program we find in section 543 a remark about the second use of math
+-- italic: it is always added to the width except with respect to the position of
+-- the subscript. That paragraph also mentions that the number of different widths
+-- is normally small so they can be shared (there is an eight bit index into a width
+-- array). Actually the limits of at most 16 heights and depths has as side effect
+-- that we get some snapping of sizes. Now, because many math characters have an
+-- italic correction, the saving on shared widths is negated by the amount of (at
+-- most 64) italics. So in practice there is no gain and the italic correction could
+-- have served as bottom kern. We think that the following approach (that we actualy
+-- came to by a different reasonsing: inconsistent open type fonts) is quite valid
+-- and robust. It's just that the opentype math fonts should never have gone that
+-- TeX italic route. Italic usage is more clear from section 543 than from the math
+-- rendering code.
+
do
local function wipe(whatever,target,original,parameters,field,move,integrals)
diff --git a/tex/context/base/mkxl/math-ini.mkxl b/tex/context/base/mkxl/math-ini.mkxl
index eb3801a9b..b8c69b78c 100644
--- a/tex/context/base/mkxl/math-ini.mkxl
+++ b/tex/context/base/mkxl/math-ini.mkxl
@@ -534,6 +534,14 @@
% \preinlinepenalty 23 \postinlinepenalty 56 x$xx$x\par x$x$x\par x$x^2$x\par x$!$x\par
% \preshortinlinepenalty 123 \postshortinlinepenalty456 x$xx$x\par x$x$x\par x$x^2$x\par x$!$x\par
+% \immutable\integerdef\defaultpreshortinlinepenalty 150
+
+\preshortinlinepenalty 150
+
+\appendtoks
+ \shortinlinemaththreshold\emwidth
+\to \everybodyfont
+
\setmathoptions\mathordinarycode\numexpr
\noitaliccorrectionclassoptioncode
% +\checkligatureclassoptioncode
@@ -638,6 +646,7 @@
+\carryoverrighttopkernclassoptioncode
+\carryoverrightbottomkernclassoptioncode
+\preferdelimiterdimensionsclassoptioncode
+ +\shortinlineclassoptioncode
\relax
\setmathoptions\mathradicalcode\numexpr
@@ -648,11 +657,13 @@
+\carryoverrighttopkernclassoptioncode
+\carryoverrightbottomkernclassoptioncode
+\preferdelimiterdimensionsclassoptioncode
+ +\shortinlineclassoptioncode
\relax
\setmathoptions\mathaccentcode\numexpr
\defaultmathclassoptions
+\autoinjectclassoptioncode
+ +\shortinlineclassoptioncode
\relax
% ord spacing but with support for \m{m^2/x__3}
diff --git a/tex/context/base/mkxl/math-spa.lmt b/tex/context/base/mkxl/math-spa.lmt
index 6cd3b467e..d068ed8e9 100644
--- a/tex/context/base/mkxl/math-spa.lmt
+++ b/tex/context/base/mkxl/math-spa.lmt
@@ -37,7 +37,7 @@ local getlist = nuts.getlist
local setglue = nuts.setglue
local setwhd = nuts.setwhd
local getdimensions = nuts.dimensions
-local getnormalizedline = node.direct.getnormalizedline
+local getnormalizedline = nuts.getnormalizedline
local getbox = nuts.getbox
local setoffsets = nuts.setoffsets
local addxoffset = nuts.addxoffset
diff --git a/tex/context/base/mkxl/spac-brk.lmt b/tex/context/base/mkxl/spac-brk.lmt
index e534faa0e..fd32f7000 100644
--- a/tex/context/base/mkxl/spac-brk.lmt
+++ b/tex/context/base/mkxl/spac-brk.lmt
@@ -37,6 +37,7 @@ local nodecodes = nodes.nodecodes
local penalty_code = nodecodes.penalty
local glue_code = nodecodes.glue
local disc_code = nodecodes.disc
+local kern_code = nodecodes.kern
local math_code = nodecodes.math
local breakcodes = tex.breakcodes
diff --git a/tex/context/base/mkxl/spac-brk.mkxl b/tex/context/base/mkxl/spac-brk.mkxl
index 8926e1b4d..0ecff3577 100644
--- a/tex/context/base/mkxl/spac-brk.mkxl
+++ b/tex/context/base/mkxl/spac-brk.mkxl
@@ -19,25 +19,21 @@
\registerctxluafile{spac-brk}{}
+\unprotect
+
%D This is a very experimental feature and a by product of improving inline math
%D crossing lines. As it might evolve: use with care.
-% \setuplayout[width=8cm]
% \starttext
% \setupalign[verytolerant]
% \tracinglousiness1
% % \tracinglousiness2
-% \samplefile{ward} \blank
-% % \ctxlua{typesetters.breakpoints.show("11=0")} \samplefile{ward} \blank
-% % \ctxlua{typesetters.breakpoints.show{ [11] = 0 }} \samplefile{ward} \blank
-% \lousiness 1 11 0 \samplefile{ward} \blank
-% \silliness 11 \samplefile{ward} \blank
-% {\tt \the\lousiness}
+% \hsize8cm \lousiness 0 \samplefile{ward} \blank
+% {\tt \the\lousiness} \blank
+% \hsize8cm \lousiness 1 11 0 \samplefile{ward} \blank
+% \hsize8cm \silliness 11 \samplefile{ward} \blank
% \stoptext
-
-\unprotect
-
-% nothing hereyet
+%D These macros are defined a the \LUA\ end.
\protect \endinput