Issue 1388: Initial work to support opentype font features.

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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index e5a2b236be9509ec57c3ddc80dc4c739437bc74d..429801db5520800c1043afafc43306b39346f303 100644 (file)
--- 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:
-  static int print_smob (SCM, 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 */