(substitute_char): Rename, rewrite, modify this.

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 63658d6be34b3f5d901102653551db02b25fe439..a73e22a2fc02f8e251b022ab8b2502014026baf7 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -8,7 +8,7 @@
 
 #include "all-font-metrics.hh"
 
-#include "open-type-font.hh"
+//#include "open-type-font.hh"
 #include "config.hh"
 #include "main.hh"
 #include "warn.hh"
@@ -17,7 +17,7 @@
 #include "scm-hash.hh"
 #include "kpath.hh"
 
-static const char *default_font_str0_ = "cmr10";
+static char const *default_font_str0_ = "cmr10";
 
 All_font_metrics::All_font_metrics (String path)
 {
@@ -120,6 +120,7 @@ All_font_metrics::find_afm (String name)
   return dynamic_cast<Adobe_font_metric*> (unsmob_metrics (val));
 }
 
+#if 0
 
 Open_type_font*
 All_font_metrics::find_otf (String name)
@@ -153,7 +154,7 @@ All_font_metrics::find_otf (String name)
 
   return dynamic_cast<Open_type_font*> (unsmob_metrics (val));
 }
-
+#endif
 
 Tex_font_metric*
 All_font_metrics::find_tfm (String name)
@@ -200,13 +201,13 @@ All_font_metrics::find_tfm (String name)
 Font_metric*
 All_font_metrics::find_font (String name)
 {
-  Font_metric *f = find_otf (name);
-
+  //Font_metric *f = find_otf (name);
+  Font_metric *f = 0;
   
   if (!f &&
-      (name.left_string (4) == "feta")
-      || (name.left_string (8) == "parmesan")
-      || (name.left_string (2) == "lm"))
+      (name.left_string (4) == "feta"
+       || (name.left_string (8) == "parmesan")
+       || (name.left_string (2) == "lm")))
     {
       f = find_afm (name);
       if (!f)