source file of the GNU LilyPond music typesetter
- (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include <math.h>
#include "dimensions.hh"
#include "all-font-metrics.hh"
#endif
}
else
- {
- fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i)));
- }
+ fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i)));
return find_scaled_font (layout, fm, requested / size);
}
#if HAVE_PANGO_FT2
if (scm_is_string (name)
&& is_pango_format_global)
- {
- return select_pango_font (layout, chain);
- }
+ return select_pango_font (layout, chain);
else
#endif
- if (scm_is_string (name))
- {
- Real rmag =
- robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-magnification"), chain, SCM_BOOL_F),
- 1.0);
- Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
-
- return find_scaled_font (layout, fm, rmag);
- }
- else if (scm_instance_p (name))
+ if (scm_instance_p (name))
{
SCM base_size = scm_slot_ref (name, ly_symbol2scm ("default-size"));
SCM vec = scm_slot_ref (name, ly_symbol2scm ("size-vector"));
Real req = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
0.0);
-
+
return get_font_by_mag_step (layout, req, vec,
scm_to_double (base_size));
}