(pango_item_string_stencil): use

logical_rect. This prevents spaces after words from disappearing.

diff --git a/ChangeLog b/ChangeLog
index 0b61dad2ea26fa87352eba2430a4959945e31164..617631eda3aae4c90f7f67afdb4040bcf38f883a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/pango-font.cc (pango_item_string_stencil): use
+       logical_rect. This prevents spaces after words from disappearing.
+
        * VERSION: release 2.9.20
 
 2006-10-02  Han-Wen Nienhuys  <hanwen@lilypond.org>

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 65b8ed016f562b6fd7495a02ceca59f057b16d4a..12fa4f3da8c03205c01efdc718f647d554d585d4 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -118,10 +118,12 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
                                                    PangoFcFont);
 
   FT_Face ftface = pango_fc_font_lock_face (fcfont);
-  Box b (Interval (PANGO_LBEARING (ink_rect),
-                  PANGO_RBEARING (ink_rect)),
-        Interval (-PANGO_DESCENT (ink_rect),
-                  PANGO_ASCENT (ink_rect)));
+
+  PangoRectangle const *which_rect = &logical_rect;
+  Box b (Interval (PANGO_LBEARING (*which_rect),
+                  PANGO_RBEARING (*which_rect)),
+        Interval (-PANGO_DESCENT (*which_rect),
+                  PANGO_ASCENT (*which_rect)));
 
   b.scale (scale_);
   char const *ps_name_str0 = FT_Get_Postscript_Name (ftface);