/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2015 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
#include "dimensions.hh"
#include "all-font-metrics.hh"
+#include "libc-extension.hh"
#include "output-def.hh"
#include "pango-font.hh"
else
{
SCM family = ly_chain_assoc_get (ly_symbol2scm ("font-family"), chain,
- SCM_BOOL_F);
+ SCM_BOOL_F);
SCM variant = ly_chain_assoc_get (ly_symbol2scm ("font-shape"), chain,
- SCM_BOOL_F);
+ SCM_BOOL_F);
SCM style = ly_chain_assoc_get (ly_symbol2scm ("font-shape"), chain,
- SCM_BOOL_F);
+ SCM_BOOL_F);
SCM weight = ly_chain_assoc_get (ly_symbol2scm ("font-series"), chain,
- SCM_BOOL_F);
+ SCM_BOOL_F);
description
- = symbols_to_pango_font_description (family, style, variant, weight,
- SCM_BOOL_F);
+ = symbols_to_pango_font_description (family, style, variant, weight,
+ SCM_BOOL_F);
}
Real step = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
- 0.0);
+ 0.0);
Real size = text_size * pow (2.0, step / 6.0);
- pango_font_description_set_size (description, gint (size * PANGO_SCALE));
+ pango_font_description_set_size (description,
+ gint (my_round (size * PANGO_SCALE)));
return description;
}
{
PangoFontDescription *pfd
= properties_to_pango_description (chain,
- point_constant
- * layout->get_dimension (ly_symbol2scm ("text-font-size")));
+ point_constant
+ * layout->get_dimension (ly_symbol2scm ("text-font-size")));
char *str = pango_font_description_to_string (pfd);
SCM scm_str = scm_from_locale_string (str);
g_free (str);
pango_font_description_free (pfd);
-
+
return find_pango_font (layout, scm_str, 1.0);
}
symbol_to_pango_style (SCM style)
{
PangoStyle pstyle = PANGO_STYLE_NORMAL;
- if (style == ly_symbol2scm ("italic"))
+ if (scm_is_eq (style, ly_symbol2scm ("italic")))
pstyle = PANGO_STYLE_ITALIC;
- else if (style == ly_symbol2scm ("oblique")
- || style == ly_symbol2scm ("slanted"))
+ else if (scm_is_eq (style, ly_symbol2scm ("oblique"))
+ || scm_is_eq (style, ly_symbol2scm ("slanted")))
pstyle = PANGO_STYLE_OBLIQUE;
return pstyle;
symbol_to_pango_variant (SCM variant)
{
PangoVariant pvariant = PANGO_VARIANT_NORMAL;
- if (variant == ly_symbol2scm ("caps"))
+ if (scm_is_eq (variant, ly_symbol2scm ("caps")))
pvariant = PANGO_VARIANT_SMALL_CAPS;
return pvariant;
}
symbol_to_pango_weight (SCM weight)
{
PangoWeight pw = PANGO_WEIGHT_NORMAL;
- if (weight == ly_symbol2scm ("bold"))
+ if (scm_is_eq (weight, ly_symbol2scm ("bold")))
pw = PANGO_WEIGHT_BOLD;
- if (weight == ly_symbol2scm ("heavy"))
+ if (scm_is_eq (weight, ly_symbol2scm ("heavy")))
pw = PANGO_WEIGHT_HEAVY;
- if (weight == ly_symbol2scm ("ultrabold"))
+ if (scm_is_eq (weight, ly_symbol2scm ("ultrabold")))
pw = PANGO_WEIGHT_ULTRABOLD;
- if (weight == ly_symbol2scm ("light"))
+ if (scm_is_eq (weight, ly_symbol2scm ("light")))
pw = PANGO_WEIGHT_LIGHT;
- if (weight == ly_symbol2scm ("ultralight"))
+ if (scm_is_eq (weight, ly_symbol2scm ("ultralight")))
pw = PANGO_WEIGHT_ULTRALIGHT;
return pw;
PangoFontDescription *
symbols_to_pango_font_description (SCM family,
- SCM style,
- SCM variant,
- SCM weight,
- SCM stretch)
+ SCM style,
+ SCM variant,
+ SCM weight,
+ SCM stretch)
{
PangoFontDescription *description = pango_font_description_new ();
family_str = ly_scm2string (family);
pango_font_description_set_family (description,
- family_str.c_str ());
+ family_str.c_str ());
pango_font_description_set_style (description,
- symbol_to_pango_style (style));
+ symbol_to_pango_style (style));
pango_font_description_set_variant (description,
- symbol_to_pango_variant (variant));
+ symbol_to_pango_variant (variant));
pango_font_description_set_weight (description,
- symbol_to_pango_weight (weight));
+ symbol_to_pango_weight (weight));
pango_font_description_set_stretch (description,
- symbol_to_pango_stretch (stretch));
+ symbol_to_pango_stretch (stretch));
return description;
}