resolve merge

[lilypond.git] / lily / include / staff-symbol.hh

diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh
index 2529c005084416198dfeea4eb7ba1e74a949d841..1c091c638811a87ba6170804519a34ac8e0e9b7e 100644 (file)
--- a/lily/include/staff-symbol.hh
+++ b/lily/include/staff-symbol.hh
@@ -1,9 +1,20 @@
 /*
-  staff-symbol.hh -- declare Staff_symbol
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 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 STAFF_SYMBOL_HH
@@ -25,6 +36,7 @@ public:
   static int get_steps (Grob *);
   static int line_count (Grob *);
   static bool on_line (Grob *me, int pos);
+  static Interval line_span (Grob *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));  
   DECLARE_GROB_INTERFACE();