resolve merge

[lilypond.git] / lily / tie-column.cc

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index c236e55bc1252c169f479133319c8b7a2121c874..6e0eaecec0e09fa987aeb4b73bf70f57fea38eca 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -1,9 +1,20 @@
 /*
-  tie-column.cc -- implement Tie_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--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 "tie-column.hh"
@@ -79,9 +90,7 @@ Tie_column::calc_positioning_done (SCM smob)
   if (!ties.size ())
     return SCM_BOOL_T;
 
-
   me->set_property ("positioning-done", SCM_BOOL_T);
-
   vector_sort (ties, Tie::less);
 
   Tie_formatting_problem problem;
@@ -90,9 +99,7 @@ Tie_column::calc_positioning_done (SCM smob)
   SCM manual_configs = me->get_property ("tie-configuration");
   problem.set_manual_tie_configuration (manual_configs);
 
-
   Ties_configuration base = problem.generate_optimal_configuration ();
-
   for (vsize i = 0; i < base.size (); i++)
     {
       SCM cp = Tie::get_control_points (ties[i], problem.common_x_refpoint (),
@@ -111,7 +118,8 @@ Tie_column::calc_positioning_done (SCM smob)
 
 
 ADD_INTERFACE (Tie_column,
-              "Object that sets directions of multiple ties in a tied chord.",
+              "Object that sets directions of multiple ties in a tied"
+              " chord.",
 
               /* properties */
               "positioning-done "