summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2025-02-21 22:14:54 +0000
committerKarl Berry <karl@freefriends.org>2025-02-21 22:14:54 +0000
commitebce834af0e109247664dda2d2dfb54e5c74d9f6 (patch)
tree7d1dae5e0a9a9d1a3658571418e4bce4d01f13ef
parent900f72f071a78863e86a9eabb6a98fddcf3deb36 (diff)
luamml (21feb25)
git-svn-id: svn://tug.org/texlive/trunk@74184 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/lualatex/luamml/CHANGELOG.md14
-rw-r--r--Master/texmf-dist/doc/lualatex/luamml/luamml.pdfbin205795 -> 205545 bytes
-rw-r--r--Master/texmf-dist/source/lualatex/luamml/luamml.dtx6
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-demo.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amsmath.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amstext.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-patches-kernel.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-patches-lab-math.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-patches-mathtools.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-pdf-demo.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-pdf.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-structelemwriter.lua2
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml-table.lua4
-rw-r--r--Master/texmf-dist/tex/lualatex/luamml/luamml.sty2
14 files changed, 29 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/lualatex/luamml/CHANGELOG.md b/Master/texmf-dist/doc/lualatex/luamml/CHANGELOG.md
index 705d0c21c8d..0643637caf2 100644
--- a/Master/texmf-dist/doc/lualatex/luamml/CHANGELOG.md
+++ b/Master/texmf-dist/doc/lualatex/luamml/CHANGELOG.md
@@ -4,11 +4,25 @@ All notable changes to the `luamml` package since the
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
this project uses date-based 'snapshot' version identifiers.
+
## [Unreleased]
+## 2025-02-21
+
+- Ulrike Fischer, 2025-02-21
+ * change intent :equationlabel to :equation-label and
+ :noequationlabel to :no-equation-label
+
+
## 2025-02-17
### Changed
+- Ulrike Fischer, 2025-02-17
+ * moved all patches into latex-lab
+ * added sockets to luamml.dtx
+ * changed handling of tags/labels: empty tags produces a row too and have an intent
+ * corrected small bugs
+
- Ulrike Fischer, 2024-11-29
luamml-structelemwriter.lua: moved the actualtext for e.g. stretched braces from the structure element to the mc-chunk.
diff --git a/Master/texmf-dist/doc/lualatex/luamml/luamml.pdf b/Master/texmf-dist/doc/lualatex/luamml/luamml.pdf
index 72c8344e308..c4d815d049a 100644
--- a/Master/texmf-dist/doc/lualatex/luamml/luamml.pdf
+++ b/Master/texmf-dist/doc/lualatex/luamml/luamml.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/lualatex/luamml/luamml.dtx b/Master/texmf-dist/source/lualatex/luamml/luamml.dtx
index 41bbf04246d..ed9114d756a 100644
--- a/Master/texmf-dist/source/lualatex/luamml/luamml.dtx
+++ b/Master/texmf-dist/source/lualatex/luamml/luamml.dtx
@@ -133,11 +133,11 @@
% \begin{macrocode}
%<@@=luamml>
%<*luatex>
-\ProvidesExplPackage {luamml} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml} {2025-02-21} {0.4.0}
{Automatically generate presentational MathML from LuaTeX math expressions}
%</luatex>
%<*pdftex>
-\ProvidesExplPackage {luamml-pdf} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml-pdf} {2025-02-21} {0.4.0}
{MathML generation for L̶u̶a̶pdfLaTeX}
%</pdftex>
% \end{macrocode}
@@ -763,7 +763,7 @@
%
% If math structure elements are created the Lbl-structure of a tag
% must be moved inside the math structure, typically as an additional column in an
-% \texttt{mtable} with an intent \texttt{:equationlabel}.
+% \texttt{mtable} with an intent \texttt{:equation-label} or \texttt{:no-equation-label}.
%
% The luamml-code handles this by stashing the Lbl-structure, storing the
% structure number in an array and reusing it once it creates the math structure elements.
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-demo.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-demo.sty
index e3fef941b17..789de95ed57 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-demo.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-demo.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{luamml-demo}{2025-02-17}{0.3.0}{Reasonable default definitions for luamml}
+\ProvidesExplPackage{luamml-demo}{2025-02-21}{0.4.0}{Reasonable default definitions for luamml}
\sys_if_engine_luatex:F {
\msg_new:nnn {luamml-demo} {pdftex-option-ignored} {Option~`#1'~is~being~ignored~in~pdfTeX~mode.}
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amsmath.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amsmath.sty
index f59d2ee2180..ad2f468f02f 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amsmath.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amsmath.sty
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {luamml-patches-amsmath} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml-patches-amsmath} {2025-02-21} {0.4.0}
{Feel free to add a description here}
\lua_now:n { require'luamml-amsmath' }
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amstext.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amstext.sty
index f7d24431e63..90800a294d4 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amstext.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-amstext.sty
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {luamml-patches-amstext} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml-patches-amstext} {2025-02-21} {0.4.0}
{patches of amstext commands}
% This is the same definition as in latex-lab-amsmath. It can go with the
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-kernel.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-kernel.sty
index d477635af7c..05240ff7078 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-kernel.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-kernel.sty
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {luamml-patches-kernel} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml-patches-kernel} {2025-02-21} {0.4.0}
{Feel free to add a description here}
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-lab-math.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-lab-math.sty
index abb23ad7448..35725c744c0 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-lab-math.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-lab-math.sty
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {luamml-patches-lab-math} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml-patches-lab-math} {2025-02-21} {0.4.0}
{Feel free to add a description here}
% This definition is identical to the one in latex-lab-math.
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-mathtools.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-mathtools.sty
index 1c9cb74eb6a..2b780302746 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-mathtools.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-patches-mathtools.sty
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {luamml-patches-mathtools} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml-patches-mathtools} {2025-02-21} {0.4.0}
{Feel free to add a description here}
\IfPackageAtLeastTF{latex-lab-testphase-math}{2025-01-24}
{}
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf-demo.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf-demo.sty
index 1b3e245c1b2..cf2ce9ddec9 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf-demo.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf-demo.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{luamml-pdf-demo}{2025-02-17}{0.3.0}{Reasonable default definitions for luamml-pdf}
+\ProvidesExplPackage{luamml-pdf-demo}{2025-02-21}{0.4.0}{Reasonable default definitions for luamml-pdf}
\RequirePackage{luamml-pdf}% Loading luamml-pdf is pretty much the point
% \RequirePackage{amsmath,array}% May come back if the patches get ported
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf.sty
index d2e2004809f..a985df3b0ba 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-pdf.sty
@@ -31,7 +31,7 @@
%%
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
-\ProvidesExplPackage {luamml-pdf} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml-pdf} {2025-02-21} {0.4.0}
{MathML generation for L̶u̶a̶pdfLaTeX}
\int_new:N \l__luamml_flag_int
\int_new:N \l__luamml_pretty_int
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-structelemwriter.lua b/Master/texmf-dist/tex/lualatex/luamml/luamml-structelemwriter.lua
index 3087305757f..53718aeb6a7 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-structelemwriter.lua
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-structelemwriter.lua
@@ -123,7 +123,7 @@ local function write_elem(tree, stash)
end
for _, elem in ipairs(tree) do
if type(elem) ~= 'string' and not elem['tex:ignore'] then
- if elem['intent']==':equationlabel' and ltx.__tag.struct.luamml.labels then
+ if elem['intent']==':equation-label' and ltx.__tag.struct.luamml.labels then
if #ltx.__tag.struct.luamml.labels > 0 then
-- print("CHECK LABEL STRUCTURE: ",table.serialize(elem), table.serialize(ltx.__tag.struct.luamml.labels))
local num= table.remove(ltx.__tag.struct.luamml.labels,1)
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml-table.lua b/Master/texmf-dist/tex/lualatex/luamml/luamml-table.lua
index 23331042c1d..75fd1f73388 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml-table.lua
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml-table.lua
@@ -58,14 +58,14 @@ end
local function store_tag(xml)
local mml_row = store_get_row()
- xml.intent = ':equationlabel'
+ xml.intent = ':equation-label'
table.insert(mml_row, 1, xml)
last_tag = nil
end
local function store_notag(xml)
local mml_row = store_get_row()
- xml.intent = ':noequationlabel'
+ xml.intent = ':no-equation-label'
table.insert(mml_row, 1, xml)
end
diff --git a/Master/texmf-dist/tex/lualatex/luamml/luamml.sty b/Master/texmf-dist/tex/lualatex/luamml/luamml.sty
index b687ef2dbe3..9d83c059afa 100644
--- a/Master/texmf-dist/tex/lualatex/luamml/luamml.sty
+++ b/Master/texmf-dist/tex/lualatex/luamml/luamml.sty
@@ -31,7 +31,7 @@
%%
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
-\ProvidesExplPackage {luamml} {2025-02-17} {0.3.0}
+\ProvidesExplPackage {luamml} {2025-02-21} {0.4.0}
{Automatically generate presentational MathML from LuaTeX math expressions}
\int_new:N \l__luamml_flag_int
\int_new:N \l__luamml_pretty_int