Fix sphinx-doc#1907: Support svg image format in LaTeX output.

xuhdev · Dec 11, 2015 · d3ebab0 · d3ebab0
1 parent 8b47cc5
commit d3ebab0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/sphinx/texinputs/Makefile b/sphinx/texinputs/Makefile
@@ -7,7 +7,7 @@ ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
 # Prefix for archive names
 ARCHIVEPRREFIX =
 # Additional LaTeX options
-LATEXOPTS =
+LATEXOPTS = --shell-escape
 
 LATEX = latex
 PDFLATEX = pdflatex

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
@@ -42,6 +42,7 @@
 %(longtable)s
 \usepackage{sphinx}
 \usepackage{multirow}
+%(svg)s
 %(usepackages)s
 %(contentsname)s
 %(numfig_format)s
@@ -159,6 +160,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         'fontpkg':         '\\usepackage{times}',
         'fncychap':        '\\usepackage[Bjarne]{fncychap}',
         'longtable':       '\\usepackage{longtable}',
+        'svg':             '\\usepackage{svg}',
         'usepackages':     '',
         'numfig_format':   '',
         'contentsname':    '',
@@ -1182,7 +1184,11 @@ def visit_image(self, node):
         options = ''
         if include_graphics_options:
             options = '[%s]' % ','.join(include_graphics_options)
-        self.body.append('\\includegraphics%s{%s}' % (options, uri))
+        if node['uri'].lower().endswith('svg') or \
+           node['uri'].lower().endswith('svgz'):
+            self.body.append('\\includesvg%s{%s}' % (options, path.splitext(uri)[0]))
+        else:
+            self.body.append('\\includegraphics%s{%s}' % (options, uri))
         self.body.extend(post)
 
     def depart_image(self, node):

diff --git a/tests/root/images.txt b/tests/root/images.txt
@@ -25,4 +25,4 @@ Sphinx image handling
 .. image:: subdir/simg.*
 
 .. an SVG image (for HTML at least)
-.. image:: svgimg.*
+.. image:: svgimg.svg
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
@@ -78,7 +78,7 @@ def kpsetest(filename):
     os.chdir(app.outdir)
     try:
         try:
-            p = Popen(['pdflatex', '--interaction=nonstopmode',
+            p = Popen(['pdflatex', '--interaction=nonstopmode', '--shell-escape',
                        'SphinxTests.tex'], stdout=PIPE, stderr=PIPE)
         except OSError:
             raise SkipTest  # most likely pdflatex was not found
@@ -143,7 +143,7 @@ def kpsetest(filename):
     os.chdir(app.outdir)
     try:
         try:
-            p = Popen(['pdflatex', '--interaction=nonstopmode',
+            p = Popen(['pdflatex', '--interaction=nonstopmode', '--shell-escape',
                        'SphinxTests.tex'], stdout=PIPE, stderr=PIPE)
         except OSError:
             raise SkipTest  # most likely pdflatex was not found

diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py
@@ -25,7 +25,6 @@
 TEXINFO_WARNINGS = ENV_WARNINGS + """\
 None:None: WARNING: citation not found: missing
 None:None: WARNING: no matching candidate for image URI u'foo.\\*'
-None:None: WARNING: no matching candidate for image URI u'svgimg.\\*'
 """
 
 if PY3:

diff --git a/tests/test_environment.py b/tests/test_environment.py
@@ -73,9 +73,9 @@ def test_images():
     assert image_uri_message in app._warning.content[-1]
     assert set(latexbuilder.images.keys()) == \
         set(['subdir/img.png', 'subdir/simg.png', 'img.png', 'img.pdf',
-             'svgimg.pdf'])
+             'svgimg.svg'])
     assert set(latexbuilder.images.values()) == \
-        set(['img.pdf', 'img.png', 'img1.png', 'simg.png', 'svgimg.pdf'])
+        set(['img.pdf', 'img.png', 'img1.png', 'simg.png', 'svgimg.svg'])
 
 
 def test_second_update():