summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-11 20:26:10 +0000
committerKarl Berry <karl@freefriends.org>2021-10-11 20:26:10 +0000
commite4ac240b2aab8cfa7e290e224e2837359ee089ca (patch)
treeef9fe92b5826efe43c86ccd1a2dc379e4fd9b343
parent5743624ea509ba5a2e1a933dc8e0327cc268ed8c (diff)
make4ht (11oct21)
git-svn-id: svn://tug.org/texlive/trunk@60738 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/make4ht/make4ht2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl10
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl2
-rw-r--r--Master/texmf-dist/doc/support/make4ht/changelog.tex19
-rw-r--r--Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdfbin152568 -> 152668 bytes
-rw-r--r--Master/texmf-dist/scripts/make4ht/domfilters/make4ht-mathmlfixes.lua25
-rw-r--r--Master/texmf-dist/scripts/make4ht/formats/make4ht-odt.lua10
-rwxr-xr-xMaster/texmf-dist/scripts/make4ht/make4ht2
8 files changed, 57 insertions, 13 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/make4ht/make4ht b/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
index 1e7b0d73df0..74a9c22d2b9 100755
--- a/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
+++ b/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
@@ -29,7 +29,7 @@ make4ht [options] filename ["tex4ht.sty op." "tex4ht op." "t4ht op" "latex op"]
-- set version number. the template should be replaced by the
-- actual version number by the build script
-local version = "v0.3i"
+local version = "v0.3j"
mkparams.version_number = version
local args = mkparams.get_args()
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index d0eb1cf8165..42b96194ea1 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 60557 2021-09-20 10:46:43Z preining $
+# $Id: tlmgr.pl 60693 2021-10-04 02:24:25Z preining $
#
# Copyright 2008-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 60557 $';
-my $datrev = '$Date: 2021-09-20 12:46:43 +0200 (Mon, 20 Sep 2021) $';
+my $svnrev = '$Revision: 60693 $';
+my $datrev = '$Date: 2021-10-04 04:24:25 +0200 (Mon, 04 Oct 2021) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -63,7 +63,7 @@ BEGIN {
}
if (-r "$bindir/$kpsewhichname") {
# if not in bootstrapping mode => kpsewhich exists, so use it to get $Master
- chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`);
+ chomp($Master = `kpsewhich -var-value=TEXMFROOT`);
}
# if we have no directory in which to find our modules,
@@ -10239,7 +10239,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 60557 2021-09-20 10:46:43Z preining $
+$Id: tlmgr.pl 60693 2021-10-04 02:24:25Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
index dd06e4d1caf..87a95c81bf2 100755
--- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
+++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
@@ -1760,7 +1760,7 @@ proc restore_backups_dialog {} {
tk_messageBox -message [__ "No backup directory defined"]
return
}
- set bdir [file join [exec kpsewhich -var-value SELFAUTOPARENT] $bdir]
+ set bdir [file join [exec kpsewhich -var-value TEXMFROOT] $bdir]
if {! [file isdirectory $bdir]} {
tk_messageBox -message [__ "Backup directory %s does not exist" $bdir]
return
diff --git a/Master/texmf-dist/doc/support/make4ht/changelog.tex b/Master/texmf-dist/doc/support/make4ht/changelog.tex
index d1b9b22219e..8747cc4bf56 100644
--- a/Master/texmf-dist/doc/support/make4ht/changelog.tex
+++ b/Master/texmf-dist/doc/support/make4ht/changelog.tex
@@ -3,6 +3,25 @@
\begin{itemize}
\item
+ 2021/10/11
+
+ \begin{itemize}
+ \tightlist
+ \item
+ version \texttt{0.3j} released.
+ \end{itemize}
+\item
+ 2021/10/09
+
+ \begin{itemize}
+ \tightlist
+ \item
+ fixed wrong DOM object name in the ODT format.
+ \item
+ add addtional \texttt{\textless{}mrow\textgreater{}} elements when
+ necessary.
+ \end{itemize}
+\item
2021/09/30
\begin{itemize}
diff --git a/Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdf b/Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdf
index 0b6b1554440..58ce6288885 100644
--- a/Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdf
+++ b/Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/make4ht/domfilters/make4ht-mathmlfixes.lua b/Master/texmf-dist/scripts/make4ht/domfilters/make4ht-mathmlfixes.lua
index 55c0da379b0..42f1e557752 100644
--- a/Master/texmf-dist/scripts/make4ht/domfilters/make4ht-mathmlfixes.lua
+++ b/Master/texmf-dist/scripts/make4ht/domfilters/make4ht-mathmlfixes.lua
@@ -37,6 +37,30 @@ local function fix_nested_mstyle(el)
end
end
+-- if element contains
+-- wrap everything in <mrow>
+local function top_mrow(math)
+ local children = math:get_children()
+ local put_mrow = false
+ -- don't process elements with one or zero children
+ -- don't process elements that already are mrow
+ if #children < 2 or math:get_element_name() == "mrow" then return nil end
+ for _,v in ipairs(children) do
+ if v:is_element() and is_token_element(v) then
+ put_mrow = true
+ break
+ end
+ end
+ if put_mrow then
+ local mrow = math:create_element("mrow")
+ for _, el in ipairs(children) do
+ mrow:add_child_node(el)
+ end
+ math._children = {mrow}
+ end
+
+end
+
local function get_fence(el, attr, form)
-- convert fence attribute to <mo> element
-- attr: open | close
@@ -108,6 +132,7 @@ return function(dom)
end
fix_token_elements(el)
fix_nested_mstyle(el)
+ top_mrow(el)
end)
return dom
end
diff --git a/Master/texmf-dist/scripts/make4ht/formats/make4ht-odt.lua b/Master/texmf-dist/scripts/make4ht/formats/make4ht-odt.lua
index 257e597bb3a..f3721eba00b 100644
--- a/Master/texmf-dist/scripts/make4ht/formats/make4ht-odt.lua
+++ b/Master/texmf-dist/scripts/make4ht/formats/make4ht-odt.lua
@@ -127,7 +127,7 @@ local function fix_picture_sizes(tmpdir)
end
local content = f:read("*all") or ""
f:close()
- local status, domobject = pcall(function()
+ local status, dom= pcall(function()
return domobject.parse(content)
end)
if not status then
@@ -224,13 +224,13 @@ function M.modify_build(make)
-- expanded in tex4ht.env in Miktex or Debian
call_xtpipes(make)
-- fix the image dimensions wrongly set by xtpipes
- local domfilters = domfilter {"t4htlinks", "odtpartable"}
+ local domfilters = domfilter({"t4htlinks", "odtpartable"}, "odtfilters")
make:match("4oo$", domfilters)
- -- fixes for mathml
- local mathmldomfilters = domfilter {"joincharacters","mathmlfixes"}
- make:match("4om$", mathmldomfilters)
-- execute it before xtpipes, because we don't want xtpipes to mess with t4htlink elements
move_matches(make)
+ -- fixes for mathml
+ local mathmldomfilters = domfilter({"joincharacters","mathmlfixes"}, "mathmlfilters")
+ make:match("4om$", mathmldomfilters)
-- convert XML entities for Unicode characters produced by Xtpipes to characters
local fixentities = filter {"entities-to-unicode", remove_xtpipes}
make:match("4oo", fixentities)
diff --git a/Master/texmf-dist/scripts/make4ht/make4ht b/Master/texmf-dist/scripts/make4ht/make4ht
index 1e7b0d73df0..74a9c22d2b9 100755
--- a/Master/texmf-dist/scripts/make4ht/make4ht
+++ b/Master/texmf-dist/scripts/make4ht/make4ht
@@ -29,7 +29,7 @@ make4ht [options] filename ["tex4ht.sty op." "tex4ht op." "t4ht op" "latex op"]
-- set version number. the template should be replaced by the
-- actual version number by the build script
-local version = "v0.3i"
+local version = "v0.3j"
mkparams.version_number = version
local args = mkparams.get_args()