unsmob_pitch -> Pitch::unsmob and related

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

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index d620b31d21a72881712a80b938903e9a91646f4a..7e8f1bd964982762c941a2ecba9f1a5913a3c2bb 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,9 +1,20 @@
 /*
-  font-interface.cc -- implement Font_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "font-interface.hh"
@@ -17,7 +28,7 @@
 Font_metric *
 Font_interface::get_default_font (Grob *me)
 {
-  Font_metric *fm = unsmob_metrics (me->get_property ("font"));
+  Font_metric *fm = Font_metric::unsmob (me->get_property ("font"));
   if (!fm)
     {
       SCM chain = music_font_alist_chain (me);
@@ -49,15 +60,16 @@ Font_interface::text_font_alist_chain (Grob *g)
   return g->get_property_alist_chain (defaults);
 }
 
-ADD_INTERFACE (Font_interface, "font-interface",
-              "Any symbol that is typeset through fixed sets of glyphs, "
-              " (ie. fonts)",
-
-              "font "
-              "font-encoding "
-              "font-family "
-              "font-name "
-              "font-series "
-              "font-shape "
-              "font-size "
-              );
+ADD_INTERFACE (Font_interface,
+               "Any symbol that is typeset through fixed sets of glyphs,"
+               " (i.e., fonts).",
+
+               /* properties */
+               "font "
+               "font-encoding "
+               "font-family "
+               "font-name "
+               "font-series "
+               "font-shape "
+               "font-size "
+              );