Merge remote branch 'upstream/v1.1.x'

pelson · pelson · commit ea3c539cf08f · 2012-06-06T18:27:30.000+01:00
* upstream/v1.1.x: Pass ints to Tk.Canvas.create_image Backport #920 to the v1.1.x branch Add info about installing from source using Pip. Closes #646. Fixed string concatenation. . Ported fix from #910 Install the mpltest.ttf file Remove PNG from the test_ttconv test -- it doesn't seem to work across freetype versions, and also it doesn't actually test ttconv, wihch is not used by the Agg backend. Move test font inside test directory Add a test case for ttconv Fix TrueType to Type-3 font conversion Fix bug when resizing qt4 figure window.
diff --git a/README.txt b/README.txt
@@ -13,6 +13,12 @@ for all these packages are available here:
 
   <http://pythonmac.org/packages/py25-fat/index.html>.
 
+*** Setup from source using Pip ***
+
+::
+
+    pip install -e https://github.com/matplotlib/matplotlib.git#egg=Package
+
 *** Back Ends ***
 
 You may use TkAgg or WXAgg back ends; Qt and GTK support is not
@@ -43,4 +49,3 @@ interactive  : False    # see http://matplotlib.sourceforge.net/interactive.html
 
 See also
 <http://matplotlib.sourceforge.net/users/customizing.html>
-
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -360,7 +360,9 @@ def __init__( self, canvas, num ):
         # requested size:
         cs = canvas.sizeHint()
         sbs = self.window.statusBar().sizeHint()
-        self.window.resize(cs.width(), cs.height()+tbs_height+sbs.height())
+        self._status_and_tool_height = tbs_height+sbs.height()
+        height = cs.height() + self._status_and_tool_height
+        self.window.resize(cs.width(), height)
 
         self.window.setCentralWidget(self.canvas)
 
@@ -406,7 +408,7 @@ def _get_toolbar(self, canvas, parent):
 
     def resize(self, width, height):
         'set the canvas size in pixels'
-        self.window.resize(width, height)
+        self.window.resize(width, height + self._status_and_tool_height)
 
     def show(self):
         self.window.show()
diff --git a/lib/matplotlib/tests/baseline_images/test_ttconv/truetype-conversion.pdf b/lib/matplotlib/tests/baseline_images/test_ttconv/truetype-conversion.pdf
diff --git a/lib/matplotlib/tests/mpltest.ttf b/lib/matplotlib/tests/mpltest.ttf
diff --git a/lib/matplotlib/tests/test_ttconv.py b/lib/matplotlib/tests/test_ttconv.py
@@ -0,0 +1,18 @@
+import matplotlib
+from matplotlib.font_manager import FontProperties
+from matplotlib.testing.decorators import image_comparison
+import matplotlib.pyplot as plt
+import os.path
+
+@image_comparison(baseline_images=["truetype-conversion"],
+                  extensions=["pdf"])
+def test_truetype_conversion():
+    fontname = os.path.join(os.path.dirname(__file__), 'mpltest.ttf')
+    fontname = os.path.abspath(fontname)
+    fontprop = FontProperties(fname=fontname, size=80)
+    matplotlib.rcParams['pdf.fonttype'] = 3
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.text(0, 0, "ABCDE", fontproperties=fontprop)
+    ax.set_xticks([])
+    ax.set_yticks([])
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -537,7 +537,7 @@ def _formatSciNotation(self, s):
         # transform 1e+004 into 1e4, for example
         if self._useLocale:
             decimal_point = locale.localeconv()['decimal_point']
-            positive = locale.localeconv()['positive_sign']
+            positive_sign = locale.localeconv()['positive_sign']
         else:
             decimal_point = '.'
             positive_sign = '+'
@@ -823,8 +823,10 @@ def __call__(self):
     def raise_if_exceeds(self, locs):
         'raise a RuntimeError if Locator attempts to create more than MAXTICKS locs'
         if len(locs)>=self.MAXTICKS:
-           raise RuntimeError('Locator attempting to generate %d ticks from %s to %s: exceeds Locator.MAXTICKS'%(len(locs), locs[0], locs[-1]))
-
+            msg = ('Locator attempting to generate %d ticks from %s to %s: ' +
+                   'exceeds Locator.MAXTICKS') % (len(locs), locs[0], locs[-1]) 
+            raise RuntimeError(msg) 
+                                
         return locs
 
     def view_limits(self, vmin, vmax):
diff --git a/setup.py b/setup.py
@@ -118,6 +118,7 @@ def chop_package(fname):
         return result
     baseline_images = [chop_package(f) for f in baseline_images]
     package_data['matplotlib'].extend(baseline_images)
