/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2009 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
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)
{
+ // 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_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",
*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::word_stencil (string str, bool feta) const
-{
- return text_stencil (str, feta, true);
-}
-
-Stencil
-Pango_font::text_stencil (string str, bool feta) const
-{
- return text_stencil (str, feta, false);
-}
+extern bool music_strings_to_paths;
Stencil
-Pango_font::text_stencil (string str,
- bool feta,
- 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];
SCM utf8_string = ly_module_lookup (mod, ly_symbol2scm ("utf-8-string"));
/*
has_utf8_string should only be true when utf8_string is a
- variable that is bound to a *named* procedure.
+ 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)
has_utf8_string = true;
}
- /*
- The SVG backend only uses utf-8-string for the non-music
- fonts, hence the check here. --pmccarty
+ bool to_paths = music_strings_to_paths;
- TODO: use a program option (-dmusic-strings-to-paths) here
- instead that is enabled only when -dbackend=svg.
+ /*
+ Backends with the utf-8-string expression use it when
+ 1) the -dmusic-strings-to-paths option is set
+ and `str' is not a music string, or
+ 2) the -dmusic-strings-to-paths option is not set.
*/
- if ((name == "svg" && !feta) || (name != "svg" && has_utf8_string))
+ if (has_utf8_string && ((to_paths && !music_string) || !to_paths))
{
// For Pango based backends, we take a shortcut.
SCM exp = scm_list_3 (ly_symbol2scm ("utf-8-string"),
projects / lilypond.git / blobdiff