IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4610 from tk0miya/4608_invalid_metatag_for_epub

Browse Source 
Fix #4608: epub: Invalid meta tag is generated
This commit is contained in:
Takeshi KOMIYA 2018-02-14 00:34:24 +09:00 committed by GitHub
commit 82d09f2256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -16,6 +16,8 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #4608: epub: Invalid meta tag is generated
Testing Testing
-------- --------

1
sphinx/builders/epub3.py
View File

@ -143,6 +143,7 @@ class Epub3Builder(_epub_base.EpubBuilder):
self.globalcontext['theme_writing_mode'] = THEME_WRITING_MODES.get(writing_mode) self.globalcontext['theme_writing_mode'] = THEME_WRITING_MODES.get(writing_mode)
self.globalcontext['html_tag'] = self.html_tag self.globalcontext['html_tag'] = self.html_tag
self.globalcontext['use_meta_charset'] = self.use_meta_charset self.globalcontext['use_meta_charset'] = self.use_meta_charset
self.globalcontext['skip_ua_compatible'] = True
def build_navlist(self, navnodes): def build_navlist(self, navnodes):
# type: (List[nodes.Node]) -> List[NavPoint] # type: (List[nodes.Node]) -> List[NavPoint]

4
sphinx/themes/basic/layout.html
View File

@ -111,8 +111,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"{% if language is not none %} lang="{{ language }}"{% endif %}> <html xmlns="http://www.w3.org/1999/xhtml"{% if language is not none %} lang="{{ language }}"{% endif %}>
{%- endif %} {%- endif %}
<head> <head>
{%- if not html5_doctype %} {%- if not html5_doctype and not skip_ua_compatible %}
<meta http-equiv="X-UA-Compatible" content="IE=Edge" /> <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
{%- endif %} {%- endif %}
{%- if use_meta_charset or html5_doctype %} {%- if use_meta_charset or html5_doctype %}
<meta charset="{{ encoding }}" /> <meta charset="{{ encoding }}" />