release: 1.1.53

[lilypond.git] / lily / afm.cc

diff --git a/lily/afm.cc b/lily/afm.cc
index e98155d12e53c66cf320db819116bc8b5b03fdb9..8ba8b9703fe66b26fbc702924bd9237ee87eaa00 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -59,8 +59,8 @@ Adobe_font_char_metric::dimensions () const
 {
   Box b= B_;
   
-  b[X_AXIS] *= 1/1000.0;
-  b[Y_AXIS] *= 1/1000.0;
+  b[X_AXIS] *= size_ / 1000.0;
+  b[Y_AXIS] *= size_ / 1000.0;
 
   return b;
 }
@@ -122,9 +122,12 @@ Adobe_font_char_metric dummy_static_char_metric;
 Adobe_font_char_metric const &
 Adobe_font_metric::find_char (String nm, bool warn) const
 {
-  if (warn && !name_to_metric_dict_.elem_b (nm))
+  if (!name_to_metric_dict_.elem_b (nm))
     {
-      warning (_f ("can't find character called `%s'", nm.ch_C()));
+      if (warn)
+       {
+         warning (_f ("can't find character called `%s'", nm.ch_C()));
+       }
       return dummy_static_char_metric;
     }