Issue 1388: Initial work to support opentype font features.

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

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 7c3ac5357465e71e5823dd8443702a22dca3b907..5e5f18ceb3f8a83d133820d762228c06a0cc44ad 100644 (file)
--- 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--2014 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,7 +55,7 @@ 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);
 }
@@ -72,4 +72,5 @@ ADD_INTERFACE (Font_interface,
                "font-series "
                "font-shape "
                "font-size "
+               "font-features "
               );