X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=2ba81c66c47b0349865a459ff3e12b630c72b1e2;hb=84cdc498410193c81778d4364796ef0ac86530de;hp=e1a8e695fd16474e616a5cadad5a4bb8e959dc76;hpb=b0984ac0eae12ef21adcdbc4922354e731e8f22d;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index e1a8e695fd..2ba81c66c4 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -1,9 +1,20 @@
 /*
-  note-column.cc -- implement Note_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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 "note-column.hh"
@@ -126,22 +137,6 @@ Note_column::add_head (Grob *me, Grob *h)
     Axis_group_interface::add_element (me, h);
 }
 
-/**
-   translate the rest symbols vertically by amount DY, but only if
-   they have no staff-position set.
-*/
-void
-Note_column::translate_rests (Grob *me, int dy)
-{
-  Grob *r = unsmob_grob (me->get_object ("rest"));
-  if (r && !scm_is_number (r->get_property ("staff-position")))
-    {
-      r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS);
-      Grob *p = r->get_parent (Y_AXIS);
-      p->flush_extent_cache (Y_AXIS);
-    }
-}
-
 Grob *
 Note_column::first_head (Grob *me)
 {
@@ -150,7 +145,7 @@ Note_column::first_head (Grob *me)
 }
 
 /*
-  Return the first Accidentals grob that we find in a note-head.
+  Return the first AccidentalPlacement grob that we find in a note-head.
 */
 Grob *
 Note_column::accidentals (Grob *me)
@@ -185,7 +180,7 @@ Note_column::dot_column (Grob *me)
       if (dots)
 	return dots->get_parent (X_AXIS);
     }
-  
+
   return 0;
 }
 
@@ -210,7 +205,7 @@ Note_column::cross_staff_extent (Grob *me, Grob *refp)
 }
 
 ADD_INTERFACE (Note_column,
-	       "Stem and noteheads combined",
+	       "Stem and noteheads combined.",
 
 	       /* properties */
 	       "arpeggio "