}
void
-Pango_font::register_font_file (std::string filename, std::string ps_name)
+Pango_font::register_font_file (string filename, string ps_name)
{
scm_hash_set_x (physical_font_tab_,
scm_makfrom0str (ps_name.c_str ()),
scm_gc_mark (physical_font_tab_);
}
+
+Index_to_charcode_map const *
+Pango_font::get_index_to_charcode_map (string key, FT_Face face)
+{
+ 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];
+}
+
+void
+get_unicode_name (char*s, FT_ULong code)
+{
+ if (code > 0xFFFF)
+ sprintf (s, "u%lX", code);
+ else
+ sprintf (s, "uni%04lX", code);
+}
+
+
Stencil
-Pango_font::pango_item_string_stencil (PangoItem const *item, std::string str) const
+Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
{
const int GLYPH_NAME_LEN = 256;
char glyph_name[GLYPH_NAME_LEN];
PANGO_ASCENT (ink_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);
+ string file_name;
+ if (file_name_as_ptr)
+ {
+ /* Normalize file name. */
+ file_name = File_name (file_name_as_ptr).to_string ();
+ }
+
SCM glyph_exprs = SCM_EOL;
SCM *tail = &glyph_exprs;
-
+
+ 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);
+
bool cid_keyed = false;
for (int i = 0; i < pgs->num_glyphs; i++)
{
PangoGlyph pg = pgi->glyph;
PangoGlyphGeometry ggeo = pgi->geometry;
- FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN);
+ glyph_name[0] = '\0';
+ if (has_glyph_names)
+ {
+ int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN);
+ 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))
+ {
+ FT_ULong char_code = cmap->find (pg)->second;
+ get_unicode_name (glyph_name, char_code);
+ }
- SCM char_id;
+ if (glyph_name[0] == '\0' && has_glyph_names)
+ {
+ programming_error ("Glyph has no name, but font supports glyph naming. Skipping glyph.");
+ continue;
+ }
+
if (glyph_name[0] == '\0')
{
/*
CID entry
*/
cid_keyed = true;
- char_id = scm_from_int (pg);
+ char_id = scm_from_uint32 (pg);
}
else
char_id = scm_makfrom0str (glyph_name);
Real size = pango_font_description_get_size (descr)
/ (Real (PANGO_SCALE));
- FcPattern *fcpat = fcfont->font_pattern;
- char *file_name_as_ptr = 0;
- FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name_as_ptr);
-
- std::string file_name;
- if (file_name_as_ptr)
- {
- /* Normalize file name. */
- file_name = File_name (file_name_as_ptr).to_string ();
- }
-
- char const *ps_name_str0 = FT_Get_Postscript_Name (ftface);
if (!ps_name_str0)
warning (_f ("no PostScript font name for font `%s'", file_name));
- std::string ps_name;
+ string ps_name;
if (!ps_name_str0
&& file_name != ""
&& (file_name.find (".otf") != NPOS
{
/* UGH: kludge a PS name for OTF/CFF fonts. */
- std::string name = file_name;
+ string name = file_name;
ssize idx = file_name.find (".otf");
if (idx == NPOS)
idx = file_name.find (".cff");
ssize slash_idx = name.rfind ('/');
if (slash_idx != NPOS)
- name = name.substr (slash_idx - 1);
-
- std::string initial = name.substr (0, 1);
+ {
+ slash_idx ++;
+ name = name.substr (slash_idx,
+ name.length () - slash_idx);
+ }
+
+ string initial = name.substr (0, 1);
initial = String_convert::to_upper (initial);
- name = name.substr (1);
+ name = name.substr (1, name.length () - 1);
name = String_convert::to_lower (name);
ps_name = initial + name;
}
}
Stencil
-Pango_font::text_stencil (std::string str) const
+Pango_font::text_stencil (string str) const
{
GList *items
= pango_itemize (context_,