X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=5e5f18ceb3f8a83d133820d762228c06a0cc44ad;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=e1297714e2e936764af0f912373d7cd60af78471;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index e1297714e2..5e5f18ceb3 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--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
@@ -28,7 +28,7 @@
 Font_metric *
 Font_interface::get_default_font (Grob *me)
 {
-  Font_metric *fm = unsmob_metrics (me->get_property ("font"));
+  Font_metric *fm = unsmob<Font_metric> (me->get_property ("font"));
   if (!fm)
     {
       SCM chain = music_font_alist_chain (me);
@@ -45,7 +45,7 @@ Font_interface::music_font_alist_chain (Grob *g)
 {
   SCM defaults
     = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
-  if (defaults == SCM_UNDEFINED)
+  if (SCM_UNBNDP (defaults))
     defaults = SCM_EOL;
   return g->get_property_alist_chain (defaults);
 }
@@ -55,21 +55,22 @@ Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults
     = g->layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
-  if (defaults == SCM_UNDEFINED)
+  if (SCM_UNBNDP (defaults))
     defaults = SCM_EOL;
   return g->get_property_alist_chain (defaults);
 }
 
 ADD_INTERFACE (Font_interface,
-	       "Any symbol that is typeset through fixed sets of glyphs,"
-	       " (i.e., fonts).",
+               "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 "
-	       );
+               /* properties */
+               "font "
+               "font-encoding "
+               "font-family "
+               "font-name "
+               "font-series "
+               "font-shape "
+               "font-size "
+               "font-features "
+              );