* The grand 2005-2006 replace.

[lilypond.git] / lily / include / accidental-placement.hh

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 6fa77a3d5e97a02a4eb3df65fec3a56ccf3b98e0..27325ea6d8496d0fb8b7bed2fb83f09f5e5412cb 100644 (file)
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -1,11 +1,10 @@
-/*   
-accidental-placement.hh -- declare  Accidental_placement
+/*
+  accidental-placement.hh -- declare  Accidental_placement
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c)  2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ACCIDENTAL_PLACEMENT_HH
 #define ACCIDENTAL_PLACEMENT_HH
@@ -15,18 +14,18 @@ source file of the GNU LilyPond music typesetter
 class Accidental_placement
 {
 public:
-  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis));
-  static void add_accidental (Grob *,Grob* );
+  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element));
+  static void add_accidental (Grob *, Grob *);
 
   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);
-  
-  static SCM position_accidentals (Grob* );
-  static bool has_interface (Grob*);
+  static void split_accidentals (Grob *accs,
+                                Link_array<Grob> *break_reminder,
+                                Link_array<Grob> *real_acc);
+
+  DECLARE_SCHEME_CALLBACK(calc_positioning_done, (SCM));
+  static bool has_interface (Grob *);
 };
 #endif /* ACCIDENTAL_PLACEMENT_HH */