Web-ja: update introduction

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 674aef76a9d6b0af07330eeb464461f5374e5e35..77f02df579c9beaedc747dcf7d565f4e00c1d5ed 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -102,7 +102,7 @@ Font_metric::mark_smob () const
 }
 
 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);
@@ -112,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
@@ -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;