X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-loose-columns.cc;h=03cac8431c0b26858eedd1286c3539ff5e980ed9;hb=d873e86e58792e7d4fc743365338e385677233da;hp=13a37071c04e69af72df52a1b5f2439241f5085e;hpb=486dff860f7b34dfe4c88a9ad6d565a02ad9bf76;p=lilypond.git

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index 13a37071c0..03cac8431c 100644
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -1,9 +1,20 @@
 /*
-  spacing-loose-columns.cc -- implement loose column spacing.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "system.hh"
@@ -15,6 +26,7 @@
 #include "spacing-spanner.hh"
 #include "warn.hh"
 #include "moment.hh"
+#include "spacing-options.hh"
 
 /* Find the loose columns in POSNS, and drape them around the columns
    specified in BETWEEN-COLS.  */
@@ -25,14 +37,13 @@ set_loose_columns (System *which, Column_x_positions const *posns)
   if (!loose_col_count)
     return;
 
+  for (int i = 0; i < loose_col_count; i++)
+    dynamic_cast<Paper_column *> (posns->loose_cols_[i])->set_system (which);
+
   for (int i = 0; i < loose_col_count; i++)
     {
       int divide_over = 1;
       Item *loose = dynamic_cast<Item *> (posns->loose_cols_[i]);
-      Paper_column *col = dynamic_cast<Paper_column *> (loose);
-
-      if (col->get_system ())
-	continue;
 
       Item *left = 0;
       Item *right = 0;
@@ -44,8 +55,13 @@ set_loose_columns (System *which, Column_x_positions const *posns)
 	  if (!scm_is_pair (between))
 	    break;
 
-	  Item *le = dynamic_cast<Item *> (unsmob_grob (scm_car (between)));
-	  Item *re = dynamic_cast<Item *> (unsmob_grob (scm_cdr (between)));
+	  /* If the line was broken at one of the loose columns, split
+	     the clique at that column. */
+	  if (!loose->get_system ())
+	    break;
+
+	  Paper_column *le = dynamic_cast<Paper_column *> (unsmob_grob (scm_car (between)));
+	  Paper_column *re = dynamic_cast<Paper_column *> (unsmob_grob (scm_cdr (between)));
 
 	  if (! (le && re))
 	    break;
@@ -65,16 +81,40 @@ set_loose_columns (System *which, Column_x_positions const *posns)
 	  loose = right = re->get_column ();
 	}
 
-      if (!right->get_system ())
-	right = right->find_prebroken_piece (LEFT);
+      if (!right)
+	{
+	  programming_error ("Can't attach loose column sensibly. Attaching to end of system.");
+	  right = which->get_bound (RIGHT);
+	}
 
+      if (right->get_system ())
+	; /* do nothing */
+      else if (right->find_prebroken_piece (LEFT)
+	       && right->find_prebroken_piece (LEFT)->get_system () == which)
+	right = right->find_prebroken_piece (LEFT);
+      else if (Paper_column::get_rank (which->get_bound (RIGHT)) < Paper_column::get_rank (right))
+	right = which->get_bound (RIGHT);
+      else
+	{
+	  clique.back ()->programming_error ("Loose column does not have right side to attach to.");
+	  System *base_system = dynamic_cast<System*> (which->original ());
+	  int j = Paper_column::get_rank (clique.back ()) + 1;
+	  int end_rank = Paper_column::get_rank (which->get_bound (RIGHT));
+	  extract_grob_set (base_system, "columns", base_cols);
+	  for (; j < end_rank; j++)
+	    {
+	      if (base_cols[j]->get_system () == which)
+		right = dynamic_cast<Item*> ((Grob*)base_cols[j]);
+	    }
+	}
+      
       Grob *common = right->common_refpoint (left, X_AXIS);
 
       clique.push_back (right);
 
       vector<Real> clique_spacing;
       clique_spacing.push_back (0.0);
-      for (vsize j = 1; j < clique.size () - 1; j ++)
+      for (vsize j = 1; j + 1 < clique.size (); j ++)
 	{
 	  Grob *clique_col = clique[j];
 
@@ -93,23 +133,19 @@ set_loose_columns (System *which, Column_x_positions const *posns)
 	  else
 	    programming_error ("Column without spacing object");
 
-	  bool expand_only = false;
 	  Real base_note_space = 0.0;
 
 	  if (Paper_column::is_musical (next_col)
 	      && Paper_column::is_musical (loose_col))
-	    base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col, 
-							     &options, &expand_only);
+	    base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col,
+							     &options);
 	  else
 	    {
-	      Real fixed, space;
-	      
-	      Spacing_spanner::standard_breakable_column_spacing (spacing, 
-								  loose_col, next_col,
-								  &fixed, &space,
-								  &options);
-
-	      base_note_space = space;
+	      Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing,
+										  loose_col, next_col,
+										  &options);
+
+	      base_note_space = spring.distance ();
 	    }
 
 	  base_note_space = max (base_note_space,
@@ -137,12 +173,10 @@ set_loose_columns (System *which, Column_x_positions const *posns)
 	  
 	  Real my_offset = right_point - distance_to_next;
 
-	  clique_col->set_system (which);
 	  clique_col->translate_axis (my_offset - clique_col->relative_coordinate (common, X_AXIS), X_AXIS);	  
 
 	  finished_right_column = clique_col;
 	}
- 
     }
 }