summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-04 22:11:47 +0000
committerKarl Berry <karl@freefriends.org>2018-05-04 22:11:47 +0000
commit3044e3bca22e8ab481a4ee71439aa8a2b03a6eb4 (patch)
tree3e84e700959e80d7ab41b2e4417b6df902af8fcb
parent8459cb2fd00d89b85367581797fb37063b09f705 (diff)
make4ht (4may18)
git-svn-id: svn://tug.org/texlive/trunk@47616 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/make4ht/make4ht2
-rw-r--r--Master/texmf-dist/doc/support/make4ht/changelog.tex13
-rw-r--r--Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdfbin101276 -> 101505 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/make4ht/make4ht2
-rwxr-xr-xMaster/texmf-dist/scripts/make4ht/mkutils.lua6
5 files changed, 16 insertions, 7 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/make4ht/make4ht b/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
index 10b277d2a73..9f9caed2e95 100755
--- a/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
+++ b/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
@@ -27,7 +27,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 = "0.2a"
+local version = "v0.2b"
mkparams.version_number = version
local args = mkparams.get_args()
diff --git a/Master/texmf-dist/doc/support/make4ht/changelog.tex b/Master/texmf-dist/doc/support/make4ht/changelog.tex
index 5200e488573..ac9e2aa6e33 100644
--- a/Master/texmf-dist/doc/support/make4ht/changelog.tex
+++ b/Master/texmf-dist/doc/support/make4ht/changelog.tex
@@ -8,6 +8,19 @@
\begin{itemize}
\tightlist
\item
+ released version \texttt{0.2b}
+ \item
+ bug fix: use only \texttt{load} function in \texttt{Make:run}, in
+ order to support a local environment.
+ \end{itemize}
+\item
+ 2018/05/03
+
+ \begin{itemize}
+ \tightlist
+ \item
+ released version \texttt{0.2a}
+ \item
renamed \texttt{latexmk} extension to \texttt{latexmk\_build}, due
to clash in TL
\end{itemize}
diff --git a/Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdf b/Master/texmf-dist/doc/support/make4ht/make4ht-doc.pdf
index 910126cb313..bc684e17682 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/make4ht b/Master/texmf-dist/scripts/make4ht/make4ht
index 10b277d2a73..9f9caed2e95 100755
--- a/Master/texmf-dist/scripts/make4ht/make4ht
+++ b/Master/texmf-dist/scripts/make4ht/make4ht
@@ -27,7 +27,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 = "0.2a"
+local version = "v0.2b"
mkparams.version_number = version
local args = mkparams.get_args()
diff --git a/Master/texmf-dist/scripts/make4ht/mkutils.lua b/Master/texmf-dist/scripts/make4ht/mkutils.lua
index 7dab423bc9b..59da85bc74e 100755
--- a/Master/texmf-dist/scripts/make4ht/mkutils.lua
+++ b/Master/texmf-dist/scripts/make4ht/mkutils.lua
@@ -213,11 +213,7 @@ end
local function run(untrusted_code, env)
if untrusted_code:byte(1) == 27 then return nil, "binary bytecode prohibited" end
local untrusted_function = nil
- if not loadstring then
- untrusted_function, message = load(untrusted_code, nil, "t",env)
- else
- untrusted_function, message = loadstring(untrusted_code)
- end
+ untrusted_function, message = load(untrusted_code, nil, "t",env)
if not untrusted_function then return nil, message end
if not setfenv then setfenv = function(a,b) return true end end
setfenv(untrusted_function, env)