/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2003--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2003--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
if (scm_promise_p (entry) == SCM_BOOL_T)
{
- Font_metric *fm = unsmob_metrics (scm_force (entry));
+ Font_metric *fm = Font_metric::unsmob (scm_force (entry));
size = fm->design_size ();
}
#if HAVE_PANGO_FT2
#endif
}
else
- fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i)));
+ fm = Font_metric::unsmob (scm_force (scm_c_vector_ref (font_vector, i)));
return find_scaled_font (layout, fm, requested / size);
}
return select_pango_font (layout, chain);
else
#endif
- if (scm_instance_p (name))
+ if (scm_is_true (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"));