Merge remote-tracking branch 'upstream/v2.x'

phoenixlqh · Jul 16, 2016 · d527799 · d527799
2 parents 6c7e06a + d42e3e9
commit d527799
Show file tree

Hide file tree

Showing 7 changed files with 2,009 additions and 9 deletions.
diff --git a/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
@@ -151,12 +151,9 @@ define(['jupyter-js-widgets', '/nbextensions/matplotlib/mpl.js'], function(widge
         if (event.shiftKey && event.which == 13) {
             this.canvas_div.blur();
             event.shiftKey = false;
-            // Send a "J" for go to next cell
-            event.which = 74;
-            event.keyCode = 74;
-            manager.command_mode();
-            manager.handle_keydown(event);
-        }
+            // select the cell after this one
+            var index = IPython.notebook.find_cell_index(this.cell_info[0]);
+            IPython.notebook.select(index + 1);        }
     }
 
     mpl.figure.prototype.handle_save = function(fig, msg) {

diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -67,7 +67,7 @@ def _get_dash_pattern(style):
 def _scale_dashes(offset, dashes, lw):
     if rcParams['_internal.classic_mode']:
         return offset, dashes
-    scale = max(1.0, lw)
+    scale = max(2.0, lw)
     scaled_offset = scaled_dashes = None
     if offset is not None:
         scaled_offset = offset * scale

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -916,7 +916,7 @@ def validate_animation_writer_path(p):
     'lines.solid_capstyle':  ['projecting', validate_capstyle],
     'lines.dashed_pattern':  [[2.8, 1.2], validate_nseq_float()],
     'lines.dashdot_pattern': [[4.8, 1.2, 0.8, 1.2], validate_nseq_float()],
-    'lines.dotted_pattern':  [[1.2, 0.6], validate_nseq_float()],
+    'lines.dotted_pattern':  [[1.1, 1.1], validate_nseq_float()],
 
     # marker props
     'markers.fillstyle': ['full', validate_fillstyle],

diff --git a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.pdf b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.png b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.png