From 7cf1520c10302ffadc5adc704f0623c07391cff8 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 13 Feb 2018 21:00:46 +0900 Subject: [PATCH] Fix #4608: epub: Invalid meta tag is generated --- CHANGES | 2 ++ sphinx/builders/epub3.py | 1 + sphinx/themes/basic/layout.html | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 0f1021d77..c8fa73ce5 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,8 @@ Features added Bugs fixed ---------- +* #4608: epub: Invalid meta tag is generated + Testing -------- diff --git a/sphinx/builders/epub3.py b/sphinx/builders/epub3.py index bb18e9c9b..0ea0dcf27 100644 --- a/sphinx/builders/epub3.py +++ b/sphinx/builders/epub3.py @@ -143,6 +143,7 @@ class Epub3Builder(_epub_base.EpubBuilder): self.globalcontext['theme_writing_mode'] = THEME_WRITING_MODES.get(writing_mode) self.globalcontext['html_tag'] = self.html_tag self.globalcontext['use_meta_charset'] = self.use_meta_charset + self.globalcontext['skip_ua_compatible'] = True def build_navlist(self, navnodes): # type: (List[nodes.Node]) -> List[NavPoint] diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html index fe8829b77..68c7d9e51 100644 --- a/sphinx/themes/basic/layout.html +++ b/sphinx/themes/basic/layout.html @@ -111,8 +111,8 @@ {%- endif %} - {%- if not html5_doctype %} - + {%- if not html5_doctype and not skip_ua_compatible %} + {%- endif %} {%- if use_meta_charset or html5_doctype %}