* lily/pango-font.cc (text_stencil): Quick try at glyph->charcode

[lilypond.git] / lily / all-font-metrics.cc

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index df523671f777794284f5bdd4ba2b794e2464da0a..c681c03c9db431dc399323625475f0a20bd65198 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -8,30 +8,79 @@
 
 #include "all-font-metrics.hh"
 
-#include "config.hh"
+#include "open-type-font.hh"
 #include "main.hh"
 #include "warn.hh"
 #include "afm.hh"
 #include "tfm.hh"
 #include "scm-hash.hh"
 #include "kpath.hh"
+#include "pango-font.hh"
 
-static const char *default_font_str0_ = "cmr10";
+static char const *default_font_str0_ = "cmr10";
 
 All_font_metrics::All_font_metrics (String path)
 {
-  afm_p_dict_ = new Scheme_hash_table;
-  tfm_p_dict_ = new Scheme_hash_table;
+  afm_dict_ = new Scheme_hash_table;
+  tfm_dict_ = new Scheme_hash_table;
+  otf_dict_ = new Scheme_hash_table;
+
+#if HAVE_PANGO_FT2
+  PangoFontMap*pfm =     pango_ft2_font_map_new ();
+
+  pango_ft2_fontmap_ =
+    G_TYPE_CHECK_INSTANCE_CAST(pfm,
+                              PANGO_TYPE_FT2_FONT_MAP,
+                              PangoFT2FontMap);
+  pango_dpi_ = 1200;
+  pango_ft2_font_map_set_resolution (pango_ft2_fontmap_,
+                                    pango_dpi_, pango_dpi_);
+
+  pango_dict_ = new Scheme_hash_table;
+#endif
   
   search_path_.parse_path (path);
 }
 
 All_font_metrics::~All_font_metrics ()
 {
-  scm_gc_unprotect_object (afm_p_dict_->self_scm ());
-  scm_gc_unprotect_object (tfm_p_dict_->self_scm ());
+  scm_gc_unprotect_object (afm_dict_->self_scm ());
+  scm_gc_unprotect_object (tfm_dict_->self_scm ());
+  scm_gc_unprotect_object (otf_dict_->self_scm ());
 }
 
+All_font_metrics::All_font_metrics (All_font_metrics const&)
+{
+}
+
+#if HAVE_PANGO_FT2
+Pango_font *
+All_font_metrics::find_pango_font (PangoFontDescription*description)
+{
+  gchar *fn = pango_font_description_to_filename (description);
+  SCM key = ly_symbol2scm (fn);
+
+  SCM val;
+  if (!pango_dict_->try_retrieve (key, &val))
+    {
+      if (verbose_global_b)
+       progress_indication ("[" + String (fn));
+      Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
+                                      pango_dpi_,
+                                      RIGHT,
+                                      description);
+      val = pf->self_scm ();
+      pango_dict_->set (key, val);
+      scm_gc_unprotect_object (val);
+
+      if (verbose_global_b)
+       progress_indication ("]");
+    }
+  g_free (fn); 
+  return dynamic_cast<Pango_font*> (unsmob_metrics (val));
+}
+#endif
+
 /*
   TODO: our AFM handling is broken: the units in an AFM file are
   relative to the design size (1000 units = 1 designsize). Hence we
@@ -45,7 +94,7 @@ All_font_metrics::find_afm (String name)
   SCM sname = ly_symbol2scm (name.to_str0 ());
   SCM name_string = scm_makfrom0str (name.to_str0 ());
   SCM val;
-  if (!afm_p_dict_->try_retrieve (sname, &val))
+  if (!afm_dict_->try_retrieve (sname, &val))
     {
       String file_name;
 
@@ -73,7 +122,7 @@ All_font_metrics::find_afm (String name)
       if (verbose_global_b)
        progress_indication ("]");
 
-      afm_p_dict_->set (sname, val);
+      afm_dict_->set (sname, val);
       scm_gc_unprotect_object (val);
 
       Adobe_font_metric *afm
@@ -113,6 +162,38 @@ All_font_metrics::find_afm (String name)
   return dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val));
 }
 
+Open_type_font*
+All_font_metrics::find_otf (String name)
+{
+  SCM sname = ly_symbol2scm (name.to_str0 ());
+  SCM name_string = scm_makfrom0str (name.to_str0 ());
+  SCM val;
+  if (!otf_dict_->try_retrieve (sname, &val))
+    {
+      String file_name;
+      
+      if (file_name.is_empty ())
+       file_name = search_path_.find (name  + ".otf");
+      if (file_name.is_empty ())
+       return 0;
+
+      if (verbose_global_b)
+       progress_indication ("[" + file_name);
+      
+      val = Open_type_font::make_otf (file_name);
+
+      if (verbose_global_b)
+       progress_indication ("]");
+
+      unsmob_metrics (val)->file_name_ = file_name;
+      unsmob_metrics (val)->description_ = scm_cons (name_string,
+                                                    scm_make_real (1.0));
+      otf_dict_->set (sname, val);
+      scm_gc_unprotect_object (val);
+    }
+
+  return dynamic_cast<Open_type_font*> (unsmob_metrics (val));
+}
 
 Tex_font_metric*
 All_font_metrics::find_tfm (String name)
@@ -120,12 +201,14 @@ All_font_metrics::find_tfm (String name)
   SCM sname = ly_symbol2scm (name.to_str0 ());
   SCM name_string = scm_makfrom0str (name.to_str0 ());
   SCM val;
-  if (!tfm_p_dict_->try_retrieve (sname, &val))
+  if (!tfm_dict_->try_retrieve (sname, &val))
     {
       String file_name;
       
       if (file_name.is_empty ())
        {
+         /* FIXME: should add "cork-" prefix to lm* fonts.  How to do
+            that, cleanly?  */
          String p = kpathsea_find_tfm (name.to_str0 ());
          if (p.length ())
            file_name = p;
@@ -147,7 +230,7 @@ All_font_metrics::find_tfm (String name)
       unsmob_metrics (val)->file_name_ = file_name;
       unsmob_metrics (val)->description_ = scm_cons (name_string,
                                                     scm_make_real (1.0));
-      tfm_p_dict_->set (sname, val);
+      tfm_dict_->set (sname, val);
       scm_gc_unprotect_object (val);
     }
 
@@ -157,16 +240,18 @@ All_font_metrics::find_tfm (String name)
 Font_metric*
 All_font_metrics::find_font (String name)
 {
-  Font_metric *f = 0;
-  if ((name.left_string (4) == "feta")
-      || (name.left_string (8) == "parmesan")
-      || (name.left_string (2) == "lm"))
+  Font_metric *f = find_otf (name);
+   
+  if (!f &&
+      (name.left_string (4) == "feta"
+       || name.left_string (8) == "parmesan"
+       || name.left_string (2) == "lm"))
     {
       f = find_afm (name);
       if (!f)
        f = find_tfm (name);
     }
-  else
+  else if (!f)
     {
       f = find_tfm (name);
       if (!f)
@@ -187,7 +272,7 @@ All_font_metrics::find_font (String name)
     f = find_afm (def_name);
 
   if (!f)
-    f =  find_tfm (def_name);
+    f = find_tfm (def_name);
 
   if (!f)
     {
@@ -208,7 +293,7 @@ LY_DEFINE (ly_font_load, "ly:font-load", 1, 0, 0,
 {
   SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
 
-  Font_metric * fm = all_fonts_global->find_font (ly_scm2string (name));
+  Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
 
   return fm->self_scm ();
 }