2003 -> 2004

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

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 5b59783ff0aa1856bcd8542a40f818c3539d9e30..5cc9de0517d944bf86219b13b3802083c02e1f76 100644 (file)
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -3,7 +3,7 @@ accidental-placement.hh -- declare  Accidental_placement
 
 source file of the GNU LilyPond music typesetter
 
-(c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
@@ -16,9 +16,14 @@ 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 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*);