X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=5045a8276ebf4c460ec10e7c4e714c1b5cc17d2b;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=5db047fc266fafee77643f04d13649a0ca03b80b;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 5db047fc26..5045a8276e 100644
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -1,11 +1,21 @@
 /*
-  font-select.cc -- implement property -> font_metric routines.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2003--2008 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 "dimensions.hh"
 #include "all-font-metrics.hh"
@@ -14,10 +24,11 @@
 #include "warn.hh"
 #include "pango-font.hh"
 #include "main.hh"
+#include "lily-imports.hh"
 
 Font_metric *
 get_font_by_design_size (Output_def *layout, Real requested,
-			 SCM font_vector)
+                         SCM font_vector)
 {
   int n = scm_c_vector_length (font_vector);
   Real size = 1e6;
@@ -30,24 +41,24 @@ get_font_by_design_size (Output_def *layout, Real requested,
     {
       SCM entry = scm_c_vector_ref (font_vector, i);
 
-      if (scm_promise_p (entry) == SCM_BOOL_T)
-	{
-	  Font_metric *fm = unsmob_metrics (scm_force (entry));
-	  size = fm->design_size ();
-	}
+      if (to_boolean (scm_promise_p (entry)))
+        {
+          Font_metric *fm = unsmob<Font_metric> (scm_force (entry));
+          size = fm->design_size ();
+        }
 #if HAVE_PANGO_FT2
       else if (scm_is_pair (entry)
-	       && scm_is_number (scm_car (entry))
-	       && scm_is_string (scm_cdr (entry)))
-	{
-	  size = scm_to_double (scm_car (entry));
-	  pango_description_string
-	    = scm_cdr (entry);
-	}
+               && scm_is_number (scm_car (entry))
+               && scm_is_string (scm_cdr (entry)))
+        {
+          size = scm_to_double (scm_car (entry));
+          pango_description_string
+            = scm_cdr (entry);
+        }
 #endif
 
       if (size > requested)
-	break;
+        break;
       last_size = size;
       last_pango_description_string = pango_description_string;
     }
@@ -57,11 +68,11 @@ get_font_by_design_size (Output_def *layout, Real requested,
   else if (i > 0)
     {
       if ((requested / last_size) < (size / requested))
-	{
-	  i--;
-	  size = last_size;
-	  pango_description_string = last_pango_description_string;
-	}
+        {
+          i--;
+          size = last_size;
+          pango_description_string = last_pango_description_string;
+        }
     }
 
   Font_metric *fm = 0;
@@ -69,32 +80,31 @@ get_font_by_design_size (Output_def *layout, Real requested,
     {
 #if HAVE_PANGO_FT2
       return find_pango_font (layout,
-			      pango_description_string,
-			      requested / size);
+                              pango_description_string,
+                              requested / size);
 #else
       error ("Trying to retrieve pango font without HAVE_PANGO_FT2.");
 #endif
     }
   else
-    fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i)));
+    fm = unsmob<Font_metric> (scm_force (scm_c_vector_ref (font_vector, i)));
 
   return find_scaled_font (layout, fm, requested / size);
 }
 
 Font_metric *
 get_font_by_mag_step (Output_def *layout, Real requested_step,
-		      SCM font_vector, Real default_size)
+                      SCM font_vector, Real default_size)
 {
   return get_font_by_design_size (layout, default_size
-				  * pow (2.0, requested_step / 6.0),
-				  font_vector);
+                                  * pow (2.0, requested_step / 6.0),
+                                  font_vector);
 }
 
 SCM
 properties_to_font_size_family (SCM fonts, SCM alist_chain)
 {
-  return scm_call_2 (ly_lily_module_constant ("lookup-font"), fonts,
-		     alist_chain);
+  return Lily::lookup_font (fonts, alist_chain);
 }
 
 Font_metric *
@@ -113,16 +123,16 @@ select_encoded_font (Output_def *layout, SCM chain)
     return select_pango_font (layout, chain);
   else
 #endif
-    if (scm_instance_p (name))
+    if (scm_is_true (scm_instance_p (name)))
       {
-	SCM base_size = scm_slot_ref (name, ly_symbol2scm ("default-size"));
-	SCM vec = scm_slot_ref (name, ly_symbol2scm ("size-vector"));
+        SCM base_size = scm_slot_ref (name, ly_symbol2scm ("default-size"));
+        SCM vec = scm_slot_ref (name, ly_symbol2scm ("size-vector"));
 
-	Real req = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
-				      0.0);
+        Real req = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
+                                      0.0);
 
-	return get_font_by_mag_step (layout, req, vec,
-				     scm_to_double (base_size));
+        return get_font_by_mag_step (layout, req, vec,
+                                     scm_to_double (base_size));
       }
 
   assert (0);