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/context.mkxl2
-rw-r--r--tex/context/base/mkiv/grph-con.lua7
-rw-r--r--tex/context/base/mkiv/lpdf-tag.lua10
-rw-r--r--tex/context/base/mkiv/node-ini.lua1
-rw-r--r--tex/context/base/mkiv/spac-chr.lua3
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin26572 -> 26587 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin269625 -> 269625 bytes
-rw-r--r--tex/context/base/mkiv/trac-vis.lua2
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin893714 -> 894028 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin61165 -> 61165 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
15 files changed, 20 insertions, 15 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 430ffe4d1..88451da74 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{2019.12.15 17:24}
+\newcontextversion{2019.12.16 18:37}
%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 b62f0d456..2981ef1b9 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{2019.12.15 17:24}
+\edef\contextversion{2019.12.16 18:37}
%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 df06ac855..0e8a9b8b4 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{2019.12.15 17:24}
+\newcontextversion{2019.12.16 18:37}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 8ae058407..f11a853e2 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{2019.12.15 17:24}
+\edef\contextversion{2019.12.16 18:37}
\edef\contextkind {beta}
%D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index e0359e631..3ec65f1f4 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
%D {YYYY.MM.DD HH:MM} format.
\edef\contextformat {\jobname}
-\edef\contextversion{2019.12.15 17:24}
+\edef\contextversion{2019.12.16 18:37}
\edef\contextkind {beta}
%D Kind of special:
diff --git a/tex/context/base/mkiv/grph-con.lua b/tex/context/base/mkiv/grph-con.lua
index 788136f6d..c3c711b0c 100644
--- a/tex/context/base/mkiv/grph-con.lua
+++ b/tex/context/base/mkiv/grph-con.lua
@@ -12,6 +12,7 @@ local tonumber = tonumber
local longtostring = string.longtostring
local formatters = string.formatters
local expandfilename = dir.expandname
+local isfile = lfs.isfile
local settings_to_array = utilities.parsers.settings_to_array
local settings_to_hash = utilities.parsers.settings_to_hash
@@ -121,7 +122,7 @@ do -- eps | ps
local presets = resolutions[resolution or "high"] or resolutions.high
local level = codeinjections.getformatoption("pdf_level") or "1.3"
local tmpname = oldname
- if not tmpname or tmpname == "" or not lfs.isfile(tmpname) then
+ if not tmpname or tmpname == "" or not isfile(tmpname) then
return
end
if cleanups.ai then
@@ -289,7 +290,7 @@ do -- png | jpg | profiles
local pngconverters = converters.png
local function profiles()
- if not lfs.isfile(rgbprofile) then
+ if not isfile(rgbprofile) then
local found = resolvers.findfile(rgbprofile)
if found and found ~= "" then
rgbprofile = found
@@ -297,7 +298,7 @@ do -- png | jpg | profiles
report_figures("unknown profile %a",rgbprofile)
end
end
- if not lfs.isfile(cmykprofile) then
+ if not isfile(cmykprofile) then
local found = resolvers.findfile(cmykprofile)
if found and found ~= "" then
cmykprofile = found
diff --git a/tex/context/base/mkiv/lpdf-tag.lua b/tex/context/base/mkiv/lpdf-tag.lua
index 61a6999c1..11174c4db 100644
--- a/tex/context/base/mkiv/lpdf-tag.lua
+++ b/tex/context/base/mkiv/lpdf-tag.lua
@@ -376,6 +376,7 @@ function nodeinjections.addtags(head)
root = { pref = pdfreference(structure_ref), kids = structure_kids }
names = pdfarray()
end
+
local function collectranges(head,list)
for n, id in nextnode, head do
if id == glyph_code then
@@ -404,7 +405,10 @@ end
-- end
last = nil
else
- collectranges(getlist(n),n)
+ local list = getlist(n)
+ if list then
+ collectranges(list,n)
+ end
end
end
end
@@ -431,7 +435,6 @@ end
local top = nil
local noftop = 0
-
local function inject(start,stop,list,literal,left,right)
local prev = getprev(start)
if prev then
@@ -442,7 +445,7 @@ end
else
setlink(literal,start)
end
- if list and getlist(list) == start then
+ if list and not prev then
setlist(list,literal)
end
local literal = copy_node(EMCliteral)
@@ -502,7 +505,6 @@ end
prev = prv
end
end
-
if prev then
literal = pageliteral(makecontent(prev,id,specification))
elseif ignore then
diff --git a/tex/context/base/mkiv/node-ini.lua b/tex/context/base/mkiv/node-ini.lua
index fcb6d3865..806ac5658 100644
--- a/tex/context/base/mkiv/node-ini.lua
+++ b/tex/context/base/mkiv/node-ini.lua
@@ -185,6 +185,7 @@ if not gluecodes.indentskip then
gluecodes.lefthangskip = gluecodes.userskip
gluecodes.righthangskip = gluecodes.userskip
gluecodes.correctionskip = gluecodes.userskip
+ gluecodes.intermathskip = gluecodes.userskip
end
if CONTEXTLMTXMODE > 0 then
diff --git a/tex/context/base/mkiv/spac-chr.lua b/tex/context/base/mkiv/spac-chr.lua
index 23cf9741b..b32565f19 100644
--- a/tex/context/base/mkiv/spac-chr.lua
+++ b/tex/context/base/mkiv/spac-chr.lua
@@ -131,11 +131,10 @@ local function nbsp(head,current)
local para = fontparameters[getfont(current)]
if getattr(current,a_alignstate) == 1 then -- flushright
head, current = inject_nobreak_space(0x00A0,head,current,para.space,0,0)
- setsubtype(current,spaceskip_code)
else
head, current = inject_nobreak_space(0x00A0,head,current,para.space,para.spacestretch,para.spaceshrink)
- setsubtype(current,spaceskip_code)
end
+ setsubtype(current,spaceskip_code)
return head, current
end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 27d8875b4..7b25a5d94 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 252e8561b..b74c34419 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/mkiv/trac-vis.lua b/tex/context/base/mkiv/trac-vis.lua
index aa88576e0..198d52324 100644
--- a/tex/context/base/mkiv/trac-vis.lua
+++ b/tex/context/base/mkiv/trac-vis.lua
@@ -893,6 +893,8 @@ local ruledglue do
[gluecodes.thinmuskip] = "MS",
[gluecodes.medmuskip] = "MM",
[gluecodes.thickmuskip] = "ML",
+ [gluecodes.intermathskip] = "IM",
+ [gluecodes.mathskip] = "MT",
[leadercodes.leaders] = "NL",
[leadercodes.cleaders] = "CL",
[leadercodes.xleaders] = "XL",
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 4a0c834d8..3b6d7bb7e 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 804b417df..c419f853d 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b50ea7651..df96d6b0b 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 : 12/15/19 17:24:31
+-- merge date : 12/16/19 18:37:19
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 13:06:28 +0000