matplotlib · WeatherGod · Jan 28, 2016 · Jan 19, 2016 · Jan 24, 2016 · Jan 24, 2016
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -147,9 +147,7 @@ <h4>Need help?</h4>
 
 <p>To keep up to date with what's going on in matplotlib, see
 the <a href="{{ pathto('users/whats_new.html', 1) }}">what's new
-page</a>, the more detailed <a href="{{ pathto('_static/CHANGELOG', 1)
-}}">changelog</a> or browse
-the <a href="https://github.com/matplotlib/matplotlib">source
+page</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source
 code</a>.  Anything that could require changes to your existing code
 is logged in the <a href="{{ pathto('api/api_changes.html', 1) }}">api
 changes</a> file.</p>

diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -214,7 +214,8 @@ def set_axes(self, axes):
 
         ACCEPTS: an :class:`~matplotlib.axes.Axes` instance
         """
-        warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
+        warnings.warn(_get_axes_msg.format('set_axes'), mplDeprecation,
+                      stacklevel=1)
         self.axes = axes
 
     def get_axes(self):
@@ -225,7 +226,8 @@ def get_axes(self):
         This has been deprecated in mpl 1.5, please use the
         axes property.  Will be removed in 1.7 or 2.0.
         """
-        warnings.warn(_get_axes_msg, mplDeprecation, stacklevel=1)
+        warnings.warn(_get_axes_msg.format('get_axes'), mplDeprecation,
+                      stacklevel=1)
         return self.axes
 
     @property
@@ -1580,5 +1582,5 @@ def kwdoc(a):
 
 docstring.interpd.update(Artist=kwdoc(Artist))
 
-_get_axes_msg = """This has been deprecated in mpl 1.5, please use the
+_get_axes_msg = """{} has been deprecated in mpl 1.5, please use the
 axes property.  A removal date has not been set."""
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -841,7 +841,7 @@ def find_tex_file(filename, format=None):
     """
     Call :program:`kpsewhich` to find a file in the texmf tree. If
     *format* is not None, it is used as the value for the
-    :option:`--format` option.
+    `--format` option.
 
     Apparently most existing TeX distributions on Unix-like systems
     use kpathsea. I hear MikTeX (a popular distribution on Windows)

diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2843,12 +2843,15 @@ def subsuper(self, s, loc, toks):
         sub = None
         super = None
 
-        # Pick all of the apostrophe's out
+        # Pick all of the apostrophes out, including first apostrophes that have
+        # been parsed as characters
         napostrophes = 0
         new_toks = []
         for tok in toks[0]:
             if isinstance(tok, six.string_types) and tok not in ('^', '_'):
                 napostrophes += len(tok)
+            elif isinstance(tok, Char) and tok.c == "'":
+                napostrophes += 1
             else:
                 new_toks.append(tok)
         toks = new_toks
@@ -2903,6 +2906,9 @@ def subsuper(self, s, loc, toks):
                 super = Hlist([])
             for i in range(napostrophes):
                 super.children.extend(self.symbol(s, loc, ['\prime']))
+            # kern() and hpack() needed to get the metrics right after extending
+            super.kern()
+            super.hpack()
 
         # Handle over/under symbols, such as sum or integral
         if self.is_overunder(nucleus):

diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -3011,15 +3011,21 @@ class Bar(_Base):
 
         def __init__(self, armA=0., armB=0., fraction=0.3, angle=None):
             """
-            *armA* : minimum length of armA
+            Parameters
+            ----------
+            armA : float
+                minimum length of armA
 
-            *armB* : minimum length of armB
+            armB : float
+                minimum length of armB
 
-            *fraction* : a fraction of the distance between two points that
-                         will be added to armA and armB.
+            fraction : float
+                a fraction of the distance between two points that
+                will be added to armA and armB.
 
-            *angle* : angle of the connecting line (if None, parallel to A
-                      and B)
+            angle : float or None
+                angle of the connecting line (if None, parallel
+                to A and B)
             """
             self.armA = armA
             self.armB = armB

diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -228,7 +228,7 @@ class QuiverKey(martist.Artist):
     """ Labelled arrow for use as a quiver plot scale key."""
     halign = {'N': 'center', 'S': 'center', 'E': 'left', 'W': 'right'}
     valign = {'N': 'bottom', 'S': 'top', 'E': 'center', 'W': 'center'}
-    pivot = {'N': 'mid', 'S': 'mid', 'E': 'tip', 'W': 'tail'}
+    pivot = {'N': 'middle', 'S': 'middle', 'E': 'tip', 'W': 'tail'}
 
     def __init__(self, Q, X, Y, U, label, **kw):
         martist.Artist.__init__(self)
@@ -708,6 +708,10 @@ def _h_arrows(self, length):
             X = X - X[:, 3, np.newaxis]   # numpy bug? using -= does not
                                           # work here unless we multiply
                                           # by a float first, as with 'mid'.
+        elif self.pivot != 'tail':
+            raise ValueError(("Quiver.pivot must have value in {{'middle', "
+                              "'tip', 'tail'}} not {}").format(self.pivot))
+
         tooshort = length < self.minlength
         if tooshort.any():
             # Use a heptagonal dot:

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_31.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_dejavusans_31.png