+    package_data['matplotlib'].append('tests/mpltest.ttf')
 
 if not check_for_numpy(__version__numpy__):
     sys.exit(1)
diff --git a/ttconv/pprdrv_tt2.cpp b/ttconv/pprdrv_tt2.cpp
@@ -41,6 +41,7 @@
 #include "truetype.h"
 #include <algorithm>
 #include <stack>
+#include <list>
 
 class GlyphToType3
 {
@@ -73,7 +74,10 @@ class GlyphToType3
     int nextoutctr(int co);
     int nearout(int ci);
     double intest(int co, int ci);
-    void PSCurveto(TTStreamWriter& stream, FWord x, FWord y, int s, int t);
+    void PSCurveto(TTStreamWriter& stream,
+                   FWord x0, FWord y0,
+                   FWord x1, FWord y1,
+                   FWord x2, FWord y2);
     void PSMoveto(TTStreamWriter& stream, int x, int y);
     void PSLineto(TTStreamWriter& stream, int x, int y);
     void do_composite(TTStreamWriter& stream, struct TTFONT *font, BYTE *glyph);
@@ -83,6 +87,18 @@ class GlyphToType3
     ~GlyphToType3();
 };
 
+// Each point on a TrueType contour is either on the path or off it (a
+// control point); here's a simple representation for building such
+// contours. Added by Jouni Seppänen 2012-05-27.
+enum Flag { ON_PATH, OFF_PATH };
+struct FlaggedPoint
+{
+    enum Flag flag;
+    FWord x;
+    FWord y;
+    FlaggedPoint(Flag flag_, FWord x_, FWord y_): flag(flag_), x(x_), y(y_) {};
+};
+
 double area(FWord *x, FWord *y, int n);
 #define sqr(x) ((x)*(x))
 
