Imported Upstream version 2.14.2

[lilypond.git] / lily / include / note-spacing.hh

diff --git a/lily/include/note-spacing.hh b/lily/include/note-spacing.hh
index c9bcf8c4787e9935f24789b4b0f4acf20107ff12..d5465b639f1dd5679619c78de34df7dfc3fea852 100644 (file)
--- a/lily/include/note-spacing.hh
+++ b/lily/include/note-spacing.hh
@@ -1,27 +1,37 @@
-/*   
-note-spacing.hh -- declare Note_spacing
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-(c) 2001--2005 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 NOTE_SPACING_HH
 #define NOTE_SPACING_HH
 
+#include "grob-interface.hh"
 #include "lily-proto.hh"
+#include "spring.hh"
 
 class Note_spacing
 {
 public:
-  static bool has_interface (Grob*);
+  DECLARE_GROB_INTERFACE();
 
-  static void get_spacing (Grob *me, Item* , Real, Real, Real*, Real*);
-  static void stem_dir_correction (Grob *me, Item * next_col, Real incr,
-                                  Real*, Real*);
-  static Item * right_column (Grob*);
-  static Item * left_column (Grob*);  
+  static Spring get_spacing (Grob *me, Item *, Real, Real);
+  static void stem_dir_correction (Grob *me, Item *next_col, Real incr,
+                                  Real *, Real *);
 };
 
 #endif /* NOTE_SPACING_HH */