From d23ac25fc3c8ba66cab698cb3738239a67852000 Mon Sep 17 00:00:00 2001 From: Elisabeth Henry Date: Sun, 18 Dec 2016 22:35:18 +0100 Subject: [PATCH] Fix duplicated HTML escape in epub rendering --- templates/epub/content.opf | 10 +++++----- templates/epub/cover.xhtml | 6 +++--- templates/epub/template.xhtml | 2 +- templates/epub/toc.ncx | 4 ++-- templates/epub3/content.opf | 10 +++++----- templates/epub3/cover.xhtml | 4 ++-- templates/epub3/template.xhtml | 4 ++-- templates/epub3/titlepage.xhtml | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/templates/epub/content.opf b/templates/epub/content.opf index 441a450..29b171c 100644 --- a/templates/epub/content.opf +++ b/templates/epub/content.opf @@ -3,10 +3,10 @@ {{uuid}} - {{title}} - {{date}} - {{lang}} - {{author}} + {{{title}}} + {{{date}}} + {{{lang}}} + {{{author}}} {{{optional}}} @@ -24,7 +24,7 @@ {{{itemrefs}}} - + {{{cover_xhtml}}} diff --git a/templates/epub/cover.xhtml b/templates/epub/cover.xhtml index 5e597cc..4d5b8bb 100644 --- a/templates/epub/cover.xhtml +++ b/templates/epub/cover.xhtml @@ -1,16 +1,16 @@ - + - {{title}} + {{{title}}}
-{{title}} +{{{title}}}
diff --git a/templates/epub/template.xhtml b/templates/epub/template.xhtml index 846d280..55b3bbb 100644 --- a/templates/epub/template.xhtml +++ b/templates/epub/template.xhtml @@ -5,7 +5,7 @@ - {{chapter_title}} + {{{chapter_title}}} diff --git a/templates/epub/toc.ncx b/templates/epub/toc.ncx index edf3678..7f0bc73 100644 --- a/templates/epub/toc.ncx +++ b/templates/epub/toc.ncx @@ -6,12 +6,12 @@ - {{title}} + {{{title}}} - {{title}} + {{{title}}} diff --git a/templates/epub3/content.opf b/templates/epub3/content.opf index 35c1388..4970dde 100644 --- a/templates/epub3/content.opf +++ b/templates/epub3/content.opf @@ -2,11 +2,11 @@ - {{uuid}} - {{title}} + {{{uuid}}} + {{{title}}} {{{date}}} - {{lang}} - {{author}} + {{{lang}}} + {{{author}}} aut {{{date}}} @@ -29,7 +29,7 @@ {{{itemrefs}}} - + {{{cover_xhtml}}} diff --git a/templates/epub3/cover.xhtml b/templates/epub3/cover.xhtml index 6b63df2..4d6ec6a 100644 --- a/templates/epub3/cover.xhtml +++ b/templates/epub3/cover.xhtml @@ -5,12 +5,12 @@ - {{title}} + {{{title}}}
-{{title}} +{{{title}}}
diff --git a/templates/epub3/template.xhtml b/templates/epub3/template.xhtml index 2c60396..d2a9fd5 100644 --- a/templates/epub3/template.xhtml +++ b/templates/epub3/template.xhtml @@ -1,14 +1,14 @@ + xmlns:epub="http://www.idpf.org/2007/ops" xml:lang = "{{{lang}}}" lang="{{{lang}}}"> {{{chapter_title}}} - +
{{{content}}}
diff --git a/templates/epub3/titlepage.xhtml b/templates/epub3/titlepage.xhtml index 57bed0f..3a9aaa8 100644 --- a/templates/epub3/titlepage.xhtml +++ b/templates/epub3/titlepage.xhtml @@ -5,13 +5,13 @@ - {{title}} + {{{title}}}
-

{{title}}

-

{{author}}

+

{{{title}}}

+

{{{author}}}