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

latex, replace `pt by TeX equivalent bp if found in width or height` attribute of an image (ref: #2714)

Browse Source
This commit is contained in:
Takeshi KOMIYA
2016-06-26 12:01:14 +09:00
parent 980da84393
commit efd74a9e14
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -13,6 +13,8 @@ Incompatible changes
it was shipped with Sphinx since 1.3.4).
* latex, literal blocks in tables do not use OriginalVerbatim but
sphinxVerbatimintable which handles captions and wraps lines(ref #2704).
* latex, replace ``pt`` by TeX equivalent ``bp`` if found in ``width`` or
``height`` attribute of an image.
Features added

17
sphinx/writers/latex.py
View File

@@ -1359,13 +1359,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
def depart_hlistcol(self, node):
pass
def latex_image_length(self, width_str, figure=False):
def latex_image_length(self, width_str):
"""Convert `width_str` with rst length to LaTeX length.
This function is copied from docutils' latex writer
The last parameter, ``figure`` is only for compatibility with 1.4.4.
It will be removed at Sphinx-1.5.
"""
match = re.match('(\d*\.?\d*)\s*(\S*)', width_str)
if not match:
@@ -1373,10 +1370,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
return width_str
res = width_str
amount, unit = match.groups()[:2]
if figure and unit in ('', 'pt'):
res = '%sbp' % amount # convert to 'bp'
elif not unit:
if not unit:
return None
elif unit == 'pt':
res = '%sbp' % amount # convert to 'bp'
elif unit == "px":
res = "%.3f\\sphinxpxdimen" % (float(amount))
elif unit == "%":
@@ -1463,7 +1460,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
if self.table:
# TODO: support align option
if 'width' in node:
length = self.latex_image_length(node['width'], figure=True)
length = self.latex_image_length(node['width'])
self.body.append('\\begin{sphinxfigure-in-table}[%s]\n\\centering\n' % length)
else:
self.body.append('\\begin{sphinxfigure-in-table}\n\\centering\n')
@@ -1472,9 +1469,9 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.context.append(ids + '\\end{sphinxfigure-in-table}\\relax\n')
elif node.get('align', '') in ('left', 'right'):
if 'width' in node:
length = self.latex_image_length(node['width'], figure=True)
length = self.latex_image_length(node['width'])
elif 'width' in node[0]:
length = self.latex_image_length(node[0]['width'], figure=True)
length = self.latex_image_length(node[0]['width'])
else:
length = '0pt'
self.body.append('\\begin{wrapfigure}{%s}{%s}\n\\centering' %

4
tests/test_build_latex.py
View File

@@ -578,10 +578,10 @@ def test_image_in_section(app, status, warning):
print(status.getvalue())
print(warning.getvalue())
assert ('\\chapter[Test section]'
'{\\sphinxincludegraphics[width=15pt,height=15pt]{{pic}.png} Test section}'
'{\\sphinxincludegraphics[width=15bp,height=15bp]{{pic}.png} Test section}'
in result)
assert ('\\chapter[Other {[}blah{]} section]{Other {[}blah{]} '
'\\sphinxincludegraphics[width=15pt,height=15pt]{{pic}.png} section}' in result)
'\\sphinxincludegraphics[width=15bp,height=15bp]{{pic}.png} section}' in result)
assert ('\\chapter{Another section}' in result)