Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 5b59783ff0aa1856bcd8542a40f818c3539d9e30..5d09bdc2df699cfbd555051536c434db5b39d589 100644 (file)
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -1,27 +1,34 @@
-/*   
-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 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 (extent_callback, (SCM element, SCM axis));  
-  static void add_accidental (Grob *,Grob* );
-
-  
-  static SCM position_accidentals (Grob* );
-  static bool has_interface (Grob*);
+  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,
+                                vector<Grob*> *break_reminder,
+                                vector<Grob*> *real_acc);
+
+  DECLARE_SCHEME_CALLBACK(calc_positioning_done, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
 #endif /* ACCIDENTAL_PLACEMENT_HH */