handle CID CFFs.

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

diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index dea3b9d40b42e85d708c492d2336cb6c79f72d7a..7ca70983ffea86189b9f429459dadbdd46170d2b 100644 (file)
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -15,12 +15,12 @@
 PangoFontDescription *
 properties_to_pango_description (SCM chain, Real text_size)
 {
-  SCM name = ly_chain_assoc (ly_symbol2scm ("font-name"), chain);
+  SCM name = ly_chain_assoc_get (ly_symbol2scm ("font-name"), chain, SCM_BOOL_F);
 
   PangoFontDescription *description = 0;
-  if (scm_is_pair (name) && scm_is_string (scm_cdr (name)))
+  if (scm_is_string (name))
     {
-      String name_str = ly_scm2string (scm_cdr (name));
+      String name_str = ly_scm2string (name);
       description = pango_font_description_from_string (name_str.to_str0 ());
     }
   else
@@ -40,7 +40,8 @@ properties_to_pango_description (SCM chain, Real text_size)
                                             SCM_BOOL_F);
     }
 
-  Real step = robust_scm2double (ly_symbol2scm ("font-size"), 0.0);
+  Real step = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
+                                0.0);
   Real size = text_size * pow (2.0, step / 6.0);
 
   pango_font_description_set_size (description,
@@ -51,8 +52,10 @@ properties_to_pango_description (SCM chain, Real text_size)
 Font_metric *
 select_pango_font (Output_def *layout, SCM chain)
 {
-  PangoFontDescription *pfd = properties_to_pango_description (chain,
-                                                              point_constant * layout->get_dimension (ly_symbol2scm ("text-font-size")));
+  PangoFontDescription *pfd
+    = properties_to_pango_description (chain,
+                                      point_constant
+                                      * layout->get_dimension (ly_symbol2scm ("text-font-size")));
 
   char *str = pango_font_description_to_string (pfd);
   SCM scm_str = scm_makfrom0str (str);