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

Fix epub result: skip creating links from image tags to original image files.

Browse Source
This commit is contained in:
Yoshiki Shibukawa 2016-08-26 00:04:50 +09:00
parent 8606de3963
commit 2a95fec985
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -11,6 +11,7 @@ Bugs fixed
underscore underscore
* #2900: Fix epub content.opf: add auto generated orphan files to spine. * #2900: Fix epub content.opf: add auto generated orphan files to spine.
* #2899: Fix ``hasdoc()`` function in Jinja2 template. It can detect ``genindex``, ``search`` collectly. * #2899: Fix ``hasdoc()`` function in Jinja2 template. It can detect ``genindex``, ``search`` collectly.
* #2901: Fix epub result: skip creating links from image tags to original image files.
Release 1.4.6 (released Aug 20, 2016) Release 1.4.6 (released Aug 20, 2016)
===================================== =====================================

3
sphinx/builders/epub.py
View File

@ -190,7 +190,8 @@ class EpubBuilder(StandaloneHTMLBuilder):
add_permalinks = False add_permalinks = False
# don't add sidebar etc. # don't add sidebar etc.
embedded = True embedded = True
# dont' create links to original images from images
html_scaled_image_link = False
# don't generate search index or include search page # don't generate search index or include search page
search = False search = False

4
sphinx/builders/html.py
View File

@ -74,6 +74,8 @@ class StandaloneHTMLBuilder(Builder):
link_suffix = '.html' # defaults to matching out_suffix link_suffix = '.html' # defaults to matching out_suffix
indexer_format = js_index indexer_format = js_index
indexer_dumps_unicode = True indexer_dumps_unicode = True
# create links to original images from images [True/False]
html_scaled_image_link = True
supported_image_types = ['image/svg+xml', 'image/png', supported_image_types = ['image/svg+xml', 'image/png',
'image/gif', 'image/jpeg'] 'image/gif', 'image/jpeg']
searchindex_filename = 'searchindex.js' searchindex_filename = 'searchindex.js'
@ -678,7 +680,7 @@ class StandaloneHTMLBuilder(Builder):
""" """
Builder.post_process_images(self, doctree) Builder.post_process_images(self, doctree)
if self.config.html_scaled_image_link: if self.config.html_scaled_image_link and self.html_scaled_image_link:
for node in doctree.traverse(nodes.image): for node in doctree.traverse(nodes.image):
scale_keys = ('scale', 'width', 'height') scale_keys = ('scale', 'width', 'height')
if not any((key in node) for key in scale_keys) or \ if not any((key in node) for key in scale_keys) or \