Issue 1388: Initial work to support opentype font features.

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index be071fe912dcfa9e5cf4c23d6dc1d55a85334939..77f02df579c9beaedc747dcf7d565f4e00c1d5ed 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -29,7 +29,6 @@ using namespace std;
 #include "stencil.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Font_metric);
 
 Real
 Font_metric::design_size () const
@@ -96,14 +95,14 @@ Font_metric::derived_mark () const
 }
 
 SCM
-Font_metric::mark_smob ()
+Font_metric::mark_smob () const
 {
   derived_mark ();
   return description_;
 }
 
 int
-Font_metric::print_smob (SCM port, scm_print_state *)
+Font_metric::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<", port);
   scm_puts (class_name (), port);
@@ -113,7 +112,7 @@ Font_metric::print_smob (SCM port, scm_print_state *)
   return 1;
 }
 
-const char Font_metric::type_p_name_[] = "ly:font-metric?";
+const char * const Font_metric::type_p_name_ = "ly:font-metric?";
 
 SCM
 Font_metric::font_file_name () const
@@ -148,7 +147,9 @@ Font_metric::sub_fonts () const
 
 Stencil
 Font_metric::text_stencil (Output_def *state,
-                           const string&, bool) const
+                           const string&,
+                           bool,
+                           const string&) const
 {
   (void) state;