* lily/stencil-scheme.cc:

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

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index fc6ce657263aa25dec47319f7de3929c84a1975c..587cc9c155748fc91d13f71f17df8d808200a9a5 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,11 +1,10 @@
-/*   
+/*
   font-interface.cc --  implement Font_interface
   
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
 
 #include "all-font-metrics.hh"
 #include "font-metric.hh"
@@ -15,46 +14,38 @@
 #include "warn.hh"
 
 
-/*
-  todo: split up this func, reuse in text_item? 
- */
+/* todo: split up this func, reuse in text_item?  */
 Font_metric *
-Font_interface::get_default_font (Grob*me)
+Font_interface::get_default_font (Grob *me)
 {
-  Font_metric * fm =  unsmob_metrics (me->get_property ("font"));
-  if (fm)
-    return fm;
-
-  fm = select_font (me->get_paper (),  font_alist_chain (me));
-  me->set_property ("font", fm->self_scm ());
+  Font_metric *fm = unsmob_metrics (me->get_property ("font"));
+  if (!fm)
+    {
+      fm = select_font (me->get_paper (), font_alist_chain (me));
+      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}.")
+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");
+  Grob *gr = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob");
 
   return Font_interface::get_default_font (gr)->self_scm ();
 }
 
-
 SCM
-Font_interface::font_alist_chain (Grob*g)
+Font_interface::font_alist_chain (Grob *g)
 {
   SCM defaults = g->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
-  
   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)",
+              "Any symbol that is typeset through fixed sets of glyphs, "
+              " (ie. fonts)",
               "font-magnification font font-series font-shape "
               "font-family font-name font-size");