Merge remote branch 'origin/release/unstable' into HEAD

[lilypond.git] / lily / include / lyric-extender.hh

diff --git a/lily/include/lyric-extender.hh b/lily/include/lyric-extender.hh
index 19f4441c9be056f9da17522153c95bb5249532b2..2d61f1db8be17c2ae8aa8603adb265ec86e04d64 100644 (file)
--- a/lily/include/lyric-extender.hh
+++ b/lily/include/lyric-extender.hh
@@ -2,16 +2,16 @@
 /*
   extender-spanner.hh -- part of GNU LilyPond
 
 /*
   extender-spanner.hh -- part of GNU LilyPond
 

-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>

 */
 
 #ifndef EXTENDER_SPANNER_HH
 #define EXTENDER_SPANNER_HH
 
 */
 
 #ifndef EXTENDER_SPANNER_HH
 #define EXTENDER_SPANNER_HH
 

-#include "spanner.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"

 
 /*
 
 /*

-

   Extenders must be entered manually for now.
 
   Although it would be possible for Lily to determine where to
   Extenders must be entered manually for now.
 
   Although it would be possible for Lily to determine where to


@@ -22,14 +22,13 @@
   for on a word's last syllable.  The extender should be aligned
   with the left side of the last note of the melissima, and not
   extend beond, lasting the whole duration of the melissima
   for on a word's last syllable.  The extender should be aligned
   with the left side of the last note of the melissima, and not
   extend beond, lasting the whole duration of the melissima

-
- */
+*/

 
 class Lyric_extender
 {
 public:
 
 class Lyric_extender
 {
 public:

-  static bool has_interface (Grob*);
-  DECLARE_SCHEME_CALLBACK (print, (SCM ));
+  DECLARE_GROB_INTERFACE ();
+  DECLARE_SCHEME_CALLBACK (print, (SCM));

 };
 
 #endif // EXTENDER_SPANNER_HH
 };
 
 #endif // EXTENDER_SPANNER_HH