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 #4640 from tk0miya/4622_show_epub_scheme_only_for_epub3.1

Browse Source 
Show opt:scheme attribute only for EPUB3.1 (refs: #4622)
This commit is contained in:
Takeshi KOMIYA 2018-02-22 21:02:14 +09:00 committed by GitHub
commit a46ba4f1a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/builders/epub3.py
View File

@ -133,6 +133,7 @@ class Epub3Builder(_epub_base.EpubBuilder):
metadata['ibook_scroll_axis'] = IBOOK_SCROLL_AXIS.get(writing_mode) metadata['ibook_scroll_axis'] = IBOOK_SCROLL_AXIS.get(writing_mode)
metadata['date'] = self.esc(format_date("%Y-%m-%dT%H:%M:%SZ")) metadata['date'] = self.esc(format_date("%Y-%m-%dT%H:%M:%SZ"))
metadata['version'] = self.esc(self.config.version) metadata['version'] = self.esc(self.config.version)
metadata['epub_version'] = self.config.epub_version
return metadata return metadata
def prepare_writing(self, docnames): def prepare_writing(self, docnames):
@ -229,6 +230,7 @@ def setup(app):
# config values # config values
app.add_config_value('epub_basename', lambda self: make_filename(self.project), None) app.add_config_value('epub_basename', lambda self: make_filename(self.project), None)
app.add_config_value('epub_version', 3.0, 'epub') # experimental
app.add_config_value('epub_theme', 'epub', 'epub') app.add_config_value('epub_theme', 'epub', 'epub')
app.add_config_value('epub_theme_options', {}, 'epub') app.add_config_value('epub_theme_options', {}, 'epub')
app.add_config_value('epub_title', lambda self: self.html_title, 'epub') app.add_config_value('epub_title', lambda self: self.html_title, 'epub')

6
sphinx/templates/epub3/content.opf_t
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="{{ lang }}" <package xmlns="http://www.idpf.org/2007/opf" version="{{ epub_version }}" xml:lang="{{ lang }}"
unique-identifier="{{ uid }}" unique-identifier="{{ uid }}"
prefix="ibooks: http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/"> prefix="ibooks: http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/">
<metadata xmlns:opf="http://www.idpf.org/2007/opf" <metadata xmlns:opf="http://www.idpf.org/2007/opf"
@ -11,7 +11,11 @@
<dc:contributor>{{ contributor }}</dc:contributor> <dc:contributor>{{ contributor }}</dc:contributor>
<dc:publisher>{{ publisher }}</dc:publisher> <dc:publisher>{{ publisher }}</dc:publisher>
<dc:rights>{{ copyright }}</dc:rights> <dc:rights>{{ copyright }}</dc:rights>
{%- if epub_version == 3.1 %}
<dc:identifier id="{{ uid }}" opf:scheme="{{ scheme }}">{{ id }}</dc:identifier> <dc:identifier id="{{ uid }}" opf:scheme="{{ scheme }}">{{ id }}</dc:identifier>
{%- else %}
<dc:identifier id="{{ uid }}">{{ id }}</dc:identifier>
{%- endif %}
<dc:date>{{ date }}</dc:date> <dc:date>{{ date }}</dc:date>
<meta property="dcterms:modified">{{ date }}</meta> <meta property="dcterms:modified">{{ date }}</meta>
<meta property="ibooks:version">{{ version }}</meta> <meta property="ibooks:version">{{ version }}</meta>