patch::: 1.3.121.jcn2

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 467f0f84cfdb15cfa8d70957131847fc03751c1b..360f4d6ed330b7d370e28b62c52d228853d06241 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -11,6 +11,7 @@
 #include <math.h>
 #include <ctype.h>
 
+#include "molecule.hh"
 #include "ly-smobs.icc"
 #include "font-metric.hh"
 #include "string.hh"
@@ -38,11 +39,11 @@ Font_metric::text_dimension (String text) const
          break;
        
        default: 
-         Box b = get_char ((unsigned char)text[i],false);
+         Box b = get_char ((unsigned char)text[i]);
          
          // Ugh, use the width of 'x' for unknown characters
          if (b[X_AXIS].length () == 0) 
-           b = get_char ((unsigned char)'x',false);
+           b = get_char ((unsigned char)'x');
          
          w += b[X_AXIS].length ();
          ydims.unite (b[Y_AXIS]);
@@ -56,14 +57,6 @@ Font_metric::text_dimension (String text) const
 }
 
 
-Box
-Scaled_font_metric::text_dimension (String t) const
-{
-  Real realmag = pow (1.2, magstep_i_);
-  Box b (orig_l_->text_dimension (t));
-
-  return Box(b[X_AXIS]* realmag, b[Y_AXIS]*realmag);
-}
 
 Font_metric::~Font_metric ()
 {
@@ -71,57 +64,28 @@ Font_metric::~Font_metric ()
 
 Font_metric::Font_metric ()
 {
-  name_ = SCM_EOL;
+  description_ = SCM_EOL;
+
+  smobify_self ();
 }
 
-Font_metric::Font_metric (Font_metric const &)
+Font_metric::Font_metric (Font_metric const &s)
 {
 }
 
 
 Box 
-Font_metric::get_char (int, bool)const
+Font_metric::get_char (int )const
 {
   return Box (Interval(0,0),Interval (0,0));
 }
 
-Scaled_font_metric::Scaled_font_metric (Font_metric* m, int s)
-{
-  magstep_i_ = s;
-  orig_l_ = m;
-}
-
-SCM
-Scaled_font_metric::make_scaled_font_metric (Font_metric*m, int s)
-{
-  Scaled_font_metric *sfm = new Scaled_font_metric (m,s);
-  sfm->name_ = m->name_;
-  
-  return sfm->smobbed_self ();
-}
-
-SCM
-Font_metric::description () const
-{
-  return gh_cons (name_, gh_int2scm (0));
-}
-
-
-SCM
-Scaled_font_metric::description () const
-{
-  SCM od = orig_l_->description ();
-  gh_set_cdr_x (od, gh_int2scm (magstep_i_));
-  return od;
-}
-
-
 
 SCM
 Font_metric::mark_smob (SCM s)
 {
   Font_metric * m = (Font_metric*) SCM_CELL_WORD_1(s);
-  return m->name_;
+  return m->description_;
 }
 
 int
@@ -129,12 +93,23 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state * )
 {
   Font_metric *m = unsmob_metrics (s);
   scm_puts ("#<Font_metric ", port);
-  scm_display (m->name_, port);
+  scm_write (m->description_, port);
   scm_puts (">", port);
   return 1;
 }
 
 
 IMPLEMENT_UNSMOB (Font_metric, metrics);
-IMPLEMENT_SIMPLE_SMOBS (Font_metric);
+IMPLEMENT_SMOBS (Font_metric);
 IMPLEMENT_DEFAULT_EQUAL_P(Font_metric);
+IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
+
+Molecule
+Font_metric::find_by_name (String) const
+{
+  Molecule m ;
+  return m;
+}
+
+
+