matplotlib · tacaswell · Feb 10, 2020 · Jan 13, 2020
diff --git a/doc/api/next_api_changes/removals.rst b/doc/api/next_api_changes/removals.rst
@@ -140,3 +140,5 @@ mathtext
 ~~~~~~~~
 - The ``\stackrel`` command (which behaved differently from its LaTeX version)
   has been removed.  Use ``\genfrac`` instead.
+- The ``\mathcircled`` command has been removed.  Directly use Unicode
+  characters, such as ``'\N{CIRCLED LATIN CAPITAL LETTER A}``, instead.
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -2406,30 +2406,6 @@
         [
         (0x0041, 0x005a, 'it', 0xe22d), # A-Z
         ],
-    'circled':
-        {
-        'rm':
-            [
-            (0x0030, 0x0030, 'rm', 0x24ea), # 0
-            (0x0031, 0x0039, 'rm', 0x2460), # 1-9
-            (0x0041, 0x005a, 'rm', 0x24b6), # A-Z
-            (0x0061, 0x007a, 'rm', 0x24d0)  # a-z
-            ],
-        'it':
-            [
-            (0x0030, 0x0030, 'rm', 0x24ea), # 0
-            (0x0031, 0x0039, 'rm', 0x2460), # 1-9
-            (0x0041, 0x005a, 'it', 0x24b6), # A-Z
-            (0x0061, 0x007a, 'it', 0x24d0)  # a-z
-            ],
-        'bf':
-            [
-            (0x0030, 0x0030, 'bf', 0x24ea), # 0
-            (0x0031, 0x0039, 'bf', 0x2460), # 1-9
-            (0x0041, 0x005a, 'bf', 0x24b6), # A-Z
-            (0x0061, 0x007a, 'bf', 0x24d0)  # a-z
-            ],
-        },
     'frak':
         {
         'rm':

diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2299,8 +2299,7 @@ class Parser:
 
     _dropsub_symbols = set(r'''\int \oint'''.split())
 
-    _fontnames = set(
-        "rm cal it tt sf bf default bb frak circled scr regular".split())
+    _fontnames = set("rm cal it tt sf bf default bb frak scr regular".split())
 
     _function_names = set("""
       arccos csc ker min arcsin deg lg Pr arctan det lim sec arg dim
@@ -2618,11 +2617,6 @@ def font(self):
 
         @font.setter
         def font(self, name):
-            if name == "circled":
-                cbook.warn_deprecated(
-                    "3.1", name="\\mathcircled", obj_type="mathtext command",
-                    alternative="unicode characters (e.g. '\\N{CIRCLED LATIN "
-                    "CAPITAL LETTER A}' or '\\u24b6')")
             if name in ('rm', 'it', 'bf'):
                 self.font_class = name
             self._font = name

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_23.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_23.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_24.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_24.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_25.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_25.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_26.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_26.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_27.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_27.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_28.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_28.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_29.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_29.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_30.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_31.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_23.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_23.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_24.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_24.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_25.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_25.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_26.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_26.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_27.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_27.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_28.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_28.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_29.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_29.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_30.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_31.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_23.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_23.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_24.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_24.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_25.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_25.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_26.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_26.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_27.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_27.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_28.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_28.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_29.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_29.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_30.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_31.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_23.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_23.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_24.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_24.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_25.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_25.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_26.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_26.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_27.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_27.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_28.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_28.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_29.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_29.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_30.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_31.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_23.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_23.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_24.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_24.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_25.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_25.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_26.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_26.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_27.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_27.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_28.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_28.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_29.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_29.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_30.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_30.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_31.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_31.png
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -120,15 +120,19 @@
               "\\phi \\chi \\psi")
 all = [digits, uppercase, lowercase, uppergreek, lowergreek]
 
+# Use stubs to reserve space if tests are removed
+# stub should be of the form (None, N) where is the number of
+# strings that used to be tested
+# Add new tests at the end.
 font_test_specs = [
     ([], all),
     (['mathrm'], all),
     (['mathbf'], all),
     (['mathit'], all),
     (['mathtt'], [digits, uppercase, lowercase]),
-    (['mathcircled'], [digits, uppercase, lowercase]),
-    (['mathrm', 'mathcircled'], [digits, uppercase, lowercase]),
-    (['mathbf', 'mathcircled'], [digits, uppercase, lowercase]),
+    (None, 3),
+    (None, 3),
+    (None, 3),
     (['mathbb'], [digits, uppercase, lowercase,
                   r'\Gamma \Pi \Sigma \gamma \pi']),
     (['mathrm', 'mathbb'], [digits, uppercase, lowercase,
@@ -146,27 +150,29 @@
 
 font_tests = []
 for fonts, chars in font_test_specs:
-    wrapper = ''.join([
-        ' '.join(fonts),
-        ' $',
-        *(r'\%s{' % font for font in fonts),
-        '%s',
-        *('}' for font in fonts),
-        '$',
-    ])
-    for set in chars:
-        font_tests.append(wrapper % set)
+    if fonts is None:
+        font_tests.extend([None] * chars)
+    else:
+        wrapper = ''.join([
+            ' '.join(fonts),
+            ' $',
+            *(r'\%s{' % font for font in fonts),
+            '%s',
+            *('}' for font in fonts),
+            '$',
+        ])
+        for set in chars:
+            font_tests.append(wrapper % set)
+
+font_tests = list(filter(lambda x: x[1] is not None, enumerate(font_tests)))
 
 
 @pytest.fixture
 def baseline_images(request, fontset, index):
     return ['%s_%s_%02d' % (request.param, fontset, index)]
 
 
-# In the following two tests, use recwarn to suppress warnings regarding the
-# deprecation of \stackrel and \mathcircled.
-
-
+# recwarn suppresses warnings regarding the deprecation of \stackrel.
 @pytest.mark.parametrize('index, test', enumerate(math_tests),
                          ids=[str(index) for index in range(len(math_tests))])
 @pytest.mark.parametrize('fontset',
@@ -181,14 +187,14 @@ def test_mathtext_rendering(baseline_images, fontset, index, test, recwarn):
              horizontalalignment='center', verticalalignment='center')
 
 
-@pytest.mark.parametrize('index, test', enumerate(font_tests),
-                         ids=[str(index) for index in range(len(font_tests))])
+@pytest.mark.parametrize('index, test', font_tests,
+                         ids=[str(index) for index, _ in font_tests])
 @pytest.mark.parametrize('fontset',
                          ['cm', 'stix', 'stixsans', 'dejavusans',
                           'dejavuserif'])
 @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
 @image_comparison(baseline_images=None, extensions=['png'])
-def test_mathfont_rendering(baseline_images, fontset, index, test, recwarn):
+def test_mathfont_rendering(baseline_images, fontset, index, test):
     matplotlib.rcParams['mathtext.fontset'] = fontset
     fig = plt.figure(figsize=(5.25, 0.75))
     fig.text(0.5, 0.5, test,