From f545805bd9949929a5c1f5defc5a36cd898c7d2f Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Wed, 3 May 2017 23:52:29 +0200
Subject: [PATCH] Remove some redundant code in LaTeX writer ``visit_figure``

	modified:   sphinx/writers/latex.py
---
 sphinx/writers/latex.py | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index be0771c091d..da65b2e16e9 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -1554,28 +1554,14 @@ def visit_figure(self, node):
                              (node['align'] == 'right' and 'r' or 'l', length or '0pt'))
             self.context.append(ids + '\\end{wrapfigure}\n')
         elif self.in_minipage:
-            if ('align' not in node.attributes or
-                    node.attributes['align'] == 'center'):
-                self.body.append('\n\\begin{center}')
-                self.context.append('\\end{center}\n')
-            else:
-                self.body.append('\n\\begin{flush%s}' % node.attributes['align'])
-                self.context.append('\\end{flush%s}\n' % node.attributes['align'])
+            self.body.append('\n\\begin{center}')
+            self.context.append('\\end{center}\n')
         else:
-            if ('align' not in node.attributes or
-                    node.attributes['align'] == 'center'):
-                # centering does not add vertical space like center.
-                align = '\n\\centering'
-                align_end = ''
-            else:
-                # TODO non vertical space for other alignments.
-                align = '\\begin{flush%s}' % node.attributes['align']
-                align_end = '\\end{flush%s}' % node.attributes['align']
-            self.body.append('\\begin{figure}[%s]%s\n' % (
-                self.elements['figure_align'], align))
+            self.body.append('\\begin{figure}[%s]\n\\centering\n' %
+                             self.elements['figure_align'])
             if any(isinstance(child, nodes.caption) for child in node):
                 self.body.append('\\capstart\n')
-            self.context.append(ids + align_end + '\\end{figure}\n')
+            self.context.append(ids + '\\end{figure}\n')
 
     def depart_figure(self, node):
         self.body.append(self.context.pop())