run cvs up before patching.

[lilypond.git] / lily / all-font-metrics.cc

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 4159cd5a32356f52be6d2d85105fee8919e83bfc..4d95f9e6c1c00fd4aab59a5b1f3e7f6e0d38f202 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -15,8 +15,6 @@
 #include "scm-hash.hh"
 #include "warn.hh"
 
-static char const *default_font_str0_ = "cmr10";
-
 All_font_metrics::All_font_metrics (string path)
 {
   otf_dict_ = new Scheme_hash_table;
@@ -158,20 +156,9 @@ All_font_metrics::find_font (string name)
 {
   Font_metric *f = find_otf (name);
 
-
-  if (!f)
-    {
-      warning (_f ("can't find font: `%s'", name.c_str ()));
-      warning (_ ("loading default font"));
-    }
-
-  string def_name = default_font_str0_;
-
   if (!f)
     {
-      error (_f ("can't find default font: `%s'", def_name.c_str ()));
-      error (_f ("(search path: `%s')", search_path_.to_string ()));
-      error (_ ("giving up"));
+      error (_f ("can't find font: `%s'", name.c_str ()));
     }
 
   return f;