matplotlib
diff --git a/‎lib/matplotlib/backends/backend_cairo.py
Lines changed: 11 additions & 10 deletions b/‎lib/matplotlib/backends/backend_cairo.py
Lines changed: 11 additions & 10 deletions
diff --git a/‎lib/matplotlib/backends/backend_gdk.py
Lines changed: 1 addition & 7 deletions b/‎lib/matplotlib/backends/backend_gdk.py
Lines changed: 1 addition & 7 deletions
@@ -57,9 +57,6 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
 
 DEBUG = False
 
-# the true dots per inch on the screen; should be display dependent
-PIXELS_PER_INCH = 96
-
 # Image formats that this backend supports - for print_figure()
 IMAGE_FORMAT          = ['eps', 'png', 'ps', 'svg']
 #IMAGE_FORMAT          = ['eps', 'pdf', 'png', 'ps', 'svg'] # pdf not ready yet
@@ -321,9 +318,10 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False):
            ctx.select_font (prop.get_name(),
                             self.fontangles [prop.get_style()],
                             self.fontweights[prop.get_weight()])
-           # 1.4 scales font to a similar size to GTK / GTKAgg backends
-           size = prop.get_size_in_points() * self.dpi.get() / PIXELS_PER_INCH * 1.4
 
+           # size = prop.get_size_in_points() * self.dpi.get() / 96.0
+           size = prop.get_size_in_points() * self.dpi.get() / 72.0
+        
            ctx.save()
            if angle:
               ctx.rotate (-angle * pi / 180)
@@ -408,8 +406,12 @@ def get_text_width_height(self, s, prop, ismath):
                          self.fontangles [prop.get_style()],
                          self.fontweights[prop.get_weight()])
 
-        # 1.4 scales font to a similar size to GTK / GTKAgg backends
-        size = prop.get_size_in_points() * self.dpi.get() / PIXELS_PER_INCH * 1.4
+        # Cairo (says it) uses 1/96 inch user space units, ref: cairo_gstate.c
+        # but if /96.0 is used the font is too small
+
+        #size = prop.get_size_in_points() * self.dpi.get() / 96.0
+        size = prop.get_size_in_points() * self.dpi.get() / 72.0
+        
         # problem - scale remembers last setting and font can become
         # enormous causing program to crash
         # save/restore prevents the problem
@@ -431,9 +433,8 @@ def new_gc(self):
 
     def points_to_pixels(self, points):
         if DEBUG: print 'backend_cairo.RendererCairo.%s()' % _fn_name()
-        # is this correct for cairo? (copied from gtk)
-        return points * PIXELS_PER_INCH/72.0 * self.dpi.get()/72.0
-
+        return points/72.0 * self.dpi.get()
+     
 
 class GraphicsContextCairo(GraphicsContextBase):
     _joind = {
 
@@ -40,10 +40,6 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 
 DEBUG = False
 
-# the true dots per inch on the screen; should be display dependent
-# see http://groups.google.com/groups?q=screen+dpi+x11&hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=7077.26e81ad5%40swift.cs.tcd.ie&rnum=5 for some info about screen dpi
-#PIXELS_PER_INCH = 96
-
 # Image formats that this backend supports - for FileChooser and print_figure()
 IMAGE_FORMAT          = ['eps', 'jpg', 'png', 'ps', 'svg'] + ['bmp'] # , 'raw', 'rgb']
 IMAGE_FORMAT.sort()
@@ -319,7 +315,7 @@ def _get_pango_layout(self, s, prop):
         Return - pango layout (from cache if already exists)
 
         Note that pango assumes a logical DPI of 96
-        Ref: pango_font_description_set_size() manual page
+        Ref: pango/fonts.c/pango_font_description_set_size() manual page
         """
         # problem? - cache gets bigger and bigger, is never cleared out
         # two (not one) layouts are created for every text item s (then they are cached) - why?
@@ -329,7 +325,6 @@ def _get_pango_layout(self, s, prop):
         if value != None:
             return value
 
-        #size = prop.get_size_in_points() * self.dpi.get() / PIXELS_PER_INCH
         size = prop.get_size_in_points() * self.dpi.get() / 96.0
         size = round(size)
 
@@ -368,7 +363,6 @@ def new_gc(self):
 
 
     def points_to_pixels(self, points):
-        #return points * PIXELS_PER_INCH/72.0 * self.dpi.get()/72.0
         return points/72.0 * self.dpi.get()