fixed texmanager

svn path=/trunk/matplotlib/; revision=1352

Author: jdh2358

CHANGELOG

@@ -1,5 +1,6 @@
 New entries should be added at the top
 
+2005-05-18 Added Orsay and JPL qt fixes - JDH
 
 2005-05-17 Added a psfrag latex backend -- some alignment issues need
            to be worked out. Run with -dLaTeX and a *.tex file and

MANIFEST

@@ -22,14 +22,231 @@ CXX/Objects.hxx
 CXX/cxx_extensions.cxx
 CXX/cxxextensions.c
 CXX/cxxsupport.cxx
+agg23/font_freetype/Makefile.am
+agg23/font_freetype/agg_font_freetype.cpp
+agg23/font_freetype/agg_font_freetype.h
+agg23/font_win32_tt/agg_font_win32_tt.cpp
+agg23/font_win32_tt/agg_font_win32_tt.h
+agg23/include/Makefile.am
+agg23/include/agg_alpha_mask_u8.h
+agg23/include/agg_arc.h
+agg23/include/agg_array.h
+agg23/include/agg_arrowhead.h
+agg23/include/agg_basics.h
+agg23/include/agg_bezier_arc.h
+agg23/include/agg_bitset_iterator.h
+agg23/include/agg_bounding_rect.h
+agg23/include/agg_bspline.h
+agg23/include/agg_clip_liang_barsky.h
+agg23/include/agg_color_gray.h
+agg23/include/agg_color_rgba.h
+agg23/include/agg_config.h
+agg23/include/agg_conv_adaptor_vcgen.h
+agg23/include/agg_conv_adaptor_vpgen.h
+agg23/include/agg_conv_bspline.h
+agg23/include/agg_conv_clip_polygon.h
+agg23/include/agg_conv_clip_polyline.h
+agg23/include/agg_conv_close_polygon.h
+agg23/include/agg_conv_concat.h
+agg23/include/agg_conv_contour.h
+agg23/include/agg_conv_curve.h
+agg23/include/agg_conv_dash.h
+agg23/include/agg_conv_gpc.h
+agg23/include/agg_conv_marker.h
+agg23/include/agg_conv_marker_adaptor.h
+agg23/include/agg_conv_segmentator.h
+agg23/include/agg_conv_shorten_path.h
+agg23/include/agg_conv_smooth_poly1.h
+agg23/include/agg_conv_stroke.h
+agg23/include/agg_conv_transform.h
+agg23/include/agg_conv_unclose_polygon.h
+agg23/include/agg_curves.h
+agg23/include/agg_dda_line.h
+agg23/include/agg_ellipse.h
+agg23/include/agg_ellipse_bresenham.h
+agg23/include/agg_embedded_raster_fonts.h
+agg23/include/agg_font_cache_manager.h
+agg23/include/agg_gamma_functions.h
+agg23/include/agg_gamma_lut.h
+agg23/include/agg_glyph_raster_bin.h
+agg23/include/agg_gsv_text.h
+agg23/include/agg_image_filters.h
+agg23/include/agg_line_aa_basics.h
+agg23/include/agg_math.h
+agg23/include/agg_math_stroke.h
+agg23/include/agg_path_storage.h
+agg23/include/agg_path_storage_integer.h
+agg23/include/agg_pattern_filters_rgba.h
+agg23/include/agg_pixfmt_amask_adaptor.h
+agg23/include/agg_pixfmt_gray.h
+agg23/include/agg_pixfmt_rgb.h
+agg23/include/agg_pixfmt_rgb_packed.h
+agg23/include/agg_pixfmt_rgba.h
+agg23/include/agg_rasterizer_outline.h
+agg23/include/agg_rasterizer_outline_aa.h
+agg23/include/agg_rasterizer_scanline_aa.h
+agg23/include/agg_render_scanlines.h
+agg23/include/agg_renderer_base.h
+agg23/include/agg_renderer_markers.h
+agg23/include/agg_renderer_mclip.h
+agg23/include/agg_renderer_outline_aa.h
+agg23/include/agg_renderer_outline_image.h
+agg23/include/agg_renderer_primitives.h
+agg23/include/agg_renderer_raster_text.h
+agg23/include/agg_renderer_scanline.h
+agg23/include/agg_rendering_buffer.h
+agg23/include/agg_rendering_buffer_dynarow.h
+agg23/include/agg_rounded_rect.h
+agg23/include/agg_scanline_bin.h
+agg23/include/agg_scanline_boolean_algebra.h
+agg23/include/agg_scanline_p.h
+agg23/include/agg_scanline_storage_aa.h
+agg23/include/agg_scanline_storage_bin.h
+agg23/include/agg_scanline_u.h
+agg23/include/agg_shorten_path.h
+agg23/include/agg_simul_eq.h
+agg23/include/agg_span_allocator.h
+agg23/include/agg_span_converter.h
+agg23/include/agg_span_generator.h
+agg23/include/agg_span_gouraud.h
+agg23/include/agg_span_gouraud_gray.h
+agg23/include/agg_span_gouraud_rgba.h
+agg23/include/agg_span_gradient.h
+agg23/include/agg_span_gradient_alpha.h
+agg23/include/agg_span_image_filter.h
+agg23/include/agg_span_image_filter_gray.h
+agg23/include/agg_span_image_filter_rgb.h
+agg23/include/agg_span_image_filter_rgba.h
+agg23/include/agg_span_image_resample.h
+agg23/include/agg_span_image_resample_gray.h
+agg23/include/agg_span_image_resample_rgb.h
+agg23/include/agg_span_image_resample_rgba.h
+agg23/include/agg_span_interpolator_adaptor.h
+agg23/include/agg_span_interpolator_linear.h
+agg23/include/agg_span_interpolator_persp.h
+agg23/include/agg_span_interpolator_trans.h
+agg23/include/agg_span_pattern.h
+agg23/include/agg_span_pattern_filter_gray.h
+agg23/include/agg_span_pattern_filter_rgb.h
+agg23/include/agg_span_pattern_filter_rgba.h
+agg23/include/agg_span_pattern_resample_gray.h
+agg23/include/agg_span_pattern_resample_rgb.h
+agg23/include/agg_span_pattern_resample_rgba.h
+agg23/include/agg_span_pattern_rgb.h
+agg23/include/agg_span_pattern_rgba.h
+agg23/include/agg_span_solid.h
+agg23/include/agg_span_subdiv_adaptor.h
+agg23/include/agg_trans_affine.h
+agg23/include/agg_trans_bilinear.h
+agg23/include/agg_trans_double_path.h
+agg23/include/agg_trans_lens.h
+agg23/include/agg_trans_perspective.h
+agg23/include/agg_trans_single_path.h
+agg23/include/agg_trans_viewport.h
+agg23/include/agg_trans_warp_magnifier.h
+agg23/include/agg_vcgen_bspline.h
+agg23/include/agg_vcgen_contour.h
+agg23/include/agg_vcgen_dash.h
+agg23/include/agg_vcgen_markers_term.h
+agg23/include/agg_vcgen_smooth_poly1.h
+agg23/include/agg_vcgen_stroke.h
+agg23/include/agg_vcgen_vertex_sequence.h
+agg23/include/agg_vertex_sequence.h
+agg23/include/agg_vpgen_clip_polygon.h
+agg23/include/agg_vpgen_clip_polyline.h
+agg23/include/agg_vpgen_segmentator.h
+agg23/include/ctrl/Makefile.am
+agg23/include/ctrl/agg_bezier_ctrl.h
+agg23/include/ctrl/agg_cbox_ctrl.h
+agg23/include/ctrl/agg_ctrl.h
+agg23/include/ctrl/agg_gamma_ctrl.h
+agg23/include/ctrl/agg_gamma_spline.h
+agg23/include/ctrl/agg_polygon_ctrl.h
+agg23/include/ctrl/agg_rbox_ctrl.h
+agg23/include/ctrl/agg_scale_ctrl.h
+agg23/include/ctrl/agg_slider_ctrl.h
+agg23/include/ctrl/agg_spline_ctrl.h
+agg23/include/platform/Makefile.am
+agg23/include/platform/agg_platform_support.h
+agg23/include/platform/mac/agg_mac_pmap.h
+agg23/include/platform/win32/agg_win32_bmp.h
+agg23/include/util/Makefile.am
+agg23/include/util/agg_color_conv.h
+agg23/include/util/agg_color_conv_rgb16.h
+agg23/include/util/agg_color_conv_rgb8.h
+agg23/src/ChangeLog
+agg23/src/Makefile
+agg23/src/Makefile.am
+agg23/src/agg_arc.cpp
+agg23/src/agg_arrowhead.cpp
 agg23/src/agg_bezier_arc.cpp
