2003 -> 2004

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

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index b7a70505c47ff9ff17c7e42f94f8ffdc93db9977..fb6d20b7736b14c6797facb3c24ae21bffd4a2d7 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -53,17 +53,17 @@ All_font_metrics::find_afm (String name)
     {
       String path;
 
-      if (path.empty_b ())
+      if (path.is_empty ())
        path = search_path_.find (name  + ".afm");
 
-      if (path.empty_b ())
+      if (path.is_empty ())
        {
          String p = kpathsea_find_afm (name.to_str0 ());
          if (p.length ())
            path = p;
        }
 
-      if (path.empty_b ())
+      if (path.is_empty ())
        return 0;
       
       if (verbose_global_b)
@@ -127,16 +127,16 @@ All_font_metrics::find_tfm (String name)
     {
       String path;
       
-      if (path.empty_b ())
+      if (path.is_empty ())
        {
          String p = kpathsea_find_tfm (name.to_str0 ());
          if (p.length ())
            path = p;
        }
 
-      if (path.empty_b ())
+      if (path.is_empty ())
        path = search_path_.find (name  + ".tfm");
-      if (path.empty_b ())
+      if (path.is_empty ())
        return 0;
 
       if (verbose_global_b)
@@ -163,7 +163,8 @@ All_font_metrics::find_tfm (String name)
 Font_metric *
 All_font_metrics::find_font (String name)
 {
-  if (name.left_string (4) == "feta") 
+  if ((name.left_string (4) == "feta") ||
+      (name.left_string (8) == "parmesan"))
     {
       Font_metric * f = find_afm (name);
       if (f)