X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-scoring.cc;h=5182072a03f9a321413bddb8b632f324c0ed38fb;hb=3c2e17bbdd44174a8dab25333738a75afa788f31;hp=ef252da5ddac8191893816d0f45fefe6e8252166;hpb=711cf44d0ab28f3159230c84d63c0b19199408b0;p=lilypond.git

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index ef252da5dd..5182072a03 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -1,10 +1,21 @@
 /*
-  slur-scoring.cc -- Score based slur formatting
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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/>.
 */
 
 
@@ -116,7 +127,7 @@ Slur_score_state::get_encompass_info (Grob *col) const
     {
       ei.stem_ = stem->extent (common_[Y_AXIS], Y_AXIS)[dir_];
       if (Grob *b = Stem::get_beam (stem))
-	ei.stem_ += stem_dir * 0.5 * Beam::get_thickness (b);
+	ei.stem_ += stem_dir * 0.5 * Beam::get_beam_thickness (b);
 
       Interval x = stem->extent (common_[X_AXIS], X_AXIS);
       ei.x_ = x.is_empty ()
@@ -273,7 +284,7 @@ Slur_score_state::fill (Grob *me)
 }
 
 
-MAKE_SCHEME_CALLBACK(Slur, calc_control_points, 1)
+MAKE_SCHEME_CALLBACK (Slur, calc_control_points, 1)
 SCM
 Slur::calc_control_points (SCM smob)
 {
@@ -621,7 +632,7 @@ Slur_score_state::generate_avoid_offsets () const
 
 	  if (!xe.is_empty ()
 	      && !ye.is_empty ())
-	    avoid.push_back (Offset (xe.center(), ye[dir_]));
+	    avoid.push_back (Offset (xe.center (), ye[dir_]));
 	}
     }  
   return avoid;