From 8627dbd50e5fb6383a7cf8cf10cdf4f08f1af1d2 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 7 Nov 2016 03:57:21 -0500 Subject: [PATCH] Fix Text layout cache lookup. Even though `Text._get_layout` takes a `renderer` parameter, the cache is looked up by the `self._renderer` attribute. If an alternate renderer is provided without changing any other properties, the cached layout from the previous renderer is returned. An alternate renderer is passed by `offsetbox.TextArea`, which, through its use in legends, causes the legend to shift slightly if figures are saved in different formats. Fixes #6899. --- .../test_axes/hist_stacked_bar.svg | 250 ++-- .../baseline_images/test_axes/markevery.svg | 534 ++++----- .../test_axes/markevery_line.svg | 558 ++++----- .../baseline_images/test_legend/fancy.svg | 392 +++---- .../test_legend/framealpha.svg | 72 +- .../test_legend/legend_auto1.svg | 490 ++++---- .../test_legend/legend_auto2.svg | 496 ++++---- .../test_legend/legend_auto3.svg | 94 +- .../test_legend/legend_expand.svg | 1020 ++++++++--------- .../test_legend/legend_various_labels.svg | 234 ++-- .../test_legend/scatter_rc1.svg | 104 +- .../test_legend/scatter_rc3.svg | 182 +-- .../test_patheffects/patheffect3.svg | 220 ++-- lib/matplotlib/text.py | 10 +- 14 files changed, 2328 insertions(+), 2328 deletions(-) diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.svg b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.svg index b0e1d7d0f5ea..c5bcbc473301 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.svg @@ -27,7 +27,7 @@ z " style="fill:#ffffff;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +" id="m99b6481df7" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="me7b1eb2014" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -579,12 +579,12 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + @@ -614,12 +614,12 @@ z - + - + @@ -659,12 +659,12 @@ Q 31.109375 20.453125 19.1875 8.296875 - + - + @@ -712,12 +712,12 @@ Q 46.96875 40.921875 40.578125 39.3125 - + - + @@ -751,12 +751,12 @@ z - + - + @@ -797,12 +797,12 @@ z - + - + @@ -847,12 +847,12 @@ Q 48.484375 72.75 52.59375 71.296875 - + - + @@ -878,12 +878,12 @@ z - + - + @@ -940,20 +940,20 @@ Q 18.3125 60.0625 18.3125 54.390625 +" id="m555172aa0a" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mdcfcaba4c2" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -966,12 +966,12 @@ L -4 0 - + - + @@ -984,12 +984,12 @@ L -4 0 - + - + @@ -1003,12 +1003,12 @@ L -4 0 - + - + @@ -1022,12 +1022,12 @@ L -4 0 - + - + @@ -1041,12 +1041,12 @@ L -4 0 - + - + @@ -1060,12 +1060,12 @@ L -4 0 - + - + @@ -1079,18 +1079,18 @@ L -4 0 - - @@ -1187,7 +1187,7 @@ Q 45.21875 56 50.046875 50.171875 Q 54.890625 44.34375 54.890625 33.015625 " id="DejaVuSans-6e"/> - + @@ -1196,10 +1196,10 @@ Q 54.890625 44.34375 54.890625 33.015625 - @@ -1257,7 +1257,7 @@ Q 40.484375 56 46.34375 49.84375 Q 52.203125 43.703125 52.203125 31.203125 " id="DejaVuSans-61"/> - + @@ -1267,10 +1267,10 @@ Q 52.203125 43.703125 52.203125 31.203125 - @@ -1316,7 +1316,7 @@ L 18.5 0 z " id="DejaVuSans-77"/> - + @@ -1327,10 +1327,10 @@ z - @@ -1387,7 +1387,7 @@ L 9.28125 70.21875 z " id="DejaVuSans-74"/> - + @@ -1398,10 +1398,10 @@ z - @@ -1466,7 +1466,7 @@ L 9.078125 0 z " id="DejaVuSans-6b"/> - + @@ -1478,7 +1478,7 @@ z - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery.svg b/lib/matplotlib/tests/baseline_images/test_axes/markevery.svg index 283ccf567d4c..8ae4cdac28a1 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/markevery.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/markevery.svg @@ -38,109 +38,109 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="m19995b3cae" style="stroke:#000000;stroke-width:0.5;"/> +" id="m6a9fe3c038" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,109 +150,109 @@ L 2.545584 0 L 0 -4.242641 L -2.545584 -0 z -" id="m5310570bd3" style="stroke:#000000;stroke-linejoin:miter;stroke-width:0.5;"/> +" id="m82f7853944" style="stroke:#000000;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -262,19 +262,19 @@ L 3 3 L 3 -3 L -3 -3 z -" id="m10b9748a1a" style="stroke:#000000;stroke-linejoin:miter;stroke-width:0.5;"/> +" id="m82e88449c5" style="stroke:#000000;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - - + + + + + + + + + + + @@ -283,14 +283,14 @@ z L 3 0 M 0 3 L 0 -3 -" id="m41da80ca8e" style="stroke:#00bfbf;stroke-width:0.5;"/> +" id="mfc7e25f046" style="stroke:#00bfbf;stroke-width:0.5;"/> - - - - - - + + + + + + @@ -319,80 +319,80 @@ L 518.4 43.2 +" id="m5217868098" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m032bb84592" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -403,98 +403,98 @@ L 0 4 +" id="mf4ab786c76" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="me4c004bbf7" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - - - + + @@ -645,7 +645,7 @@ L 9.28125 70.21875 z " id="DejaVuSans-74"/> - + @@ -658,8 +658,8 @@ z - - + + @@ -725,7 +725,7 @@ z " id="DejaVuSans-6b"/> - + @@ -739,8 +739,8 @@ z - - + + @@ -804,7 +804,7 @@ Q 6.59375 54.828125 13.0625 64.515625 Q 19.53125 74.21875 31.78125 74.21875 " id="DejaVuSans-30"/> - + @@ -823,8 +823,8 @@ Q 19.53125 74.21875 31.78125 74.21875 - - + + @@ -946,7 +946,7 @@ L 54.390625 54.6875 z " id="DejaVuSans-67"/> - + @@ -980,7 +980,7 @@ z - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg index c7534826bab5..db71bd78fa57 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg @@ -27,7 +27,7 @@ z " style="fill:#ffffff;"/> - +" id="m2824b38e85" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +" id="m5f7a0fab99" style="stroke:#000000;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +" id="m88efd6ac17" style="stroke:#000000;stroke-linejoin:miter;stroke-width:0.5;"/> - - - - - - - - - - - + + + + + + + + + + + - +" id="mb4ac259b61" style="stroke:#00bfbf;stroke-width:0.5;"/> - - - - - - + + + + + + @@ -723,80 +723,80 @@ L 518.4 43.2 +" id="m116d6a5ea8" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m4c4a231df1" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -807,102 +807,102 @@ L 0 4 +" id="mddc199f271" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m45687904ac" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - - - - + + @@ -1053,7 +1053,7 @@ L 9.28125 70.21875 z " id="DejaVuSans-74"/> - + @@ -1064,14 +1064,14 @@ z - - - + + @@ -1137,7 +1137,7 @@ z " id="DejaVuSans-6b"/> - + @@ -1149,14 +1149,14 @@ z - - - + + @@ -1220,7 +1220,7 @@ Q 6.59375 54.828125 13.0625 64.515625 Q 19.53125 74.21875 31.78125 74.21875 " id="DejaVuSans-30"/> - + @@ -1237,14 +1237,14 @@ Q 19.53125 74.21875 31.78125 74.21875 - - - + + @@ -1366,7 +1366,7 @@ L 54.390625 54.6875 z " id="DejaVuSans-67"/> - + @@ -1400,7 +1400,7 @@ z - + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg b/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg index fa9e0f8534ad..427ab827f4a1 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/fancy.svg @@ -38,87 +38,87 @@ C -2.000462 -1.161816 -2.236068 -0.593012 -2.236068 0 C -2.236068 0.593012 -2.000462 1.161816 -1.581139 1.581139 C -1.161816 2.000462 -0.593012 2.236068 0 2.236068 z -" id="m2ec9b9bc79" style="stroke:#000000;"/> +" id="m27675ac663" style="stroke:#000000;"/> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - +" style="fill:none;stroke:#0000ff;stroke-dasharray:6,6;stroke-dashoffset:0;"/> +" id="m83e9afba35" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - + + + + + + + + + + + +" id="m632805ea67" style="stroke:#008000;stroke-width:0.5;"/> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + +" id="mf2f92b29a1" style="stroke:#008000;stroke-width:0.5;"/> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - +" id="m32de9dd134" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m8a9609bd6e" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -356,122 +356,122 @@ L 0 4 +" id="m00cc0744e5" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m76ad6f44c1" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +" style="fill:#4c4c4c;opacity:0.5;stroke:#4c4c4c;stroke-linejoin:miter;"/> - @@ -614,26 +614,26 @@ Q 22.953125 48.484375 18.875 42.84375 Q 14.796875 37.203125 14.796875 27.296875 " id="DejaVuSans-64"/> - + - - - - - - - - + + + + + + + + - + - + @@ -654,107 +654,107 @@ L 29 38.921875 z " id="DejaVuSans-58"/> - + - + - - - - + - + - + - + - - - + - + - + - + - - + - + - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/framealpha.svg b/lib/matplotlib/tests/baseline_images/test_legend/framealpha.svg index 498cd50cb638..8b8e885da22b 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/framealpha.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/framealpha.svg @@ -27,7 +27,7 @@ z " style="fill:#ffffff;"/> - +" id="medc72a6524" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m0a07e70d89" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -239,96 +239,96 @@ L 0 4 +" id="m0157d7a694" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m3785766d9c" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - - @@ -465,7 +465,7 @@ Q 15.875 39.890625 15.1875 32.171875 z " id="DejaVuSans-65"/> - + @@ -479,7 +479,7 @@ z - + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg index 16b1cd4ce52c..17a7270dc97b 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg @@ -38,109 +38,109 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="mee187e3765" style="stroke:#000000;stroke-width:0.5;"/> +" id="m7eacf8141d" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -155,109 +155,109 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="m88dc45b409" style="stroke:#000000;stroke-width:0.5;"/> +" id="mc3995d4ecd" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,80 +286,80 @@ L 518.4 43.2 +" id="m8ddb832080" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mc999b5ce47" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -370,110 +370,110 @@ L 0 4 +" id="mef78f1d744" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m91e46507ef" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + @@ -520,7 +520,7 @@ L 12.40625 0 z " id="DejaVuSans-31"/> - + @@ -529,8 +529,8 @@ z - - + + @@ -543,7 +543,7 @@ L 4.890625 23.390625 z " id="DejaVuSans-2d"/> - + @@ -554,7 +554,7 @@ z - + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg index e74a232fe7d9..4dbb53e56e0b 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg @@ -27,7 +27,7 @@ z " style="fill:#ffffff;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +" id="m2f4acd5ff8" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m90d8af5bf8" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -1736,98 +1736,98 @@ L 0 4 +" id="m9b961d60fc" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m2db8527770" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - - @@ -1879,16 +1879,16 @@ Q 40.53125 6.109375 44.609375 11.75 Q 48.6875 17.390625 48.6875 27.296875 " id="DejaVuSans-70"/> - + - + - @@ -1972,19 +1972,19 @@ Q 45.21875 56 50.046875 50.171875 Q 54.890625 44.34375 54.890625 33.015625 " id="DejaVuSans-6e"/> - + - - - + + + - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto3.svg b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto3.svg index 7d8c47fe75df..dcc9d3f83f9a 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/legend_auto3.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/legend_auto3.svg @@ -27,7 +27,7 @@ z " style="fill:#ffffff;"/> - +" id="m8b3506c23b" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - + + + + + + + @@ -82,20 +82,20 @@ L 518.4 43.2 +" id="m4441fa3ef9" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m637bc81bd0" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -137,12 +137,12 @@ z - + - + @@ -182,12 +182,12 @@ Q 31.109375 20.453125 19.1875 8.296875 - + - + @@ -221,12 +221,12 @@ z - + - + @@ -271,12 +271,12 @@ Q 48.484375 72.75 52.59375 71.296875 - + - + @@ -329,12 +329,12 @@ Q 18.3125 60.0625 18.3125 54.390625 - + - + @@ -368,20 +368,20 @@ z +" id="maf9ad61188" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="md7511c2572" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -396,12 +396,12 @@ L -4 0 - + - + @@ -416,12 +416,12 @@ L -4 0 - + - + @@ -436,12 +436,12 @@ L -4 0 - + - + @@ -456,12 +456,12 @@ L -4 0 - + - + @@ -476,12 +476,12 @@ L -4 0 - + - + @@ -496,22 +496,22 @@ L -4 0 - - - - + + @@ -576,7 +576,7 @@ Q 15.875 39.890625 15.1875 32.171875 z " id="DejaVuSans-65"/> - + @@ -587,7 +587,7 @@ z - + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_expand.svg b/lib/matplotlib/tests/baseline_images/test_legend/legend_expand.svg index a0f4483551aa..142da9bd7fe6 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/legend_expand.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/legend_expand.svg @@ -38,109 +38,109 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="m9073693cf8" style="stroke:#000000;stroke-width:0.5;"/> +" id="m7e6ac844bc" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -155,109 +155,109 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="ma473e560d5" style="stroke:#000000;stroke-width:0.5;"/> +" id="m19a60f92bb" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,80 +286,80 @@ L 518.4 43.2 +" id="m28c5f88269" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m343928b920" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -370,101 +370,101 @@ L 0 4 +" id="m8235ff0f9c" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m176a0e503c" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - @@ -472,8 +472,8 @@ z - - + + @@ -529,23 +529,23 @@ z - - - + + - + @@ -554,8 +554,8 @@ z - - + + @@ -568,7 +568,7 @@ L 4.890625 23.390625 z " id="DejaVuSans-2d"/> - + @@ -579,22 +579,22 @@ z - - + + - + @@ -603,13 +603,13 @@ z - - + + - + @@ -628,211 +628,211 @@ z " style="fill:#ffffff;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -859,72 +859,72 @@ L 518.4 231.709091 - + - + - + - + - + - + - + - + - + - + - + - + @@ -933,92 +933,92 @@ L 518.4 231.709091 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + @@ -1042,23 +1042,23 @@ z - - - + + - + @@ -1067,13 +1067,13 @@ z - - + + - + @@ -1085,21 +1085,21 @@ z - - + + - + @@ -1108,13 +1108,13 @@ z - - + + - + @@ -1125,10 +1125,10 @@ z - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/legend_various_labels.svg b/lib/matplotlib/tests/baseline_images/test_legend/legend_various_labels.svg index c88831c688e0..d0ee0f63fdf8 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/legend_various_labels.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/legend_various_labels.svg @@ -38,13 +38,13 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="ma650ed4e71" style="stroke:#000000;stroke-width:0.500000;"/> +" id="mc3dd6596f1" style="stroke:#000000;stroke-width:0.5;"/> - - - - - + + + + + @@ -59,59 +59,59 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="maa3ac86c13" style="stroke:#000000;stroke-width:0.500000;"/> +" id="m7568b22d77" style="stroke:#000000;stroke-width:0.5;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,12 +126,12 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="mf313ae95ab" style="stroke:#000000;stroke-width:0.500000;"/> +" id="mbfad75ac03" style="stroke:#000000;stroke-width:0.5;"/> - - - - + + + + @@ -160,80 +160,80 @@ L 274.909091 43.2 +" id="mdba24f6042" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m62fed728f4" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -244,128 +244,128 @@ L 0 4 +" id="m81b21c6288" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m9c4dd6064b" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -373,16 +373,16 @@ L -4 0 - + @@ -402,14 +402,14 @@ L 12.40625 0 z " id="DejaVuSans-31"/> - + - + @@ -572,25 +572,25 @@ Q 31.78125 56 36.171875 55.265625 Q 40.578125 54.546875 44.28125 53.078125 " id="DejaVuSans-73"/> - + - - - - - - - - - + + + + + + + + + - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.svg b/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.svg index 2077dcb6f851..ea371456253f 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.svg @@ -38,19 +38,19 @@ C -2.000462 -1.161816 -2.236068 -0.593012 -2.236068 0 C -2.236068 0.593012 -2.000462 1.161816 -1.581139 1.581139 C -1.161816 2.000462 -0.593012 2.236068 0 2.236068 z -" id="m366d4cce12" style="stroke:#000000;"/> +" id="m12f212a9d2" style="stroke:#000000;"/> - - - - - - - - - - - + + + + + + + + + + + @@ -79,92 +79,92 @@ L 274.909091 43.2 +" id="m1bcd58660f" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m17b078cda5" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -175,102 +175,102 @@ L 0 4 +" id="m9f2d582f58" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mf7da5caec5" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - @@ -413,7 +413,7 @@ Q 22.953125 48.484375 18.875 42.84375 Q 14.796875 37.203125 14.796875 27.296875 " id="DejaVuSans-64"/> - + @@ -427,7 +427,7 @@ Q 14.796875 37.203125 14.796875 27.296875 - + @@ -453,7 +453,7 @@ Q 5.515625 40.765625 12.171875 48.375 Q 18.84375 56 30.609375 56 " id="DejaVuSans-6f"/> - + @@ -463,7 +463,7 @@ Q 18.84375 56 30.609375 56 - + diff --git a/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc3.svg b/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc3.svg index ab9e02b7e4bb..cd5aa2fcef1e 100644 --- a/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc3.svg +++ b/lib/matplotlib/tests/baseline_images/test_legend/scatter_rc3.svg @@ -38,19 +38,19 @@ C -2.000462 -1.161816 -2.236068 -0.593012 -2.236068 0 C -2.236068 0.593012 -2.000462 1.161816 -1.581139 1.581139 C -1.161816 2.000462 -0.593012 2.236068 0 2.236068 z -" id="m48c19c8559" style="stroke:#000000;"/> +" id="mcf9aeaf088" style="stroke:#000000;"/> - - - - - - - - - - - + + + + + + + + + + + @@ -79,92 +79,92 @@ L 274.909091 43.2 +" id="m5e0c2cbe87" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m6eb12c5c59" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -175,102 +175,102 @@ L 0 4 +" id="mcddd9bfd3e" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m729bb16df5" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - @@ -413,50 +413,50 @@ Q 22.953125 48.484375 18.875 42.84375 Q 14.796875 37.203125 14.796875 27.296875 " id="DejaVuSans-64"/> - + - - - - - - - - + + + + + + + + - - - @@ -518,20 +518,20 @@ Q 39.703125 55.765625 41.0625 55.515625 z " id="DejaVuSans-72"/> - + - - - - + + + + - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.svg b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.svg index 3962eb41b111..85ce056cdb24 100644 --- a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.svg +++ b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.svg @@ -26,19 +26,19 @@ L 72 43.2 z " style="fill:#ffffff;"/> - - - - - - - - - - - - +" id="me149d1514e" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mc09ce5b844" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -229,12 +229,12 @@ z - + - + @@ -275,12 +275,12 @@ z - + - + @@ -310,12 +310,12 @@ z - + - + @@ -330,12 +330,12 @@ z - + - + @@ -375,12 +375,12 @@ Q 31.109375 20.453125 19.1875 8.296875 - + - + @@ -395,12 +395,12 @@ Q 31.109375 20.453125 19.1875 8.296875 - + - + @@ -448,12 +448,12 @@ Q 46.96875 40.921875 40.578125 39.3125 - + - + @@ -468,12 +468,12 @@ Q 46.96875 40.921875 40.578125 39.3125 - + - + @@ -511,20 +511,20 @@ z +" id="m3d2fc7613c" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m0e6e0d799d" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -539,12 +539,12 @@ L -4 0 - + - + @@ -559,12 +559,12 @@ L -4 0 - + - + @@ -579,12 +579,12 @@ L -4 0 - + - + @@ -599,12 +599,12 @@ L -4 0 - + - + @@ -619,12 +619,12 @@ L -4 0 - + - + @@ -639,12 +639,12 @@ L -4 0 - + - + @@ -659,12 +659,12 @@ L -4 0 - + - + @@ -679,12 +679,12 @@ L -4 0 - + - + @@ -1737,76 +1737,76 @@ z - - - - - - - - @@ -1914,7 +1914,7 @@ L 42.09375 0 z " id="Cmr10-32"/> - + @@ -2163,7 +2163,7 @@ L 577.211406 385.3 L 570.3325 413.495313 L 556.012187 413.495313 z -" style="fill:url(#h6c4b1eddc0);stroke:#000000;stroke-linejoin:miter;"/> +" style="fill:url(#hab4508ec66);stroke:#000000;stroke-linejoin:miter;"/> + - +