/*
- pango-select.cc -- implement lily font selection for Pango_fonts.
+ pango-select.cc -- implement lily font selection for Pango_fonts.
source file of the GNU LilyPond music typesetter
- (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+ (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include <math.h>
#include "output-def.hh"
#include "pango-font.hh"
-
PangoFontDescription *
properties_to_pango_description (SCM chain, Real text_size)
{
- SCM name = ly_chain_assoc (ly_symbol2scm ("font-name"), chain);
+ SCM name = ly_chain_assoc_get (ly_symbol2scm ("font-name"), chain, SCM_BOOL_F);
PangoFontDescription *description = 0;
- if (scm_is_pair (name) && scm_is_string (scm_cdr (name)))
+ if (scm_is_string (name))
{
- String name_str = ly_scm2string (scm_cdr (name));
+ String name_str = ly_scm2string (name);
description = pango_font_description_from_string (name_str.to_str0 ());
}
else
SCM_BOOL_F);
SCM variant = ly_chain_assoc_get (ly_symbol2scm ("font-shape"), chain,
SCM_BOOL_F);
-
+
SCM style = ly_chain_assoc_get (ly_symbol2scm ("font-shape"), chain,
SCM_BOOL_F);
SCM weight = ly_chain_assoc_get (ly_symbol2scm ("font-series"), chain,
SCM_BOOL_F);
-
+
description
= symbols_to_pango_font_description (family, style, variant, weight,
SCM_BOOL_F);
}
- Real step = robust_scm2double (ly_symbol2scm ("font-size"), 0.0);
+ Real step = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
+ 0.0);
Real size = text_size * pow (2.0, step / 6.0);
-
+
pango_font_description_set_size (description,
gint (size * PANGO_SCALE));
return description;
Font_metric *
select_pango_font (Output_def *layout, SCM chain)
{
- PangoFontDescription *pfd = properties_to_pango_description (chain,
- point_constant * layout->get_dimension (ly_symbol2scm ("text-font-size")));
-
- Font_metric * fm = all_fonts_global->find_pango_font (pfd);
+ PangoFontDescription *pfd
+ = properties_to_pango_description (chain,
+ point_constant
+ * layout->get_dimension (ly_symbol2scm ("text-font-size")));
+
+ char *str = pango_font_description_to_string (pfd);
+ SCM scm_str = scm_makfrom0str (str);
+ g_free (str);
- return find_scaled_font (layout, fm, 1.0);
+ return find_pango_font (layout, scm_str, 1.0);
}
PangoStyle
pstyle = PANGO_STYLE_ITALIC;
}
else if (style == ly_symbol2scm ("oblique")
- || style == ly_symbol2scm ("slanted")
- )
+ || style == ly_symbol2scm ("slanted"))
{
pstyle = PANGO_STYLE_OBLIQUE;
}
return pvariant;
}
-
PangoWeight
symbol_to_pango_weight (SCM weight)
{
PangoStretch ps = PANGO_STRETCH_NORMAL;
/*
- // TODO
-
+ // TODO
+
PANGO_STRETCH_ULTRA_CONDENSED,
PANGO_STRETCH_EXTRA_CONDENSED,
PANGO_STRETCH_CONDENSED,
PANGO_STRETCH_SEMI_CONDENSED,
-
+
PANGO_STRETCH_SEMI_EXPANDED,
PANGO_STRETCH_EXPANDED,
PANGO_STRETCH_EXTRA_EXPANDED,
PANGO_STRETCH_ULTRA_EXPANDED
- */
+ */
return ps;
}
-
-
-PangoFontDescription*
-symbols_to_pango_font_description(SCM family,
- SCM style,
- SCM variant,
- SCM weight,
- SCM stretch)
+PangoFontDescription *
+symbols_to_pango_font_description (SCM family,
+ SCM style,
+ SCM variant,
+ SCM weight,
+ SCM stretch)
{
- PangoFontDescription * description = pango_font_description_new ();
+ PangoFontDescription *description = pango_font_description_new ();
String family_str = "roman";
if (scm_is_symbol (family))