source file of the GNU LilyPond music typesetter
- (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#define PANGO_ENABLE_BACKEND // ugh, why necessary?
#include "dimensions.hh"
#include "file-name.hh"
+#include "international.hh"
#include "lookup.hh"
#include "main.hh"
+#include "string-convert.hh"
#include "warn.hh"
#if HAVE_PANGO_FT2
#include "stencil.hh"
Pango_font::Pango_font (PangoFT2FontMap *fontmap,
- Direction dir,
PangoFontDescription *description,
Real output_scale)
{
(void) fontmap;
physical_font_tab_ = scm_c_make_hash_table (11);
- PangoDirection pango_dir = (dir == RIGHT)
- ? PANGO_DIRECTION_LTR
- : PANGO_DIRECTION_RTL;
+ PangoDirection pango_dir = PANGO_DIRECTION_LTR;
context_
= pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION);
// context_ = pango_ft2_font_map_create_context (fontmap);
--hwn
*/
+ output_scale_ = output_scale;
scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale);
/*
}
void
-Pango_font::register_font_file (String filename, String ps_name)
+Pango_font::register_font_file (std::string filename, std::string ps_name)
{
scm_hash_set_x (physical_font_tab_,
- scm_makfrom0str (ps_name.to_str0 ()),
- scm_makfrom0str (filename.to_str0 ()));
+ scm_makfrom0str (ps_name.c_str ()),
+ scm_makfrom0str (filename.c_str ()));
}
void
}
Stencil
-Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) const
+Pango_font::pango_item_string_stencil (PangoItem const *item, std::string str) const
{
const int GLYPH_NAME_LEN = 256;
char glyph_name[GLYPH_NAME_LEN];
- PangoAnalysis *pa = &(item->analysis);
+ PangoAnalysis const *pa = &(item->analysis);
PangoGlyphString *pgs = pango_glyph_string_new ();
- pango_shape (str.to_str0 () + item->offset,
- item->length, pa, pgs);
+ pango_shape (str.c_str () + item->offset,
+ item->length, (PangoAnalysis*) pa, pgs);
PangoRectangle logical_rect;
PangoRectangle ink_rect;
}
else
char_id = scm_makfrom0str (glyph_name);
- *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_
- + dx),
+
+ *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_),
+
char_id),
SCM_EOL);
- dx = 0.0;
tail = SCM_CDRLOC (*tail);
}
/ (Real (PANGO_SCALE));
FcPattern *fcpat = fcfont->font_pattern;
- char *file_name = 0;
- FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name);
-#ifdef __MINGW32__
- /* Normalize file name. */
- // FIXME: memleak(s?), drop the #ifdef?
- file_name = File_name (file_name).to_string ().get_copy_str0 ();
-#endif
+ char *file_name_as_ptr = 0;
+ FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name_as_ptr);
+ std::string file_name;
+ if (file_name_as_ptr)
+ {
+ /* Normalize file name. */
+ file_name = File_name (file_name_as_ptr).to_string ();
+ }
+
char const *ps_name_str0 = FT_Get_Postscript_Name (ftface);
if (!ps_name_str0)
warning (_f ("no PostScript font name for font `%s'", file_name));
- String ps_name;
+ std::string ps_name;
if (!ps_name_str0
- && file_name
- && (String (file_name).index (".otf") >= 0
- || String (file_name).index (".cff") >= 0))
+ && file_name != ""
+ && (file_name.find (".otf") != NPOS
+ || file_name.find (".cff") != NPOS))
{
/* UGH: kludge a PS name for OTF/CFF fonts. */
- String name = file_name;
- int idx = max (String (file_name).index (".otf"),
- String (file_name).index (".cff"));
-
- name = name.left_string (idx);
+ std::string name = file_name;
+ ssize idx = file_name.find (".otf");
+ if (idx == NPOS)
+ idx = file_name.find (".cff");
- int slash_idx = name.index_last ('/');
- if (slash_idx >= 0)
- name = name.right_string (name.length () - slash_idx - 1);
+ name = name.substr (0, idx);
- String initial = name.cut_string (0, 1);
- initial.to_upper ();
- name = name.nomid_string (0, 1);
- name.to_lower ();
+ ssize slash_idx = name.rfind ('/');
+ if (slash_idx != NPOS)
+ {
+ slash_idx ++;
+ name = name.substr (slash_idx,
+ name.length () - slash_idx);
+ }
+
+ std::string initial = name.substr (0, 1);
+ initial = String_convert::to_upper (initial);
+ name = name.substr (1, name.length () - 1);
+ name = String_convert::to_lower (name);
ps_name = initial + name;
}
else if (ps_name_str0)
pango_fc_font_unlock_face (fcfont);
SCM expr = scm_list_5 (ly_symbol2scm ("glyph-string"),
- scm_makfrom0str (ps_name.to_str0 ()),
+ scm_makfrom0str (ps_name.c_str ()),
scm_from_double (size),
scm_from_bool (cid_keyed),
ly_quote_scm (glyph_exprs));
}
Stencil
-Pango_font::text_stencil (String str) const
+Pango_font::text_stencil (std::string str) const
{
- GList *items = pango_itemize (context_,
- str.to_str0 (),
- 0, str.length (), attribute_list_,
- NULL);
+ GList *items
+ = pango_itemize (context_,
+ str.c_str (),
+ 0, str.length (), attribute_list_,
+ NULL);
- GList *ptr = items;
Stencil dest;
- Real x = 0.0;
- while (ptr)
+
+ 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)
{
PangoItem *item = (PangoItem *) ptr->data;
- Stencil item_stencil = pango_item_string_stencil (item, str, x);
-
+ Stencil item_stencil = pango_item_string_stencil (item, str);
- /*
- UGH. Is this correct for bidi?
- */
- x = item_stencil.extent (X_AXIS)[RIGHT];
+ if (text_dir == RIGHT)
+ {
+ 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 ())
#endif
dest.add_stencil (item_stencil);
-
- ptr = ptr->next;
}
/*
SCM exp
= scm_list_3 (ly_symbol2scm ("utf-8-string"),
scm_makfrom0str (descr_string),
- scm_makfrom0str (str.to_str0 ()));
+ scm_makfrom0str (str.c_str ()));
g_free (descr_string);
projects / lilypond.git / blobdiff