preparing for 0.84

jdh2358 · jdh2358 · commit 1ed561d75155 · 2005-09-19T13:58:03.000Z
svn path=/trunk/matplotlib/; revision=1762
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -143,7 +143,7 @@
 from __future__ import generators
 
 
-__version__  = '0.84.cvs.3'
+__version__  = '0.84'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1710,8 +1710,8 @@ def hist(self, x, bins=10, normed=0, bottom=0,
 
         The return values is (n, bins, patches)
 
-        If normed is true, the first element of the return tuple will be the
-        counts normalized to form a probability distribtion, ie,
+        If normed is true, the first element of the return tuple will
+        be the counts normalized to form a probability density, ie,
         n/(len(x)*dbin)
 
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -180,6 +180,7 @@ def _get_layout(self, renderer):
         tmp, heightt = renderer.get_text_width_height(
                 'T', self._fontproperties, ismath=False)
 
+        heightt += 3  # 3 pixel pad
         for line in lines:
             w,h = renderer.get_text_width_height(
                 line, self._fontproperties, ismath=self.is_math_text())
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
 BUILD_WINDOWING        = 'auto'
 
 
-VERBOSE = False # insert lots of diagnostic prints in extension code
+VERBOSE = True # insert lots of diagnostic prints in extension code
 
 
 
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -312,7 +312,7 @@ Glyph::get_path( const FT_Face& face) {
 
 FT2Font::FT2Font(std::string facefile) 
 {
-  _VERBOSE("FT2Font::FT2Font");
+  _VERBOSE(Printf("FT2Font::FT2Font %s", facefile.c_str()).str());
   clear(Py::Tuple(0));
 
   
@@ -397,6 +397,8 @@ FT2Font::FT2Font(std::string facefile)
     setattr("underline_position",  Py::Int(face->underline_position));
     setattr("underline_thickness", Py::Int(face->underline_thickness));
   }
+
+  _VERBOSE("FT2Font::FT2Font done");
 }
 
 FT2Font::~FT2Font()
@@ -752,7 +754,7 @@ FT2Font::set_text(const Py::Tuple & args) {
   for (unsigned int n=0; n<glyphs.size(); n++) 
     FT_Glyph_Transform(glyphs[n], &matrix, 0);
 
-  
+  _VERBOSE("FT2Font::set_text done");  
   return xys;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`BUILD_WINDOWING = 'auto'`
`43`	`43`
`44`	`44`
`45`		`-VERBOSE = False # insert lots of diagnostic prints in extension code`
	`45`	`+VERBOSE = True # insert lots of diagnostic prints in extension code`
`46`	`46`
`47`	`47`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ Glyph::get_path( const FT_Face& face) {`
`312`	`312`
`313`	`313`	`FT2Font::FT2Font(std::string facefile)`
`314`	`314`	`{`
`315`		`- _VERBOSE("FT2Font::FT2Font");`
	`315`	`+ _VERBOSE(Printf("FT2Font::FT2Font %s", facefile.c_str()).str());`
`316`	`316`	`clear(Py::Tuple(0));`
`317`	`317`
`318`	`318`
`@@ -397,6 +397,8 @@ FT2Font::FT2Font(std::string facefile)`
`397`	`397`	`setattr("underline_position", Py::Int(face->underline_position));`
`398`	`398`	`setattr("underline_thickness", Py::Int(face->underline_thickness));`
`399`	`399`	`}`
	`400`	`+`
	`401`	`+ _VERBOSE("FT2Font::FT2Font done");`
`400`	`402`	`}`
`401`	`403`
`402`	`404`	`FT2Font::~FT2Font()`
`@@ -752,7 +754,7 @@ FT2Font::set_text(const Py::Tuple & args) {`
`752`	`754`	`for (unsigned int n=0; n<glyphs.size(); n++)`
`753`	`755`	`FT_Glyph_Transform(glyphs[n], &matrix, 0);`
`754`	`756`
`755`		`-`
	`757`	`+ _VERBOSE("FT2Font::set_text done");`
`756`	`758`	`return xys;`
`757`	`759`	`}`
`758`	`760`