source file of the GNU LilyPond music typesetter
- (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
*/
#include "modified-font-metric.hh"
#include "open-type-font.hh"
#include "stencil.hh"
-#include "virtual-methods.hh"
#include "warn.hh"
#include "ly-smobs.icc"
Stencil
Font_metric::find_by_name (string s) const
{
- replace_all (s, '-', 'M');
+ replace_all (&s, '-', 'M');
int idx = name_to_index (s);
Box b;
{
expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
self_scm (),
- scm_makfrom0str (s.c_str ()));
+ ly_string2scm (s));
b = get_indexed_char (idx);
}
}
Stencil
-Font_metric::text_stencil (string str) const
+Font_metric::word_stencil (string str) const
{
- SCM lst = scm_list_3 (ly_symbol2scm ("text"),
- this->self_scm (),
- scm_makfrom0str (str.c_str ()));
+ return text_stencil (str);
+}
- Box b = text_dimension (str);
- return Stencil (b, lst);
+Stencil
+Font_metric::text_stencil (string str) const
+{
+ (void) str;
+ programming_error("Cannot get a text stencil from this font");
+ return Stencil (Box (), SCM_EOL);
}
Box