From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 24 Sep 2003 15:49:57 +0000 (+0000)
Subject: * lily/spacing-spanner.cc (note_spacing): don't make longer
X-Git-Tag: release/2.0.1~25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c77ce13768e0173945afc071d2253a3d576ccc08;p=lilypond.git

* lily/spacing-spanner.cc (note_spacing): don't make longer
durations than measure-length.

* VERSION: release 2.0.0

* GNUmakefile.in (rsync-web): version independent rsync target.

* input/regression/+.ly: print version number.

* Documentation/topdocs/NEWS.texi (Top): insert close brace.

* VERSION (PACKAGE_NAME): release 1.9.10
---

diff --git a/ChangeLog b/ChangeLog
index bf9b4bb5c7..c247896f5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* lily/spacing-spanner.cc (note_spacing): don't make longer
+	durations than measure-length.
+
 	* VERSION: release 2.0.0
 
 	* GNUmakefile.in (rsync-web): version independent rsync target.
@@ -44,7 +47,6 @@
 	quartertones, not semitones.
 	(NoteNamesContext): swallow more event types
 
-
 	* Documentation/topdocs/NEWS.texi (Top): insert close brace.
 
 	* VERSION (PACKAGE_NAME): release 1.9.10
diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index bd94264729..4b996abc13 100644
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -81,8 +81,8 @@ one with cue notes for the instrumental part:
 
 @example
 << \tag #'part <<
-  @{ c4 f2 g4 @}      % in the part, we have cue-notes  
-  \\ R1 >>
+     @{ c4 f2 g4 @}      % in the part, we have cue-notes  
+     \\ R1 >>
   \tag #'score R1  % in the score: only a rest
 >>
 @end example
diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 72d72af0eb..996d2caf80 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -867,6 +867,18 @@ Spacing_spanner::note_spacing (Grob*me, Grob *lc, Grob *rc,
   Moment rwhen =  Paper_column::when_mom (rc);
 
   Moment delta_t = rwhen - lwhen;
+  if (!Paper_column::musical_b (rc ))
+    {
+      /*
+	when toying with mmrests, it is possible to have musical
+	column on the left and non-musical on the right, spanning
+	several measures.
+       */
+      
+      Moment *dt = unsmob_moment (rc->get_grob_property ("measure-length"));
+      if (dt)
+	delta_t = delta_t <? *dt; 
+    }
   Real dist = 0.0;
 
   /*