From 2badebc070d68e48945592125b9aee3a42e8e73a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 26 Jan 2004 10:36:39 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ configure.in | 2 +- lily/note-heads-engraver.cc | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 620132cbc2..1a02b08fed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-01-26 Jan Nieuwenhuizen + + * 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 * lily/lyric-phrasing-engraver.cc (stop_translation_timestep): diff --git a/configure.in b/configure.in index e048975f72..c86e919778 100644 --- 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 2927d4dc54..bd8b1c8a86 100644 --- 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); -- 2.39.2