X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=8a170642616e038022beb00be6cd7ad7488918f1;hb=d194ee9f637a200ac26b59e818acf5ca37985dc9;hp=8cfdcba9bfcaa26a58eb2acf70d3a68e203f4ee2;hpb=7c1ee9ae5133a32f00fe0d2f59b1a6e84baa0bed;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 8cfdcba9bf..8a17064261 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -1,23 +1,23 @@
-/* 
+/*
   paper-def.cc -- implement Paper_def
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dimensions.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 #include "pango-font.hh"
+#include "all-font-metrics.hh"
 
 Real
 output_scale (Output_def *od)
 {
-  return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale")));
+  return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale")));
 }
 
-
 SCM
 get_font_table (Output_def *def)
 {
@@ -29,8 +29,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 *
@@ -38,72 +48,59 @@ find_scaled_font (Output_def *mod, Font_metric *f, Real m)
 {
   if (mod->parent_)
     return find_scaled_font (mod->parent_, f, 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_from_double (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);
-  
-  sizes = scm_acons (scm_make_real (lookup_mag), val, sizes);
-  scm_gc_unprotect_object (val);
+
+  sizes = scm_acons (scm_from_double (lookup_mag), val, sizes);
+  unsmob_metrics (val)->unprotect ();
   scm_hashq_set_x (font_table, f->self_scm (), sizes);
   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.  */
-Output_def * 
+Output_def *
 scale_output_def (Output_def *o, Real amount)
 {
   SCM proc = ly_lily_module_constant ("scale-layout");
   SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount));
-  scm_gc_protect_object (new_pap);
 
-  return unsmob_output_def (new_pap);
+  o = unsmob_output_def (new_pap);
+  o->protect ();
+  return o;
 }
 
-LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
-	   1, 0, 0,
-	   (SCM bp),
-	   "Return fonts from the @code{\\paper} block @var{bp}.")
-{
-  Output_def *b = unsmob_output_def (bp);
-
-  SCM font_table = b->lookup_variable (ly_symbol2scm ("scaled-fonts"));
-  
-  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");
-
-  SCM ell = SCM_EOL;
-  if (scm_hash_table_p (font_table) == SCM_BOOL_T)
-    {
-      SCM func = ly_lily_module_constant ("hash-table->alist");
-
-      for (SCM s = scm_call_1 (func, font_table); scm_is_pair (s);
-	   s = scm_cdr (s))
-	{
-	  SCM entry = scm_car (s);
-	  for (SCM t = scm_cdr (entry); scm_is_pair (t); t = scm_cdr (t))
-	    {
-	      Font_metric *fm = unsmob_metrics (scm_cdar (t));
-
-	      if (dynamic_cast<Modified_font_metric*> (fm)
-		  || dynamic_cast<Pango_font*> (fm))
-		ell = scm_cons (fm->self_scm (), ell);
-	    }
-	}
-    }
-  return ell;
-}