Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix #1810: Fix vertical text alignment in the Cairo and OS-X backends.

The renderer backends' draw_text method is now passed the location of
the text baseline, not the bottom of the text bounding box.
  • Loading branch information...
commit 4aed809d4926051218bd9f118d022b3a09ea4102 1 parent 1ccf29d
@mdboom mdboom authored
Showing with 2,821 additions and 2,046 deletions.
  1. +11 −0 doc/users/whats_new.rst
  2. +2 −2 lib/matplotlib/backend_bases.py
  3. +9 −3 lib/matplotlib/backends/backend_agg.py
  4. +7 −11 lib/matplotlib/backends/backend_pdf.py
  5. +1 −1  lib/matplotlib/backends/backend_pgf.py
  6. +1 −1  lib/matplotlib/backends/backend_ps.py
  7. +2 −7 lib/matplotlib/backends/backend_svg.py
  8. +5 −5 lib/matplotlib/mathtext.py
  9. BIN  lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
  10. BIN  lib/matplotlib/tests/baseline_images/test_axes/const_xy.pdf
  11. BIN  lib/matplotlib/tests/baseline_images/test_axes/const_xy.png
  12. +48 −48 lib/matplotlib/tests/baseline_images/test_axes/const_xy.svg
  13. BIN  lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf
  14. +167 −167 lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg
  15. BIN  lib/matplotlib/tests/baseline_images/test_axes/errorbar_basic.pdf
  16. BIN  lib/matplotlib/tests/baseline_images/test_axes/errorbar_basic.png
  17. BIN  lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf
  18. BIN  lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
  19. +78 −78 lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.svg
  20. BIN  lib/matplotlib/tests/baseline_images/test_axes/fill_units.pdf
  21. BIN  lib/matplotlib/tests/baseline_images/test_axes/fill_units.png
  22. +72 −72 lib/matplotlib/tests/baseline_images/test_axes/fill_units.svg
  23. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.pdf
  24. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.pdf
  25. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.pdf
  26. +21 −21 lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.svg
  27. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.pdf
  28. +21 −21 lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_003.svg
  29. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.pdf
  30. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.png
  31. +18 −18 lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_004.svg
  32. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.pdf
  33. BIN  lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.png
  34. +18 −18 lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg
  35. BIN  lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.pdf
  36. BIN  lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.png
  37. +24 −24 lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.svg
  38. BIN  lib/matplotlib/tests/baseline_images/test_axes/log_scales.pdf
  39. BIN  lib/matplotlib/tests/baseline_images/test_axes/markevery.pdf
  40. BIN  lib/matplotlib/tests/baseline_images/test_axes/markevery.png
  41. +15 −15 lib/matplotlib/tests/baseline_images/test_axes/markevery.svg
  42. BIN  lib/matplotlib/tests/baseline_images/test_axes/markevery_line.pdf
  43. BIN  lib/matplotlib/tests/baseline_images/test_axes/markevery_line.png
  44. +23 −23 lib/matplotlib/tests/baseline_images/test_axes/markevery_line.svg
  45. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_axes.pdf
  46. +30 −30 lib/matplotlib/tests/baseline_images/test_axes/polar_axes.svg
  47. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf
  48. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.png
  49. +34 −34 lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.svg
  50. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_theta_position.pdf
  51. +30 −30 lib/matplotlib/tests/baseline_images/test_axes/polar_theta_position.svg
  52. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_units.pdf
  53. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_units.png
  54. +35 −35 lib/matplotlib/tests/baseline_images/test_axes/polar_units.svg
  55. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_units_2.pdf
  56. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_units_2.png
  57. +36 −36 lib/matplotlib/tests/baseline_images/test_axes/polar_units_2.svg
  58. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.pdf
  59. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.png
  60. +33 −33 lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.svg
  61. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.pdf
  62. BIN  lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.png
  63. +35 −35 lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.svg
  64. BIN  lib/matplotlib/tests/baseline_images/test_axes/scatter.pdf
  65. BIN  lib/matplotlib/tests/baseline_images/test_axes/shaped_data.pdf
  66. BIN  lib/matplotlib/tests/baseline_images/test_axes/shaped_data.png
  67. +61 −61 lib/matplotlib/tests/baseline_images/test_axes/shaped_data.svg
  68. BIN  lib/matplotlib/tests/baseline_images/test_axes/single_date.pdf
  69. BIN  lib/matplotlib/tests/baseline_images/test_axes/single_date.png
  70. +33 −33 lib/matplotlib/tests/baseline_images/test_axes/single_date.svg
  71. BIN  lib/matplotlib/tests/baseline_images/test_axes/single_point.pdf
  72. BIN  lib/matplotlib/tests/baseline_images/test_axes/single_point.png
  73. +28 −28 lib/matplotlib/tests/baseline_images/test_axes/single_point.svg
  74. BIN  lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf
  75. BIN  lib/matplotlib/tests/baseline_images/test_axes/symlog.png
  76. +15 −15 lib/matplotlib/tests/baseline_images/test_axes/symlog.svg
  77. BIN  lib/matplotlib/tests/baseline_images/test_axes/twin_axis_locaters_formatters.pdf
  78. BIN  lib/matplotlib/tests/baseline_images/test_axes/twin_axis_locaters_formatters.png
  79. +34 −34 lib/matplotlib/tests/baseline_images/test_axes/twin_axis_locaters_formatters.svg
  80. BIN  lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight.pdf
  81. BIN  lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight.png
  82. +18 −18 lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight.svg
  83. BIN  lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.pdf
  84. BIN  lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.png
  85. +26 −26 lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_suptile_legend.svg
  86. BIN  lib/matplotlib/tests/baseline_images/test_contour/contour_manual_labels.pdf
  87. BIN  lib/matplotlib/tests/baseline_images/test_contour/contour_manual_labels.png
  88. +23 −23 lib/matplotlib/tests/baseline_images/test_contour/contour_manual_labels.svg
  89. BIN  lib/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.pdf
  90. BIN  lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.pdf
  91. BIN  lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.png
  92. +16 −16 lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.svg
  93. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_axhline.pdf
  94. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_axhline.png
  95. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_axhspan.png
  96. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_axvline.pdf
  97. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_axvline.png
  98. +12 −12 lib/matplotlib/tests/baseline_images/test_dates/date_axvline.svg
  99. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.pdf
  100. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.png
  101. +20 −20 lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.svg
  102. BIN  lib/matplotlib/tests/baseline_images/test_dates/date_empty.png
  103. BIN  lib/matplotlib/tests/baseline_images/test_figure/figure_today.pdf
  104. BIN  lib/matplotlib/tests/baseline_images/test_image/image_clip.pdf
  105. +25 −25 lib/matplotlib/tests/baseline_images/test_image/image_clip.svg
  106. BIN  lib/matplotlib/tests/baseline_images/test_image/image_interps.pdf
  107. BIN  lib/matplotlib/tests/baseline_images/test_image/image_interps.png
  108. +33 −33 lib/matplotlib/tests/baseline_images/test_image/image_interps.svg
  109. BIN  lib/matplotlib/tests/baseline_images/test_legend/fancy.pdf
  110. BIN  lib/matplotlib/tests/baseline_images/test_legend/fancy.png
  111. +53 −53 lib/matplotlib/tests/baseline_images/test_legend/fancy.svg
  112. BIN  lib/matplotlib/tests/baseline_images/test_legend/legend_auto2.pdf
  113. BIN  lib/matplotlib/tests/baseline_images/test_legend/legend_auto3.pdf
  114. BIN  lib/matplotlib/tests/baseline_images/test_legend/legend_auto3.png
  115. +22 −22 lib/matplotlib/tests/baseline_images/test_legend/legend_auto3.svg
  116. BIN  lib/matplotlib/tests/baseline_images/test_legend/legend_expand.png
  117. BIN  lib/matplotlib/tests/baseline_images/test_legend/scatter_rc1.pdf
  118. BIN  lib/matplotlib/tests/baseline_images/test_legend/scatter_rc3.pdf
  119. BIN  lib/matplotlib/tests/baseline_images/test_legend/scatter_rc3.png
  120. +10 −10 lib/matplotlib/tests/baseline_images/test_legend/scatter_rc3.svg
  121. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_24.png
  122. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_25.png
  123. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_26.png
  124. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_27.png
  125. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_28.png
  126. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_30.png
  127. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_31.png
  128. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_37.png
  129. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_41.png
  130. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_24.png
  131. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_25.png
  132. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_26.png
  133. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_27.png
  134. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_28.png
  135. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_30.png
  136. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_31.png
  137. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_37.png
  138. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_41.png
  139. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_24.png
  140. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_25.png
  141. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_26.png
  142. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_27.png
  143. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_28.png
  144. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_30.png
  145. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_31.png
  146. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_37.png
  147. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_41.png
  148. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_05.pdf
  149. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_06.pdf
  150. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_20.pdf
  151. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_21.pdf
  152. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_22.pdf
  153. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_23.pdf
  154. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_27.pdf
  155. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_33.pdf
  156. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_34.pdf
  157. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.pdf
  158. +69 −69 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_37.svg
  159. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.pdf
  160. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_40.png
  161. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_41.pdf
  162. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_47.pdf
  163. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_48.pdf
  164. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_50.pdf
  165. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_52.pdf
  166. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.pdf
  167. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.png
  168. +58 −58 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_53.svg
  169. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_54.pdf
  170. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_67.pdf
  171. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_34.pdf
  172. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_37.pdf
  173. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_47.pdf
  174. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_48.pdf
  175. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_52.pdf
  176. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.pdf
  177. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.png
  178. +58 −58 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_53.svg
  179. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.pdf
  180. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_34.pdf
  181. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_47.pdf
  182. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_48.pdf
  183. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_52.pdf
  184. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.pdf
  185. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.png
  186. +58 −58 lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_53.svg
  187. BIN  lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.pdf
  188. BIN  lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.pdf
  189. +17 −17 lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.svg
  190. BIN  lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap_test_image.pdf
  191. BIN  lib/matplotlib/tests/baseline_images/test_subplots/subplots_offset_text.pdf
  192. BIN  lib/matplotlib/tests/baseline_images/test_subplots/subplots_offset_text.png
  193. +42 −42 lib/matplotlib/tests/baseline_images/test_subplots/subplots_offset_text.svg
  194. BIN  lib/matplotlib/tests/baseline_images/test_text/antialiased.png
  195. BIN  lib/matplotlib/tests/baseline_images/test_text/text_alignment.pdf
  196. BIN  lib/matplotlib/tests/baseline_images/test_text/text_alignment.png
  197. +742 −0 lib/matplotlib/tests/baseline_images/test_text/text_alignment.svg
  198. BIN  lib/matplotlib/tests/baseline_images/test_text/text_contains.png
  199. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.pdf
  200. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.png
  201. +25 −25 lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.svg
  202. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout2.pdf
  203. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout2.png
  204. +106 −106 lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout2.svg
  205. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout3.pdf
  206. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout3.png
  207. +78 −78 lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout3.svg
  208. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.pdf
  209. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.png
  210. +100 −100 lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.svg
  211. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.pdf
  212. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.png
  213. +46 −46 lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.svg
  214. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.pdf
  215. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.png
  216. +147 −147 lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.svg
  217. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout7.pdf
  218. BIN  lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout7.png
  219. +25 −25 lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout7.svg
  220. BIN  lib/matplotlib/tests/baseline_images/test_triangulation/tripcolor1.pdf
  221. +1 −2  lib/matplotlib/tests/test_axes.py
  222. +1 −1  lib/matplotlib/tests/test_mathtext.py
  223. +36 −16 lib/matplotlib/tests/test_text.py
  224. +7 −1 lib/matplotlib/text.py
