Replace internal_get_property with get_property where possible

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index a27dda61d1b0a050d80d78fa0b7325472ac2d2dd..ab0f8f47e36a7a4c53e6e546836c73276a63c107 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2014 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
@@ -29,7 +29,6 @@ using namespace std;
 #include "stencil.hh"
 #include "warn.hh"
 
-#include "ly-smobs.icc"
 
 Real
 Font_metric::design_size () const
@@ -48,8 +47,8 @@ Font_metric::find_by_name (string s) const
   if (idx >= 0)
     {
       expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
-                        self_scm (),
-                        ly_string2scm (s));
+                         self_scm (),
+                         ly_string2scm (s));
       b = get_indexed_char_dimensions (idx);
     }
 
@@ -60,7 +59,6 @@ Font_metric::find_by_name (string s) const
 Font_metric::Font_metric ()
 {
   description_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 
@@ -79,17 +77,11 @@ Font_metric::count () const
 }
 
 Box
-Font_metric::get_indexed_char_dimensions (size_t k) const
+Font_metric::get_indexed_char_dimensions (size_t) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
 
-size_t
-Font_metric::name_to_index (string) const
-{
-  return (size_t)-1;
-}
-
 Offset
 Font_metric::get_indexed_wxwy (size_t) const
 {
@@ -112,7 +104,7 @@ Font_metric::mark_smob (SCM s)
 int
 Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Font_metric *m = unsmob_metrics (s);
+  Font_metric *m = Font_metric::unsmob (s);
   scm_puts ("#<", port);
   scm_puts (m->class_name (), port);
   scm_puts (" ", port);
@@ -121,9 +113,7 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
   return 1;
 }
 
-IMPLEMENT_SMOBS (Font_metric);
-IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
-IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
+const char Font_metric::type_p_name_[] = "ly:font-metric?";
 
 SCM
 Font_metric::font_file_name () const
@@ -138,20 +128,14 @@ Font_metric::font_name () const
   return s;
 }
 
-size_t
-Font_metric::index_to_ascii (size_t i) const
-{
-  return i;
-}
-
 size_t
 Font_metric::index_to_charcode (size_t i) const
 {
-  return index_to_ascii (i);
+  return i;
 }
 
 Offset
-Font_metric::attachment_point (string) const
+Font_metric::attachment_point (const string&) const
 {
   return Offset (0, 0);
 }
@@ -163,11 +147,11 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::text_stencil (Output_def* state,
-                           string, bool) const
+Font_metric::text_stencil (Output_def *state,
+                           const string&, bool) const
 {
   (void) state;
-  
+
   programming_error ("Cannot get a text stencil from this font");
   return Stencil (Box (), SCM_EOL);
 }