lilypond-1.3.119

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 2a67d597700a3746c82b67efaa4cb838f27017a6..6d1fe1d95d356eb177b08828602083ffba50e390 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -67,7 +67,8 @@ All_font_metrics::find_afm (String name)
       if (verbose_global_b)
        progress_indication ("[" + path);
       val = read_afm_file (path);
-
+      unsmob_metrics (val)->path_ = path;
+      
       unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0));
 
       if (verbose_global_b)
@@ -85,7 +86,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+= "\n";
+         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_);
          s += "\n";
@@ -122,12 +124,15 @@ All_font_metrics::find_tfm (String name)
       if (path.empty_b())
        return 0;
 
+      
       if (verbose_global_b)
        progress_indication ("[" + path);
       val = Tex_font_metric::make_tfm (path);
+
       if (verbose_global_b)
        progress_indication ("]");
 
+      unsmob_metrics (val)->path_ = path;
       unsmob_metrics (val)->description_ = gh_cons (name_str, gh_double2scm (1.0));
       tfm_p_dict_->set (sname, val);
 

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 8ff6a36bac4127269a6525f81d4437ee31b0f380..360f4d6ed330b7d370e28b62c52d228853d06241 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -69,7 +69,7 @@ Font_metric::Font_metric ()
   smobify_self ();
 }
 
-Font_metric::Font_metric (Font_metric const &)
+Font_metric::Font_metric (Font_metric const &s)
 {
 }
 

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 767b3475df3a3d0319a0141c2ac0bfba3f4cb59a..2ebbf303b106544fadb20870684b945f11390ed2 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -14,12 +14,13 @@
 #include "lily-guile.hh"
 #include "smobs.hh"
 #include "lily-proto.hh"
+#include "string.hh"
 
 struct Font_metric
 {
 public:
   SCM description_;
-
+  String path_;
   virtual Box get_char (int ascii) const;
   virtual Box text_dimension (String)  const;
   virtual Molecule find_by_name (String) const;