+agg23/src/agg_bspline.cpp
 agg23/src/agg_curves.cpp
+agg23/src/agg_embedded_raster_fonts.cpp
+agg23/src/agg_gsv_text.cpp
 agg23/src/agg_image_filters.cpp
+agg23/src/agg_line_aa_basics.cpp
+agg23/src/agg_line_profile_aa.cpp
 agg23/src/agg_path_storage.cpp
 agg23/src/agg_rasterizer_scanline_aa.cpp
+agg23/src/agg_rounded_rect.cpp
+agg23/src/agg_sqrt_tables.cpp
 agg23/src/agg_trans_affine.cpp
+agg23/src/agg_trans_double_path.cpp
+agg23/src/agg_trans_single_path.cpp
+agg23/src/agg_trans_warp_magnifier.cpp
+agg23/src/agg_vcgen_bspline.cpp
+agg23/src/agg_vcgen_contour.cpp
 agg23/src/agg_vcgen_dash.cpp
+agg23/src/agg_vcgen_markers_term.cpp
+agg23/src/agg_vcgen_smooth_poly1.cpp
 agg23/src/agg_vcgen_stroke.cpp
+agg23/src/agg_vpgen_clip_polygon.cpp
+agg23/src/agg_vpgen_clip_polyline.cpp
+agg23/src/agg_vpgen_segmentator.cpp
+agg23/src/authors
+agg23/src/autogen.sh
+agg23/src/configure.in
+agg23/src/copying
+agg23/src/install
+agg23/src/news
+agg23/src/readme
+agg23/src/ctrl/Makefile.am
+agg23/src/ctrl/agg_bezier_ctrl.cpp
+agg23/src/ctrl/agg_cbox_ctrl.cpp
+agg23/src/ctrl/agg_gamma_ctrl.cpp
+agg23/src/ctrl/agg_gamma_spline.cpp
+agg23/src/ctrl/agg_polygon_ctrl.cpp
+agg23/src/ctrl/agg_rbox_ctrl.cpp
+agg23/src/ctrl/agg_scale_ctrl.cpp
+agg23/src/ctrl/agg_slider_ctrl.cpp
+agg23/src/ctrl/agg_spline_ctrl.cpp
+agg23/src/platform/Makefile.am
+agg23/src/platform/AmigaOS/agg_platform_support.cpp
+agg23/src/platform/BeOS/agg_platform_support.cpp
+agg23/src/platform/X11/Makefile.am
+agg23/src/platform/X11/agg_platform_support.cpp
+agg23/src/platform/mac/agg_mac_pmap.cpp
+agg23/src/platform/mac/agg_platform_support.cpp
+agg23/src/platform/sdl/agg_platform_support.cpp
+agg23/src/platform/win32/agg_platform_support.cpp
+agg23/src/platform/win32/agg_win32_bmp.cpp
+agg23/svg/agg_svg_exception.h
+agg23/svg/agg_svg_parser.cpp
+agg23/svg/agg_svg_parser.h
+agg23/svg/agg_svg_path_renderer.cpp
+agg23/svg/agg_svg_path_renderer.h
+agg23/svg/agg_svg_path_tokenizer.cpp
+agg23/svg/agg_svg_path_tokenizer.h
+agg23/svg/svg_test.cpp
+agg23/svg/BeOS/Makefile
+agg23/svg/X11/Makefile
+agg23/svg/macos_cw/expat.h
+agg23/svg/macos_cw/include.h
+agg23/svg/macos_cw/xmlparse.h
+agg23/svg/win32_api/Makefile
+agg23/svg/win32_api/svg_test.dsp
+agg23/svg/win32_api/svg_test.dsw
 examples/README
 examples/__init__.py
 examples/accented_text.py
