Merge with master

[lilypond.git] / lily / spacing-spanner.cc

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index fb91f0b0102b4c7e0432e0ffde48cb57e62e7eb4..50848ecc598a2ae8c33f944605e6efd3ce2967d5 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spacing-spanner.hh"
@@ -54,12 +54,12 @@ Spacing_spanner::set_springs (SCM smob)
   */
   Spacing_options options;
   options.init_from_grob (me);
+  vector<Grob*> cols = Spacing_spanner::get_columns (me);
+  set_explicit_neighbor_columns (cols);
 
-  set_explicit_neighbor_columns (options.columns_);
-
-  prune_loose_columns (me, &options);
-  set_implicit_neighbor_columns (options.columns_);
-  generate_springs (me, &options);
+  prune_loose_columns (me, &cols, &options);
+  set_implicit_neighbor_columns (cols);
+  generate_springs (me, cols, &options);
 
   return SCM_UNSPECIFIED;
 }
@@ -216,13 +216,14 @@ Spacing_spanner::generate_pair_spacing (Grob *me,
 
 void
 Spacing_spanner::generate_springs (Grob *me,
+                                  vector<Grob*> const &cols,
                                   Spacing_options const *options)
 {
   Paper_column *prev = 0;
-  for (vsize i = 0; i < options->columns_.size (); i++)
+  for (vsize i = 0; i < cols.size (); i++)
     {
-      Paper_column *col = dynamic_cast<Paper_column *> (options->columns_[i]);
-      Paper_column *next = (i < options->columns_.size()-1) ? dynamic_cast<Paper_column *> (options->columns_[i+1]) : 0;
+      Paper_column *col = dynamic_cast<Paper_column *> (cols[i]);
+      Paper_column *next = (i + 1 < cols.size ()) ? dynamic_cast<Paper_column *> (cols[i+1]) : 0;
       
       if (i > 0)
        generate_pair_spacing (me, prev, col, next, options);
@@ -317,6 +318,9 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 
          if (!Paper_column::is_musical (right_col))
            {
+             /*
+               reconsider this: breaks with wide marks/tempos/etc.
+              */
              Real left_col_stick_out = robust_relative_extent (left_col, left_col,  X_AXIS)[RIGHT];
              compound_fixed_note_space = max (left_col_stick_out, options->increment_);
 
@@ -393,27 +397,42 @@ Spacing_spanner::musical_column_spacing (Grob *me,
   Spaceable_grob::add_spring (left_col, right_col, distance, inverse_strength);
 }
 
+/*
+  Check if COL fills the whole measure.
+ */
 bool
-Spacing_spanner::fills_measure (Grob *me, Item *l, Item *r)
+Spacing_spanner::fills_measure (Grob *me, Item *left, Item *col)
 {
-  return false;
   System *sys = get_root_system (me);
-  Grob *next = sys->column (r->get_column()->get_rank () + 1);
+  Item *next = sys->column (col->get_column()->get_rank () + 1);
   if (!next)
     return false;
 
+  if (Paper_column::is_musical (next)
+      || Paper_column::is_musical (left)
+      || !Paper_column::is_musical (col)
+      || !Paper_column::is_used (next))
+    return false;
+  
   Moment dt =
-    Paper_column::when_mom (next) - Paper_column::when_mom (r);
+    Paper_column::when_mom (next) - Paper_column::when_mom (col);
   
-  Moment *len = unsmob_moment (l->get_property ("measure-length"));
+  Moment *len = unsmob_moment (left->get_property ("measure-length"));
   if (!len)
     return false;
   
-  if (dt.main_part_ == len->main_part_)
+  /*
+    Don't check for exact measure length, since ending measures are
+    often shortened due to pickups.
+   */
+  if (dt.main_part_ > len->main_part_ / Rational (2)
+      && (next->is_broken ()
+         || next->break_status_dir ()))
     return true;
 
   return false;
 }
+
 /*
   Read hints from L and generate springs.
 */
@@ -493,7 +512,9 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
       
     }
 
-  if (fills_measure (me, l, r))
+  if (Paper_column::is_musical (r)
+      && l->break_status_dir () == CENTER
+      && fills_measure (me, l, r))
     {
       compound_space += 1.0; 
     }
@@ -504,13 +525,6 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
   assert (!isinf (compound_space));
   compound_space = max (compound_space, compound_fixed);
 
-  /*
-    There used to be code that changed spacing depending on
-    raggedright setting.  Ugh.
-
-    Do it more cleanly, or rename the property.
-
-  */
   Real inverse_strength = (compound_space - compound_fixed);
   Real distance = compound_space;
   Spaceable_grob::add_spring (l, r, distance, inverse_strength);
@@ -541,9 +555,3 @@ ADD_INTERFACE (Spacing_spanner,
               
               );
 
-ADD_INTERFACE (Spacing_interface,
-              "Something to do with line breaking and spacing. "
-              "Kill this one after determining line breaks.",
-              
-              "");
-