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 bugfix from 0.5.

Browse Source
This commit is contained in:
Georg Brandl 2008-12-08 08:57:46 +01:00
commit 1d00f4a487
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -24,12 +24,15 @@ New features added
Release 0.5.1 (in development) Release 0.5.1 (in development)
============================== ==============================
* Fix a bug when including images in sources in subdirectories. * Fix LaTeX writer output for images with specified height.
* Fix wrong generated image path when including images in sources
in subdirectories.
* Fix the JavaScript search when html_copy_source is off. * Fix the JavaScript search when html_copy_source is off.
* Fix a bug in autodoc when documenting classes with the option. * Fix an indentation problem in autodoc when documenting classes
``autoclass_content = "both"`` set. with the option ``autoclass_content = "both"`` set.
* Don't crash on empty index entries, only emit a warning. * Don't crash on empty index entries, only emit a warning.

3
sphinx/writers/latex.py
View File

@ -750,7 +750,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
include_graphics_options.append('width=%s' % w) include_graphics_options.append('width=%s' % w)
if attrs.has_key('height'): if attrs.has_key('height'):
h = self.latex_image_length(attrs['height']) h = self.latex_image_length(attrs['height'])
include_graphics_options.append('height=%s' % h) if h:
include_graphics_options.append('height=%s' % h)
if attrs.has_key('align'): if attrs.has_key('align'):
align_prepost = { align_prepost = {
# By default latex aligns the top of an image. # By default latex aligns the top of an image.

2
tests/root/images.txt
View File

@ -9,6 +9,8 @@ Sphinx image handling
.. an image with path name (relative to this directory!) .. an image with path name (relative to this directory!)
.. image:: subdir/img.png .. image:: subdir/img.png
:height: 100
:width: 200
.. an image with unspecified extension .. an image with unspecified extension
.. image:: img.* .. image:: img.*

2
tests/test_build.py
View File

@ -28,7 +28,7 @@ latex_warnfile = StringIO()
ENV_WARNINGS = """\ ENV_WARNINGS = """\
WARNING: %(root)s/images.txt:9: Image file not readable: foo.png WARNING: %(root)s/images.txt:9: Image file not readable: foo.png
WARNING: %(root)s/images.txt:21: Nonlocal image URI found: http://www.python.org/logo.png WARNING: %(root)s/images.txt:23: Nonlocal image URI found: http://www.python.org/logo.png
WARNING: %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading included \ WARNING: %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading included \
file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
""" """