Run grand replace for 2015.

[lilypond.git] / lily / include / hairpin.hh

diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh
index ede5ab1aef0b9d754aef786186afc491fd623980..8807bc8cc81c893f6af490450f2c87ee6449a69d 100644 (file)
--- a/lily/include/hairpin.hh
+++ b/lily/include/hairpin.hh
@@ -1,9 +1,20 @@
 /*
-  hairpin.hh -- declare Hairpin
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2008 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 HAIRPIN_HH
@@ -15,10 +26,11 @@
 struct Hairpin
 {
 public:
+  static Real span_bar_correction (Spanner *me);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  static void consider_suicide (Spanner*);
-  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (broken_bound_padding, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+  DECLARE_GROB_INTERFACE ();
 };
 
 #endif // HAIRPIN_HH