Fix baseline-alignment on multi-line text. (Reported by Olle Engdegård)

mdboom · mdboom · commit a1abdb3910e2 · 2010-06-07T14:23:58.000Z
svn path=/trunk/matplotlib/; revision=8393
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg b/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg
@@ -143,7 +143,7 @@ L518.400000 67.200000"/>
 <g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt;  opacity: 1.000000" xlink:href="#m9281cae24120827b11d5ea8a7ad3e96b" x="518.400000" y="43.200000"/>
 </g></g>
 <g id="text6">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(498.314062,401.706250)scale(0.120000)">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(498.314063,401.706250)scale(0.120000)">
 <use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115"/>
 <use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="63.623047"/>
 <use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="95.410156"/>
@@ -163,7 +163,7 @@ L518.400000 67.200000"/>
 <path id="c_0bce5afba2dc6b9024b26277c38ad8e8" d="M56.203125 -29.593750l0.000000 4.390625l-41.312500 0.000000q0.593750 9.281250 5.593750 14.140625q5.000000 4.859375 13.937500 4.859375q5.171875 0.000000 10.031250 -1.265625q4.859375 -1.265625 9.656250 -3.812500l0.000000 8.500000q-4.843750 2.046875 -9.921875 3.125000q-5.078125 1.078125 -10.296875 1.078125q-13.093750 0.000000 -20.734375 -7.609375q-7.640625 -7.625000 -7.640625 -20.625000q0.000000 -13.421875 7.250000 -21.296875q7.250000 -7.890625 19.562500 -7.890625q11.031250 0.000000 17.453125 7.109375q6.421875 7.093750 6.421875 19.296875M47.218750 -32.234375q-0.093750 -7.359375 -4.125000 -11.750000q-4.031250 -4.406250 -10.671875 -4.406250q-7.515625 0.000000 -12.031250 4.250000q-4.515625 4.250000 -5.203125 11.968750z"/>
 <path id="c_d41d8cd98f00b204e9800998ecf8427e" d=""/>
 </defs>
-<g style="fill: #000000; opacity: 1.000000" transform="translate(262.293750,416.003125)scale(0.120000)">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(262.121875,416.003125)scale(0.120000)">
 <use xlink:href="#c_801fe2e877fad46da27c898b407b3b54"/>
 <use xlink:href="#c_7b26b13f539f13a4c64eef23b6952d29" x="59.179688"/>
 <use xlink:href="#c_5099edb83619131346ae654950954dea" x="95.263672"/>
@@ -289,7 +289,7 @@ L518.400000 67.200000"/>
 <g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt;  opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="158.400000"/>
 </g></g>
 <g id="text14">
-<g style="fill: #000000; opacity: 1.000000" transform="translate(43.375000,162.767188)scale(0.120000)">
+<g style="fill: #000000; opacity: 1.000000" transform="translate(43.375000,162.767187)scale(0.120000)">
 <use xlink:href="#c_42baa63129a918535c52adb20d687ea7"/>
 <use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" x="63.623047"/>
 <use xlink:href="#c_ed3e21196fb739f392806f09ca0594ef" x="127.246094"/>
