diff options
author | Karl Berry <karl@freefriends.org> | 2019-05-24 21:21:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-05-24 21:21:45 +0000 |
commit | 437cb829fc15a8874bb17cb344dc554518daafc2 (patch) | |
tree | 632fc70ebed244e4a7746dd70fad2df6de08d14c /Master/texmf-dist/scripts/make4ht/extensions | |
parent | 69e636169cd6533e5aacbe16b2edaeb9e3d8f7e5 (diff) |
make4ht (24may19)
git-svn-id: svn://tug.org/texlive/trunk@51215 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/make4ht/extensions')
-rw-r--r-- | Master/texmf-dist/scripts/make4ht/extensions/dvisvgm_hashes.lua | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/make4ht/extensions/dvisvgm_hashes.lua b/Master/texmf-dist/scripts/make4ht/extensions/dvisvgm_hashes.lua index aae3e4bba96..83010ac388f 100644 --- a/Master/texmf-dist/scripts/make4ht/extensions/dvisvgm_hashes.lua +++ b/Master/texmf-dist/scripts/make4ht/extensions/dvisvgm_hashes.lua @@ -48,6 +48,7 @@ local function get_generated_pages(output, pages) while(pos) do pos, finish, file = string.find(output, "output written to ([^\n]+)", finish) pages[tonumber(page)] = file + if not finish then break end pos, finish, page = string.find(output, "processing page (%d+)", finish) end return pages @@ -77,7 +78,7 @@ local function make_ranges(pages) end local function read_log(dvisvgmlog) - local f = io.open(dvisvgmlog, "r") + local f = io.open(dvisvgmlog, "rb") if not f then return nil, "Cannot read dvisvgm log" end local output = f:read("*all") f:close() @@ -169,7 +170,7 @@ local function get_dvi_pages(arg) cpu_cnt = arg.cpu_cnt or extoptions.cpu_cnt or cpu_cnt dvisvgm_par.scale = arg.scale or extoptions.scale or 1.15 dvisvgm_options = dvisvgm_options % dvisvgm_par - local f = io.open(idv_file, "r") + local f = io.open(idv_file, "rb") if not f then return nil, "Cannot open idv file: " .. idv_file end local content = f:read("*all") f:close() @@ -229,6 +230,14 @@ function M.modify_build(make) lgfiles[i] = replace end end + -- tex4ebook process also the images table, so we need to replace generated filenames here as well + local lgimages = make.lgfile.images + for _, image in ipairs(lgimages) do + local replace = output_map[image.output] + if replace then + image.output = replace + end + end end end) @@ -248,7 +257,8 @@ function M.modify_build(make) -- disable the image processing for _,v in ipairs(make.build_seq) do if v.name == "t4ht" then - v.params.t4ht_par = v.params.t4ht_par .. " -p" + local t4ht_par = v.params.t4ht_par or make.params.t4ht_par or "" + v.params.t4ht_par = t4ht_par .. " -p" end end make:image(".", function() return "" end) |