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 200c1eb8775f56e13765682fb5676093d88f2a3b..77f02df579c9beaedc747dcf7d565f4e00c1d5ed 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -21,6 +21,7 @@
 
 #include <cmath>
 #include <cctype>
+using namespace std;
 
 #include "dimensions.hh"
 #include "modified-font-metric.hh"
@@ -28,7 +29,6 @@
 #include "stencil.hh"
 #include "warn.hh"
 
-using std::string;
 
 Real
 Font_metric::design_size () const
@@ -112,7 +112,7 @@ Font_metric::print_smob (SCM port, scm_print_state *) const
   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
@@ -147,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;