resolve merge

[lilypond.git] / lily / spacing-loose-columns.cc

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index 302cccb13340361e72360e11fbc730a9d6edc7cf..03cac8431c0b26858eedd1286c3539ff5e980ed9 100644 (file)
--- 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--2009 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"
@@ -26,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;
@@ -45,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;
@@ -66,13 +81,18 @@ set_loose_columns (System *which, Column_x_positions const *posns)
          loose = right = re->get_column ();
        }
 
+      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
        {
@@ -88,12 +108,6 @@ set_loose_columns (System *which, Column_x_positions const *posns)
            }
        }
       
-
-      if (!right)
-       {
-         programming_error ("Can't attach loose column sensibly. Attaching to end of system.");
-         right = which->get_bound (RIGHT);
-       }
       Grob *common = right->common_refpoint (left, X_AXIS);
 
       clique.push_back (right);
@@ -159,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;
        }
- 
     }
 }