Set text hinting to defaults

QuLogic · QuLogic · commit b8d482f235f1 · 2025-04-26T05:26:23.000-04:00
Namely, `text.hinting` is now `default` instead of `force_autohint` (or
`none` for classic tests) and `text.hinting_factor` is now 1, not 8.
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -301,9 +301,9 @@
 ##                ("native" is a synonym.)
 ## - force_autohint: Use FreeType's auto-hinter.  ("auto" is a synonym.)
 ## - no_hinting: Disable hinting.  ("none" is a synonym.)
-#text.hinting: force_autohint
+#text.hinting: default
 
-#text.hinting_factor: 8  # Specifies the amount of softness for hinting in the
+#text.hinting_factor: 1  # Specifies the amount of softness for hinting in the
                          # horizontal direction.  A value of 1 will hint to full
                          # pixels.  A value of 2 will hint to half pixels etc.
 #text.kerning_factor: 0  # Specifies the scaling factor for kerning values.  This
diff --git a/lib/matplotlib/mpl-data/stylelib/_classic_test_patch.mplstyle b/lib/matplotlib/mpl-data/stylelib/_classic_test_patch.mplstyle
@@ -4,3 +4,6 @@
 ytick.alignment: center_baseline
 
 hatch.color: edge
+
+text.hinting: default
+text.hinting_factor: 1
diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py
@@ -19,8 +19,12 @@
 
 def set_font_settings_for_testing():
     mpl.rcParams['font.family'] = 'DejaVu Sans'
-    mpl.rcParams['text.hinting'] = 'none'
-    mpl.rcParams['text.hinting_factor'] = 8
+    if getattr(mpl, '_called_from_pytest', False):
+        mpl.rcParams['text.hinting'] = 'default'
+        mpl.rcParams['text.hinting_factor'] = 1
+    else:
+        mpl.rcParams['text.hinting'] = 'none'
+        mpl.rcParams['text.hinting_factor'] = 8
 
 
 def set_reproducibility_for_testing():
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -8145,8 +8145,8 @@ def test_normal_axes():
 
     # test the axis bboxes
     target = [
-        [123.375, 75.88888888888886, 983.25, 33.0],
-        [85.51388888888889, 99.99999999999997, 53.375, 993.0]
+        [124.0, 76.89, 982.0, 32.0],
+        [86.89, 100.5, 52.0, 992.0],
     ]
     for nn, b in enumerate(bbaxis):
         targetbb = mtransforms.Bbox.from_bounds(*target[nn])
@@ -8166,7 +8166,7 @@ def test_normal_axes():
     targetbb = mtransforms.Bbox.from_bounds(*target)
     assert_array_almost_equal(bbax.bounds, targetbb.bounds, decimal=2)
 
-    target = [85.5138, 75.88888, 1021.11, 1017.11]
+    target = [86.89, 76.89, 1019.11, 1015.61]
     targetbb = mtransforms.Bbox.from_bounds(*target)
     assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
 
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -814,7 +814,7 @@ def test_tightbbox():
     ax.set_xlim(0, 1)
     t = ax.text(1., 0.5, 'This dangles over end')
     renderer = fig.canvas.get_renderer()
-    x1Nom0 = 9.035  # inches
+    x1Nom0 = 8.9375  # inches
     assert abs(t.get_tightbbox(renderer).x1 - x1Nom0 * fig.dpi) < 2
     assert abs(ax.get_tightbbox(renderer).x1 - x1Nom0 * fig.dpi) < 2
     assert abs(fig.get_tightbbox(renderer).x1 - x1Nom0) < 0.05
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -469,10 +469,10 @@ def test_figure_legend_outside():
     todos += ['left ' + pos for pos in ['lower', 'center', 'upper']]
     todos += ['right ' + pos for pos in ['lower', 'center', 'upper']]
 
-    upperext = [20.347556,  27.722556, 790.583, 545.499]
-    lowerext = [20.347556,  71.056556, 790.583, 588.833]
-    leftext = [151.681556, 27.722556, 790.583, 588.833]
-    rightext = [20.347556,  27.722556, 659.249, 588.833]
+    upperext = [20.722556, 26.722556, 790.333, 545.999]
+    lowerext = [20.722556, 70.056556, 790.333, 589.333]
+    leftext = [152.056556, 26.722556, 790.333, 589.333]
+    rightext = [20.722556, 26.722556, 658.999, 589.333]
     axbb = [upperext, upperext, upperext,
             lowerext, lowerext, lowerext,
             leftext, leftext, leftext,
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
@@ -328,7 +328,7 @@ def test_get_tightbbox_polar():
     fig.canvas.draw()
     bb = ax.get_tightbbox(fig.canvas.get_renderer())
     assert_allclose(
-        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1e-03)
+        bb.extents, [108.27778, 28.7778, 539.7222, 451.2222], rtol=1e-03)
 
 
 @check_figures_equal()
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -711,14 +711,14 @@ def test_wrap(x, rotation, halign):
     s = 'This is a very long text that should be wrapped multiple times.'
     text = subfig.text(x, 0.7, s, wrap=True, rotation=rotation, ha=halign)
     fig.canvas.draw()
-    assert text._get_wrapped_text() == ('This is a very long\n'
-                                        'text that should be\n'
+    assert text._get_wrapped_text() == ('This is a very long text\n'
+                                        'that should be\n'
                                         'wrapped multiple\n'
                                         'times.')
 
 
 def test_mathwrap():
-    fig = plt.figure(figsize=(6, 4))
+    fig = plt.figure(figsize=(5, 4))
     s = r'This is a very $\overline{\mathrm{long}}$ line of Mathtext.'
     text = fig.text(0, 0.5, s, size=40, wrap=True)
     fig.canvas.draw()
