Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 2f61d53f3fb821746b6a64e29b98d6a867b1cbdd..215bf679812bee9da7f56682e67dd41cfd9b9bb9 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -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;
 
@@ -188,7 +188,7 @@ Stencil
 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);
 }