release: 1.3.127

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 0ebc486c678220463fc2c53ff4d872d4068b2813..33a4667ef707058c37c5575b06b91e2ec4d62f1b 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -18,11 +18,7 @@
 #include "scm-hash.hh"
 #include "kpath.hh"
 
-
-
-
-
-const char * default_font_sz_ = "cmr10";
+static const char * default_font_sz_ = "cmr10";
 
 All_font_metrics::All_font_metrics (String path)
 {
@@ -159,12 +155,10 @@ All_font_metrics::find_font (String name)
   warning (_ ("Loading default font"));
   
   String def_name = default_font_sz_;
-  SCM l = scm_assoc (ly_str02scm ("default"),
-                    scm_eval2 (ly_symbol2scm ("cmr-alist"), SCM_EOL));
-  
-  if (l != SCM_BOOL_F)
-    def_name = ly_scm2string (gh_cdr (l));
 
+  /*
+    we're in emergency recovery mode here anyway, so don't try to do
+    anything smart that runs the risk of failing.  */
   f= find_afm (def_name);
   if (f)
     return f;