From 1621d667cd2e4ee542f8ff68835bbed3e8247d26 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 8 Apr 2004 00:16:58 +0000 Subject: [PATCH] (text_dimension): only multiply with magnification_ when looking up in orig_. --- ChangeLog | 3 +++ lily/scaled-font-metric.cc | 2 +- lily/time-signature.cc | 4 ++-- ly/declarations-init.ly | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a634d1063e..fc5218d356 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-04-08 Han-Wen Nienhuys + * lily/scaled-font-metric.cc (text_dimension): only multiply with + magnification_ when looking up in orig_. + * scm/output-tex.scm (text): switch off char-mapping. * lily/tfm.cc (coding_scheme): replace ' ' in encoding with '-', diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc index 3ee8ef8c67..90257a3d73 100644 --- a/lily/scaled-font-metric.cc +++ b/lily/scaled-font-metric.cc @@ -273,6 +273,7 @@ Modified_font_metric::text_dimension (String text) char_box = orig_->get_indexed_char (idx); } + char_box.scale (magnification_); if (!char_box[X_AXIS].is_empty ()) w += char_box[X_AXIS][RIGHT]; // length ? @@ -286,6 +287,5 @@ Modified_font_metric::text_dimension (String text) b = Box (Interval (0, w), ydims); } - b.scale (magnification_); return b; } diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 99f48a884c..bef6078c75 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -106,9 +106,9 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den) chain); SCM sn = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain, - scm_makfrom0str (to_string (num).to_str0 ())); + scm_makfrom0str (to_string (num).to_str0 ())); SCM sd = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain, - scm_makfrom0str (to_string (den).to_str0 ())); + scm_makfrom0str (to_string (den).to_str0 ())); Stencil n = *unsmob_stencil (sn); Stencil d = *unsmob_stencil (sd); diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index c9ac536cc0..daa4916d21 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -52,7 +52,7 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP) pt = #(/ in 72.27) cm = #(* 10 mm) - inputcoding = #"TeX" + inputencoding = #"TeX" raggedright = ##f raggedlast = ##f packed = ##f -- 2.39.5