Skip to content

Commit 1efa832

Browse files
committed
Merge branch 'v1.2.x'
Conflicts: lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
2 parents 034b12b + 527fd07 commit 1efa832

11 files changed

+743
-78
lines changed

lib/matplotlib/axes.py

+4
Original file line numberDiff line numberDiff line change
@@ -5384,6 +5384,8 @@ def errorbar(self, x, y, yerr=None, xerr=None,
53845384
lines_kw['lw'] = kwargs['lw']
53855385
if 'transform' in kwargs:
53865386
lines_kw['transform'] = kwargs['transform']
5387+
if 'alpha' in kwargs:
5388+
lines_kw['alpha'] = kwargs['alpha']
53875389
if 'zorder' in kwargs:
53885390
lines_kw['zorder'] = kwargs['zorder']
53895391

@@ -5440,6 +5442,8 @@ def xywhere(xs, ys, mask):
54405442
plot_kw['mew'] = kwargs['mew']
54415443
if 'transform' in kwargs:
54425444
plot_kw['transform'] = kwargs['transform']
5445+
if 'alpha' in kwargs:
5446+
plot_kw['alpha'] = kwargs['alpha']
54435447
if 'zorder' in kwargs:
54445448
plot_kw['zorder'] = kwargs['zorder']
54455449

lib/matplotlib/figure.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ def __init__(self,
319319

320320
self._hold = rcParams['axes.hold']
321321
self.canvas = None
322+
self._suptitle = None
322323

323324
if subplotpars is None:
324325
subplotpars = SubplotParams()
@@ -491,8 +492,14 @@ def suptitle(self, t, **kwargs):
491492
if ('verticalalignment' not in kwargs) and ('va' not in kwargs):
492493
kwargs['verticalalignment'] = 'top'
493494

494-
t = self.text(x, y, t, **kwargs)
495-
return t
495+
sup = self.text(x, y, t, **kwargs)
496+
if self._suptitle is not None:
497+
self._suptitle.set_text(t)
498+
self._suptitle.set_position((x, y))
499+
self._suptitle.update_from(sup)
500+
else:
501+
self._suptitle = sup
502+
return self._suptitle
496503

497504
def set_canvas(self, canvas):
498505
"""
Binary file not shown.
Loading

lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.svg

+167-74
Loading
Binary file not shown.
Loading

0 commit comments

Comments
 (0)