* The grand 2005-2006 replace.

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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 183815d42dacb061c07aa8f411d574ee4370ad55..df3be0645c1901841215604538d9bb4ba0114bd5 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -1,25 +1,30 @@
-/*   
+/*
   font-metric.hh -- declare Font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef FONT_METRIC_HH
 #define FONT_METRIC_HH
 
 #include "box.hh"
-#include "smobs.hh"
 #include "lily-proto.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
 
-struct Font_metric
+class Font_metric
 {
+  DECLARE_CLASSNAME(Font_metric);
+
 public:
   SCM description_;
   String file_name_;
-  
+
+  virtual Stencil text_stencil (String) const;
+  virtual Box text_dimension (String) const;
+  virtual String font_name () const;
   virtual int count () const;
   virtual Offset attachment_point (String) const;
   virtual Offset get_indexed_wxwy (int) const;
@@ -32,14 +37,13 @@ public:
   virtual Stencil find_by_name (String) const;
   virtual Stencil get_indexed_char_stencil (int k) const;
   virtual Stencil get_ascii_char_stencil (int k) const;
-  virtual String coding_scheme () const;
   virtual SCM sub_fonts () const;
-  
+  virtual SCM font_file_name () const;
   DECLARE_SMOBS (Font_metric,);
 
 private:
   /* No copying, no implicit copy constructor.  */
-  Font_metric (Font_metric const&);
+  Font_metric (Font_metric const &);
 
 protected:
   virtual void derived_mark () const;
@@ -49,13 +53,14 @@ protected:
 
 int get_encoded_index (Font_metric *m, String input_coding, int code);
 
-struct Simple_font_metric : public Font_metric
+class Simple_font_metric : public Font_metric
 {
+  DECLARE_CLASSNAME(Simple_font_metric);
 public:
-  
 };
-  
 
-DECLARE_UNSMOB(Font_metric, metrics);
+DECLARE_UNSMOB (Font_metric, metrics);
+
+Box lookup_tex_text_dimension (Font_metric *font, SCM text);
 
 #endif /* FONT_METRIC_HH */