X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-collision.hh;h=fcdece0a59e69be00d229fd2fa78b9739b606819;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7500ea45e980c646f54fdaa3a5cebebcce714c59;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 7500ea45e9..fcdece0a59 100644
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -1,9 +1,20 @@
 /*
-  collision.hh -- declare Collision
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--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/>.
 */
 
 #ifndef COLLISION_HH
@@ -13,7 +24,6 @@
 #include "grob-interface.hh"
 #include "lily-proto.hh"
 
-
 /**
    Resolve conflicts between various Note_columns (chords).
 
@@ -27,12 +37,13 @@
 class Note_collision_interface
 {
 public:
-  static SCM automatic_shift (Grob *, Drul_array<vector<Grob*> >);
+  static SCM automatic_shift (Grob *, Drul_array<vector<Grob *> >);
   static SCM forced_shift (Grob *);
 
-  static Drul_array<vector<Grob*> > get_clash_groups (Grob *me);
+  static vector<int> note_head_positions (Grob *me);
+  static Drul_array<vector<Grob *> > get_clash_groups (Grob *me);
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM smob));
   static void add_column (Grob *me, Grob *ncol);
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 };
 #endif // COLLISION_HH