@@ -307,7 +524,6 @@ lib/dateutil/rrule.py
 lib/dateutil/tz.py
 lib/matplotlib/.cvsignore
 lib/matplotlib/__init__.py
-lib/matplotlib/__init__.py.~1.51.~
 lib/matplotlib/_contour.py
 lib/matplotlib/_image.py
 lib/matplotlib/_mathtext_data.py
@@ -319,7 +535,6 @@ lib/matplotlib/artist.py
 lib/matplotlib/axes.py
 lib/matplotlib/axes.py.orig
 lib/matplotlib/axis.py
-lib/matplotlib/axis.py.~1.20.~
 lib/matplotlib/backend_bases.py
 lib/matplotlib/cbook.py
 lib/matplotlib/cm.py
@@ -328,7 +543,6 @@ lib/matplotlib/colors.py
 lib/matplotlib/contour.py
 lib/matplotlib/dates.py
 lib/matplotlib/figure.py
-lib/matplotlib/figure.py.~1.22.~
 lib/matplotlib/finance.py
 lib/matplotlib/font_manager.py
 lib/matplotlib/image.py
@@ -341,17 +555,13 @@ lib/matplotlib/pylab.py
 lib/matplotlib/pyparsing.py
 lib/matplotlib/table.py
 lib/matplotlib/texmanager.py
