From 0cd6e872b5cf031d3fdded9480d7f5307663b351 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 29 Mar 2019 10:50:07 +0000 Subject: [PATCH] Backport PR #13762: Cleanup marker_reference example. --- .../marker_reference.py | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/examples/lines_bars_and_markers/marker_reference.py b/examples/lines_bars_and_markers/marker_reference.py index c275f5d503f5..fb84d6077326 100644 --- a/examples/lines_bars_and_markers/marker_reference.py +++ b/examples/lines_bars_and_markers/marker_reference.py @@ -28,15 +28,6 @@ def format_axes(ax): ax.invert_yaxis() -def nice_repr(text): - return repr(text).lstrip('u') - - -def math_repr(text): - tx = repr(text).lstrip('u').strip("'").strip("$") - return r"'\${}\$'".format(tx) - - def split_list(a_list): i_half = len(a_list) // 2 return (a_list[:i_half], a_list[i_half:]) @@ -46,7 +37,6 @@ def split_list(a_list): # Filled and unfilled-marker types # ================================ # -# # Plot all un-filled markers fig, axes = plt.subplots(ncols=2) @@ -58,9 +48,9 @@ def split_list(a_list): for ax, markers in zip(axes, split_list(unfilled_markers)): for y, marker in enumerate(markers): - ax.text(-0.5, y, nice_repr(marker), **text_style) + ax.text(-0.5, y, repr(marker), **text_style) ax.plot(y * points, marker=marker, **marker_style) - format_axes(ax) + format_axes(ax) plt.show() @@ -71,9 +61,9 @@ def split_list(a_list): fig, axes = plt.subplots(ncols=2) for ax, markers in zip(axes, split_list(Line2D.filled_markers)): for y, marker in enumerate(markers): - ax.text(-0.5, y, nice_repr(marker), **text_style) + ax.text(-0.5, y, repr(marker), **text_style) ax.plot(y * points, marker=marker, **marker_style) - format_axes(ax) + format_axes(ax) fig.suptitle('filled markers', fontsize=14) plt.show() @@ -83,7 +73,6 @@ def split_list(a_list): # Custom Markers with MathText # ============================ # -# # Use :doc:`MathText `, to use custom marker symbols, # like e.g. ``"$\u266B$"``. For an overview over the STIX font symbols refer # to the `STIX font table `_. @@ -99,8 +88,10 @@ def split_list(a_list): for y, marker in enumerate(markers): - ax.text(-0.5, y, math_repr(marker), **text_style) + # Escape dollars so that the text is written "as is", not as mathtext. + ax.text(-0.5, y, repr(marker).replace("$", r"\$"), **text_style) ax.plot(y * points, marker=marker, **marker_style) format_axes(ax) +fig.suptitle('mathtext markers', fontsize=14) plt.show()