X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=0bea74247ef4e161d8895a29e9edcaa939251099;hb=4eb6f42fc6ca20d65c788a73eb78dfcc22ea0453;hp=a26c2e565c13b5ec11342dec2395cf7c44ad45dd;hpb=fd7e615444cf58b38283a59b56d3457c07778397;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index a26c2e565c..0bea74247e 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,38 +13,26 @@
 #include "box.hh"
 #include "lily-guile.hh"
 #include "smobs.hh"
-
-struct Character_metric
-{
-  virtual Box dimensions () const;
-  virtual ~Character_metric ();
-};
+#include "lily-proto.hh"
+#include "string.hh"
 
 struct Font_metric
 {
-  Font_metric ();
-  String name_str_;
-  virtual SCM description () const;
-  virtual Character_metric const *get_char (int ascii, bool warn) const; 
-  virtual ~Font_metric ();
-  virtual Box text_dimension (String) const;
-
-  DECLARE_SMOBS;
+public:
+  SCM description_;
+  String path_;
+  virtual Box get_char (int ascii) const;
+  virtual Box text_dimension (String)  const;
+  virtual Molecule find_by_name (String) const;
+
+  DECLARE_SMOBS (Font_metric,);
 private:
   Font_metric (Font_metric const&); // no copy.
+protected:
+  Font_metric ();
 };
 
-
-struct Scaled_font_metric : public Font_metric
-{
-  Font_metric *orig_l_;
-  int magstep_i_;
-  
-  Scaled_font_metric (Font_metric*, int);
-  virtual SCM description () const;
-  virtual Box text_dimension (String) const;
-};
-
+Font_metric * unsmob_metrics (SCM s);
 
 #endif /* FONT_METRIC_HH */