(text_dimension): only multiply with

magnification_ when looking up in orig_.

diff --git a/ChangeLog b/ChangeLog
index a634d1063ec173e70302f440d7c21e5a038a2895..fc5218d356e3b3bbe20a2960b8a9c1d7a819ff2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * 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 3ee8ef8c6706767ba790a1cdd79751faf419d4c6..90257a3d739d88c865c2236bb7f4584c75ebcf44 100644 (file)
--- 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 99f48a884c461fe8aca47496d24528c6c899c299..bef6078c75b5f3a3cb644f67df497c0b71bc8169 100644 (file)
--- 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 c9ac536cc03e9d3a9f88170b6b2b96ae684bb905..daa4916d210cb45592858992e66df406998fd3cc 100644 (file)
--- 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