lilypond-1.5.7

diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index e7ff35eb8f60472ca74c32a8d9fc9724df61f74a..45f93fb319af4223e9e25091d8943d1d27a261b6 100644 (file)
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -70,10 +70,10 @@ which substitutes some @AT_VARIABLES@ as well.
       </td></tr>
       <tr><td><font size="-1">
        <a href="@TOP@Documentation/out-www/index.html#mailing-lists">About the lists</a><br>
-       <a href="http://mail.gnu.org/mailman/listinfo/gnu-music-discuss/">Discussion</a><br>
-        <a href="http://mail.gnu.org/mailman/listinfo/help-gnu-music/">Help</a><br>
-        <a href="http://mail.gnu.org/mailman/listinfo/bug-gnu-music/">Bugs</a><br>
-        <a href="http://mail.gnu.org/mailman/listinfo/info-gnu-music/">Announcements</a><br>
+       <a href="http://mail.gnu.org/mailman/listinfo/lilypond-user/">Using LilyPond</a><br>
+        <a href="http://mail.gnu.org/mailman/listinfo/lilypond-devel/">Developing LilyPond</a><br>
+        <a href="http://mail.gnu.org/mailman/listinfo/bug-lilypond/">Reporting bugs</a><br>
+        <a href="http://mail.gnu.org/mailman/listinfo/info-lilypond/">Announcements</a><br>
        <br>
       </font></td></tr>
     <tr><td bgcolor="#e8e8ff"><b>Sites</b></td></tr>

diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely
index b91c7158a0b1a1ea409b65446a8a6eda8fa56c64..03f562a563ba719f0b39bbc7fc2e0183835b14c8 100644 (file)
--- a/Documentation/regression-test.tely
+++ b/Documentation/regression-test.tely
@@ -92,7 +92,8 @@ Grace note do weird things with timing. Fragile.
 
 @lilypondfile[printfilename]{grace-nest4.ly}
 
-@lilypondfile[printfilename]{grace-nest.ly}
+@lilypondfile[printfilename]{grace-nest5.ly}
+@lilypondfile[printfilename]{grace-nest1.ly}
 
 @lilypondfile[printfilename]{grace-start.ly}
 
@@ -212,13 +213,9 @@ Grace note do weird things with timing. Fragile.
 
 @lilypondfile[printfilename]{spacing-loose.ly}
 
-@lilypondfile[printfilename]{spacing-accidentals.ly}
+@lilypondfile[printfilename]{spacing-accidental.ly}
 
-@lilypondfile[printfilename]{spacing-accidentals-staff.ly}
-
-@lilypondfile[printfilename]{spacing-accidentals.ly}
-
-@lilypondfile[printfilename]{spacing-accidentals-staff.ly}
+@lilypondfile[printfilename]{spacing-accidental-staffs.ly}
 
 @lilypondfile[printfilename]{lyrics-bar.ly}
 

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 583d9219c2ad0924c94e0a86a140fb807100a1b6..08392660562399ab85c95df28de6042a526ef08b 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -25,7 +25,7 @@ sequentially.
 
 @item -f,--format=@var{format}
 Output format for sheet music. Choices are @code{tex} (for @TeX{}
-output), @code{ps} (for PostScript), @code{scm} (for a Scheme
+output), @code{pdftex} for PDF@TeX input, @code{ps} (for PostScript), @code{scm} (for a Scheme
 dump), and @code{as} (for ASCII-art).
 
 @c TODO: TFMFONTS

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index fde8167730ed9ea7e9f4d74ee3b4ab20881d6790..8357e2c3ad2d70f92f8b8b75335c8cf1cd5dfbef 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -25,7 +25,7 @@ void
 Grace_iterator::process (Moment m)
 {
   Moment main ;
-  main.main_part_ = music_length_.grace_part_ + m.grace_part_;
+  main.main_part_ = - start_mom_.grace_part_ + m.grace_part_;
   Music_wrapper_iterator::process (main);
 }
 
@@ -43,7 +43,7 @@ Grace_iterator::pending_moment () const
   Moment cp =Music_wrapper_iterator::pending_moment();
 
   Moment pending;
-  pending.grace_part_ =  cp.main_part_- music_length_.grace_part_ ;
+  pending.grace_part_ =  start_mom_.grace_part_ + cp.main_part_;
 
   return pending;
 }

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index 27c88c6f7b66ab283946a1b23ca5ee1dad9f9c34..8fd0ff0d0b8c6cb0ab8da2346de6cec0bf2b8dd3 100644 (file)
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -19,17 +19,18 @@ Grace_music::compress (Moment m)
 Moment
 Grace_music::length_mom () const
 {
-  Moment l = Music_wrapper::length_mom ();
-  Moment gl;
-  gl.grace_part_ = l.main_part_ + l.grace_part_ ;
-  return gl;
+  Moment m ;
+  return m;
 }
 
 
 Moment
 Grace_music::start_mom () const
 {
-  return - length_mom ();
+  Moment l = Music_wrapper::length_mom ();
+  Moment gl;
+  gl.grace_part_ = -(l.main_part_ + l.grace_part_ );
+  return gl;
 }
 
 Grace_music::Grace_music ()

diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh
index 1b8baf9ea931f1fa8b8faf03e08cb65e15ced9b0..c394821df4856c69b17ecda16129fdf2f46dc873 100644 (file)
--- a/lily/include/separating-group-spanner.hh
+++ b/lily/include/separating-group-spanner.hh
@@ -19,6 +19,7 @@ public:
   static void find_rods (Item*, SCM);
   static void set_interface (Grob*);
   static bool has_interface (Grob*);
+  static void find_musical_sequences (Grob*);
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
 };
 

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index a8e9e76fa52a8f7088de2594b16974fad58093c1..1df990d42b5aca513341b4a765c1c78ebded1b78 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -86,8 +86,6 @@ Music_sequence::cumulative_length () const
   last_len.grace_part_ = Rational (0);
   cumulative += last_len;
 
-  cumulative += - first_start ();
-  
   return  cumulative;
 }
 
@@ -105,12 +103,10 @@ Music_sequence::maximum_length () const
   for (SCM s = music_list (); gh_pair_p (s);  s = gh_cdr (s))
     {
       Music * m = unsmob_music (gh_car (s));
-      Moment l = m->length_mom () + m->start_mom ();
+      Moment l = m->length_mom ();
       dur = dur >? l;
     }
 
-  dur -= minimum_start ();
-  
   return dur;
 }
 int
@@ -175,14 +171,9 @@ Music_sequence::first_start () const
     {
       Music * mus = unsmob_music (gh_car (s));
       Moment l = mus->length_mom ();
-
-      if (l.main_part_)
-       return mus->start_mom ();
-      else if (l.grace_part_)
-       {
-         m.grace_part_ = - l.grace_part_; 
-         return m;
-       }
+      Moment s = mus->start_mom ();
+      if (l.to_bool () || s.to_bool ())
+       return s;
     }
   return m;
 }

diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index 5d8ce337de7cbd604b3c928fa350c2e826aa022a..f37320caf078f2bb08157ec126e80100ecaef471 100644 (file)
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -97,8 +97,8 @@ get_grace_fixups (SCM cursor)
   for (; gh_pair_p (cursor); cursor = gh_cdr (cursor))
     {
       Music * mus = unsmob_music (gh_car (cursor));
-      Moment l =mus->length_mom ();
       Moment s = mus->start_mom ();
+      Moment l =mus->length_mom () - s;
 
       if (s.grace_part_)
        {
@@ -154,7 +154,7 @@ Sequential_music_iterator::construct_children ()
 void
 Sequential_music_iterator::next_element ()
 {
-  Moment len =iter_p_->music_length_mom ();
+  Moment len =iter_p_->music_length_mom () - iter_p_->music_start_mom ();
   assert (!grace_fixups_  || grace_fixups_->start_ >= here_mom_);
   
   if (len.main_part_ && grace_fixups_ &&
@@ -245,8 +245,10 @@ Sequential_music_iterator::get_music (Moment until)const
       
       Moment m = 0;
       for (SCM i = nm; gh_pair_p (i); i = gh_cdr (i))
-       m = m >? unsmob_music (gh_car (i))->length_mom ();
-
+       {
+         Music *mus=unsmob_music (gh_car (i));
+         m = m >? (mus->length_mom () - mus->start_mom ());
+       }
       if (m > Moment (0))
        break ;
       else
@@ -256,6 +258,8 @@ Sequential_music_iterator::get_music (Moment until)const
   
   return s;
 }
+
+
 /*
   Skip events till UNTIL. We don't do any other side effects such as
   descending to child iterator contexts, because they might depend on
@@ -291,9 +295,7 @@ Sequential_music_iterator::process (Moment until)
          /*
            do the stuff/note/rest preceding a grace.
           */
-         iter_p_->process (iter_p_->music_length_mom ()+ 
-                           iter_p_->music_start_mom ());
-
+         iter_p_->process (iter_p_->music_length_mom ());
        }
       else
        iter_p_->process (until - here_mom_ + iter_p_->music_start_mom ());

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 8aa3209f28e3c269ee3a3cf17c3431208b6308e5..26bf4e8066b9165b7c54c81f05605dd298bd0141 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -43,6 +43,8 @@ void
 Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength)
 {
   SCM mins = me->get_grob_property ("ideal-distances");
+  
+  
   SCM newdist= gh_double2scm (d);
   for (SCM s = mins; gh_pair_p (s); s = gh_cdr (s))
     {
@@ -60,7 +62,6 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength)
 }
 
 
-
 void
 Spaceable_grob::remove_interface (Grob*me)
 {