From: fred <fred>
Date: Wed, 27 Mar 2002 00:35:25 +0000 (+0000)
Subject: lilypond-1.3.124
X-Git-Tag: release/1.5.59~999
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=754d6e58dc9cdf8b375c09c3a0b55150747711f5;p=lilypond.git

lilypond-1.3.124
---

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 6d1fe1d95d..0ebc486c67 100644
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -85,8 +85,8 @@ All_font_metrics::find_afm (String name)
 
       if (tfm->info_.checksum != afm->checksum_)
 	{
-	  String s = _f ("checksum mismatch for font file: `%s'", path.ch_C ());
-	  s += _f ("does not match: `%s'", tfm->path_.ch_C()); // FIXME
+	  String s = _f ("checksum mismatch for font file:\n`%s'", path.ch_C ());
+	  s += " " + _f ("does not match: `%s'", tfm->path_.ch_C()); // FIXME
 	  s += "\n";
 	  s += " TFM: " + to_str ((int) tfm->info_.checksum);
 	  s += " AFM: " + to_str ((int) afm->checksum_);
@@ -138,7 +138,7 @@ All_font_metrics::find_tfm (String name)
 
       scm_unprotect_object (val);
     }
-    
+
   return
     dynamic_cast<Tex_font_metric*> (unsmob_metrics (val));
 }
diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 2da00c7b54..068ca68ae2 100644
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -161,8 +161,6 @@ public:
   Tfm_header header_;
   Array<Tex_font_char_metric> char_metrics_;
   Array<int> ascii_to_metric_idx_;
-
-  String path_;
 private:
   Tex_font_metric ();
 };