X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faccidental-placement.hh;h=5d09bdc2df699cfbd555051536c434db5b39d589;hb=03ce3667568361ee7433032988a4089c64de2ec7;hp=2343e01e12b7e95f1638e662af6103b50fc8e229;hpb=889dc430ee110fc9f7b66d9f8768fb746bb2b12a;p=lilypond.git

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 2343e01e12..5d09bdc2df 100644
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -3,29 +3,32 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ACCIDENTAL_PLACEMENT_HH
 #define ACCIDENTAL_PLACEMENT_HH
 
-#include "grob.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 class Accidental_placement
 {
 public:
-  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element));
   static void add_accidental (Grob *, Grob *);
 
+  static vector<Grob*> get_break_reminder_accidentals (vector<Grob*> const &elts,
+						       Grob *left);
   static Interval get_relevant_accidental_extent (Grob *me,
 						  Item *item_col,
 						  Grob *acc);
   static void split_accidentals (Grob *accs,
-				 Link_array<Grob> *break_reminder,
-				 Link_array<Grob> *real_acc);
+				 vector<Grob*> *break_reminder,
+				 vector<Grob*> *real_acc);
 
   DECLARE_SCHEME_CALLBACK(calc_positioning_done, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 #endif /* ACCIDENTAL_PLACEMENT_HH */