X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=4e6f5aac050628bda6a512046c95ff733a28c182;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a5f34a71fa9555471647e8ed0ae283dd1d063135;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index a5f34a71fa..4e6f5aac05 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,9 +1,20 @@
 /*
-  font-interface.cc --  implement Font_interface
-  
-  source file of the GNU LilyPond music typesetter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
+  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,34 +28,25 @@
 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);
-      
-      fm = select_font (me->get_layout (), chain);
+
+      fm = select_font (me->layout (), chain);
       me->set_property ("font", fm->self_scm ());
     }
-  
-  return fm;
-}
 
-LY_DEFINE (ly_font_interface_get_default_font, "ly:get-default-font",
-	  1 , 0, 0, (SCM grob),
-	  "Return the default font for grob @var{gr}.")
-{
-  Grob *gr = unsmob_grob (grob);
-  SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob");
-
-  return Font_interface::get_default_font (gr)->self_scm ();
+  return fm;
 }
 
-
 SCM
 Font_interface::music_font_alist_chain (Grob *g)
 {
   SCM defaults
-    = g->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+    = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+  if (defaults == SCM_UNDEFINED)
+    defaults = SCM_EOL;
   return g->get_property_alist_chain (defaults);
 }
 
@@ -52,12 +54,22 @@ SCM
 Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults
-    = g->get_layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
+    = g->layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
+  if (defaults == SCM_UNDEFINED)
+    defaults = SCM_EOL;
   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-magnification font font-series font-shape "
-	       "font-family font-encoding font-name 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 "
+              );