release: 1.3.6

[lilypond.git] / lily / include / font-metric.hh

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 13c6aca493ebc8377ca4afb6b0da6b551c637e3d..03152c7be85c7a596000636606ad63b5a5fe11a9 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -11,25 +11,33 @@
 #define FONT_METRIC_HH
 
 #include "box.hh"
-/*
-  sigh.  
-
-  signature -> Internal compiler error
-*/
+#include "lily-guile.hh"
 
 struct Character_metric
 {
-  virtual Box dimensions () const=0;
-  virtual ~Character_metric () {}
+  virtual Box dimensions () const;
+  virtual ~Character_metric ();
 };
 
 struct Font_metric
 {
-  virtual Character_metric const *get_char (int ascii, bool warn) const=0;
-  virtual ~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;
 };
 
 
+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;
+};
 
 
 #endif /* FONT_METRIC_HH */