From 7bc03f52e810e4d78873d1c2ea702b86675c4df5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 8 Jan 2005 14:26:33 +0000 Subject: [PATCH] (pango_item_string_stencil): use ink_rect, which provides a tighter bbox. --- ChangeLog | 13 ++++++++----- lily/pango-font.cc | 9 +++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e696e0d1c4..98deccd202 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,19 @@ 2005-01-08 Han-Wen Nienhuys + * lily/pango-font.cc (pango_item_string_stencil): use ink_rect, + which provides a tighter bbox. + * scm/define-grobs.scm (all-grob-descriptions): remove all extra-offsets from definitions. 2005-01-08 Erlend Aasland * scm/output-lib.scm: Rename guitar-tunings to guitar-tuning and - add tuning for 4-string bass and some common 4/5-string banjo tunings. - New function (four-string-banjo) turns a 5-string tuning into a 4-string - tuning. - New function (fret-number-tablature-format-banjo) computes correct fret - numbers on 5-string banjos. + add tuning for 4-string bass and some common 4/5-string banjo + tunings. New function (four-string-banjo) turns a 5-string tuning + into a 4-string tuning. New function + (fret-number-tablature-format-banjo) computes correct fret numbers + on 5-string banjos. * ly/engraver-init.ly: Default stringTunings = #guitar-tuning Add beam correction to TabVoice. diff --git a/lily/pango-font.cc b/lily/pango-font.cc index d53c6fb913..ac76c10c70 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -91,10 +91,10 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con PangoFcFont); FT_Face ftface = pango_fc_font_lock_face (fcfont); - Box b (Interval (PANGO_LBEARING(logical_rect), - PANGO_RBEARING(logical_rect)), - Interval (-PANGO_DESCENT(logical_rect), - PANGO_ASCENT(logical_rect))); + Box b (Interval (PANGO_LBEARING(ink_rect), + PANGO_RBEARING(ink_rect)), + Interval (-PANGO_DESCENT(ink_rect), + PANGO_ASCENT(ink_rect))); b.scale (scale_); @@ -178,6 +178,7 @@ Pango_font::text_stencil (String str) const } #if 0 + // check extents. if (!dest.extent_box ()[X_AXIS].is_empty ()) { Stencil frame = Lookup::frame (dest.extent_box(), 0.1, 0.1); -- 2.39.2