tex4ebook (7nov20)

git-svn-id: svn://tug.org/texlive/trunk@56876 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 5 insertions, 3 deletions

diff --git a/Master/texmf-dist/scripts/tex4ebook/tex4ebook b/Master/texmf-dist/scripts/tex4ebook/tex4ebook
index dc602c4e72b..91df031ffb7 100755
--- a/Master/texmf-dist/scripts/tex4ebook/tex4ebook
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook
@@ -67,7 +67,7 @@ else
 end
 
 if args.version then
-  print "tex4ebook v0.3b"
+  print "tex4ebook v0.3c"
   return 
 end
 
diff --git a/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub.lua b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub.lua
index b0ccee62027..75304e24942 100755
--- a/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub.lua
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub.lua
@@ -393,12 +393,13 @@ local function fix_ncx_toc_levels(dom)
   return dom
 end
 
-local function clean_xml_files()
+function clean_xml_files()
   local opf_file = outputdir .. "/content.opf"
   update_file(opf_file, function(content)
     -- remove wrong elements from the OPF file
     -- open opf file and create LuaXML DOM
-    local opf_dom = dom.parse(content)
+    -- the second argument to dom.parse is needed to avoid parsing issues due to the <meta> element.
+    local opf_dom = dom.parse(content, {})
     -- remove child elements from elements that don't allow them
     for _, el in ipairs(opf_dom:query_selector("dc|title, dc|creator")) do
       -- get text content
diff --git a/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub3.lua b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub3.lua
index 650eea4e6db..fc200bd8661 100755
--- a/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub3.lua
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub3.lua
@@ -273,6 +273,7 @@ function writeContainer()
   log:info "write container"
 	eb.make_opf()
 	cleanOPF()
+  eb.clean_xml_files()
 	local ret = eb.pack_container()
 	return ret
 end