X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=3d58e0dd0ed69cbbd4a701b425d6c94e3d27549e;hb=e3fa24f095381f36fdc5fa17494ec16b5cd18fe8;hp=12fa4f3da8c03205c01efdc718f647d554d585d4;hpb=9a88ca226c37eb20c968ecefb2fe8657063376cd;p=lilypond.git

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 12fa4f3da8..3d58e0dd0e 100644
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -8,17 +8,21 @@
 
 #define PANGO_ENABLE_BACKEND // ugh, why necessary?
 #include <pango/pangoft2.h>
+#include <freetype/ftxf86.h>
+
+#include <map>
 
 /* Ugh.  */
-#include "pango-font.hh"
 
+#include "pango-font.hh"
 #include "dimensions.hh"
 #include "file-name.hh"
 #include "international.hh"
-#include "lookup.hh"
+#include "lookup.hh"		// debugging
 #include "main.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "all-font-metrics.hh"
 
 #if HAVE_PANGO_FT2
 #include "stencil.hh"
@@ -76,16 +80,10 @@ Pango_font::derived_mark () const
 }
 
 
-Index_to_charcode_map const *
-Pango_font::get_index_to_charcode_map (string key, FT_Face face)
+void
+get_glyph_index_name (char *s, FT_ULong code)
 {
-  if (charcode_maps_.find (key) == charcode_maps_.end ())
-    charcode_maps_[key] = make_index_to_charcode_map (face);
-
-  if (charcode_maps_.find (key) == charcode_maps_.end ())
-    return 0;
-  
-  return &charcode_maps_[key];
+  sprintf (s, "glyphIndex%lX", code);
 }
 
 void
@@ -99,7 +97,8 @@ get_unicode_name (char*s, FT_ULong code)
 
 
 Stencil
-Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
+Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
+				       bool tight_bbox) const
 {
   const int GLYPH_NAME_LEN = 256;
   char glyph_name[GLYPH_NAME_LEN];
@@ -119,9 +118,13 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
 
   FT_Face ftface = pango_fc_font_lock_face (fcfont);
 
-  PangoRectangle const *which_rect = &logical_rect;
-  Box b (Interval (PANGO_LBEARING (*which_rect),
-		   PANGO_RBEARING (*which_rect)),
+  PangoRectangle const *which_rect
+    = (tight_bbox)
+    ? &ink_rect
+    : &logical_rect;
+    
+  Box b (Interval (PANGO_LBEARING (logical_rect),
+		   PANGO_RBEARING (logical_rect)),
 	 Interval (-PANGO_DESCENT (*which_rect),
 		   PANGO_ASCENT (*which_rect)));
 
@@ -144,8 +147,9 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
   Index_to_charcode_map const *cmap = 0;
   bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES;
   if  (! has_glyph_names)
-    cmap = ((Pango_font*)this)->get_index_to_charcode_map (file_name, ftface);
-  
+    cmap = all_fonts_global->get_index_to_charcode_map (file_name, ftface);
+
+  bool is_ttf = string (FT_Get_X11_Font_Format (ftface)) == "TrueType";
   bool cid_keyed = false;
   for (int i = 0; i < pgs->num_glyphs; i++)
     {
@@ -161,14 +165,12 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
 	  if (errorcode)
 	    programming_error ("FT_Get_Glyph_Name returns error");
 	}
-      
+
       SCM char_id = SCM_EOL;
       if (glyph_name[0] == '\0'
 	  && cmap
-
-	  /* Ugh should ask FreeType about font type. */
-	  && (file_name.find (".ttf") != NPOS
-	      || file_name.find (".TTF") != NPOS))
+	  && is_ttf
+	  && cmap->find (pg) != cmap->end ())
 	{
 	  FT_ULong char_code = cmap->find (pg)->second;
 	  get_unicode_name (glyph_name, char_code);
@@ -176,11 +178,23 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
 
       if (glyph_name[0] ==  '\0' && has_glyph_names)
 	{
-	  programming_error ("Glyph has no name, but font supports glyph naming. Skipping glyph: "
-			     + description_string ());
+	  programming_error (_f ("Glyph has no name, but font supports glyph naming.\n"
+				 "Skipping glyph U+%0X, file %s",
+				 pg,
+				 file_name.c_str ()));
 	  continue;
 	}
+
+      
+      if (glyph_name == string (".notdef") && is_ttf)
+	glyph_name[0] = '\0';
 	  
+      if (glyph_name[0] == '\0' && is_ttf)
+	{
+	  // access by glyph index directly.
+	  get_glyph_index_name (glyph_name, pg);
+	}
+      
       if (glyph_name[0] == '\0')
 	{
 	  /*
@@ -265,8 +279,21 @@ Pango_font::physical_font_tab () const
   return physical_font_tab_;
 }
 
+
+Stencil
+Pango_font::word_stencil (string str) const
+{
+  return text_stencil (str, true);
+}
+  
 Stencil
 Pango_font::text_stencil (string str) const
+{
+  return text_stencil (str, false);
+}
+
+Stencil
+Pango_font::text_stencil (string str, bool tight) const
 {
   GList *items
     = pango_itemize (context_,
@@ -290,7 +317,7 @@ Pango_font::text_stencil (string str) const
     {
       PangoItem *item = (PangoItem *) ptr->data;
 
-      Stencil item_stencil = pango_item_string_stencil (item, str);
+      Stencil item_stencil = pango_item_string_stencil (item, str, tight);
 
       if (text_dir == RIGHT)
 	{