lilypond-1.3.128

diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly
index 802727f22e5fbc9d90ba0a2617b9d3b24e27b2bf..04f9ecbbac3e30268ac3930b4fcf5c1c71212c4d 100644 (file)
--- 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 32e8202e81b883ed0963bb45c292722fa9022e82..5785e114cff6742a68141c84b4c1efce2cf4b8d0 100644 (file)
--- 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 4195416c33f8a9fdbb3fb666edb6ad178f5bdc45..f7b7341288da247259ef2c76c15d375818239745 100644 (file)
--- 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.
 %