From: fred <fred>
Date: Wed, 27 Mar 2002 01:01:47 +0000 (+0000)
Subject: lilypond-1.3.154
X-Git-Tag: release/1.5.59~750
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7c0d27170bc87dfbe7896bbb5014a91024d13a31;p=lilypond.git

lilypond-1.3.154
---

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 72003d663e..6d728efd0a 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -123,8 +123,8 @@ All_font_metrics::find_tfm (String name)
       
       if (path.empty_b ())
 	{
-	  char * p = ly_find_tfm (name.ch_C ());
-	  if (p)
+	  String p = ly_find_tfm (name.ch_C ());
+	  if (p.length_i ())
 	    path = p;
 	}
 
diff --git a/lily/grob.cc b/lily/grob.cc
index 98f0601722..db504faa81 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -295,8 +295,6 @@ Grob::get_uncached_molecule ()const
 
       m = unsmob_molecule (mol);
     }
-
-
   
   /*
     transparent retains dimensions of element.
diff --git a/lily/include/kpath.hh b/lily/include/kpath.hh
index e6b0f54398..accc1f610a 100644
--- a/lily/include/kpath.hh
+++ b/lily/include/kpath.hh
@@ -13,7 +13,7 @@ source file of the GNU LilyPond music typesetter
 
 
 char * ly_find_afm (char const * name);
-char * ly_find_tfm (char const * name);
+String ly_find_tfm (char const * name);
 void ly_init_kpath (char *av0);