X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faccidental-interface.hh;h=9c9b97b580e432086e7d1eb79b6f9b7afbcdd482;hb=21f6ea846dc1930cb41f185485ce6e1c8d9b30bd;hp=13646895e63443e91477fcdcb2ff6910505ad292;hpb=883e317d51c5e50011bc0e764a785631e5ea8689;p=lilypond.git

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 13646895e6..9c9b97b580 100644
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -1,9 +1,20 @@
 /*
-  accidental-interface.hh -- declare  Accidental_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2012 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_INTERFACE_HH
@@ -19,13 +30,14 @@ class Accidental_interface
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_stencils, (SCM));
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  
-  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
+  DECLARE_SCHEME_CALLBACK (horizontal_skylines, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+
+  DECLARE_GROB_INTERFACE ();
   static string get_fontcharname (string style, int alteration);
-  static vector<Box> accurate_boxes (Grob *me,
-							  Grob **common);
+  static SCM get_stencil (Grob *me);
 };
 
 #endif