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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 927d9bb678..429801db55 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -33,9 +33,9 @@ typedef std::map<FT_UInt, FT_ULong> Index_to_charcode_map;
 class Font_metric : public Smob<Font_metric>
 {
 public:
-  int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
-  static const char type_p_name_[];
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  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 */