SF.net SVN: matplotlib:[8393] trunk/matplotlib/lib/matplotlib

[<md...@us...>]

Revision: 8393
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8393&view=rev
Author:   mdboom
Date:     2010-06-07 14:23:58 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
Fix baseline-alignment on multi-line text.  (Reported by Olle Engdeg?\195?\165rd)

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg
    trunk/matplotlib/lib/matplotlib/tests/test_text.py
    trunk/matplotlib/lib/matplotlib/text.py

Added Paths:
-----------
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_text/multiline.pdf
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_text/multiline.png
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_text/multiline.svg

Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg	2010-06-07 13:04:24 UTC (rev 8392)
+++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg	2010-06-07 14:23:58 UTC (rev 8393)
@@ -143,7 +143,7 @@
 <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 @@
 <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 @@
 <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"/>

Added: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_text/multiline.pdf
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_text/multiline.pdf	                        (rev 0)
+++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_text/multiline.pdf	2010-06-07 14:23:58 UTC (rev 8393)
@@ -0,0 +1,194 @@
+%PDF-1.4
+%\xAC\xDC \xAB\xBA
+1 0 obj
+<< /Type /Catalog /Pages 2 0 R >>
+endobj
+8 0 obj
+<< /XObject 7 0 R /Pattern 5 0 R
+/ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] /ExtGState 4 0 R
+/Shading 6 0 R /Font 3 0 R >>
+endobj
+10 0 obj
+<< /Contents 9 0 R /Type /Page /Resources 8 0 R /Parent 2 0 R
+/MediaBox [ 0 0 576 432 ] >>
+endobj
+9 0 obj
+<< /Filter /FlateDecode /Length 11 0 R >>
+stream
+x\x9Cm\x8F=\xC20\x85w\x9F\xC2#,!\xCE_\xC3Z	*\xB1\x92 \xD1VEI\xA7 8>.ڪ\x91\x9F\xFD\xDEg+\x847PxB–_%&\xB4\x85\xE3\xDF\xD5h\xC5J\xFE*ϡ\xE4܃U\x85bC\xA8\x81!/\xCC\xD8\xC4O\xA3\xBD\x9E;\xCD\xE4\x81h\xDA1\xDAi\xC9\xC1fK\xD7\xE6\xFF\xDBc\xBA\xCCc\xC9\xFF\x94\xD8Bpw$$\xC3Lh@9#\xBC/,\x92BZ\xA7,\x86+l\xD2=\xE6.v}\xBD\xC5p\xC3CXaF	\xEB
+H\xBD\xD7|c\xA0r\xFD\xCCx\x89]ۧ\xBA\xCF_^]\x9FL
+endstream
+endobj
+11 0 obj
+185
+endobj
+16 0 obj
+<< /Filter /FlateDecode /Length 304 >>
+stream
+x\x9C=\x92;\x92\xC30C{\x9D\x82Ȍ\xF8\x93\xE4\xF3d'\x95\xF7\xFE\xED>2\xC9V\x80I\x89