* lily/note-heads-engraver.cc (process_music): use robust_scm2int

(iso gh_scm2int), fixes crash in new part-combiner.

* configure.in: Up mftrace to 1.0.27.

diff --git a/ChangeLog b/ChangeLog
index 620132cbc202b69931c44b7e7c83046fd9019414..1a02b08fedbe12e0417f9b6987a3512247301437 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-26  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/note-heads-engraver.cc (process_music): use robust_scm2int
+       (iso gh_scm2int), fixes crash in new part-combiner.
+
+       * configure.in: Up mftrace to 1.0.27.
+
 2004-01-26  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/lyric-phrasing-engraver.cc (stop_translation_timestep):

diff --git a/configure.in b/configure.in
index e048975f72eb447b1be0e429e9f8cb1bad7c1d44..c86e9197783df5614a25617a8261d9a523511546 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,7 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.17)
+STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
 
 # new makeinfo for multi-page website docs
 STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 2927d4dc54c5de6341d1c4b9c08c81c05c5a935d..bd8b1c8a86810d6223bfb2750561d4fbc2ebfd0b 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -76,7 +76,7 @@ Note_heads_engraver::process_music ()
          Rhythmic_head::set_dots (note, d);
          
          if (dur.dot_count ()
-             != gh_scm2int (d->get_grob_property ("dot-count")))
+             != robust_scm2int (d->get_grob_property ("dot-count"), 0))
            d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);