X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=81ba1115ce453314ed5807d535afed55d8fac2c9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a92bf773d44e131de3de19c69f54bd2389fdbcfc;hpb=df56feefa28914b45532b0a31b24c304c162b497;p=lilypond.git

diff --git a/lily/font-select.cc b/lily/font-select.cc
index a92bf773d4..81ba1115ce 100644
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -1,71 +1,55 @@
 /*
-  font-select.cc -- implement property -> font_metric routines. 
+  font-select.cc -- implement property -> font_metric routines.
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <math.h>
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"
 #include "output-def.hh"
 #include "font-interface.hh"
 #include "warn.hh"
-
-LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
-	   (SCM paper_smob, SCM chain),
-
-	   "Return a font metric satisfying the font-qualifiers "
-	   "in the alist chain @var{chain}.\n"
-	   "(An alist chain is a list of alists, "
-	   "containing grob properties).\n")
-{
-  Output_def *paper = unsmob_output_def (paper_smob);
-  SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1,
-		   __FUNCTION__, "paper definition");
-  
-  Font_metric *fm = select_font (paper, chain);
-  return fm->self_scm ();
-}
-
-LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0,
-	   (SCM layout_smob, SCM name),
-	   "Return the layout variable @var{name}.")
-{
-  Output_def *layout = unsmob_output_def (layout_smob);
-  SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
-		   __FUNCTION__, "layout definition");
-  return scm_make_real (layout->get_dimension (name));
-}
-
-bool
-wild_compare (SCM field_val, SCM val)
-{
-  return (val == SCM_BOOL_F
-	  || field_val == ly_symbol2scm ("*")
-	  || field_val == val);
-}
+#include "pango-font.hh"
+#include "main.hh"
 
 Font_metric *
 get_font_by_design_size (Output_def *layout, Real requested,
 			 SCM font_vector)
 {
-  int n = SCM_VECTOR_LENGTH (font_vector);
+  int n = scm_c_vector_length (font_vector);
   Real size = 1e6;
   Real last_size = -1e6;
   int i = 0;
 
+  SCM pango_description_string = SCM_EOL;
+  SCM last_pango_description_string = SCM_EOL;
   for (; i < n; i++)
     {
-      SCM entry = SCM_VECTOR_REF (font_vector, i);
-      Font_metric *fm = unsmob_metrics (scm_force (entry));
-      size = fm->design_size ();
+      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 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);
+	}
+#endif
 
       if (size > requested)
 	break;
       last_size = size;
+      last_pango_description_string = pango_description_string;
     }
 
   if (i == n)
@@ -76,11 +60,24 @@ get_font_by_design_size (Output_def *layout, Real requested,
 	{
 	  i--;
 	  size = last_size;
+	  pango_description_string = last_pango_description_string;
 	}
     }
 
-  Font_metric *fm = unsmob_metrics (scm_force (SCM_VECTOR_REF (font_vector,
-							       i)));
+  Font_metric *fm = 0;
+  if (scm_is_string (pango_description_string))
+    {
+#if HAVE_PANGO_FT2
+      return find_pango_font (layout,
+			      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)));
+
   return find_scaled_font (layout, fm, requested / size);
 }
 
@@ -96,45 +93,38 @@ 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 scm_call_2 (ly_lily_module_constant ("lookup-font"), fonts,
+		     alist_chain);
 }
 
 Font_metric *
 select_encoded_font (Output_def *layout, SCM chain)
 {
-  SCM name = ly_chain_assoc (ly_symbol2scm ("font-name"), chain);
+  SCM name = ly_chain_assoc_get (ly_symbol2scm ("font-name"), chain, SCM_BOOL_F);
 
-  if (!scm_is_pair (name) || !scm_is_string (scm_cdr (name)))
+  if (!scm_is_string (name))
     {
       SCM fonts = layout->lookup_variable (ly_symbol2scm ("fonts"));
       name = properties_to_font_size_family (fonts, chain);
     }
-  else
-    name = scm_cdr (name);
 
-  if (scm_is_string (name))
-    {
-      SCM mag = ly_chain_assoc (ly_symbol2scm ("font-magnification"), chain);
-      Real rmag = (scm_is_pair (mag)
-		   ? robust_scm2double (scm_cdr (mag), 1.0)
-		   : 1);
-      Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
-		
-      return find_scaled_font (layout, fm, rmag);
-    }
-  else if (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 font_size = ly_chain_assoc (ly_symbol2scm ("font-size"), chain);
-      Real req = 0;
-      if (scm_is_pair (font_size))
-	req = scm_to_double (scm_cdr (font_size));
-
-      return get_font_by_mag_step (layout, req, vec,
-				   scm_to_double (base_size) * point_constant);
-    }
+#if HAVE_PANGO_FT2
+  if (scm_is_string (name)
+      && is_pango_format_global)
+    return select_pango_font (layout, chain);
+  else
+#endif
+    if (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"));
+
+	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));
+      }
 
   assert (0);
   return 0;