diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-08 03:02:12 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-08 03:02:12 +0000 |
commit | bc2d0660f4f460b55009ab4e525f2a0e4cde6187 (patch) | |
tree | d35815089faf23c45f4f21690e42cfcc7c65a5fd /support/make4ht/extensions | |
parent | 57edbaffbe7daad894e3036a4123acd03e0fdb9b (diff) |
CTAN sync 202009080302
Diffstat (limited to 'support/make4ht/extensions')
6 files changed, 8 insertions, 8 deletions
diff --git a/support/make4ht/extensions/make4ht-ext-common_domfilters.lua b/support/make4ht/extensions/make4ht-ext-common_domfilters.lua index 63232b22ce..802902d48d 100644 --- a/support/make4ht/extensions/make4ht-ext-common_domfilters.lua +++ b/support/make4ht/extensions/make4ht-ext-common_domfilters.lua @@ -27,7 +27,7 @@ function M.modify_build(make) count = 2 else local process = filter {"fixinlines", "idcolons", "joincharacters", "mathmlfixes", "tablerows","booktabs"} - make:match("html$", process) + make:match("html?$", process) count = 1 end return make diff --git a/support/make4ht/extensions/make4ht-ext-common_filters.lua b/support/make4ht/extensions/make4ht-ext-common_filters.lua index 513fbed34e..9b3e7f3f74 100644 --- a/support/make4ht/extensions/make4ht-ext-common_filters.lua +++ b/support/make4ht/extensions/make4ht-ext-common_filters.lua @@ -11,7 +11,7 @@ function M.test(format) end function M.modify_build(make) - make:match("html$", process) + make:match("html?$", process) local matches = make.matches -- the filters should be first match to be executed, especially if tidy -- should be executed as well diff --git a/support/make4ht/extensions/make4ht-ext-dvisvgm_hashes.lua b/support/make4ht/extensions/make4ht-ext-dvisvgm_hashes.lua index 87f58abd57..8bf82e0588 100644 --- a/support/make4ht/extensions/make4ht-ext-dvisvgm_hashes.lua +++ b/support/make4ht/extensions/make4ht-ext-dvisvgm_hashes.lua @@ -244,11 +244,11 @@ function M.modify_build(make) -- fix src attributes local process = filter { - function(str) - return str:gsub('src="([^"]+)', function(filename) + function(str, filename) + return str:gsub('src=["\'](.-)(["\'])', function(filename, endquote) local newname = output_map[filename] or filename log:debug("newname", newname) - return 'src="'.. newname + return 'src=' .. endquote .. newname .. endquote end) end } diff --git a/support/make4ht/extensions/make4ht-ext-join_colors.lua b/support/make4ht/extensions/make4ht-ext-join_colors.lua index 182661fbdb..4d72b0e15b 100644 --- a/support/make4ht/extensions/make4ht-ext-join_colors.lua +++ b/support/make4ht/extensions/make4ht-ext-join_colors.lua @@ -10,7 +10,7 @@ end function M.modify_build(make) local process = filter {"joincolors"} - make:match("html$", process) + make:match("html?$", process) return make end return M diff --git a/support/make4ht/extensions/make4ht-ext-mathjaxnode.lua b/support/make4ht/extensions/make4ht-ext-mathjaxnode.lua index cbad897d4e..c2c4928aeb 100644 --- a/support/make4ht/extensions/make4ht-ext-mathjaxnode.lua +++ b/support/make4ht/extensions/make4ht-ext-mathjaxnode.lua @@ -9,7 +9,7 @@ end function M.modify_build(make) local mathjax = filter { "mathjaxnode"} - make:match("html$",mathjax) + make:match("html?$",mathjax) return make end diff --git a/support/make4ht/extensions/make4ht-ext-tidy.lua b/support/make4ht/extensions/make4ht-ext-tidy.lua index b381a05a8f..8318a8b894 100644 --- a/support/make4ht/extensions/make4ht-ext-tidy.lua +++ b/support/make4ht/extensions/make4ht-ext-tidy.lua @@ -38,7 +38,7 @@ end function M.modify_build(make) - make:match("html$", function(filename, par) + make:match("html?$", function(filename, par) local settings = get_filter_settings "tidy" or {} par.options = par.options or settings.options or "-utf8 -w 512 -ashtml -q" local command = "tidy ${options} ${filename}" % par |