* lily/all-font-metrics.cc (find_font): Add "lm" to try-AFM-first

[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..d9fd9c6585d0f672616b8d76e894939d62ca335c 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -17,34 +17,31 @@ struct Modified_font_metric : public Font_metric
 public:
   Box text_dimension (String);
   
-  
-  static SCM make_scaled_font_metric (SCM, Font_metric*, Real);
+  static SCM make_scaled_font_metric (Font_metric *fm, Real magnification,
+                                     SCM font_encoding, SCM input_encoding);
   virtual int count () const;
   virtual Offset get_indexed_wxwy (int) const;
   virtual int name_to_index (String) const;
   virtual String coding_scheme () const;
-
-  virtual Font_metric * original_font () const;  
+  virtual Font_metric *original_font () const;  
 
 protected:
-  
   SCM coding_vector_;
   SCM coding_table_;
   SCM coding_mapping_;
   SCM coding_description_;
+  Font_metric *orig_;
+  Real magnification_;
+  String input_encoding_;
   friend SCM ly_font_encoding_alist (SCM);
     
+  Modified_font_metric (Font_metric *fm, Real magnification,
+                       String font_encoding, String input_encoding);
   virtual Real design_size () 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;
 };