Merge pull request matplotlib#6300 from mdboom/linewidth

Remake of matplotlib#6286
folk85 · Apr 14, 2016 · f859b74 · f859b74
2 parents 18accb7 + f5e87d4
commit f859b74
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 2 deletions.
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -865,7 +865,7 @@ def validate_animation_writer_path(p):
     'verbose.fileo': ['sys.stdout', six.text_type],
 
     # line props
-    'lines.linewidth':       [2.5, validate_float],  # line width in points
+    'lines.linewidth':       [1.5, validate_float],  # line width in points
     'lines.linestyle':       ['-', six.text_type],             # solid line
     'lines.color':           ['b', validate_color],  # blue
     'lines.marker':          ['None', six.text_type],     # black

diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_bbox_inches.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_bbox_inches.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_mixedmode.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_mixedmode.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_pdflatex.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_pdflatex.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate1.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate1.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_xelatex.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pgf/pgf_xelatex.pdf
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -134,7 +134,10 @@ def test_rcupdate():
                                      '\\usepackage[T1]{fontenc}',
                                      '\\usepackage{sfmath}']})
     tol = (6, 0)
+    original_params = mpl.rcParams.copy()
     for i, rc_set in enumerate(rc_sets):
+        mpl.rcParams.clear()
+        mpl.rcParams.update(original_params)
         mpl.rcParams.update(rc_set)
         create_figure()
         compare_figure('pgf_rcupdate%d.pdf' % (i + 1), tol=tol[i])

diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -78,7 +78,7 @@ backend      : $TEMPLATE_BACKEND
 ### LINES
 # See http://matplotlib.org/api/artist_api.html#module-matplotlib.lines for more
 # information on line properties.
-#lines.linewidth   : 2.0     # line width in points
+#lines.linewidth   : 1.5     # line width in points
 #lines.linestyle   : -       # solid line
 #lines.color       : blue    # has no affect on plot(); see axes.prop_cycle
 #lines.marker      : None    # the default marker