along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
-#define PANGO_ENABLE_BACKEND // ugh, why necessary?
+// Necessary for supporting pango_context_new() and
+// pango_context_set_font_map() in Pango < 1.22
+#define PANGO_ENABLE_BACKEND
+
#include <pango/pangoft2.h>
#include <freetype/ftxf86.h>
#if HAVE_PANGO_FT2
#include "stencil.hh"
-Pango_font::Pango_font (PangoFT2FontMap * /* fontmap */,
+Pango_font::Pango_font (PangoFT2FontMap *fontmap,
PangoFontDescription const *description,
Real output_scale)
{
physical_font_tab_ = scm_c_make_hash_table (11);
PangoDirection pango_dir = PANGO_DIRECTION_LTR;
- context_ = pango_ft2_get_context (PANGO_RESOLUTION,
- PANGO_RESOLUTION);
+ context_ = pango_context_new ();
+ pango_context_set_font_map (context_, PANGO_FONT_MAP (fontmap));
pango_description_ = pango_font_description_copy (description);
attribute_list_ = pango_attr_list_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];
PangoRectangle ink_rect;
pango_glyph_string_extents (pgs, pa->font, &ink_rect, &logical_rect);
- PangoFcFont *fcfont = G_TYPE_CHECK_INSTANCE_CAST (pa->font,
- PANGO_TYPE_FC_FONT,
- PangoFcFont);
+ PangoFcFont *fcfont = PANGO_FC_FONT (pa->font);
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",
return physical_font_tab_;
}
-Stencil
-Pango_font::word_stencil (string str, bool music_string) const
-{
- return text_stencil (str, music_string, true);
-}
-
-Stencil
-Pango_font::text_stencil (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];