X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-spanner.cc;h=4a6d0b05156dd602f7bcefde0261f539f00ad0aa;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8ebf100a530ad8d2085142647e9e414883fb8953;hpb=af7c2aee31efc83b9c0ff67cf2dfeea9fbaf937c;p=lilypond.git

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 8ebf100a53..4a6d0b0515 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spacing-spanner.hh"
@@ -21,6 +21,7 @@
 #include "paper-score.hh"
 #include "pointer-group-interface.hh"
 #include "separation-item.hh"
+#include "skyline-pair.hh"
 #include "spaceable-grob.hh"
 #include "spacing-interface.hh"
 #include "staff-spacing.hh"
@@ -136,7 +137,7 @@ Spacing_spanner::calc_common_shortest_duration (SCM grob)
 	}
     }
 
-  int max_idx = -1;
+  vsize max_idx = VPOS;
   int max_count = 0;
   for (vsize i = durations.size (); i--;)
     {
@@ -152,7 +153,7 @@ Spacing_spanner::calc_common_shortest_duration (SCM grob)
   if (Moment *m = unsmob_moment (bsd))
     d = m->main_part_;
 
-  if (max_idx >= 0)
+  if (max_idx != VPOS)
     d = min (d, durations[max_idx]);
 
   return Moment (d).smobbed_copy ();
@@ -367,16 +368,9 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 	  else
 	    {
 	      /*
-		Fixed should be 0.0. If there are no spacing wishes, we're
-		likely dealing with polyphonic spacing of hemiolas.
-	    
-		We used to have min_distance_ = options->increment_
-
-		but this can lead to numeric instability problems when we
-		do
-	    
-		inverse_strength = (distance_ - min_distance_)
-      
+		Min distance should be 0.0. If there are no spacing
+		wishes, we're probably dealing with polyphonic spacing
+		of hemiolas.      
 	      */
 	      spring = Spring (base_note_space, 0.0);
 	    }
@@ -401,14 +395,18 @@ Spacing_spanner::musical_column_spacing (Grob *me,
     {
       /*
 	In packed mode, pack notes as tight as possible.  This makes
-	sense mostly in combination with raggedright mode: the notes
+	sense mostly in combination with ragged-right mode: the notes
 	are then printed at minimum distance.  This is mostly useful
 	for ancient notation, but may also be useful for some flavours
-	of contemporary music.  If not in raggedright mode, lily will
-	pack as much bars of music as possible into a line, but the
+	of contemporary music.  If not in ragged-right mode, lily will
+	pack as many bars of music as possible into a line, but the
 	line will then be stretched to fill the whole linewidth.
+
+	Note that we don't actually pack things as tightly as possible:
+	we don't allow the next column to begin before this one ends.
       */
-      spring.set_distance (spring.min_distance ());
+      spring.set_distance (max (left_col->extent (left_col, X_AXIS)[RIGHT],
+				spring.min_distance ()));
       spring.set_inverse_stretch_strength (1.0);
     }
 
@@ -517,18 +515,20 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
 }
 
 ADD_INTERFACE (Spacing_spanner,
-	       "The space taken by a note is dependent on its duration. Doubling a\n"
-	       "duration adds spacing-increment to the space. The most common shortest\n"
-	       "note gets @code{shortest-duration-space}. Notes that are even shorter are\n"
-	       "spaced proportonial to their duration.\n"
+	       "The space taken by a note is dependent on its duration."
+	       "  Doubling a duration adds @code{spacing-increment} to the"
+	       " space.  The most common shortest note gets"
+	       " @code{shortest-duration-space}.  Notes that are even shorter"
+	       " are spaced proportonial to their duration.\n"
 	       "\n"
-	       "Typically, the increment is the width of a black note head.  In a\n"
-	       "piece with lots of 8th notes, and some 16th notes, the eighth note\n"
-	       "gets 2 note heads width (i.e. the space following a note is 1 note\n"
-	       "head width) A 16th note is followed by 0.5 note head width. The\n"
-	       "quarter note is followed by  3 NHW, the half by 4 NHW, etc.\n",
-
-	       
+	       "Typically, the increment is the width of a black note head."
+	       "  In a piece with lots of 8th notes, and some 16th notes, the"
+	       " eighth note gets a 2@tie{}note heads width (i.e., the space"
+	       " following a note is a 1@tie{}note head width).  A 16th note"
+	       " is followed by 0.5 note head width.  The quarter note is"
+	       " followed by 3@tie{}NHW, the half by 4@tie{}NHW, etc.",
+
+	       /* properties */
 	       "average-spacing-wishes "
 	       "base-shortest-duration "
 	       "common-shortest-duration "
@@ -538,6 +538,5 @@ ADD_INTERFACE (Spacing_spanner,
 	       "strict-grace-spacing "
 	       "strict-note-spacing "
 	       "uniform-stretching "
-	       
 	       );