/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
PangoFontDescription const *description,
Real output_scale)
{
+ // This line looks stupid, but if we don't initialize physical_font_tab_ before
+ // we allocate memory in scm_c_make_hash_table, then that could trigger a garbage
+ // collection.
+ physical_font_tab_ = SCM_EOL;
physical_font_tab_ = scm_c_make_hash_table (11);
PangoDirection pango_dir = PANGO_DIRECTION_LTR;
context_ = pango_context_new ();
}
Stencil
-Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item,
- bool tight_bbox) const
+Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
{
const int GLYPH_NAME_LEN = 256;
char glyph_name[GLYPH_NAME_LEN];
FT_Face ftface = pango_fc_font_lock_face (fcfont);
- 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)));
+ Interval (-PANGO_DESCENT (ink_rect),
+ PANGO_ASCENT (ink_rect)));
+
b.scale (scale_);
char const *ps_name_str0 = FT_Get_Postscript_Name (ftface);
glyph_name[0] = '\0';
if (has_glyph_names)
{
- int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name,
- GLYPH_NAME_LEN);
+ FT_Error errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name,
+ GLYPH_NAME_LEN);
if (errorcode)
programming_error (
_f ("FT_Get_Glyph_Name () error: %s",
*tail = scm_cons (scm_list_4 (scm_from_double (ggeo.width * scale_),
scm_from_double (ggeo.x_offset * scale_),
- scm_from_double (ggeo.y_offset * scale_),
+ scm_from_double (- ggeo.y_offset * scale_),
char_id),
SCM_EOL);
tail = SCM_CDRLOC (*tail);
return physical_font_tab_;
}
-Stencil
-Pango_font::text_stencil (Output_def* state,
- string str, bool music_string) const
-{
- return text_stencil (str, music_string, false);
-}
-
extern bool music_strings_to_paths;
Stencil
-Pango_font::text_stencil (string str,
- bool music_string,
- bool tight) const
+Pango_font::text_stencil (Output_def * /* state */,
+ string str, bool music_string) const
{
/*
The text assigned to a PangoLayout is automatically divided
for (GSList *p = layout_runs; p; p = p->next)
{
PangoGlyphItem *item = (PangoGlyphItem *) p->data;
- Stencil item_stencil = pango_item_string_stencil (item, tight);
+ Stencil item_stencil = pango_item_string_stencil (item);
item_stencil.translate_axis (last_x, X_AXIS);
last_x = item_stencil.extent (X_AXIS)[RIGHT];