X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faccidental-placement.hh;h=bb47efdb0a8a6c9958851968d49b257b85c22e18;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=5cc9de0517d944bf86219b13b3802083c02e1f76;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 5cc9de0517..bb47efdb0a 100644
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -1,32 +1,41 @@
-/*   
-accidental-placement.hh -- declare  Accidental_placement
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
- */
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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));
-  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*);
+  DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element));
+  static void add_accidental (Grob *, Grob *, bool, long);
+
+  static vector<Grob *> get_relevant_accidentals (vector<Grob *> const &elts, Grob *left);
+  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 */