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

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index b2464067c8..fcdece0a59 100644
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -24,7 +24,6 @@
 #include "grob-interface.hh"
 #include "lily-proto.hh"
 
-
 /**
    Resolve conflicts between various Note_columns (chords).
 
@@ -38,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