View
11 doc/users/whats_new.rst
@@ -110,6 +110,17 @@ used, which, in the case of straight contours was sometimes quite distant
from the requested location. Much more precise label positioning is now
possible.
+Better vertical text alignment
+------------------------------
+
+The vertical alignment of text is now consistent across backends. You
+may see small differences in text placement, particularly with rotated
+text.
+
+If you are using a custom backend, note that the `draw_text` renderer
+method is now passed the location of the baseline, not the location of
+the bottom of the text bounding box.
+
.. _whats-new-1-2-2:
new in matplotlib 1.2.2
View
4 lib/matplotlib/backend_bases.py
@@ -475,7 +475,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
the x location of the text in display coords
*y*
- the y location of the text in display coords
+ the y location of the text baseline in display coords
*s*
the text string
@@ -497,7 +497,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
if 0: bbox_artist(self, renderer)
- to if 1, and then the actual bounding box will be blotted along with
+ to if 1, and then the actual bounding box will be plotted along with
your text.
"""
View
12 lib/matplotlib/backends/backend_agg.py
@@ -154,8 +154,10 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
ox, oy, width, height, descent, font_image, used_characters = \
self.mathtext_parser.parse(s, self.dpi, prop)
- x = np.round(x + ox)
- y = np.round(y - oy)
+ xd = descent * np.sin(angle / (180.0 * np.pi))
+ yd = descent * np.cos(angle / (180.0 * np.pi))
+ x = np.round(x + ox - xd)
+ y = np.round(y - oy + yd)
self._renderer.draw_text_image(font_image, x, y + 1, angle, gc)
def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
@@ -177,10 +179,14 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
# space) in the following call to draw_text_image).
font.set_text(s, 0, flags=flags)
font.draw_glyphs_to_bitmap(antialiased=rcParams['text.antialiased'])
+ d = font.get_descent() / 64.0
+ # The descent needs to be adjusted for the angle
+ xd = d * np.sin(angle / (180.0 * np.pi))
+ yd = d * np.cos(angle / (180.0 * np.pi))
#print x, y, int(x), int(y), s
self._renderer.draw_text_image(
- font.get_image(), np.round(x), np.round(y) + 1, angle, gc)
+ font.get_image(), np.round(x - xd), np.round(y + yd) + 1, angle, gc)
def get_text_width_height_descent(self, s, prop, ismath):
"""
View
18 lib/matplotlib/backends/backend_pdf.py
@@ -1622,15 +1622,15 @@ def draw_gouraud_triangles(self, gc, points, colors, trans):
self.check_gc(gc)
self.file.output(name, Op.shading)
- def _setup_textpos(self, x, y, descent, angle, oldx=0, oldy=0, olddescent=0, oldangle=0):
+ def _setup_textpos(self, x, y, angle, oldx=0, oldy=0, oldangle=0):
if angle == oldangle == 0:
- self.file.output(x - oldx, (y + descent) - (oldy + olddescent), Op.textpos)
+ self.file.output(x - oldx, y - oldy, Op.textpos)
else:
angle = angle / 180.0 * pi
self.file.output( cos(angle), sin(angle),
-sin(angle), cos(angle),
x, y, Op.textmatrix)
- self.file.output(0, descent, Op.textpos)
+ self.file.output(0, 0, Op.textpos)
def draw_mathtext(self, gc, x, y, s, prop, angle):
# TODO: fix positioning and encoding
@@ -1660,7 +1660,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
fonttype = global_fonttype
if fonttype == 42 or num <= 255:
- self._setup_textpos(ox, oy, 0, 0, oldx, oldy)
+ self._setup_textpos(ox, oy, 0, oldx, oldy)
oldx, oldy = ox, oy
if (fontname, fontsize) != prev_font:
self.file.output(self.file.fontName(fontname), fontsize,
@@ -1762,7 +1762,7 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
self.file.output(elt[1], elt[2], Op.selectfont)
elif elt[0] == 'text':
curx, cury = mytrans.transform((elt[1], elt[2]))
- self._setup_textpos(curx, cury, 0, angle, oldx, oldy)
+ self._setup_textpos(curx, cury, angle, oldx, oldy)
oldx, oldy = curx, cury
if len(elt[3]) == 1:
self.file.output(elt[3][0], Op.show)
@@ -1811,13 +1811,11 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
if rcParams['pdf.use14corefonts']:
font = self._get_font_afm(prop)
l, b, w, h = font.get_str_bbox(s)
- descent = -b * fontsize / 1000
fonttype = 1
else:
font = self._get_font_ttf(prop)
self.track_characters(font, s)
font.set_text(s, 0.0, flags=LOAD_NO_HINTING)
- descent = font.get_descent() / 64.0
fonttype = rcParams['pdf.fonttype']
@@ -1857,7 +1855,7 @@ def draw_text_simple():
self.file.fontName(prop),
fontsize,
Op.selectfont)
- self._setup_textpos(x, y, descent, angle)
+ self._setup_textpos(x, y, angle)
self.file.output(self.encode_string(s, fonttype), Op.show, Op.end_text)
def draw_text_woven(chunks):
@@ -1878,7 +1876,6 @@ def draw_text_woven(chunks):
# output all the 2-byte characters.
for mode in (1, 2):
newx = oldx = 0
- olddescent = 0
# Output a 1-byte character chunk
if mode == 1:
self.file.output(Op.begin_text,
@@ -1888,10 +1885,9 @@ def draw_text_woven(chunks):
for chunk_type, chunk in chunks:
if mode == 1 and chunk_type == 1:
- self._setup_textpos(newx, 0, descent, 0, oldx, 0, olddescent, 0)
+ self._setup_textpos(newx, 0, 0, oldx, 0, 0)
self.file.output(self.encode_string(chunk, fonttype), Op.show)
oldx = newx
- olddescent = descent
lastgind = None
for c in chunk:
View
2  lib/matplotlib/backends/backend_pgf.py
@@ -636,7 +636,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
text_args.append("x=%fin" % (x * f))
text_args.append("y=%fin" % (y * f))
text_args.append("left")
- text_args.append("bottom")
+ text_args.append("base")
if angle != 0:
text_args.append("rotate=%f" % angle)
View
2  lib/matplotlib/backends/backend_ps.py
@@ -755,7 +755,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
#print 'text', s
lines = []
thisx = 0
- thisy = font.get_descent() / 64.0
+ thisy = 0
for c in s:
ccode = ord(c)
gind = cmap.get(ccode)
View
9 lib/matplotlib/backends/backend_svg.py
@@ -852,8 +852,6 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath, mtext=None):
_glyphs = text2path.get_glyphs_with_font(
font, s, glyph_map=glyph_map, return_new_glyphs_only=True)
glyph_info, glyph_map_new, rects = _glyphs
- y -= ((font.get_descent() / 64.0) *
- (prop.get_size_in_points() / text2path.FONT_SCALE))
if glyph_map_new:
writer.start(u'defs')
@@ -953,8 +951,6 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
if not ismath:
font = self._get_font(prop)
font.set_text(s, 0.0, flags=LOAD_NO_HINTING)
- descent = font.get_descent() / 64.0
- y -= descent
fontsize = prop.get_size_in_points()
@@ -982,10 +978,9 @@ def _draw_text_as_text(self, gc, x, y, s, prop, angle, ismath, mtext=None):
# to the anchor point manually for now.
angle_rad = angle * np.pi / 180.
dir_vert = np.array([np.sin(angle_rad), np.cos(angle_rad)])
- y += descent # Undo inappropriate text descent handling
v_offset = np.dot(dir_vert, [(x - ax), (y - ay)])
- ax = ax + (v_offset - descent) * dir_vert[0]
- ay = ay + (v_offset - descent) * dir_vert[1]
+ ax = ax + v_offset * dir_vert[0]
+ ay = ay + v_offset * dir_vert[1]
ha_mpl_to_svg = {'left': 'start', 'right': 'end',
'center': 'middle'}
View
10 lib/matplotlib/mathtext.py
@@ -261,7 +261,7 @@ def render_rect_filled(self, x1, y1, x2, y2):
self.pswriter.write(ps)
def get_results(self, box, used_characters):
- ship(0, -self.depth, box)
+ ship(0, 0, box)
return (self.width,
self.height + self.depth,
self.depth,
@@ -288,7 +288,7 @@ def render_rect_filled(self, x1, y1, x2, y2):
self.rects.append((x1, self.height - y2, x2 - x1, y2 - y1))
def get_results(self, box, used_characters):
- ship(0, -self.depth, box)
+ ship(0, 0, box)
return (self.width,
self.height + self.depth,
self.depth,
@@ -316,7 +316,7 @@ def render_rect_filled(self, x1, y1, x2, y2):
(x1, self.height - y1 + 1, x2 - x1, y2 - y1))
def get_results(self, box, used_characters):
- ship(0, -self.depth, box)
+ ship(0, 0, box)
svg_elements = Bunch(svg_glyphs = self.svg_glyphs,
svg_rects = self.svg_rects)
return (self.width,
@@ -346,7 +346,7 @@ def render_rect_filled(self, x1, y1, x2, y2):
(x1, self.height-y2 , x2 - x1, y2 - y1))
def get_results(self, box, used_characters):
- ship(0, -self.depth, box)
+ ship(0, 0, box)
return (self.width,
self.height + self.depth,
self.depth,
@@ -374,7 +374,7 @@ def render_rect_filled(self, x1, y1, x2, y2):
(x1, y1 - self.height, x2 - x1, y2 - y1))
def get_results(self, box, used_characters):
- ship(0, -self.depth, box)
+ ship(0, 0, box)
return (self.width,
self.height + self.depth,
self.depth,
View
BIN  lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  lib/matplotlib/tests/baseline_images/test_axes/const_xy.pdf
Binary file not shown
View
BIN  lib/matplotlib/tests/baseline_images/test_axes/const_xy.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
96 lib/matplotlib/tests/baseline_images/test_axes/const_xy.svg
@@ -86,7 +86,7 @@ Q6.59375 17.9688 6.59375 36.375
Q6.59375 54.8281 13.0625 64.5156
Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/>
</defs>
- <g transform="translate(68.9765625 157.753308824)scale(0.12 -0.12)">
+ <g transform="translate(68.9765625 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
@@ -120,7 +120,7 @@ L12.4062 0
z
" id="BitstreamVeraSans-Roman-31"/>
</defs>
- <g transform="translate(118.995625 157.595808824)scale(0.12 -0.12)">
+ <g transform="translate(118.995625 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
</g>
</g>
@@ -163,7 +163,7 @@ Q49.8594 40.875 45.4062 35.4062
Q44.1875 33.9844 37.6406 27.2188
Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/>
</defs>
- <g transform="translate(168.423125 157.753308824)scale(0.12 -0.12)">
+ <g transform="translate(168.423125 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-32"/>
</g>
</g>
@@ -214,7 +214,7 @@ Q53.9062 64.0156 53.9062 55.3281
Q53.9062 49.2656 50.4375 45.0938
Q46.9688 40.9219 40.5781 39.3125" id="BitstreamVeraSans-Roman-33"/>
</defs>
- <g transform="translate(217.9209375 157.753308824)scale(0.12 -0.12)">
+ <g transform="translate(217.9209375 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-33"/>
</g>
</g>
@@ -253,7 +253,7 @@ L4.89062 26.7031
z
" id="BitstreamVeraSans-Roman-34"/>
</defs>
- <g transform="translate(267.2125 157.595808824)scale(0.12 -0.12)">
+ <g transform="translate(267.2125 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-34"/>
</g>
</g>
@@ -298,7 +298,7 @@ Q14.8906 38.1406 10.7969 36.2812
z
" id="BitstreamVeraSans-Roman-35"/>
</defs>
- <g transform="translate(317.1696875 157.595808824)scale(0.12 -0.12)">
+ <g transform="translate(317.1696875 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-35"/>
</g>
</g>
@@ -346,7 +346,7 @@ Q23.3906 74.2188 37.2031 74.2188
Q40.9219 74.2188 44.7031 73.4844
Q48.4844 72.75 52.5938 71.2969" id="BitstreamVeraSans-Roman-36"/>
</defs>
- <g transform="translate(366.579375 157.753308824)scale(0.12 -0.12)">
+ <g transform="translate(366.579375 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-36"/>
</g>
</g>
@@ -376,7 +376,7 @@ L8.20312 64.5938
z
" id="BitstreamVeraSans-Roman-37"/>
</defs>
- <g transform="translate(416.3875 157.595808824)scale(0.12 -0.12)">
+ <g transform="translate(416.3875 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-37"/>
</g>
</g>
@@ -432,7 +432,7 @@ Q38.1406 66.4062 31.7812 66.4062
Q25.3906 66.4062 21.8438 63.2344
Q18.3125 60.0625 18.3125 54.3906" id="BitstreamVeraSans-Roman-38"/>
</defs>
- <g transform="translate(465.8 157.753308824)scale(0.12 -0.12)">
+ <g transform="translate(465.8 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-38"/>
</g>
</g>
@@ -480,7 +480,7 @@ Q16.2188 57.2812 16.2188 49.4219
Q16.2188 41.5 20.0938 36.9531
Q23.9688 32.4219 30.6094 32.4219" id="BitstreamVeraSans-Roman-39"/>
</defs>
- <g transform="translate(515.3821875 157.753308824)scale(0.12 -0.12)">
+ <g transform="translate(515.3821875 157.965183824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-39"/>
</g>
</g>
@@ -519,7 +519,7 @@ L10.6875 0
z
" id="BitstreamVeraSans-Roman-2e"/>
</defs>
- <g transform="translate(42.745625 149.214871324)scale(0.12 -0.12)">
+ <g transform="translate(42.745625 148.158308824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -540,7 +540,7 @@ z
</g>
<g id="text_12">
<!-- 0.96 -->
- <g transform="translate(42.828125 132.273694853)scale(0.12 -0.12)">
+ <g transform="translate(42.828125 131.217132353)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -561,7 +561,7 @@ z
</g>
<g id="text_13">
<!-- 0.98 -->
- <g transform="translate(42.89375 115.332518382)scale(0.12 -0.12)">
+ <g transform="translate(42.89375 114.275955882)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -582,7 +582,7 @@ z
</g>
<g id="text_14">
<!-- 1.00 -->
- <g transform="translate(43.39625 98.3913419118)scale(0.12 -0.12)">
+ <g transform="translate(43.39625 97.3347794118)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -603,7 +603,7 @@ z
</g>
<g id="text_15">
<!-- 1.02 -->
- <g transform="translate(43.80125 81.4501654412)scale(0.12 -0.12)">
+ <g transform="translate(43.80125 80.3936029412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -624,7 +624,7 @@ z
</g>
<g id="text_16">
<!-- 1.04 -->
- <g transform="translate(43.2725 64.5089889706)scale(0.12 -0.12)">
+ <g transform="translate(43.2725 63.4524264706)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -645,7 +645,7 @@ z
</g>
<g id="text_17">
<!-- 1.06 -->
- <g transform="translate(43.355 47.5678125)scale(0.12 -0.12)">
+ <g transform="translate(43.355 46.51125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -712,7 +712,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_18">
<!-- 0.94 -->
- <g transform="translate(59.3728125 279.729779412)scale(0.12 -0.12)">
+ <g transform="translate(59.3728125 279.941654412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -733,7 +733,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_19">
<!-- 0.96 -->
- <g transform="translate(133.8140625 279.729779412)scale(0.12 -0.12)">
+ <g transform="translate(133.8140625 279.941654412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -754,7 +754,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_20">
<!-- 0.98 -->
- <g transform="translate(208.246875 279.729779412)scale(0.12 -0.12)">
+ <g transform="translate(208.246875 279.941654412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -775,7 +775,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_21">
<!-- 1.00 -->
- <g transform="translate(282.898125 279.729779412)scale(0.12 -0.12)">
+ <g transform="translate(282.898125 279.941654412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -796,7 +796,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_22">
<!-- 1.02 -->
- <g transform="translate(357.500625 279.729779412)scale(0.12 -0.12)">
+ <g transform="translate(357.500625 279.941654412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -817,7 +817,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_23">
<!-- 1.04 -->
- <g transform="translate(431.63625 279.729779412)scale(0.12 -0.12)">
+ <g transform="translate(431.63625 279.941654412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -838,7 +838,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_24">
<!-- 1.06 -->
- <g transform="translate(506.0775 279.729779412)scale(0.12 -0.12)">
+ <g transform="translate(506.0775 279.941654412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -861,7 +861,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_25">
<!-- 0 -->
- <g transform="translate(61.953125 271.191341912)scale(0.12 -0.12)">
+ <g transform="translate(61.953125 270.134779412)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
@@ -879,7 +879,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_26">
<!-- 1 -->
- <g transform="translate(62.79125 259.903786765)scale(0.12 -0.12)">
+ <g transform="translate(62.79125 258.840661765)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
</g>
</g>
@@ -897,7 +897,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_27">
<!-- 2 -->
- <g transform="translate(62.44625 248.688419118)scale(0.12 -0.12)">
+ <g transform="translate(62.44625 247.546544118)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-32"/>
</g>
</g>
@@ -915,7 +915,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_28">
<!-- 3 -->
- <g transform="translate(62.241875 237.308988971)scale(0.12 -0.12)">
+ <g transform="translate(62.241875 236.252426471)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-33"/>
</g>
</g>
@@ -933,7 +933,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_29">
<!-- 4 -->
- <g transform="translate(61.625 226.021433824)scale(0.12 -0.12)">
+ <g transform="translate(61.625 224.958308824)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-34"/>
</g>
</g>
@@ -951,7 +951,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_30">
<!-- 5 -->
- <g transform="translate(62.339375 214.642003676)scale(0.12 -0.12)">
+ <g transform="translate(62.339375 213.664191176)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-35"/>
</g>
</g>
@@ -969,7 +969,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_31">
<!-- 6 -->
- <g transform="translate(61.95875 203.426636029)scale(0.12 -0.12)">
+ <g transform="translate(61.95875 202.370073529)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-36"/>
</g>
</g>
@@ -987,7 +987,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_32">
<!-- 7 -->
- <g transform="translate(62.375 192.139080882)scale(0.12 -0.12)">
+ <g transform="translate(62.375 191.075955882)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-37"/>
</g>
</g>
@@ -1005,7 +1005,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_33">
<!-- 8 -->
- <g transform="translate(62.0 180.838400735)scale(0.12 -0.12)">
+ <g transform="translate(62.0 179.781838235)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-38"/>
</g>
</g>
@@ -1023,7 +1023,7 @@ L295.2 165.176" style="fill:none;stroke:#0000ff;"/>
</g>
<g id="text_34">
<!-- 9 -->
- <g transform="translate(61.964375 169.544283088)scale(0.12 -0.12)">
+ <g transform="translate(61.964375 168.487720588)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-39"/>
</g>
</g>
@@ -1102,7 +1102,7 @@ z
</g>
<g id="text_35">
<!-- 0.94 -->
- <g transform="translate(59.3728125 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(59.3728125 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -1123,7 +1123,7 @@ z
</g>
<g id="text_36">
<!-- 0.96 -->
- <g transform="translate(133.8140625 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(133.8140625 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -1144,7 +1144,7 @@ z
</g>
<g id="text_37">
<!-- 0.98 -->
- <g transform="translate(208.246875 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(208.246875 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -1165,7 +1165,7 @@ z
</g>
<g id="text_38">
<!-- 1.00 -->
- <g transform="translate(282.898125 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(282.898125 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -1186,7 +1186,7 @@ z
</g>
<g id="text_39">
<!-- 1.02 -->
- <g transform="translate(357.500625 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(357.500625 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -1207,7 +1207,7 @@ z
</g>
<g id="text_40">
<!-- 1.04 -->
- <g transform="translate(431.63625 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(431.63625 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -1228,7 +1228,7 @@ z
</g>
<g id="text_41">
<!-- 1.06 -->
- <g transform="translate(506.0775 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(506.0775 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -1251,7 +1251,7 @@ z
</g>
<g id="text_42">
<!-- 0.94 -->
- <g transform="translate(42.745625 393.1678125)scale(0.12 -0.12)">
+ <g transform="translate(42.745625 392.11125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -1272,7 +1272,7 @@ z
</g>
<g id="text_43">
<!-- 0.96 -->
- <g transform="translate(42.828125 376.226636029)scale(0.12 -0.12)">
+ <g transform="translate(42.828125 375.170073529)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -1293,7 +1293,7 @@ z
</g>
<g id="text_44">
<!-- 0.98 -->
- <g transform="translate(42.89375 359.285459559)scale(0.12 -0.12)">
+ <g transform="translate(42.89375 358.228897059)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-39"/>
@@ -1314,7 +1314,7 @@ z
</g>
<g id="text_45">
<!-- 1.00 -->
- <g transform="translate(43.39625 342.344283088)scale(0.12 -0.12)">
+ <g transform="translate(43.39625 341.287720588)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -1335,7 +1335,7 @@ z
</g>
<g id="text_46">
<!-- 1.02 -->
- <g transform="translate(43.80125 325.403106618)scale(0.12 -0.12)">
+ <g transform="translate(43.80125 324.346544118)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -1356,7 +1356,7 @@ z
</g>
<g id="text_47">
<!-- 1.04 -->
- <g transform="translate(43.2725 308.461930147)scale(0.12 -0.12)">
+ <g transform="translate(43.2725 307.405367647)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
@@ -1377,7 +1377,7 @@ z
</g>
<g id="text_48">
<!-- 1.06 -->
- <g transform="translate(43.355 291.520753676)scale(0.12 -0.12)">
+ <g transform="translate(43.355 290.464191176)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-2e"/>
<use x="95.41015625" xlink:href="#BitstreamVeraSans-Roman-30"/>
View
BIN  lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf
Binary file not shown
View
334 lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg
@@ -307,16 +307,16 @@ L334.724 -351.045
L335.646 -350.647" id="C0_3_0b64afb096"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C0_0_5e85b25a23" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C0_0_5e85b25a23" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C0_1_60940b79b6" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C0_1_60940b79b6" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C0_2_a16c75d4be" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C0_2_a16c75d4be" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C0_3_0b64afb096" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C0_3_0b64afb096" y="432.0"/>
</g>
</g>
<g id="PathCollection_2">
@@ -852,16 +852,16 @@ L72 -342.333
L72 -339.429" id="C1_3_5b394b4d1a"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C1_0_c282926572" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C1_0_c282926572" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C1_1_34f737c521" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C1_1_34f737c521" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C1_2_ec7dca1113" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C1_2_ec7dca1113" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C1_3_5b394b4d1a" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C1_3_5b394b4d1a" y="432.0"/>
</g>
</g>
<g id="PathCollection_3">
@@ -1547,16 +1547,16 @@ L334.901 -327.812
L335.646 -327.608" id="C2_3_ae17b4891c"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C2_0_f099e666a0" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C2_0_f099e666a0" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C2_1_debadbe17e" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C2_1_debadbe17e" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C2_2_4b4cfb9cd8" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C2_2_4b4cfb9cd8" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C2_3_ae17b4891c" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C2_3_ae17b4891c" y="432.0"/>
</g>
</g>
<g id="PathCollection_4">
@@ -2368,16 +2368,16 @@ L333.108 -319.099
L333.249 -319.056" id="C3_3_3b491ef200"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C3_0_4177435af4" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C3_0_4177435af4" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C3_1_e4a0d6bde5" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C3_1_e4a0d6bde5" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C3_2_07f8c911bd" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C3_2_07f8c911bd" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C3_3_3b491ef200" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C3_3_3b491ef200" y="432.0"/>
</g>
</g>
<g id="PathCollection_5">
@@ -3306,16 +3306,16 @@ L333.001 -310.387
L333.249 -310.312" id="C4_3_6771376803"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C4_0_bc49d46aa4" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C4_0_bc49d46aa4" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C4_1_d14c067c03" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C4_1_d14c067c03" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C4_2_2d8278092b" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C4_2_2d8278092b" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C4_3_6771376803" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C4_3_6771376803" y="432.0"/>
</g>
</g>
<g id="PathCollection_6">
@@ -4298,16 +4298,16 @@ L333.145 -301.674
L333.249 -301.642" id="C5_3_5064ef3c06"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C5_0_c72637cd63" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C5_0_c72637cd63" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C5_1_fe625d568d" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C5_1_fe625d568d" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C5_2_dead702070" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C5_2_dead702070" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C5_3_5064ef3c06" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C5_3_5064ef3c06" y="432.0"/>
</g>
</g>
<g id="PathCollection_7">
@@ -5355,16 +5355,16 @@ L332.371 -292.961
L333.249 -292.675" id="C6_3_77f6753ea4"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C6_0_20c55fe605" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C6_0_20c55fe605" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C6_1_00f358948b" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C6_1_00f358948b" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C6_2_eb1a1104cf" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C6_2_eb1a1104cf" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#67001f;" x="0" xlink:href="#C6_3_77f6753ea4" y="432.0"/>
+ <use style="fill:#67001f;" x="0.0" xlink:href="#C6_3_77f6753ea4" y="432.0"/>
</g>
</g>
<g id="PathCollection_8">
@@ -6433,19 +6433,19 @@ L339.435 -281.345
L340.439 -281.154" id="C7_4_9aaa816a0d"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#a51429;" x="0" xlink:href="#C7_0_3471654245" y="432.0"/>
+ <use style="fill:#a51429;" x="0.0" xlink:href="#C7_0_3471654245" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#a51429;" x="0" xlink:href="#C7_1_787e350050" y="432.0"/>
+ <use style="fill:#a51429;" x="0.0" xlink:href="#C7_1_787e350050" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#a51429;" x="0" xlink:href="#C7_2_5fd8339e6e" y="432.0"/>
+ <use style="fill:#a51429;" x="0.0" xlink:href="#C7_2_5fd8339e6e" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#a51429;" x="0" xlink:href="#C7_3_5b5e647678" y="432.0"/>
+ <use style="fill:#a51429;" x="0.0" xlink:href="#C7_3_5b5e647678" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#a51429;" x="0" xlink:href="#C7_4_9aaa816a0d" y="432.0"/>
+ <use style="fill:#a51429;" x="0.0" xlink:href="#C7_4_9aaa816a0d" y="432.0"/>
</g>
</g>
<g id="PathCollection_9">
@@ -7568,19 +7568,19 @@ L337.721 -269.728
L338.042 -269.62" id="C8_4_e9f616b1c3"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#e48066;" x="0" xlink:href="#C8_0_29133d4fc6" y="432.0"/>
+ <use style="fill:#e48066;" x="0.0" xlink:href="#C8_0_29133d4fc6" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#e48066;" x="0" xlink:href="#C8_1_9011ceaa64" y="432.0"/>
+ <use style="fill:#e48066;" x="0.0" xlink:href="#C8_1_9011ceaa64" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#e48066;" x="0" xlink:href="#C8_2_f03fc9509f" y="432.0"/>
+ <use style="fill:#e48066;" x="0.0" xlink:href="#C8_2_f03fc9509f" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#e48066;" x="0" xlink:href="#C8_3_8a7d022a48" y="432.0"/>
+ <use style="fill:#e48066;" x="0.0" xlink:href="#C8_3_8a7d022a48" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#e48066;" x="0" xlink:href="#C8_4_e9f616b1c3" y="432.0"/>
+ <use style="fill:#e48066;" x="0.0" xlink:href="#C8_4_e9f616b1c3" y="432.0"/>
</g>
</g>
<g id="PathCollection_10">
@@ -8851,19 +8851,19 @@ L72 -252.303
L72 -249.398" id="C9_4_9b1df7bf25"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#fcdfcf;" x="0" xlink:href="#C9_0_4ba954225b" y="432.0"/>
+ <use style="fill:#fcdfcf;" x="0.0" xlink:href="#C9_0_4ba954225b" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#fcdfcf;" x="0" xlink:href="#C9_1_9827395826" y="432.0"/>
+ <use style="fill:#fcdfcf;" x="0.0" xlink:href="#C9_1_9827395826" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#fcdfcf;" x="0" xlink:href="#C9_2_0dac05bc07" y="432.0"/>
+ <use style="fill:#fcdfcf;" x="0.0" xlink:href="#C9_2_0dac05bc07" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#fcdfcf;" x="0" xlink:href="#C9_3_b9c94ef877" y="432.0"/>
+ <use style="fill:#fcdfcf;" x="0.0" xlink:href="#C9_3_b9c94ef877" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#fcdfcf;" x="0" xlink:href="#C9_4_9b1df7bf25" y="432.0"/>
+ <use style="fill:#fcdfcf;" x="0.0" xlink:href="#C9_4_9b1df7bf25" y="432.0"/>
</g>
</g>
<g id="PathCollection_11">
@@ -10064,10 +10064,10 @@ L424.326 -44.8733
L422.604 -43.2" id="Ca_1_1a962af47a"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#d7e8f1;" x="0" xlink:href="#Ca_0_7b800f52c1" y="432.0"/>
+ <use style="fill:#d7e8f1;" x="0.0" xlink:href="#Ca_0_7b800f52c1" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#d7e8f1;" x="0" xlink:href="#Ca_1_1a962af47a" y="432.0"/>
+ <use style="fill:#d7e8f1;" x="0.0" xlink:href="#Ca_1_1a962af47a" y="432.0"/>
</g>
</g>
<g id="PathCollection_12">
@@ -11023,13 +11023,13 @@ L427.195 -170.985
L429.12 -169.18" id="Cb_2_5b16f07270"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#6bacd1;" x="0" xlink:href="#Cb_0_ca0d8b3690" y="432.0"/>
+ <use style="fill:#6bacd1;" x="0.0" xlink:href="#Cb_0_ca0d8b3690" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#6bacd1;" x="0" xlink:href="#Cb_1_e05764c83a" y="432.0"/>
+ <use style="fill:#6bacd1;" x="0.0" xlink:href="#Cb_1_e05764c83a" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#6bacd1;" x="0" xlink:href="#Cb_2_5b16f07270" y="432.0"/>
+ <use style="fill:#6bacd1;" x="0.0" xlink:href="#Cb_2_5b16f07270" y="432.0"/>
</g>
</g>
<g id="PathCollection_13">
@@ -11855,13 +11855,13 @@ L427.149 -179.697
L429.12 -177.84" id="Cc_2_66fcc6b359"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#1c5c9f;" x="0" xlink:href="#Cc_0_da14001678" y="432.0"/>
+ <use style="fill:#1c5c9f;" x="0.0" xlink:href="#Cc_0_da14001678" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#1c5c9f;" x="0" xlink:href="#Cc_1_1b109aa7fa" y="432.0"/>
+ <use style="fill:#1c5c9f;" x="0.0" xlink:href="#Cc_1_1b109aa7fa" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#1c5c9f;" x="0" xlink:href="#Cc_2_66fcc6b359" y="432.0"/>
+ <use style="fill:#1c5c9f;" x="0.0" xlink:href="#Cc_2_66fcc6b359" y="432.0"/>
</g>
</g>
<g id="PathCollection_14">
@@ -12567,13 +12567,13 @@ L427.401 -188.41
L429.12 -186.713" id="Cd_2_49a1a4a672"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Cd_0_e3057f2d36" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Cd_0_e3057f2d36" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Cd_1_dc28b7d2aa" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Cd_1_dc28b7d2aa" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Cd_2_49a1a4a672" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Cd_2_49a1a4a672" y="432.0"/>
</g>
</g>
<g id="PathCollection_15">
@@ -13159,13 +13159,13 @@ L428.316 -197.123
L429.12 -196.251" id="Ce_2_5fd0563a93"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Ce_0_865ccdc645" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Ce_0_865ccdc645" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Ce_1_7e4087a68b" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Ce_1_7e4087a68b" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Ce_2_5fd0563a93" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Ce_2_5fd0563a93" y="432.0"/>
</g>
</g>
<g id="PathCollection_16">
@@ -13635,10 +13635,10 @@ L428.062 -208.739
L429.12 -207.322" id="Cf_1_29e1ac70e0"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Cf_0_2c069e023a" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Cf_0_2c069e023a" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#Cf_1_29e1ac70e0" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#Cf_1_29e1ac70e0" y="432.0"/>
</g>
</g>
<g id="PathCollection_17">
@@ -14020,10 +14020,10 @@ L428.951 -223.261
L429.12 -222.887" id="C10_1_c40eaea8c2"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#C10_0_22c866ae7c" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#C10_0_22c866ae7c" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#C10_1_c40eaea8c2" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#C10_1_c40eaea8c2" y="432.0"/>
</g>
</g>
<g id="PathCollection_18">
@@ -14313,7 +14313,7 @@ L196.632 -201.794
L194.236 -202.48" id="C11_0_1fac15647a"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#C11_0_1fac15647a" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#C11_0_1fac15647a" y="432.0"/>
</g>
</g>
<g id="PathCollection_19">
@@ -14533,7 +14533,7 @@ L199.029 -213.754
L196.632 -214.456" id="C12_0_18bd5390e7"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#C12_0_18bd5390e7" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#C12_0_18bd5390e7" y="432.0"/>
</g>
</g>
<g id="PathCollection_20">
@@ -14628,7 +14628,7 @@ L196.388 -214.548
L196.632 -214.456" id="C13_0_9466d794f7"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:#053061;" x="0" xlink:href="#C13_0_9466d794f7" y="432.0"/>
+ <use style="fill:#053061;" x="0.0" xlink:href="#C13_0_9466d794f7" y="432.0"/>
</g>
</g>
<g id="LineCollection_1">
@@ -14850,16 +14850,16 @@ L319.3 -385.896
L320.666 -388.8" id="C16_3_a20eb7a141"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C16_0_643e8c7c11" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C16_0_643e8c7c11" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C16_1_ad5cda9f28" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C16_1_ad5cda9f28" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C16_2_59ff197d88" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C16_2_59ff197d88" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C16_3_a20eb7a141" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C16_3_a20eb7a141" y="432.0"/>
</g>
</g>
<g id="LineCollection_4">
@@ -15160,16 +15160,16 @@ L306.884 -388.145
L307.11 -388.8" id="C17_3_50f54d714e"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C17_0_b954c8d6f8" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C17_0_b954c8d6f8" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C17_1_006b7ab552" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C17_1_006b7ab552" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C17_2_b133c742f5" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C17_2_b133c742f5" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C17_3_50f54d714e" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C17_3_50f54d714e" y="432.0"/>
</g>
</g>
<g id="LineCollection_5">
@@ -15536,16 +15536,16 @@ L295.602 -385.896
L296.439 -388.8" id="C18_3_fcde23913f"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C18_0_1623ed64d2" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C18_0_1623ed64d2" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C18_1_83a166fa18" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C18_1_83a166fa18" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C18_2_f2da694d24" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C18_2_f2da694d24" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C18_3_fcde23913f" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C18_3_fcde23913f" y="432.0"/>
</g>
</g>
<g id="LineCollection_6">
@@ -15977,16 +15977,16 @@ L286.137 -385.896
L286.912 -388.8" id="C19_3_c9f505beaf"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C19_0_1b91d414ab" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C19_0_1b91d414ab" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C19_1_b9c308dc5e" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C19_1_b9c308dc5e" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C19_2_8ed19c4aa8" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C19_2_8ed19c4aa8" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C19_3_c9f505beaf" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C19_3_c9f505beaf" y="432.0"/>
</g>
</g>
<g id="LineCollection_7">
@@ -16445,16 +16445,16 @@ L277.12 -385.896
L277.875 -388.8" id="C1a_3_7575f1b870"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1a_0_2462ff38e6" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1a_0_2462ff38e6" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1a_1_772667b2d8" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1a_1_772667b2d8" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1a_2_3ce2c3ac08" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1a_2_3ce2c3ac08" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1a_3_7575f1b870" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1a_3_7575f1b870" y="432.0"/>
</g>
</g>
<g id="LineCollection_8">
@@ -16950,16 +16950,16 @@ L268.536 -387.356
L268.914 -388.8" id="C1b_3_6f7de7bc4a"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1b_0_d08a1b234f" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1b_0_d08a1b234f" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1b_1_cd39d8f1f9" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1b_1_cd39d8f1f9" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1b_2_9eb3311eac" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1b_2_9eb3311eac" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1b_3_6f7de7bc4a" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1b_3_6f7de7bc4a" y="432.0"/>
</g>
</g>
<g id="LineCollection_9">
@@ -17465,19 +17465,19 @@ L258.949 -386.278
L259.647 -388.8" id="C1c_4_c9b745f7e3"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1c_0_fe1535578d" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1c_0_fe1535578d" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1c_1_f18234b15a" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1c_1_f18234b15a" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1c_2_5f9ee00727" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1c_2_5f9ee00727" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1c_3_c5b79ddeb5" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1c_3_c5b79ddeb5" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1c_4_c9b745f7e3" y="432.0"/>
+ <use style="fill:none;stroke:#bfbf00;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1c_4_c9b745f7e3" y="432.0"/>
</g>
</g>
<g id="LineCollection_10">
@@ -17856,13 +17856,13 @@ L427.456 -292.961
L429.12 -294.604" id="C1d_2_d0f6186d9b"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1d_0_02d63d6905" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1d_0_02d63d6905" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1d_1_760e4d7c03" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1d_1_760e4d7c03" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1d_2_d0f6186d9b" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1d_2_d0f6186d9b" y="432.0"/>
</g>
</g>
<g id="LineCollection_11">
@@ -18177,13 +18177,13 @@ L428.365 -284.249
L429.12 -285.066" id="C1e_2_a1f4e877c3"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1e_0_0c3da5d93a" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1e_0_0c3da5d93a" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1e_1_0317df00f5" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1e_1_0317df00f5" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1e_2_a1f4e877c3" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1e_2_a1f4e877c3" y="432.0"/>
</g>
</g>
<g id="LineCollection_12">
@@ -18440,10 +18440,10 @@ L428.101 -272.632
L429.12 -273.995" id="C1f_1_bd3291e6d1"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1f_0_83140964db" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1f_0_83140964db" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C1f_1_bd3291e6d1" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C1f_1_bd3291e6d1" y="432.0"/>
</g>
</g>
<g id="LineCollection_13">
@@ -18654,10 +18654,10 @@ L428.974 -258.111
L429.12 -258.433" id="C20_1_648da092f8"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C20_0_be43a081e0" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C20_0_be43a081e0" y="432.0"/>
</g>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C20_1_648da092f8" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C20_1_648da092f8" y="432.0"/>
</g>
</g>
<g id="LineCollection_14">
@@ -18822,7 +18822,7 @@ L198.117 -191.314
L199.029 -191.142" id="C21_0_21e6ff2f4e"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C21_0_21e6ff2f4e" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C21_0_21e6ff2f4e" y="432.0"/>
</g>
</g>
<g id="LineCollection_15">
@@ -18955,7 +18955,7 @@ L192.945 -202.931
L194.236 -202.48" id="C22_0_79797abf35"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C22_0_79797abf35" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C22_0_79797abf35" y="432.0"/>
</g>
</g>
<g id="LineCollection_16">
@@ -19050,7 +19050,7 @@ L196.388 -214.548
L196.632 -214.456" id="C23_0_9466d794f7"/>
</defs>
<g clip-path="url(#pbb64507b19)">
- <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0" xlink:href="#C23_0_9466d794f7" y="432.0"/>
+ <use style="fill:none;stroke:#00bfbf;stroke-linecap:butt;stroke-width:2;" x="0.0" xlink:href="#C23_0_9466d794f7" y="432.0"/>
</g>
</g>
<g id="LineCollection_17">
@@ -19120,7 +19120,7 @@ Q53.9062 64.0156 53.9062 55.3281
Q53.9062 49.2656 50.4375 45.0938
Q46.9688 40.9219 40.5781 39.3125" id="BitstreamVeraSans-Roman-33"/>
</defs>
- <g transform="translate(64.27125 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(64.27125 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-2212"/>
<use x="83.7890625" xlink:href="#BitstreamVeraSans-Roman-33"/>
</g>
@@ -19164,7 +19164,7 @@ Q49.8594 40.875 45.4062 35.4062
Q44.1875 33.9844 37.6406 27.2188
Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/>
</defs>
- <g transform="translate(109.03125 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(109.03125 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-2212"/>
<use x="83.7890625" xlink:href="#BitstreamVeraSans-Roman-32"/>
</g>
@@ -19199,7 +19199,7 @@ L12.4062 0
z
" id="BitstreamVeraSans-Roman-31"/>
</defs>
- <g transform="translate(153.624375 401.54875)scale(0.12 -0.12)">
+ <g transform="translate(153.624375 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-2212"/>
<use x="83.7890625" xlink:href="#BitstreamVeraSans-Roman-31"/>
</g>
@@ -19239,7 +19239,7 @@ Q6.59375 17.9688 6.59375 36.375
Q6.59375 54.8281 13.0625 64.5156
Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/>
</defs>
- <g transform="translate(202.8965625 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(202.8965625 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
@@ -19257,7 +19257,7 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/>
</g>
<g id="text_5">
<!-- 1 -->
- <g transform="translate(247.955625 401.54875)scale(0.12 -0.12)">
+ <g transform="translate(247.955625 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
</g>
</g>
@@ -19275,7 +19275,7 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/>
</g>
<g id="text_6">
<!-- 2 -->
- <g transform="translate(292.423125 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(292.423125 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-32"/>
</g>
</g>
@@ -19293,7 +19293,7 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/>
</g>
<g id="text_7">
<!-- 3 -->
- <g transform="translate(336.9609375 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(336.9609375 401.918125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-33"/>
</g>
</g>