From 592a6ca3216e89d481892b245d052d071610eea7 Mon Sep 17 00:00:00 2001 From: Nelle Varoquaux <nelle.varoquaux@gmail.com> Date: Mon, 6 Mar 2017 20:10:10 -0800 Subject: [PATCH 1/4] DOC moved autowarp_demo to sphinx-gallery compatible docstring --- examples/text_labels_and_annotations/autowrap_demo.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/examples/text_labels_and_annotations/autowrap_demo.py b/examples/text_labels_and_annotations/autowrap_demo.py index d56e18f3f86f..e71759c79baf 100644 --- a/examples/text_labels_and_annotations/autowrap_demo.py +++ b/examples/text_labels_and_annotations/autowrap_demo.py @@ -1,5 +1,11 @@ """ -Auto-wrapping text demo. +================== +Auto-wrapping text +================== + +Matplotlib can wrap text automatically, but if it's too long, the text will be +displayed slightly outside of the boundaries of the axis anyways. + """ import matplotlib.pyplot as plt @@ -12,7 +18,7 @@ plt.text(6, 5, t, ha='left', rotation=15, wrap=True) plt.text(5, 5, t, ha='right', rotation=-15, wrap=True) plt.text(5, 10, t, fontsize=18, style='oblique', ha='center', - va='top', wrap=True) + va='top', wrap=True) plt.text(3, 4, t, family='serif', style='italic', ha='right', wrap=True) plt.text(-1, 0, t, ha='left', rotation=-15, wrap=True) From ed1a1a5ff0ed5b02d20cbdd87e6ae333d7828690 Mon Sep 17 00:00:00 2001 From: Nelle Varoquaux <nelle.varoquaux@gmail.com> Date: Mon, 6 Mar 2017 20:10:21 -0800 Subject: [PATCH 2/4] DOC moved text_demo_fontdict to sphinx-gallery compatible docstring --- .../text_labels_and_annotations/text_demo_fontdict.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/text_labels_and_annotations/text_demo_fontdict.py b/examples/text_labels_and_annotations/text_demo_fontdict.py index ae35d222b8d3..1cc0c466255f 100644 --- a/examples/text_labels_and_annotations/text_demo_fontdict.py +++ b/examples/text_labels_and_annotations/text_demo_fontdict.py @@ -1,5 +1,11 @@ """ -Demo using fontdict to control style of text and labels. +======================================================= +Controlling style of text and labels using a dictionary +======================================================= + + +This example shows how to share parameters across many text objects and labels +by creating a dictionnary of options passed across several functions. """ import numpy as np import matplotlib.pyplot as plt From 269b42d770f61eceedd392a188c97774d96f0742 Mon Sep 17 00:00:00 2001 From: Nelle Varoquaux <nelle.varoquaux@gmail.com> Date: Mon, 6 Mar 2017 20:25:19 -0800 Subject: [PATCH 3/4] DOC FIX removed a blank line from an example --- examples/text_labels_and_annotations/text_demo_fontdict.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/text_labels_and_annotations/text_demo_fontdict.py b/examples/text_labels_and_annotations/text_demo_fontdict.py index 1cc0c466255f..c3594d2bef81 100644 --- a/examples/text_labels_and_annotations/text_demo_fontdict.py +++ b/examples/text_labels_and_annotations/text_demo_fontdict.py @@ -3,9 +3,8 @@ Controlling style of text and labels using a dictionary ======================================================= - This example shows how to share parameters across many text objects and labels -by creating a dictionnary of options passed across several functions. +by creating a dictionary of options passed across several functions. """ import numpy as np import matplotlib.pyplot as plt From 48e608fb4c590c236835c6617a36bc69f45aae9b Mon Sep 17 00:00:00 2001 From: Nelle Varoquaux <nelle.varoquaux@gmail.com> Date: Tue, 7 Mar 2017 10:57:33 -0800 Subject: [PATCH 4/4] DOC removed/added blankspace --- examples/text_labels_and_annotations/autowrap_demo.py | 2 +- examples/text_labels_and_annotations/text_demo_fontdict.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/text_labels_and_annotations/autowrap_demo.py b/examples/text_labels_and_annotations/autowrap_demo.py index e71759c79baf..fa6080b70c5b 100644 --- a/examples/text_labels_and_annotations/autowrap_demo.py +++ b/examples/text_labels_and_annotations/autowrap_demo.py @@ -5,8 +5,8 @@ Matplotlib can wrap text automatically, but if it's too long, the text will be displayed slightly outside of the boundaries of the axis anyways. - """ + import matplotlib.pyplot as plt fig = plt.figure() diff --git a/examples/text_labels_and_annotations/text_demo_fontdict.py b/examples/text_labels_and_annotations/text_demo_fontdict.py index c3594d2bef81..ad6fa8cc972b 100644 --- a/examples/text_labels_and_annotations/text_demo_fontdict.py +++ b/examples/text_labels_and_annotations/text_demo_fontdict.py @@ -6,6 +6,7 @@ This example shows how to share parameters across many text objects and labels by creating a dictionary of options passed across several functions. """ + import numpy as np import matplotlib.pyplot as plt