Merge branch 'master' into lilypond/translation

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

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index ed2703af87651b42894764305e7d6cff3e3effbf..6f9696ef5e669fdfb94d46458b9e1f36f21ffe94 100644 (file)
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -1,16 +1,27 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.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-interface.hh"
-#include "grob.hh"
+#include "lily-proto.hh"
 
 class Accidental_placement
 {
@@ -18,9 +29,7 @@ public:
   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 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);