From a987f3f7402ef760f98a3c83912951f98db3fe59 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 19 Aug 2002 10:57:41 +0000 Subject: [PATCH] * lily/self-aligment-interface.cc (centered_on_parent): only return center if extents not empty. * scm/music-functions.scm (unfold-repeats): typo, --- ChangeLog | 5 +++++ input/regression/repeat-unfold-all.ly | 7 +++++-- lily/music.cc | 2 +- lily/self-aligment-interface.cc | 5 +++-- scm/music-functions.scm | 4 ++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5523c15694..45c2a213d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ * VERSION: release 1.6.0 + * lily/self-aligment-interface.cc (centered_on_parent): only + return center if extents not empty. + + * scm/music-functions.scm (unfold-repeats): typo, + * mf/feta-bolletjes.mf: use resolution independent variables. 2002-08-19 janneke diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index 23428c15e5..b4fe54c30b 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -4,9 +4,12 @@ texidoc = "Repeats may be unfolded through the Scheme function @code{unfold-repeats}." } -nots = \notes\relative c' {c4 \repeat volta 2 c4 \alternative { d e }} +nots = \notes\relative c' { + c4 \repeat volta 2 c4 \alternative { d e } + \repeat tremolo 4 { c16 d } +} -\score { \notes { +\score { \notes \context Voice { \nots \apply #unfold-repeats \nots } diff --git a/lily/music.cc b/lily/music.cc index 6f9ce4c928..4eb6a68514 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -231,7 +231,7 @@ LY_DEFINE(ly_set_mus_property, "Set property @var{sym} in music expression @var{mus} to @var{val}.") { Music * sc = unsmob_music (mus); - SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "music"); SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc index dd0c05cc19..15eec97cd0 100644 --- a/lily/self-aligment-interface.cc +++ b/lily/self-aligment-interface.cc @@ -11,8 +11,9 @@ Self_alignment_interface::centered_on_parent (SCM element_smob, SCM axis) Grob *me = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); Grob *him = me->get_parent (a); - - return gh_double2scm (him->extent (him,a).center ()); + Interval he = him->extent (him,a); + + return gh_double2scm (he.empty_b () ? 0.0 : he.center ()); } diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 59a78254ee..cab888da17 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -53,13 +53,13 @@ written by Rune Zedeler. " (let* ((es (ly-get-mus-property music 'elements)) (e (ly-get-mus-property music 'element)) (n (ly-music-name music))) - + (if (equal? n "Repeated_music") (begin (if (equal? (ly-get-mus-property music 'iterator-ctor) Chord_tremolo_iterator::constructor) - (shift-duration-log music (- (intlog2 (ly-get-mus-property 'repeat-count music)))) + (shift-duration-log music (intlog2 (ly-get-mus-property music 'repeat-count))) ) (ly-set-mus-property! music 'length Repeated_music::unfolded_music_length) -- 2.39.2