Merge branch 'master' into patch-1

Author: nschloe

matplotlib2tikz/__about__.py

@@ -5,6 +5,6 @@
 __copyright__ = 'Copyright (c) 2010-2017, %s <%s>' % (__author__, __email__)
 __credits__ = []
 __license__ = 'License :: OSI Approved :: MIT License'
-__version__ = '0.6.9'
+__version__ = '0.6.10'
 __maintainer__ = u'Nico Schlömer'
 __status__ = 'Development Status :: 5 - Production/Stable'

matplotlib2tikz/axes.py

@@ -32,10 +32,9 @@ def __init__(self, data, obj):
 
             self.nsubplots = geom[0] * geom[1]
             if self.nsubplots > 1:
-                is_groupplot = True
                 # Is this an axis-colorbar pair? No need for groupplot then.
-                if self.nsubplots == 2 and _find_associated_colorbar(obj):
-                    is_groupplot = False
+                is_groupplot = \
+                    self.nsubplots != 2 or not _find_associated_colorbar(obj)
 
                 if is_groupplot:
                     self.is_subplot = True
@@ -179,10 +178,9 @@ def __init__(self, data, obj):
         y_tick_dirs = [tick._tickdir for tick in obj.yaxis.get_major_ticks()]
         if x_tick_dirs or y_tick_dirs:
             if x_tick_dirs and y_tick_dirs:
-                if x_tick_dirs[0] == y_tick_dirs[0]:
-                    direction = x_tick_dirs[0]
-                else:
-                    direction = None
+                direction = \
+                    x_tick_dirs[0] if x_tick_dirs[0] == y_tick_dirs[0] \
+                    else None
             elif x_tick_dirs:
                 direction = x_tick_dirs[0]
             else:
@@ -559,10 +557,8 @@ def _get_ticks(data, xy, ticks, ticklabels):
                         )
                     )
         else:
-            if 'minor' in xy:
-                axis_options.append('%stick={}' % xy)
-            else:
-                axis_options.append('%stick=\\empty' % xy)
+            val = '{}' if 'minor' in xy else '\\empty'
+            axis_options.append('%stick=%s' % (xy, val))
 
         if is_label_required:
             axis_options.append('%sticklabels={%s}'
@@ -602,12 +598,10 @@ def _mpl_cmap2pgf_cmap(cmap):
     '''
     if isinstance(cmap, mpl.colors.LinearSegmentedColormap):
         return _handle_linear_segmented_color_map(cmap)
-    elif isinstance(cmap, mpl.colors.ListedColormap):
-        return _handle_listed_color_map(cmap)
-    else:
-        raise RuntimeError(
-          'Only LinearSegmentedColormap and ListedColormap are supported'
-          )
+
+    assert isinstance(cmap, mpl.colors.ListedColormap), \
+        'Only LinearSegmentedColormap and ListedColormap are supported'
+    return _handle_listed_color_map(cmap)
 
 
 def _handle_linear_segmented_color_map(cmap):

matplotlib2tikz/image.py

@@ -51,8 +51,8 @@ def draw_image(data, obj):
     # write the corresponding information to the TikZ file
     extent = obj.get_extent()
 
-    # the format specification will only accept tuples, not lists
-    if isinstance(extent, list):  # convert to () list
+    # the format specification will only accept tuples
+    if not isinstance(extent, tuple):
         extent = tuple(extent)
 
     rel_filepath = os.path.basename(filename)

matplotlib2tikz/line2d.py

@@ -216,6 +216,17 @@ def draw_linecollection(data, obj):
     return data, content
 
 
+TIKZ_LINEWIDTHS = {
+        0.1: 'ultra thin',
+        0.2: 'very thin',
+        0.4: 'thin',
+        0.6: 'semithick',
+        0.8: 'thick',
+        1.2: 'very thick',
+        1.6: 'ultra thick'
+        }
+
+
 def _mpl_linewidth2pgfp_linewidth(data, line_width):
     if data['strict']:
         # Takes the matplotlib linewidths, and just translate them
@@ -313,7 +324,7 @@ def _mpl_marker2pgfp_marker(data, mpl_marker, marker_face_color):
     if mpl_marker == ',':
         print('Unsupported marker '','' (pixel).')
 
-    return (data, None, None)
+    return data, None, None
 
 
 _MPLLINESTYLE_2_PGFPLOTSLINESTYLE = {
@@ -364,13 +375,3 @@ def _mpl_linestyle2pgfp_linestyle(line_style):
 #               % e
 #               )
 #     return (xdata, ydata)
-
-
-TIKZ_LINEWIDTHS = {0.1: 'ultra thin',
-                   0.2: 'very thin',
-                   0.4: 'thin',
-                   0.6: 'semithick',
-                   0.8: 'thick',
-                   1.2: 'very thick',
-                   1.6: 'ultra thick'
-                   }

matplotlib2tikz/path.py

@@ -76,12 +76,8 @@ def draw_path(data, path, draw_options=None, simplify=None):
         # Store the previous point for quadratic Beziers.
         prev = vert[0:2]
 
-    nodes_string = '\n'.join(nodes)
-    if draw_options:
-        path_command = '\\path [%s] %s;\n\n' % \
-                       (', '.join(draw_options), nodes_string)
-    else:
-        path_command = '\\path %s;\n\n' % nodes_string
+    do = '[{}]'.format(', '.join(draw_options)) if draw_options else ''
+    path_command = '\\path {} {};\n\n'.format(do, '\n'.join(nodes))
 
     return data, path_command
 
@@ -146,15 +142,12 @@ def draw_pathcollection(data, obj):
             '{/tikz/mark size=\\perpointmarksize}',
             ])
 
-    if draw_options:
-        content.append('\\addplot [%s]\n' % (', '.join(draw_options)))
-    else:
-        content.append('\\addplot\n')
+    do = ' [{}]'.format(', '.join(draw_options)) if draw_options else ''
+    content.append('\\addplot{}\n'.format(do))
+
+    to = ' [{}]'.format(', '.join(table_options)) if table_options else ''
+    content.append('table{}{{%\n'.format(to))
 
-    if table_options:
-        content.append('table [%s]{%%\n' % ', '.join(table_options))
-    else:
-        content.append('table {%\n')
     content.append((' '.join(labels)).strip() + '\n')
     fmt = (' '.join(dd.shape[1] * ['%+.15e'])) + '\n'
     for d in dd:

matplotlib2tikz/save.py

@@ -134,14 +134,13 @@ def get_tikz_code(
     else:
         data['extra axis options [base]'] = set()
 
-    if dpi is None:
-        savefig_dpi = mpl.rcParams['savefig.dpi']
-        if isinstance(savefig_dpi, int):
-            data['dpi'] = savefig_dpi
-        else:
-            data['dpi'] = mpl.rcParams['figure.dpi']
-    else:
+    if dpi:
         data['dpi'] = dpi
+    else:
+        savefig_dpi = mpl.rcParams['savefig.dpi']
+        data['dpi'] = \
+            savefig_dpi if isinstance(savefig_dpi, int) \
+            else mpl.rcParams['figure.dpi']
 
     # gather the file content
     data, content = _recurse(data, figure)