release commit

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

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index c3cd7639f07f8c2890db7c67895d30a310ac070c..26d9575d5b25b86e84e0a9032c4b1235ec44bca0 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -1,9 +1,9 @@
-/*   
+/*
   modified-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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MODIFIED_FONT_METRIC_HH
@@ -15,36 +15,29 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  Box text_dimension (String);
-  
-  
-  static SCM make_scaled_font_metric (SCM, Font_metric*, Real);
+  virtual Box text_dimension (String) const;
+  virtual Stencil text_stencil (String) const;
+
+  static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
   virtual int count () const;
   virtual Offset get_indexed_wxwy (int) const;
+  virtual Offset attachment_point (String) const;
   virtual int name_to_index (String) const;
-  virtual String coding_scheme () const;
-
-  virtual Font_metric * original_font () const;  
+  virtual unsigned index_to_charcode (int) const;
+  Font_metric *original_font () const;
 
 protected:
-  
-  SCM coding_vector_;
-  SCM coding_table_;
-  SCM coding_mapping_;
-  SCM coding_description_;
-  friend SCM ly_font_encoding_alist (SCM);
-    
+  Font_metric *orig_;
+  Real magnification_;
+
+  Modified_font_metric (Font_metric *fm, Real magnification);
+  virtual SCM sub_fonts () const;
+  virtual String font_name () const;
   virtual Real design_size () const;
-  virtual void derived_mark () const; 
+  virtual void derived_mark () const;
   virtual Box get_indexed_char (int) const;
   virtual int index_to_ascii (int) const;
   virtual Box get_ascii_char (int) const;
-  Font_metric *orig_;
-  Real magnification_;
-  String coding_scheme_;
-
-  
-  Modified_font_metric (String, Font_metric*, Real);
   Box tex_kludge (String) const;
 };