summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/minim
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-21 03:01:29 +0000
committerNorbert Preining <norbert@preining.info>2023-10-21 03:01:29 +0000
commit6deeaf1bda76263051b929f5d5401c98d85e74ef (patch)
tree385460fec9e3be1f3e98950bde1c729aa3a8aa5b /macros/luatex/generic/minim
parentc9ab6fbcc0f960c5e669419f2565ff121a7f33fd (diff)
CTAN sync 202310210301
Diffstat (limited to 'macros/luatex/generic/minim')
-rw-r--r--macros/luatex/generic/minim/README6
-rw-r--r--macros/luatex/generic/minim/minim-alloc.lua15
-rw-r--r--macros/luatex/generic/minim/minim-alloc.tex16
-rw-r--r--macros/luatex/generic/minim/minim-doc.sty2
-rw-r--r--macros/luatex/generic/minim/minim.doc4
-rw-r--r--macros/luatex/generic/minim/minim.ini2
-rw-r--r--macros/luatex/generic/minim/minim.pdfbin321641 -> 338726 bytes
7 files changed, 29 insertions, 16 deletions
diff --git a/macros/luatex/generic/minim/README b/macros/luatex/generic/minim/README
index 2114fa4fb4..36fe201f7c 100644
--- a/macros/luatex/generic/minim/README
+++ b/macros/luatex/generic/minim/README
@@ -1,4 +1,4 @@
-Version: 2023/1.2
+Version: 2023/1.3
SUMMARY
@@ -31,6 +31,10 @@ the packages mentioned above.
HISTORY
+2023/1.3 (20/10/2023)
+
+ No changes.
+
2023/1.2 (3/3/2023)
* Added \Ucharcat, as in XeTeX.
diff --git a/macros/luatex/generic/minim/minim-alloc.lua b/macros/luatex/generic/minim/minim-alloc.lua
index 3775aafa43..ce53e5d440 100644
--- a/macros/luatex/generic/minim/minim-alloc.lua
+++ b/macros/luatex/generic/minim/minim-alloc.lua
@@ -262,13 +262,14 @@ local function make_alloc_old(fname, globcount)
end
-- existing allocation counters
-make_alloc_old ('count', 260 )
-make_alloc_old ('dimen', 261 )
-make_alloc_old ('skip', 262 )
-make_alloc_old ('muskip', 263 )
-make_alloc_old ('box', 264 )
-make_alloc_old ('toks', 265 )
-make_alloc_old ('marks', 266 )
+local globoffset = tex.count['alloc:globoffset']
+make_alloc_old ('count', globoffset + 0 )
+make_alloc_old ('dimen', globoffset + 1 )
+make_alloc_old ('skip', globoffset + 2 )
+make_alloc_old ('muskip', globoffset + 3 )
+make_alloc_old ('box', globoffset + 4 )
+make_alloc_old ('toks', globoffset + 5 )
+make_alloc_old ('marks', globoffset + 6 )
function M.luadef (csname, fn, ...)
local nr = M.new_function(csname)
diff --git a/macros/luatex/generic/minim/minim-alloc.tex b/macros/luatex/generic/minim/minim-alloc.tex
index 4110301413..1b3ca06795 100644
--- a/macros/luatex/generic/minim/minim-alloc.tex
+++ b/macros/luatex/generic/minim/minim-alloc.tex
@@ -85,7 +85,6 @@
\def\ProvidesFile#1{\begincsname minim:intercept:#1\endcsname
\minim:providesfile{#1}}
-
% repair ltluatex, which, without apparent reason, resets all allocation
% counters, even if they already exist
\expandafter\def\csname minim:intercept:ltluatex.tex\endcsname
@@ -109,8 +108,15 @@
% 1 allocation
-% use global allocation (see etex.src)
-\ifdefined \globcount
+% used on the lua side by make_alloc_old
+\newcount \alloc:globoffset
+\alloc:globoffset = 260
+
+\ifdefined \documentclass
+ % latex has no \globcount etc.
+ \alloc:globoffset = 10
+\else \ifdefined \globcount
+ % use global allocation (see etex.src)
\let\newcount = \globcount
\let\newdimen = \globdimen
\let\newskip = \globskip
@@ -118,7 +124,7 @@
\let\newbox = \globbox
\let\newtoks = \globtoks
\let\newmarks = \globmarks
-\fi
+\fi \fi
% new allocation macros
@@ -153,6 +159,8 @@
% those ourselves:
\ifnum\csname e@alloc@ccodetable@count\endcsname = 0
\csname e@alloc@ccodetable@count\endcsname = 4 \fi
+% an empty table
+\newcatcodetable \minim:initcatcodes
% set initial chunk name value
\def\chardef:chunk#1#2{\chardef#1#2\directlua{lua.name[\the#2]='\csstring#1'}}
diff --git a/macros/luatex/generic/minim/minim-doc.sty b/macros/luatex/generic/minim/minim-doc.sty
index 5da6494c5e..97b173beac 100644
--- a/macros/luatex/generic/minim/minim-doc.sty
+++ b/macros/luatex/generic/minim/minim-doc.sty
@@ -59,7 +59,7 @@
\scriptfont 0 = \tenmaths
\scriptscriptfont 0 = \tenmathss
-\expandglyphsinfont \tenrm 40 25 5
+\expandglyphsinfont \tenrm 25 25 5
\protrudechars=2 \adjustspacing=2
\tenrm
diff --git a/macros/luatex/generic/minim/minim.doc b/macros/luatex/generic/minim/minim.doc
index 7061917398..bf56d89747 100644
--- a/macros/luatex/generic/minim/minim.doc
+++ b/macros/luatex/generic/minim/minim.doc
@@ -4,8 +4,8 @@
\startmetadata
author {Esger Renkema}
title {minim}
- date {2023-03-03}
- version {2023/1.2}
+ date {2023-10-20}
+ version {2023/1.3}
keywords {LuaTeX; Plain TeX; MetaPost; PDF/A; Tagged PDF; accessibility; a11y;
Unicode mathematics; XMP; metadata; hypertext; bookmarks}
stopmetadata
diff --git a/macros/luatex/generic/minim/minim.ini b/macros/luatex/generic/minim/minim.ini
index 26aed3a2c5..e8017cc8f5 100644
--- a/macros/luatex/generic/minim/minim.ini
+++ b/macros/luatex/generic/minim/minim.ini
@@ -7,7 +7,7 @@
\input minim-plain
\unless\ifdefined\fmtversion
- \def\fmtversion{2021/1.0}\fi
+ \def\fmtversion{2023/1.3}\fi
\suppressoutererror = 1
\input minim-etex
diff --git a/macros/luatex/generic/minim/minim.pdf b/macros/luatex/generic/minim/minim.pdf
index 3685ecf7fd..b6e05b6cc8 100644
--- a/macros/luatex/generic/minim/minim.pdf
+++ b/macros/luatex/generic/minim/minim.pdf
Binary files differ