From ec3426946c37f270d71e8c4ad19d37beea726e7d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 7 Nov 2020 03:00:56 +0000 Subject: CTAN sync 202011070300 --- support/tex4ebook/changelog.tex | 11 +++++++++++ support/tex4ebook/tex4ebook | 2 +- support/tex4ebook/tex4ebook-doc.pdf | Bin 79364 -> 79505 bytes support/tex4ebook/tex4ebook-exec_epub.lua | 5 +++-- support/tex4ebook/tex4ebook-exec_epub3.lua | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) (limited to 'support/tex4ebook') diff --git a/support/tex4ebook/changelog.tex b/support/tex4ebook/changelog.tex index f77423e85b..3d0d6c1c6c 100644 --- a/support/tex4ebook/changelog.tex +++ b/support/tex4ebook/changelog.tex @@ -2,6 +2,17 @@ \section{Changes}\label{changes}} \begin{itemize} +\item + 2020/11/06 + + \begin{itemize} + \tightlist + \item + bug fix: remove custom elements from the NCX file in the Epub 3 + format. + \item + released version \texttt{0.3c} + \end{itemize} \item 2020/09/07 diff --git a/support/tex4ebook/tex4ebook b/support/tex4ebook/tex4ebook index dc602c4e72..91df031ffb 100755 --- a/support/tex4ebook/tex4ebook +++ b/support/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/support/tex4ebook/tex4ebook-doc.pdf b/support/tex4ebook/tex4ebook-doc.pdf index 942a92df29..3546db973f 100644 Binary files a/support/tex4ebook/tex4ebook-doc.pdf and b/support/tex4ebook/tex4ebook-doc.pdf differ diff --git a/support/tex4ebook/tex4ebook-exec_epub.lua b/support/tex4ebook/tex4ebook-exec_epub.lua index b0ccee6202..75304e2494 100644 --- a/support/tex4ebook/tex4ebook-exec_epub.lua +++ b/support/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 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/support/tex4ebook/tex4ebook-exec_epub3.lua b/support/tex4ebook/tex4ebook-exec_epub3.lua index 650eea4e6d..fc200bd866 100644 --- a/support/tex4ebook/tex4ebook-exec_epub3.lua +++ b/support/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 -- cgit v1.2.3