Fix #4335: mathtext whitespacing commands

Conflicts: lib/matplotlib/tests/test_mathtext.py
mdboom · Apr 17, 2015 · Apr 23, 2015 · Apr 23, 2015 · Apr 24, 2015 · May 3, 2015
commit f219056b4f5587a66c904387b39a47ec09b4fff2
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -1946,7 +1946,6 @@
     'boxminus'                 : 8863,
     'equiv'                    : 8801,
     'Lleftarrow'               : 8666,
-    'thinspace'                : 8201,
     'll'                       : 8810,
     'Cup'                      : 8915,
     'measeq'                   : 8798,
@@ -2169,7 +2168,6 @@
     'cdots'                    : 8943,
     'hat'                      : 770,
     'eqgtr'                    : 8925,
-    'enspace'                  : 8194,
     'psi'                      : 968,
     'frown'                    : 8994,
     'acute'                    : 769,

diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2431,13 +2431,18 @@ def _make_space(self, percentage):
             self._em_width_cache[key] = width
         return Kern(width * percentage)
 
-    _space_widths = { r'\ '      : 0.3,
-                      r'\,'      : 0.4,
-                      r'\;'      : 0.8,
-                      r'\quad'   : 1.6,
-                      r'\qquad'  : 3.2,
-                      r'\!'      : -0.4,
-                      r'\/'      : 0.4 }
+    _space_widths = { r'\,'         : 0.16667,  # 3/18 em = 3 mu
+                      r'\thinspace' : 0.16667,  # 3/18 em = 3 mu
+                      r'\/'         : 0.16667,  # 3/18 em = 3 mu
+                      r'\>'         : 0.22222,  # 4/18 em = 4 mu
+                      r'\:'         : 0.22222,  # 4/18 em = 4 mu
+                      r'\;'         : 0.27778,  # 5/18 em = 5 mu
+                      r'\ '         : 0.33333,  # 6/18 em = 6 mu
+                      r'\enspace'   : 0.5,      # 9/18 em = 9 mu
+                      r'\quad'      : 1,        # 1 em = 18 mu
+                      r'\qquad'     : 2,        # 2 em = 36 mu
+                      r'\!'         : -0.16667, # -3/18 em = -3 mu
+                      }
     def space(self, s, loc, toks):
         assert(len(toks)==1)
         num = self._space_widths[toks[0]]

diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_70.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_70.svg
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.png
diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_70.svg