#define PANGO_ENABLE_BACKEND // ugh, why necessary?
#include <pango/pangoft2.h>
+#include <freetype/ftxf86.h>
+
+#include <map>
/* Ugh. */
+
#include "pango-font.hh"
+#include "open-type-font.hh" // Index_to_charcode_map
+
#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"
}
+map<string, Index_to_charcode_map > filename_charcode_maps_map;
+Index_to_charcode_map const *get_index_to_charcode_map (string postscript_name, FT_Face face);
+
+
Index_to_charcode_map const *
-Pango_font::get_index_to_charcode_map (string key, FT_Face face)
+get_index_to_charcode_map (string filename, FT_Face face)
{
- if (charcode_maps_.find (key) == charcode_maps_.end ())
- charcode_maps_[key] = make_index_to_charcode_map (face);
+ if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ())
+ filename_charcode_maps_map[filename] = make_index_to_charcode_map (face);
- if (charcode_maps_.find (key) == charcode_maps_.end ())
+ if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ())
return 0;
- return &charcode_maps_[key];
+ return &filename_charcode_maps_map[filename];
+}
+
+void
+get_glyph_index_name (char *s, FT_ULong code)
+{
+ sprintf (s, "glyphIndex%lX", code);
}
void
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];
PangoFcFont);
FT_Face ftface = pango_fc_font_lock_face (fcfont);
- Box b (Interval (PANGO_LBEARING (ink_rect),
- PANGO_RBEARING (ink_rect)),
- Interval (-PANGO_DESCENT (ink_rect),
- PANGO_ASCENT (ink_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)));
b.scale (scale_);
char const *ps_name_str0 = FT_Get_Postscript_Name (ftface);
FcPattern *fcpat = fcfont->font_pattern;
- char *file_name_as_ptr = 0;
- FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name_as_ptr);
+ FcChar8 *file_name_as_ptr = 0;
+ FcPatternGetString (fcpat, FC_FILE, 0, &file_name_as_ptr);
string file_name;
if (file_name_as_ptr)
{
/* Normalize file name. */
- file_name = File_name (file_name_as_ptr).to_string ();
+ file_name = File_name ((char const *)file_name_as_ptr).to_string ();
}
SCM glyph_exprs = SCM_EOL;
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 = 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++)
{
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);
if (glyph_name[0] == '\0' && has_glyph_names)
{
- programming_error ("Glyph has no name, but font supports glyph naming");
+ 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')
{
/*
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_,
{
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)
{
/*
For Pango based backends, we take a shortcut.
*/
- char *descr_string = pango_font_description_to_string (pango_description_);
SCM exp
= scm_list_3 (ly_symbol2scm ("utf-8-string"),
- scm_makfrom0str (descr_string),
+ scm_makfrom0str (description_string ().c_str ()),
scm_makfrom0str (str.c_str ()));
- g_free (descr_string);
-
Box b (Interval (0, 0), Interval (0, 0));
b.unite (dest.extent_box ());
return Stencil (b, exp);
return dest;
}
+string
+Pango_font::description_string () const
+{
+ char *descr_string = pango_font_description_to_string (pango_description_);
+ string s (descr_string);
+ g_free (descr_string);
+ return s;
+}
+
+
SCM
Pango_font::font_file_name () const
{
projects / lilypond.git / blobdiff