X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=c9daa95f3edf2000d39fb47a5d856a8df505073a;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=9e762cb367b0e51c5375aa4d822edcd3fd26f0c8;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 9e762cb367..c9daa95f3e 100644
--- 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--2011 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
@@ -29,7 +29,6 @@ using namespace std;
 #include "stencil.hh"
 #include "warn.hh"
 
-#include "ly-smobs.icc"
 
 Real
 Font_metric::design_size () const
@@ -60,11 +59,11 @@ Font_metric::find_by_name (string s) const
 Font_metric::Font_metric ()
 {
   description_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 
 Font_metric::Font_metric (Font_metric const &)
+  : Smob<Font_metric> ()
 {
 }
 
@@ -84,12 +83,6 @@ 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
 {
@@ -102,28 +95,24 @@ Font_metric::derived_mark () const
 }
 
 SCM
-Font_metric::mark_smob (SCM s)
+Font_metric::mark_smob () const
 {
-  Font_metric *m = (Font_metric *) SCM_CELL_WORD_1 (s);
-  m->derived_mark ();
-  return m->description_;
+  derived_mark ();
+  return description_;
 }
 
 int
-Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
+Font_metric::print_smob (SCM port, scm_print_state *) const
 {
-  Font_metric *m = unsmob_metrics (s);
   scm_puts ("#<", port);
-  scm_puts (m->class_name (), port);
+  scm_puts (class_name (), port);
   scm_puts (" ", port);
-  scm_write (m->description_, port);
+  scm_write (description_, port);
   scm_puts (">", port);
   return 1;
 }
 
-IMPLEMENT_SMOBS (Font_metric);
-IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
-IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
+const char * const Font_metric::type_p_name_ = "ly:font-metric?";
 
 SCM
 Font_metric::font_file_name () const
@@ -145,7 +134,7 @@ Font_metric::index_to_charcode (size_t i) const
 }
 
 Offset
-Font_metric::attachment_point (string) const
+Font_metric::attachment_point (const string&) const
 {
   return Offset (0, 0);
 }
@@ -158,7 +147,7 @@ Font_metric::sub_fonts () const
 
 Stencil
 Font_metric::text_stencil (Output_def *state,
-                           string, bool) const
+                           const string&, bool) const
 {
   (void) state;