From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 2 Oct 2006 23:27:10 +0000 (+0000)
Subject: (pango_item_string_stencil): use
X-Git-Tag: cvs/HEAD~35
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=355ab15d82816386df2be05aebd4fa5088e80352;p=lilypond.git

(pango_item_string_stencil): use
logical_rect. This prevents spaces after words from disappearing.
---

diff --git a/ChangeLog b/ChangeLog
index 0b61dad2ea..617631eda3 100644
--- 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 65b8ed016f..12fa4f3da8 100644
--- 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);