-lib/matplotlib/texmanager.py~
 lib/matplotlib/text.py
-lib/matplotlib/text.py.~1.22.~
 lib/matplotlib/ticker.py
 lib/matplotlib/transforms.py
 lib/matplotlib/windowing.py
 lib/matplotlib/backends/.cvsignore
 lib/matplotlib/backends/__init__.py
-lib/matplotlib/backends/backend_agg
 lib/matplotlib/backends/backend_agg.py
-lib/matplotlib/backends/backend_agg.py.~1.23.~
 lib/matplotlib/backends/backend_agg2.py
 lib/matplotlib/backends/backend_cairo.py
 lib/matplotlib/backends/backend_fltkagg.py
@@ -360,6 +570,7 @@ lib/matplotlib/backends/backend_gdk.py
 lib/matplotlib/backends/backend_gtk.py
 lib/matplotlib/backends/backend_gtkagg.py
 lib/matplotlib/backends/backend_gtkcairo.py
+lib/matplotlib/backends/backend_latex.py
 lib/matplotlib/backends/backend_paint.py
 lib/matplotlib/backends/backend_ps.py
 lib/matplotlib/backends/backend_qt.py

MANIFEST.in

@@ -11,6 +11,6 @@ recursive-include examples README *.py *.glade
 prune examples/_tmp_*
 recursive-include src  *.cpp *.c *.h
 recursive-include CXX  *.cxx *.hxx *.c
-recursive-include agg22 *
+recursive-include agg23 *
 recursive-include lib *
 recursive-include swig *

TODO

@@ -705,4 +705,7 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- DONE tkagg figure not launching new figure until plot is called?
 
--- clipping off in date_demo_rrule (agg 0.5 offset bug?)
+-- clipping off in date_demo_rrule (agg 0.5 offset bug?)
+
+-- merge qt patch.
+

lib/matplotlib/artist.py

@@ -2,7 +2,7 @@
 import sys
 from cbook import iterable, flatten
 from transforms import identity_transform
-
+import warnings
 ## Note, matplotlib artists use the doc strings for set and get
 # methods to enable the introspection methods of set and get in the
 # matlab interface Every set_ to be controlled by the set function
@@ -390,7 +390,13 @@ def get(o, *args):
     func = getattr(o, 'get_' + name)
     return func()
 
-def set(h, *args, **kwargs):
+def set(*args, **kwargs):
+    message = 'set deprecated because it overrides python2.4 builtin set.  Use setp'
+    warnings.warn(message, DeprecationWarning, stacklevel=2)
+
+    return setp(*args, **kwargs)
+    
+def setp(h, *args, **kwargs):
     """
     matlab(TM) and pylab allow you to use set and get to set and get
     object properties, as well as to do introspection on the object

lib/matplotlib/backends/backend_latex.py

@@ -36,6 +36,8 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         setcolor = '%1.3f %1.3f %1.3f setrgbcolor' % gc.get_rgb()
         fontsize = prop.get_size_in_points()
         scale = float(fontsize/10.0)
+        color = r'\rgb %1.3f %1.3f %1.3f'%gc.get_rgb()
+        tex = '\color{rgb}{%s}'%s
         self.psfrag.append(r'\psfrag{%s}[bl][bl][%f][%f]{%s}'%(thetext, scale, angle, s))
         ps = """\
 gsave
@@ -161,7 +163,7 @@ def print_figure(self, outfile, dpi=72,
 
 \begin{figure}[t]
   %s
-  \includegraphics{%s}
+  \resizebox{5.5in}{!}{\includegraphics{%s}}
  
 \end{figure}