From dab1dca2dccaf8bcb0e73795763c38379f0d7523 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 31 Jan 2001 21:41:37 +0000 Subject: [PATCH] lilypond-1.3.128 --- input/regression/triplets.ly | 4 ++-- lily/repeated-music.cc | 5 ++++- mf/feta-generic.mf | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly index 802727f22e..04f9ecbbac 100644 --- a/input/regression/triplets.ly +++ b/input/regression/triplets.ly @@ -8,7 +8,7 @@ texidoc="Simple beams. This broke somewhere < 1.3.110 linebreak = \penalty -1000; -$ex8 = \notes \relative c' { +ex = \notes \relative c' { \repeat "volta" 2 { \times 2/3 {c8( cis d} \times 2/3 {dis e f} \times 2/3 {fis g gis} \times 2/3 {a bes b} | @@ -24,4 +24,4 @@ $ex8 = \notes \relative c' { c1 || \linebreak } -\score { \context Staff { \notes { \$ex8 } } } +\score { \context Staff { \notes { \ex } } } diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 32e8202e81..5785e114cf 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -96,8 +96,11 @@ Repeated_music::alternatives_length_mom (bool fold) const Moment Repeated_music::alternatives_volta_length_mom () const { - SCM p = alternatives ()->music_list (); + if (!alternatives ()) + return 0; + Moment m; + SCM p = alternatives ()->music_list (); while (gh_pair_p (p)) { m = m + unsmob_music (gh_car (p))->length_mom (); diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 4195416c33..f7b7341288 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -1,4 +1,4 @@ -i% +% % feta-generic.mf -- implement generic stuff: include lots of files, but don't % set dims. % -- 2.11.4.GIT