Merge branch 'master' into patch-1

Author: nschloe

README.md

@@ -14,6 +14,8 @@ This is matplotlib2tikz, a Python tool for converting matplotlib figures into
 
 for native inclusion into LaTeX documents.
 
+matplotlib2tikz works with both Python 2 and Python 3.
+
 The output of matplotlib2tikz is in
 [PGFPlots](http://pgfplots.sourceforge.net/pgfplots.pdf), a LaTeX library that
 sits on top of TikZ and describes graphs in terms of axes, data etc.
@@ -96,18 +98,6 @@ pip install -U matplotlib2tikz
 to install/update.
 
 
-#### Dependencies
-
-matplotlib2tikz needs [matplotlib](http://matplotlib.org/) and
-[NumPy](http://www.numpy.org/) to work. matplotlib2tikz works both with
-Python 2 and Python 3.
-
-To use the resulting TikZ/PGFPlots figures, your LaTeX installation needs
-
-  * TikZ (aka PGF, >=2.00), and
-  * PGFPlots (>=1.3).
-
-
 ### Usage
 
 1. Generate your matplotlib plot as usual.

matplotlib2tikz/line2d.py

@@ -303,14 +303,14 @@ def _mpl_marker2pgfp_marker(data, mpl_marker, marker_face_color):
         pgfplots_marker = _MP_MARKER2PGF_MARKER[mpl_marker]
         if (marker_face_color is not None) and pgfplots_marker == 'o':
             pgfplots_marker = '*'
-            data['pgfplots libs'].add('plotmarks')
+            data['tikz libs'].add('plotmarks')
         marker_options = None
         return (data, pgfplots_marker, marker_options)
     except KeyError:
         pass
     # try plotmarks list
     try:
-        data['pgfplots libs'].add('plotmarks')
+        data['tikz libs'].add('plotmarks')
         pgfplots_marker, marker_options = _MP_MARKER2PLOTMARKS[mpl_marker]
         if marker_face_color is not None and \
            marker_face_color.lower() != 'none' and \