X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=429801db5520800c1043afafc43306b39346f303;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=d74c8157ca9f50003aa1777d9cb35ed3d8923b19;hpb=207f71b8b2ab9ca550e841615bedce393e652ca6;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index d74c8157ca..429801db55 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -35,7 +35,7 @@ class Font_metric : public Smob<Font_metric>
 public:
   int print_smob (SCM, scm_print_state *) const;
   SCM mark_smob () const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   virtual ~Font_metric ();
 private:
   DECLARE_CLASSNAME (Font_metric);
@@ -47,7 +47,9 @@ public:
   // Return stencil for given string. output_state may be modified to
   // record the font.
   virtual Stencil text_stencil (Output_def *output_state,
-                                const string &text, bool music) const;
+                                const string &text,
+                                bool music,
+                                const string &features_str) const;
 
   virtual string font_name () const;
   virtual size_t count () const;
@@ -72,6 +74,6 @@ protected:
 };
 
 
-char *pfb2pfa (Byte const *pfb, int length);
+vector<char> pfb2pfa (const vector<char> &pfb);
 
 #endif /* FONT_METRIC_HH */