Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / ledger-line-spanner.cc

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 1817b49be9832b83293808278b0c32f236e15378..052e69ba1959daca8a6cf3fd64651460fdb1d99c 100644 (file)
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <map>
 using namespace std;
 
-#include "item.hh"
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
@@ -29,7 +28,7 @@ struct Ledger_line_spanner
                                    Interval x_extent,
                                    Real left_shorten);
 
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 
 Stencil
@@ -43,7 +42,7 @@ Ledger_line_spanner::brew_ledger_lines (Grob *staff,
 {
   int line_count = (staff_extent.contains (pos)
                    ? 0
-                   : sign (pos) * int (rint(pos -  staff_extent[Direction (sign (pos))])) / 2);
+                   : sign (pos) * int (rint (pos -  staff_extent[Direction (sign (pos))])) / 2);
   Stencil stencil;
   if (line_count)
     {
@@ -352,7 +351,6 @@ Ledger_line_spanner::print (SCM smob)
 }
 
 ADD_INTERFACE (Ledger_line_spanner,
-              "ledger-line-spanner-interface",
 
               "This spanner draws the ledger lines of a staff.\n"
               "This is a separate grob because it has to process\n"
@@ -368,11 +366,10 @@ ADD_INTERFACE (Ledger_line_spanner,
 
 struct Ledgered_interface
 {
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 
 ADD_INTERFACE (Ledgered_interface,
-              "ledgered-interface",
 
               "Objects that need ledger lines, typically "
               "note heads. See also @ref{ledger-line-spanner-interface}.",