From 510b307c38933e773e9d4885023a4595b978eb33 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 Nov 2020 22:02:51 +0000 Subject: tex4ebook (7nov20) git-svn-id: svn://tug.org/texlive/trunk@56876 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/support/tex4ebook/changelog.tex | 11 +++++++++++ .../doc/support/tex4ebook/tex4ebook-doc.pdf | Bin 79364 -> 79505 bytes Master/texmf-dist/scripts/tex4ebook/tex4ebook | 2 +- .../scripts/tex4ebook/tex4ebook-exec_epub.lua | 5 +++-- .../scripts/tex4ebook/tex4ebook-exec_epub3.lua | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/support/tex4ebook/changelog.tex b/Master/texmf-dist/doc/support/tex4ebook/changelog.tex index f77423e85b7..3d0d6c1c6c4 100644 --- a/Master/texmf-dist/doc/support/tex4ebook/changelog.tex +++ b/Master/texmf-dist/doc/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/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf index 942a92df29c..3546db973f5 100644 Binary files a/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf and b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf differ 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 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 -- cgit v1.2.3