diff --git a/lib/matplotlib/tests/baseline_images/test_text/multiline.pdf b/lib/matplotlib/tests/baseline_images/test_text/multiline.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_text/multiline.png b/lib/matplotlib/tests/baseline_images/test_text/multiline.png
diff --git a/lib/matplotlib/tests/baseline_images/test_text/multiline.svg b/lib/matplotlib/tests/baseline_images/test_text/multiline.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created with matplotlib (http://matplotlib.sourceforge.net/) -->
+<svg width="576pt" height="432pt" viewBox="0 0 576 432"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="svg1">
+<filter id="colorAdd"><feComposite in="SourceGraphic" in2="BackgroundImage" operator="arithmetic" k2="1" k3="1"/></filter>
+<g id="figure1">
+<g id="patch1">
+<path style="fill: #ffffff; stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square;  opacity: 1.000000"  d="M0.000000 432.000000L576.000000 432.000000L576.000000 0.000000
+L0.000000 0.000000L0.000000 432.000000"/>
+</g>
+<g id="axes1">
+<g id="patch2">
+<path style="fill: #ffffff; opacity: 1.000000"  d="M72.000000 388.800000L518.400000 388.800000L518.400000 43.200000
+L72.000000 43.200000L72.000000 388.800000"/>
+</g>
+<g id="matplotlib.axis1">
+</g>
+<g id="matplotlib.axis2">
+</g>
+<g id="patch3">
+<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square;  opacity: 1.000000"  d="M72.000000 43.200000L518.400000 43.200000"/>
+</g>
+<g id="patch4">
+<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square;  opacity: 1.000000"  d="M518.400000 388.800000L518.400000 43.200000"/>
+</g>
+<g id="patch5">
+<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square;  opacity: 1.000000"  d="M72.000000 388.800000L518.400000 388.800000"/>
+</g>
+<g id="patch6">
+<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square;  opacity: 1.000000"  d="M72.000000 388.800000L72.000000 43.200000"/>
+</g>
+<g id="text1">
+<defs>
+<path id="c_4653c6dfde66c7610eae0911760d3490" d="M52.000000 -44.187500q3.375000 -6.062500 8.062500 -8.937500q4.687500 -2.875000 11.031250 -2.875000q8.546875 0.000000 13.187500 5.984375q4.640625 5.968750 4.640625 17.000000l0.000000 33.015625l-9.031250 0.000000l0.000000 -32.718750q0.000000 -7.859375 -2.796875 -11.656250q-2.781250 -3.812500 -8.484375 -3.812500q-6.984375 0.000000 -11.046875 4.640625q-4.046875 4.625000 -4.046875 12.640625l0.000000 30.906250l-9.031250 0.000000l0.000000 -32.718750q0.000000 -7.906250 -2.781250 -11.687500q-2.781250 -3.781250 -8.593750 -3.781250q-6.890625 0.000000 -10.953125 4.656250q-4.046875 4.656250 -4.046875 12.625000l0.000000 30.906250l-9.031250 0.000000l0.000000 -54.687500l9.031250 0.000000l0.000000 8.500000q3.078125 -5.031250 7.375000 -7.421875q4.296875 -2.390625 10.203125 -2.390625q5.968750 0.000000 10.140625 3.031250q4.171875 3.015625 6.171875 8.781250"/>
+<path id="c_c438d87e693443c2861ebd6359e6491e" d="M8.500000 -21.578125l0.000000 -33.109375l8.984375 0.000000l0.000000 32.765625q0.000000 7.765625 3.015625 11.656250q3.031250 3.875000 9.093750 3.875000q7.265625 0.000000 11.484375 -4.640625q4.234375 -4.640625 4.234375 -12.656250l0.000000 -31.000000l8.984375 0.000000l0.000000 54.687500l-8.984375 0.000000l0.000000 -8.406250q-3.265625 4.984375 -7.593750 7.406250q-4.312500 2.421875 -10.031250 2.421875q-9.421875 0.000000 -14.312500 -5.859375q-4.875000 -5.859375 -4.875000 -17.140625"/>
+<path id="c_5099edb83619131346ae654950954dea" d="M9.421875 -75.984375l8.984375 0.000000l0.000000 75.984375l-8.984375 0.000000z"/>
+<path id="c_0f8c41144cfbf448378cb6fd1cc8e549" d="M18.312500 -70.218750l0.000000 15.531250l18.500000 0.000000l0.000000 6.984375l-18.500000 0.000000l0.000000 29.687500q0.000000 6.687500 1.828125 8.593750q1.828125 1.906250 7.453125 1.906250l9.218750 0.000000l0.000000 7.515625l-9.218750 0.000000q-10.406250 0.000000 -14.359375 -3.875000q-3.953125 -3.890625 -3.953125 -14.140625l0.000000 -29.687500l-6.593750 0.000000l0.000000 -6.984375l6.593750 0.000000l0.000000 -15.531250z"/>
+<path id="c_6a63bda47b2f3da1cec6aadd80692cfe" d="M9.421875 -54.687500l8.984375 0.000000l0.000000 54.687500l-8.984375 0.000000zM9.421875 -75.984375l8.984375 0.000000l0.000000 11.390625l-8.984375 0.000000z"/>
+<path id="c_fe791a90f5471e2ab20a5ed41a7fa451" d="M54.890625 -33.015625l0.000000 33.015625l-8.984375 0.000000l0.000000 -32.718750q0.000000 -7.765625 -3.031250 -11.609375q-3.031250 -3.859375 -9.078125 -3.859375q-7.281250 0.000000 -11.484375 4.640625q-4.203125 4.625000 -4.203125 12.640625l0.000000 30.906250l-9.031250 0.000000l0.000000 -54.687500l9.031250 0.000000l0.000000 8.500000q3.234375 -4.937500 7.593750 -7.375000q4.375000 -2.437500 10.093750 -2.437500q9.421875 0.000000 14.250000 5.828125q4.843750 5.828125 4.843750 17.156250"/>
+<path id="c_0bce5afba2dc6b9024b26277c38ad8e8" d="M56.203125 -29.593750l0.000000 4.390625l-41.312500 0.000000q0.593750 9.281250 5.593750 14.140625q5.000000 4.859375 13.937500 4.859375q5.171875 0.000000 10.031250 -1.265625q4.859375 -1.265625 9.656250 -3.812500l0.000000 8.500000q-4.843750 2.046875 -9.921875 3.125000q-5.078125 1.078125 -10.296875 1.078125q-13.093750 0.000000 -20.734375 -7.609375q-7.640625 -7.625000 -7.640625 -20.625000q0.000000 -13.421875 7.250000 -21.296875q7.250000 -7.890625 19.562500 -7.890625q11.031250 0.000000 17.453125 7.109375q6.421875 7.093750 6.421875 19.296875M47.218750 -32.234375q-0.093750 -7.359375 -4.125000 -11.750000q-4.031250 -4.406250 -10.671875 -4.406250q-7.515625 0.000000 -12.031250 4.250000q-4.515625 4.250000 -5.203125 11.968750z"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(264.887500,21.943750)scale(0.144000)">
+<use xlink:href="#c_4653c6dfde66c7610eae0911760d3490"/>
+<use xlink:href="#c_c438d87e693443c2861ebd6359e6491e" x="97.412109"/>
+<use xlink:href="#c_5099edb83619131346ae654950954dea" x="160.791016"/>
+<use xlink:href="#c_0f8c41144cfbf448378cb6fd1cc8e549" x="188.574219"/>
+<use xlink:href="#c_6a63bda47b2f3da1cec6aadd80692cfe" x="227.783203"/>
+<use xlink:href="#c_5099edb83619131346ae654950954dea" x="255.566406"/>
+<use xlink:href="#c_6a63bda47b2f3da1cec6aadd80692cfe" x="283.349609"/>
+<use xlink:href="#c_fe791a90f5471e2ab20a5ed41a7fa451" x="311.132813"/>
+<use xlink:href="#c_0bce5afba2dc6b9024b26277c38ad8e8" x="374.511719"/>
+</g>
+<defs>
+<path id="c_801fe2e877fad46da27c898b407b3b54" d="M54.890625 -54.687500l-19.781250 26.609375l20.796875 28.078125l-10.593750 0.000000l-15.921875 -21.484375l-15.906250 21.484375l-10.609375 0.000000l21.250000 -28.609375l-19.437500 -26.078125l10.593750 0.000000l14.500000 19.484375l14.500000 -19.484375z"/>
+<path id="c_d41d8cd98f00b204e9800998ecf8427e" d=""/>
+<path id="c_01d93a582460e35a7945ca50d148ffeb" d="M34.281250 -27.484375q-10.890625 0.000000 -15.093750 2.484375q-4.203125 2.484375 -4.203125 8.500000q0.000000 4.781250 3.156250 7.593750q3.156250 2.796875 8.562500 2.796875q7.484375 0.000000 12.000000 -5.296875q4.515625 -5.296875 4.515625 -14.078125l0.000000 -2.000000zM52.203125 -31.203125l0.000000 31.203125l-8.984375 0.000000l0.000000 -8.296875q-3.078125 4.968750 -7.671875 7.343750q-4.593750 2.375000 -11.234375 2.375000q-8.390625 0.000000 -13.359375 -4.718750q-4.953125 -4.718750 -4.953125 -12.625000q0.000000 -9.218750 6.171875 -13.906250q6.187500 -4.687500 18.437500 -4.687500l12.609375 0.000000l0.000000 -0.890625q0.000000 -6.203125 -4.078125 -9.593750q-4.078125 -3.390625 -11.453125 -3.390625q-4.687500 0.000000 -9.140625 1.125000q-4.437500 1.125000 -8.531250 3.375000l0.000000 -8.312500q4.921875 -1.906250 9.562500 -2.843750q4.640625 -0.953125 9.031250 -0.953125q11.875000 0.000000 17.734375 6.156250q5.859375 6.140625 5.859375 18.640625"/>
+<path id="c_e3864de5dabf2f8dd9eee74726882ec1" d="M45.406250 -27.984375q0.000000 -9.765625 -4.031250 -15.125000q-4.015625 -5.375000 -11.296875 -5.375000q-7.218750 0.000000 -11.250000 5.375000q-4.031250 5.359375 -4.031250 15.125000q0.000000 9.718750 4.031250 15.093750q4.031250 5.375000 11.250000 5.375000q7.281250 0.000000 11.296875 -5.375000q4.031250 -5.375000 4.031250 -15.093750M54.390625 -6.781250q0.000000 13.953125 -6.203125 20.765625q-6.187500 6.812500 -18.984375 6.812500q-4.734375 0.000000 -8.937500 -0.703125q-4.203125 -0.703125 -8.156250 -2.171875l0.000000 -8.734375q3.953125 2.140625 7.812500 3.156250q3.859375 1.031250 7.859375 1.031250q8.843750 0.000000 13.234375 -4.609375q4.390625 -4.609375 4.390625 -13.937500l0.000000 -4.453125q-2.781250 4.843750 -7.125000 7.234375q-4.343750 2.390625 -10.406250 2.390625q-10.046875 0.000000 -16.203125 -7.656250q-6.156250 -7.671875 -6.156250 -20.328125q0.000000 -12.687500 6.156250 -20.343750q6.156250 -7.671875 16.203125 -7.671875q6.062500 0.000000 10.406250 2.390625q4.343750 2.390625 7.125000 7.218750l0.000000 -8.296875l8.984375 0.000000z"/>
+</defs>
+<g style="fill: #000000; opacity: 1.000000" transform="translate(242.567187,38.200000)scale(0.144000)">
+<use xlink:href="#c_0f8c41144cfbf448378cb6fd1cc8e549"/>
+<use xlink:href="#c_0bce5afba2dc6b9024b26277c38ad8e8" x="39.208984"/>
+<use xlink:href="#c_801fe2e877fad46da27c898b407b3b54" x="98.982422"/>
+<use xlink:href="#c_0f8c41144cfbf448378cb6fd1cc8e549" x="158.162109"/>
+<use xlink:href="#c_d41d8cd98f00b204e9800998ecf8427e" x="197.371094"/>
+<use xlink:href="#c_01d93a582460e35a7945ca50d148ffeb" x="229.158203"/>
+<use xlink:href="#c_5099edb83619131346ae654950954dea" x="290.437500"/>
+<use xlink:href="#c_6a63bda47b2f3da1cec6aadd80692cfe" x="318.220703"/>
+<use xlink:href="#c_e3864de5dabf2f8dd9eee74726882ec1" x="346.003906"/>
+<use xlink:href="#c_fe791a90f5471e2ab20a5ed41a7fa451" x="409.480469"/>
+<use xlink:href="#c_4653c6dfde66c7610eae0911760d3490" x="472.859375"/>
+<use xlink:href="#c_0bce5afba2dc6b9024b26277c38ad8e8" x="570.271484"/>
+<use xlink:href="#c_fe791a90f5471e2ab20a5ed41a7fa451" x="631.794922"/>
+<use xlink:href="#c_0f8c41144cfbf448378cb6fd1cc8e549" x="695.173828"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -64,3 +64,13 @@ def test_font_styles():
 
     fig.savefig('font_styles')
 
+@image_comparison(baseline_images=['multiline'])
+def test_multiline():
+    fig = plt.figure()
+    ax = plt.subplot( 1, 1, 1 )
+    ax.set_title("multiline\ntext alignment")
+
+    ax.set_xticks([])
+    ax.set_yticks([])
+
+    fig.savefig('multiline')
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -298,7 +298,7 @@ def get_text_width_height_descent(*kl, **kwargs):
                                                          ismath=False)
         offsety = lp_h * self._linespacing
 
-        baseline = None
+        baseline = 0
         for i, line in enumerate(lines):
             clean_line, ismath = self.is_math_text(line)
             if clean_line:
@@ -308,8 +308,6 @@ def get_text_width_height_descent(*kl, **kwargs):
             else:
                 w, h, d = 0, 0, 0
 
-            if baseline is None:
-                baseline = h - d
             whs[i] = w, h
 
             # For general multiline text, we will have a fixed spacing
@@ -326,9 +324,11 @@ def get_text_width_height_descent(*kl, **kwargs):
 
             horizLayout[i] = thisx, thisy-(d + d_yoffset), \
                              w, h
+            baseline = (h - d) - thisy
             thisy -= offsety + d_yoffset
             width = max(width, w)
 
+
         ymin = horizLayout[-1][1]
         ymax = horizLayout[0][1] + horizLayout[0][3]
         height = ymax-ymin
