X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=12d8807831d5d57023ef905de5bdb501a8d46972;hb=ead2bc50eefa1caf1f375488e11f93ee504dbaf2;hp=2f61d53f3fb821746b6a64e29b98d6a867b1cbdd;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 2f61d53f3f..12d8807831 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2007 Han-Wen Nienhuys + (c) 1999--2009 Han-Wen Nienhuys Mats Bengtsson (the ugly TeX parsing in text_dimension) */ @@ -31,7 +31,7 @@ Font_metric::design_size () const 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; @@ -185,10 +185,9 @@ Font_metric::word_stencil (string str) const } Stencil -Font_metric::text_stencil (string str) const +Font_metric::text_stencil (string /* str */) const { - (void) str; - assert (false); + programming_error("Cannot get a text stencil from this font"); return Stencil (Box (), SCM_EOL); }