* lily/parser.yy (assignment_id): allow LYRICS_STRING as

[lilypond.git] / lily / paper-def.cc

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 6dd082f9f642e53726fdfcafa7c30c26a766aa08..62b585bb5ab192f5403adbf7d90b61cdd22cef5f 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -10,6 +10,8 @@
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 #include "pango-font.hh"
+#include "all-font-metrics.hh"
+
 
 Real
 output_scale (Output_def *od)
@@ -17,7 +19,6 @@ output_scale (Output_def *od)
   return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale")));
 }
 
-
 SCM
 get_font_table (Output_def *def)
 {
@@ -29,8 +30,18 @@ get_font_table (Output_def *def)
     }
   return font_table;
 }
-  
 
+SCM
+get_pango_font_table (Output_def *def)
+{
+  SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts"));
+  if (scm_hash_table_p (font_table) != SCM_BOOL_T)
+    {
+      font_table = scm_c_make_hash_table (11);
+      def->set_variable (ly_symbol2scm ("pango-fonts"), font_table);
+    }
+  return font_table;
+}
 
 /* TODO: should add nesting for Output_def here too. */
 Font_metric *
@@ -42,15 +53,10 @@ find_scaled_font (Output_def *mod, Font_metric *f, Real m)
   Real lookup_mag = m / output_scale (mod);
   
   SCM font_table = get_font_table (mod);
-  SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_BOOL_F);
-  if (sizes != SCM_BOOL_F)
-    {
-      SCM met = scm_assoc (scm_make_real (lookup_mag), sizes);
-      if (scm_is_pair (met))
-       return unsmob_metrics (scm_cdr (met));
-    }
-  else
-    sizes = SCM_EOL;
+  SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_EOL);
+  SCM handle = scm_assoc (scm_make_real (lookup_mag), sizes);
+  if (scm_is_pair (handle))
+    return unsmob_metrics (scm_cdr (handle));
   
   SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag);
   
@@ -60,6 +66,33 @@ find_scaled_font (Output_def *mod, Font_metric *f, Real m)
   return unsmob_metrics (val);
 }
 
+Font_metric*
+find_pango_font (Output_def *layout,  SCM descr, Real factor)
+{
+  if (layout->parent_)
+    return find_pango_font (layout->parent_, descr, factor);
+  
+  SCM table = get_pango_font_table (layout);
+  SCM sizes =  scm_hash_ref (table, descr, SCM_EOL);
+  SCM size_key = scm_from_double (factor);
+  SCM handle = scm_assoc (size_key, sizes);
+  if (scm_is_pair (handle))
+    {
+      return unsmob_metrics (scm_cdr (handle));
+    }
+
+  PangoFontDescription *description
+    = pango_font_description_from_string (scm_i_string_chars (descr));
+  Font_metric *fm = all_fonts_global->find_pango_font (description,
+                                                      factor,
+                                                      output_scale (layout));
+
+  sizes = scm_acons (size_key,  fm->self_scm(), sizes);
+  scm_hash_set_x (table, descr, sizes);
+
+  return fm;
+}
+
 /* TODO: this is a nasty interface. During formatting,
    the Output_def should be scaled to the output_scale_
    specified in the toplevel Output_def.  */