*** 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 cb9206efdcae1cbb3d8da6eb87d8231976871d72..769a16095a83b252fa7d53924c9d21510985ab0d 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -20,28 +20,41 @@ struct Font_metric
 {
 public:
   SCM description_;
-  String path_;
+  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 Box text_dimension (String)  const;
   virtual int name_to_index (String) const;
-
-  virtual Molecule find_by_name (String) const;
-  virtual Molecule get_indexed_char_molecule (int k) const;
-  virtual Molecule get_ascii_char_molecule (int k) 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,);
+
 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 Simple_font_metric : public Font_metric
+{
+public:
+  
+};
+  
+
 DECLARE_UNSMOB(Font_metric, metrics);
 
 #endif /* FONT_METRIC_HH */