Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 9950d1a7474f3d2ad09b995776cf39820ab510df..5045a8276ebf4c460ec10e7c4e714c1b5cc17d2b 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -24,6 +24,7 @@
 #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,
@@ -42,7 +43,7 @@ get_font_by_design_size (Output_def *layout, Real requested,
 
       if (to_boolean (scm_promise_p (entry)))
         {
-          Font_metric *fm = Font_metric::unsmob (scm_force (entry));
+          Font_metric *fm = unsmob<Font_metric> (scm_force (entry));
           size = fm->design_size ();
         }
 #if HAVE_PANGO_FT2
@@ -86,7 +87,7 @@ get_font_by_design_size (Output_def *layout, Real requested,
 #endif
     }
   else
-    fm = Font_metric::unsmob (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);
 }
@@ -103,8 +104,7 @@ get_font_by_mag_step (Output_def *layout, Real requested_step,
 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 *