/*
- pango-font.cc -- implement Pango_font
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2004--2009 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#define PANGO_ENABLE_BACKEND // ugh, why necessary?
}
Stencil
-Pango_font::pango_item_string_stencil (PangoItem const *item,
- string str,
+Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item,
bool tight_bbox) const
{
const int GLYPH_NAME_LEN = 256;
char glyph_name[GLYPH_NAME_LEN];
- PangoAnalysis const *pa = &(item->analysis);
- PangoGlyphString *pgs = pango_glyph_string_new ();
- pango_shape (str.c_str () + item->offset,
- item->length, (PangoAnalysis*) pa, pgs);
+ PangoAnalysis const *pa = &(glyph_item->item->analysis);
+ PangoGlyphString *pgs = glyph_item->glyphs;
PangoRectangle logical_rect;
PangoRectangle ink_rect;
PangoGlyph pg = pgi->glyph;
PangoGlyphGeometry ggeo = pgi->geometry;
+ /*
+ Zero-width characters are valid Unicode characters,
+ but glyph lookups need to be skipped.
+ */
+ if (!(pg ^ PANGO_GLYPH_EMPTY))
+ continue;
+
glyph_name[0] = '\0';
if (has_glyph_names)
{
}
Stencil
-Pango_font::word_stencil (string str, bool feta) const
+Pango_font::word_stencil (string str, bool music_string) const
{
- return text_stencil (str, feta, true);
+ return text_stencil (str, music_string, true);
}
Stencil
-Pango_font::text_stencil (string str, bool feta) const
+Pango_font::text_stencil (string str, bool music_string) const
{
- return text_stencil (str, feta, false);
+ return text_stencil (str, music_string, false);
}
+extern bool music_strings_to_paths;
+
Stencil
Pango_font::text_stencil (string str,
- bool feta,
+ bool music_string,
bool tight) const
{
- GList *items
- = pango_itemize (context_,
- str.c_str (),
- 0, str.length (), attribute_list_,
- NULL);
+ /*
+ The text assigned to a PangoLayout is automatically divided
+ into sections and reordered according to the Unicode
+ Bidirectional Algorithm, if necessary.
+ */
+ PangoLayout *layout = pango_layout_new (context_);
+ pango_layout_set_text (layout, str.c_str (), -1);
+ GSList *lines = pango_layout_get_lines (layout);
Stencil dest;
-
Real last_x = 0.0;
- Direction text_dir = RIGHT;
- for (GList *p = items; p; p = p->next)
- {
- PangoItem *item = (PangoItem *) p->data;
- if (item->analysis.level == PANGO_DIRECTION_RTL)
- text_dir = LEFT;
- }
-
- for (GList *ptr = items; ptr; ptr = ptr->next)
+ for (GSList *l = lines; l; l = l->next)
{
- PangoItem *item = (PangoItem *) ptr->data;
+ PangoLayoutLine *line = (PangoLayoutLine *) l->data;
+ GSList *layout_runs = line->runs;
- Stencil item_stencil = pango_item_string_stencil (item, str, tight);
-
- if (text_dir == RIGHT)
+ for (GSList *p = layout_runs; p; p = p->next)
{
+ PangoGlyphItem *item = (PangoGlyphItem *) p->data;
+ Stencil item_stencil = pango_item_string_stencil (item, tight);
+
item_stencil.translate_axis (last_x, X_AXIS);
last_x = item_stencil.extent (X_AXIS)[RIGHT];
- }
- else if (text_dir == LEFT)
- dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS);
#if 0 // Check extents.
- if (!item_stencil.extent_box ()[X_AXIS].is_empty ())
- {
- Stencil frame = Lookup::frame (item_stencil.extent_box (), 0.1, 0.1);
- Box empty;
- empty.set_empty ();
- Stencil dimless_frame (empty, frame.expr ());
- dest.add_stencil (frame);
- }
+ if (!item_stencil.extent_box ()[X_AXIS].is_empty ())
+ {
+ Stencil frame = Lookup::frame (item_stencil.extent_box (), 0.1, 0.1);
+ Box empty;
+ empty.set_empty ();
+ Stencil dimless_frame (empty, frame.expr ());
+ dest.add_stencil (frame);
+ }
#endif
- dest.add_stencil (item_stencil);
+ dest.add_stencil (item_stencil);
+ }
}
string name = get_output_backend_name ();
if (ly_is_module (mod))
{
SCM utf8_string = ly_module_lookup (mod, ly_symbol2scm ("utf-8-string"));
- if (utf8_string != SCM_BOOL_F)
+ /*
+ has_utf8_string should only be true when utf8_string is a
+ 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"),
return Stencil (b, exp);
}
- g_list_free (items);
-
return dest;
}
projects / lilypond.git / blobdiff