X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=9e3a2d38b30b53086c1067759a6e15c75680c315;hb=0041871ea33b9e937e14f2fb97a32a759c7404ce;hp=291895eb3325873f8ad2fe49d2ad436ae2cd2d13;hpb=d544bd3103acc8175089ec6aeecd57376f2d201d;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 291895eb33..9e3a2d38b3 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,8 @@ #define PANGO_ENABLE_BACKEND #include -#include +#include "freetype.hh" +#include FT_XFREE86_H #include #include @@ -34,6 +35,7 @@ #include "file-name.hh" #include "international.hh" #include "lookup.hh" // debugging +#include "ly-module.hh" #include "main.hh" #include "string-convert.hh" #include "warn.hh" @@ -81,8 +83,8 @@ Pango_font::~Pango_font () } void -Pango_font::register_font_file (string filename, - string ps_name, +Pango_font::register_font_file (const string &filename, + const string &ps_name, int face_index) { scm_hash_set_x (physical_font_tab_, @@ -91,6 +93,22 @@ Pango_font::register_font_file (string filename, scm_from_int (face_index))); } +size_t +Pango_font::name_to_index (string nm) const +{ + PangoFcFont *fcfont = PANGO_FC_FONT (pango_context_load_font (context_, pango_description_)); + FT_Face face = pango_fc_font_lock_face (fcfont); + char *nm_str = (char *) nm.c_str (); + if (FT_UInt idx = FT_Get_Name_Index (face, nm_str)) + { + pango_fc_font_unlock_face (fcfont); + return (size_t) idx; + } + + pango_fc_font_unlock_face (fcfont); + return (size_t) - 1; +} + void Pango_font::derived_mark () const { @@ -114,6 +132,51 @@ get_unicode_name (char *s, sprintf (s, "uni%04lX", code); } +Box +Pango_font::get_unscaled_indexed_char_dimensions (size_t signed_idx) const +{ + PangoFcFont *fcfont = PANGO_FC_FONT (pango_context_load_font (context_, pango_description_)); + FT_Face face = pango_fc_font_lock_face (fcfont); + Box b = ly_FT_get_unscaled_indexed_char_dimensions (face, signed_idx); + pango_fc_font_unlock_face (fcfont); + return b; +} + +Box +Pango_font::get_scaled_indexed_char_dimensions (size_t signed_idx) const +{ + PangoFont *font = pango_context_load_font (context_, pango_description_); + PangoRectangle logical_rect; + PangoRectangle ink_rect; + pango_font_get_glyph_extents (font, signed_idx, &ink_rect, &logical_rect); + Box out (Interval (PANGO_LBEARING (ink_rect), + PANGO_RBEARING (ink_rect)), + Interval (-PANGO_DESCENT (ink_rect), + PANGO_ASCENT (ink_rect))); + out.scale (scale_); + return out; +} + +Box +Pango_font::get_glyph_outline_bbox (size_t signed_idx) const +{ + PangoFcFont *fcfont = PANGO_FC_FONT (pango_context_load_font (context_, pango_description_)); + FT_Face face = pango_fc_font_lock_face (fcfont); + Box b = ly_FT_get_glyph_outline_bbox (face, signed_idx); + pango_fc_font_unlock_face (fcfont); + return b; +} + +SCM +Pango_font::get_glyph_outline (size_t signed_idx) const +{ + PangoFcFont *fcfont = PANGO_FC_FONT (pango_context_load_font (context_, pango_description_)); + FT_Face face = pango_fc_font_lock_face (fcfont); + SCM s = ly_FT_get_glyph_outline (face, signed_idx); + pango_fc_font_unlock_face (fcfont); + return s; +} + Stencil Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const { @@ -128,7 +191,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const pango_glyph_string_extents (pgs, pa->font, &ink_rect, &logical_rect); PangoFcFont *fcfont = PANGO_FC_FONT (pa->font); - FT_Face ftface = pango_fc_font_lock_face (fcfont); Box b (Interval (PANGO_LBEARING (logical_rect), @@ -180,6 +242,13 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const if (!(pg ^ PANGO_GLYPH_EMPTY)) continue; + if (pg & PANGO_GLYPH_UNKNOWN_FLAG) + { + warning (_f ("no glyph for character U+%0X in font `%s'", + pg & ~PANGO_GLYPH_UNKNOWN_FLAG, file_name.c_str ())); + continue; + } + glyph_name[0] = '\0'; if (has_glyph_names) { @@ -222,9 +291,22 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const char_id = scm_from_uint32 (pg); } else - char_id = scm_from_locale_string (glyph_name); + char_id = scm_from_utf8_string (glyph_name); - *tail = scm_cons (scm_list_4 (scm_from_double (ggeo.width * scale_), + PangoRectangle logical_sub_rect; + PangoRectangle ink_sub_rect; + + pango_glyph_string_extents_range (pgs, i, i + 1, pa->font, &ink_sub_rect, &logical_sub_rect); + Box b_sub (Interval (PANGO_LBEARING (logical_sub_rect), + PANGO_RBEARING (logical_sub_rect)), + Interval (-PANGO_DESCENT (ink_sub_rect), + PANGO_ASCENT (ink_sub_rect))); + + b_sub.scale (scale_); + + *tail = scm_cons (scm_list_5 (scm_from_double (b_sub[X_AXIS][RIGHT] - b_sub[X_AXIS][LEFT]), + scm_cons (scm_from_double (b_sub[Y_AXIS][DOWN]), + scm_from_double (b_sub[Y_AXIS][UP])), scm_from_double (ggeo.x_offset * scale_), scm_from_double (- ggeo.y_offset * scale_), char_id), @@ -277,13 +359,14 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const ((Pango_font *) this)->register_font_file (file_name, ps_name, face_index); - pango_fc_font_unlock_face (fcfont); - SCM expr = scm_list_5 (ly_symbol2scm ("glyph-string"), + SCM expr = scm_list_n (ly_symbol2scm ("glyph-string"), + self_scm (), ly_string2scm (ps_name), scm_from_double (size), scm_from_bool (cid_keyed), - ly_quote_scm (glyph_exprs)); + ly_quote_scm (glyph_exprs), + SCM_UNDEFINED); return Stencil (b, expr); } @@ -302,7 +385,7 @@ extern bool music_strings_to_paths; Stencil Pango_font::text_stencil (Output_def * /* state */, - string str, bool music_string) const + const string &str, bool music_string) const { /* The text assigned to a PangoLayout is automatically divided @@ -358,8 +441,8 @@ Pango_font::text_stencil (Output_def * /* state */, variable that is bound to a *named* procedure, i.e. not a lambda expression. */ - if (utf8_string != SCM_BOOL_F - && scm_procedure_name (SCM_VARIABLE_REF (utf8_string)) != SCM_BOOL_F) + if (scm_is_true (utf8_string) + && scm_is_true (scm_procedure_name (SCM_VARIABLE_REF (utf8_string)))) has_utf8_string = true; }