diff --git a/doc/api/api_changes/2015-05-08_mathtext_spacing.rst b/doc/api/api_changes/2015-05-08_mathtext_spacing.rst new file mode 100644 index 000000000000..eaa4691f55c3 --- /dev/null +++ b/doc/api/api_changes/2015-05-08_mathtext_spacing.rst @@ -0,0 +1,5 @@ +Improved spacing in mathtext +```````````````````````````` + +The extra space that appeared after subscripts and superscripts has +been removed. diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index 9dafaaa1785d..6cfa96077fbf 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -2738,7 +2738,7 @@ def subsuper(self, s, loc, toks): x.shift_amount = shift_down else: super.shrink() - x = Hlist([super, Kern(SCRIPT_SPACE * xHeight)]) + x = Hlist([super]) # x.width += SCRIPT_SPACE * xHeight clr = SUP1 * xHeight shift_up = max(shift_up, clr) diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf b/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf index 4490910edc97..219bdc694d83 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg b/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg index 4c231f9b5bb2..b5bb297baa47 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg @@ -5,108 +5,102 @@ - - - + - + - + - + - + - + - + - + - + - + @@ -116,40 +110,39 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - @@ -161,29 +154,28 @@ z - + - + - @@ -196,12 +188,12 @@ z - + - + @@ -215,40 +207,40 @@ z - + - + - + @@ -259,12 +251,12 @@ Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/> - + - + @@ -280,22 +272,22 @@ Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/> - + - + - + - + @@ -308,17 +300,17 @@ L-4 0" id="m81ec2b1422" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + @@ -328,17 +320,17 @@ L-4 0" id="m81ec2b1422" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + @@ -348,17 +340,17 @@ L-4 0" id="m81ec2b1422" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + @@ -368,50 +360,50 @@ L-4 0" id="m81ec2b1422" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + @@ -421,38 +413,36 @@ Q46.9688 40.9219 40.5781 39.3125" id="BitstreamVeraSans-Roman-33"/> - + - + - - + @@ -462,17 +452,17 @@ z - + - + - + @@ -482,47 +472,47 @@ z - + - + - + - + @@ -532,29 +522,28 @@ Q48.4844 72.75 52.5938 71.2969" id="BitstreamVeraSans-Roman-36"/> - + - + - - + @@ -564,118 +553,118 @@ z - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -683,7 +672,7 @@ L-2 0" id="m101a636a75" style="stroke:#000000;stroke-width:0.5;"/> - + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf index 5a02fb5926ed..8a91c37c98f5 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png index 5399ebe7c612..7dc464bd3476 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg index 5ba70cfea3e5..3ec8f352909c 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.svg @@ -5,659 +5,649 @@ - - - - - - + - - - - + + - - - + + - - - - - + + + + +M 7.328125 61.375000 +Q 7.328125 63.578125 8.984375 65.234375 +Q 10.640625 66.890625 12.796875 66.890625 +Q 14.203125 66.890625 15.515625 66.156250 +Q 16.843750 65.437500 17.578125 64.109375 +Q 18.312500 62.796875 18.312500 61.375000 +Q 18.312500 59.234375 16.640625 57.562500 +Q 14.984375 55.906250 12.796875 55.906250 +Q 10.640625 55.906250 8.984375 57.562500 +Q 7.328125 59.234375 7.328125 61.375000 +" id="Cmr10-69"/> - + @@ -667,17 +657,17 @@ Q7.32812 59.2344 7.32812 61.375" id="Cmr10-69"/> - - - - - - - - - - - + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf index 3657cd1d0f61..f6b319095e4f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg index 5c0d8503e926..87aeb2c38115 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.svg @@ -5,715 +5,702 @@ - - + - - - - - - + + + - - - - - + + + + - - - - - - + + + + - - - + - - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf index f7d03958c243..001932d0d958 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png index 5007dc71f21e..d7132cb61daf 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg index 308ca7de5764..829a01ec347b 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg @@ -5,757 +5,746 @@ - - - - - + - - - - - - + + + + + - - - - - + + + - - - + + - - - + + - + @@ -783,51 +772,49 @@ Q14.7031 17.3281 14.7031 13.9219" id="Cmmi10-55"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf index 10fbba1d4197..cf4ab5c0f3cb 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png index 8f9e41e3d2f8..6961bce83ca5 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg index 160007a9ac0a..94cb5efa1280 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.svg @@ -5,553 +5,545 @@ - - - - - - + + + - - - - - + + + - - - + - + @@ -561,11 +553,11 @@ Q12.3125 17.2344 12.3125 14.1094" id="Cmmi10-b2"/> - - - - - + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf index 0ad2344a49b3..724fdd1afad4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png index d2769ab32270..4a8518a15489 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg index 0207b8e8d45f..8a6b0ab1674f 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_20.svg @@ -5,475 +5,462 @@ - - - - + + - - - - - - - - - - - - + + + + + - - - + @@ -483,17 +470,17 @@ z - - - - - - - - - - - + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf index d618b1b8f7c5..e9d79e3257a1 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg index 341d3de0c247..66ae09dac7f9 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.svg @@ -5,16 +5,15 @@ - @@ -22,515 +21,496 @@ z - - - - - - - - - - - - + - - - - - - + + + + - - - - + - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf index ee799c0978d1..649ae70c2cc7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png index 65cd43cc8e0e..3001a69592c2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg index 728e69085390..80f23ab4d959 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.svg @@ -5,573 +5,558 @@ - - - - - + - - + - - + - - - + - - + - - - - - + + + - - - + + - + @@ -599,51 +584,49 @@ z - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.pdf index a420868eb87e..5a74ad970db0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.png index 42b8623a8ad3..3624430af075 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.svg index 74efb3616d74..09c55fe309bb 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_38.svg @@ -5,380 +5,372 @@ - - - + - - - + + - - - - - - + + + - - + - + @@ -388,11 +380,11 @@ z - - - - - + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf index 0f66dfe214ca..24d2bf19a77d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png index ed82ca80dbd2..950ecd327e0a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg index 70c075d92dfb..e5af8cfef318 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.svg @@ -5,350 +5,332 @@ - - - - - - - - - - - - - - + + - - + - + - - + @@ -358,17 +340,17 @@ z - - - - - - - - - - - + + + + + + + + + + + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf index 02269ad7bfb1..211b6b485b91 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg index c8ae75c11ff6..8b84544912f9 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.svg @@ -5,16 +5,15 @@ - @@ -22,423 +21,400 @@ z - - - - + - - - - - - - - - - - - - - - + + + + + - - - - - + diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf index b354098b2170..6ed398306f3b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png index 5c2dc5a3ee7a..5d9c628775cb 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg index 7c23271ae15f..59e6a725b861 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_37.svg @@ -5,482 +5,465 @@ - - - - - - + - - - - - + - - + - + - - - + - - + - + - - + + - + @@ -508,51 +491,49 @@ Q32.5938 25.9062 27.5938 28.5938" id="STIXGeneral-Regular-1d7ea"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.pdf b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.pdf index a3294b60bdf0..47a8b6e15ae3 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.pdf and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.png b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.png index 03faea36c7ce..467816074bbf 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.png and b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.svg b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.svg index 04f2426d7a44..6bb56a60d7a8 100644 --- a/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.svg +++ b/lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.svg @@ -5,306 +5,296 @@ - - - - + + - - + - - - - - - + - - +M 39.093750 15.796875 +L 43.406250 32.906250 +Q 40.703125 39.203125 34.593750 39.203125 +Q 28.093750 39.203125 21.796875 32.640625 +Q 15.500000 26.093750 15.500000 16.796875 +Q 15.500000 11.500000 18.140625 8.796875 +Q 20.796875 6.093750 25.203125 6.093750 +Q 28.703125 6.093750 32.500000 8.750000 +Q 36.296875 11.406250 39.093750 15.796875 +" id="STIXGeneral-Italic-1d625"/> + - + @@ -314,11 +304,11 @@ Q18.2969 -20.7969 20.4062 -12.4062" id="STIXGeneral-Regular-222b"/> - - - - - + + + + +