@@ -150,8 +166,7 @@ double area(FWord *x, FWord *y, int n)
 */
 void GlyphToType3::PSConvert(TTStreamWriter& stream)
 {
-    int i,j,k,fst,start_offpt;
-    int end_offpt = 0;
+    int i,j,k;
 
     assert(area_ctr == NULL);
     area_ctr=(double*)calloc(num_ctr, sizeof(double));
@@ -191,56 +206,79 @@ void GlyphToType3::PSConvert(TTStreamWriter& stream)
     i=j=k=0;
     while ( i < num_ctr )
     {
-        fst = j = (k==0) ? 0 : (epts_ctr[k-1]+1);
+        // A TrueType contour consists of on-path and off-path points.
+        // Two consecutive on-path points are to be joined with a
+        // line; off-path points between on-path points indicate a
+        // quadratic spline, where the off-path point is the control
+        // point. Two consecutive off-path points have an implicit
+        // on-path point midway between them.
+        std::list<FlaggedPoint> points;
 
-        /* Move to the first point on the contour. */
-        stack(stream, 3);
-        PSMoveto(stream,xcoor[j],ycoor[j]);
-
-        start_offpt = 0;                /* No off curve points yet. */
-
-        /* Step thru the remaining points of this contour. */
-        for (j++; j <= epts_ctr[k]; j++)
+        // Represent flags and x/y coordinates as a C++ list
+        for (; j <= epts_ctr[k]; j++)
         {
-            if (!(tt_flags[j]&1))       /* Off curve */
-            {
-                if (!start_offpt)
-                {
-                    start_offpt = end_offpt = j;
-                }
-                else
-                {
-                    end_offpt++;
-                }
+            if (!(tt_flags[j] & 1)) {
+                points.push_back(FlaggedPoint(OFF_PATH, xcoor[j], ycoor[j]));
+            } else {
+                points.push_back(FlaggedPoint(ON_PATH, xcoor[j], ycoor[j]));
             }
-            else
+        }
+
+        // For any two consecutive off-path points, insert the implied
+        // on-path point.
+        FlaggedPoint prev = points.back();
+        for (std::list<FlaggedPoint>::iterator it = points.begin();
+             it != points.end();
+             it++)
+        {
+            if (prev.flag == OFF_PATH && it->flag == OFF_PATH)
             {
-                /* On Curve */
-                if (start_offpt)
-                {
-                    stack(stream, 7);
-                    PSCurveto(stream, xcoor[j],ycoor[j],start_offpt,end_offpt);
-                    start_offpt = 0;
-                }
-                else
-                {
-                    stack(stream, 3);
-                    PSLineto(stream, xcoor[j], ycoor[j]);
-                }
+                points.insert(it,
+                              FlaggedPoint(ON_PATH,
+                                           (prev.x + it->x) / 2,
+                                           (prev.y + it->y) / 2));
             }
+            prev = *it;
         }
-
-        /* Do the final curve or line */
-        /* of this coutour. */
-        if (start_offpt)
+        // Handle the wrap-around: insert a point either at the beginning
+        // or at the end that has the same coordinates as the opposite point.
+        // This also ensures that the initial point is ON_PATH.
+        if (points.front().flag == OFF_PATH)
         {
-            stack(stream, 7);
-            PSCurveto(stream, xcoor[fst],ycoor[fst],start_offpt,end_offpt);
+            assert(points.back().flag == ON_PATH);
+            points.insert(points.begin(), points.back());
         }
         else
         {
-            stack(stream, 3);
-            PSLineto(stream, xcoor[fst],ycoor[fst]);
+            assert(points.front().flag == ON_PATH);
+            points.push_back(points.front());
+        }
+
+        // For output, a vector is more convenient than a list.
+        std::vector<FlaggedPoint> points_v(points.begin(), points.end());
+        // The first point
+        stack(stream, 3);
+        PSMoveto(stream, points_v.front().x, points_v.front().y);
+
+        // Step through the remaining points
+        for (size_t p = 1; p < points_v.size(); )
+        {
+            const FlaggedPoint& point = points_v.at(p);
+            if (point.flag == ON_PATH)
+            {
+                stack(stream, 3);
+                PSLineto(stream, point.x, point.y);
+                p++;
+            } else {
+                assert(points_v.at(p-1).flag == ON_PATH);
+                assert(points_v.at(p+1).flag == ON_PATH);
+                stack(stream, 7);
+                PSCurveto(stream,
+                          points_v.at(p-1).x, points_v.at(p-1).y,
+                          point.x, point.y,
+                          points_v.at(p+1).x, points_v.at(p+1).y);
+                p += 2;
+            }
         }
 
         k=nextinctr(i,k);
@@ -392,36 +430,34 @@ void GlyphToType3::PSLineto(TTStreamWriter& stream, int x, int y)
 }
 
 /*
-** Emmit a PostScript "curveto" command.
+** Emit a PostScript "curveto" command, assuming the current point
+** is (x0, y0), the control point of a quadratic spline is (x1, y1),
+** and the endpoint is (x2, y2). Note that this requires a conversion,
+** since PostScript splines are cubic.
 */
-void GlyphToType3::PSCurveto(TTStreamWriter& stream, FWord x, FWord y, int s, int t)
+void GlyphToType3::PSCurveto(TTStreamWriter& stream,
+                             FWord x0, FWord y0,
+                             FWord x1, FWord y1,
+                             FWord x2, FWord y2)
 {
-    int N, i;
-    double sx[3], sy[3], cx[4], cy[4];
-
-    N = t-s+2;
-    for (i=0; i<N-1; i++)
-    {
-        sx[0] = i==0?xcoor[s-1]:(xcoor[i+s]+xcoor[i+s-1])/2;
-        sy[0] = i==0?ycoor[s-1]:(ycoor[i+s]+ycoor[i+s-1])/2;
-        sx[1] = xcoor[s+i];
-        sy[1] = ycoor[s+i];
-        sx[2] = i==N-2?x:(xcoor[s+i]+xcoor[s+i+1])/2;
-        sy[2] = i==N-2?y:(ycoor[s+i]+ycoor[s+i+1])/2;
-        cx[3] = sx[2];
-        cy[3] = sy[2];
-        cx[1] = (2*sx[1]+sx[0])/3;
-        cy[1] = (2*sy[1]+sy[0])/3;
-        cx[2] = (sx[2]+2*sx[1])/3;
-        cy[2] = (sy[2]+2*sy[1])/3;
-
-        stream.printf(pdf_mode ?
-                      "%d %d %d %d %d %d c\n" :
-                      "%d %d %d %d %d %d _c\n",
-                      (int)cx[1], (int)cy[1], (int)cx[2], (int)cy[2],
-                      (int)cx[3], (int)cy[3]);
-    }
-} /* end of PSCurveto() */
+    double sx[3], sy[3], cx[3], cy[3];
+
+    sx[0] = x0;
+    sy[0] = y0;
+    sx[1] = x1;
+    sy[1] = y1;
+    sx[2] = x2;
+    sy[2] = y2;
+    cx[0] = (2*sx[1]+sx[0])/3;
+    cy[0] = (2*sy[1]+sy[0])/3;
+    cx[1] = (sx[2]+2*sx[1])/3;
+    cy[1] = (sy[2]+2*sy[1])/3;
+    cx[2] = sx[2];
+    cy[2] = sy[2];
+    stream.printf("%d %d %d %d %d %d %s\n",
+                  (int)cx[0], (int)cy[0], (int)cx[1], (int)cy[1],
+                  (int)cx[2], (int)cy[2], pdf_mode ? "c" : "_c");
+}
 
 /*
 ** Deallocate the structures which stored
