*** empty log message ***

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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 843fab6ffe9332ecaca7f1af3125f31f1239de4f..769a16095a83b252fa7d53924c9d21510985ab0d 100644 (file)
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,38 +13,48 @@
 #include "box.hh"
 #include "lily-guile.hh"
 #include "smobs.hh"
-
+#include "lily-proto.hh"
+#include "string.hh"
 
 struct Font_metric
 {
-  SCM name_;
-  virtual SCM description () const;
-  virtual Box get_char (int ascii, bool warn) const;
-  virtual ~Font_metric ();
-  virtual Box text_dimension (String) const;
+public:
+  SCM description_;
+  String filename_;
+  
+  virtual int count () const;
+  virtual Offset get_indexed_wxwy (int) const;
+  virtual Box get_indexed_char (int index) const;
+  virtual Box get_ascii_char (int ascii) const;
+  virtual int name_to_index (String) const;
+  virtual int index_to_ascii (int) const;
+  virtual Real design_size () const;
+  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;
+  
+  DECLARE_SMOBS (Font_metric,);
 
-  DECLARE_SIMPLE_SMOBS(Font_metric,);
 private:
-  Font_metric (Font_metric const&); // no copy.
+  /* No copying, no implicit copy constructor.  */
+  Font_metric (Font_metric const&);
+
 protected:
+  virtual void derived_mark () const;
+
   Font_metric ();
 };
 
+int get_encoded_index (Font_metric *m, String input_coding, int code);
 
-struct Scaled_font_metric : public Font_metric
+struct Simple_font_metric : public Font_metric
 {
-  virtual SCM description () const;
-  virtual Box text_dimension (String) const;
-
-  static SCM make_scaled_font_metric (Font_metric*, int);
-protected:
-  Font_metric *orig_l_;
-  int magstep_i_;
+public:
   
-  Scaled_font_metric (Font_metric*,int);
 };
+  
 
-Font_metric * unsmob_metrics (SCM s);
+DECLARE_UNSMOB(Font_metric, metrics);
 
 #endif /* FONT_METRIC_HH */
-