X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fledger-line-spanner.cc;h=052e69ba1959daca8a6cf3fd64651460fdb1d99c;hb=c37931ff1b57efdd0764dfc6ca15b91ed8e1c446;hp=907c95985f7f015c331ada15718d21f5fb771c4c;hpb=586d833b4fb7a336524eb0929d693095a802fa26;p=lilypond.git

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 907c95985f..052e69ba19 100644
--- 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)
     {
@@ -119,7 +118,10 @@ Ledger_line_spanner::set_spacing_rods (SCM smob)
   // find size of note heads.
   Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
   if (!staff)
-    return SCM_EOL;
+    {
+      me->suicide ();
+      return SCM_EOL;
+    }
 
   Real min_length_fraction
     = robust_scm2double (me->get_property ("minimum-length-fraction"), 0.15);
@@ -349,28 +351,27 @@ Ledger_line_spanner::print (SCM smob)
 }
 
 ADD_INTERFACE (Ledger_line_spanner,
-	       "ledger-line-interface",
 
 	       "This spanner draws the ledger lines of a staff.\n"
 	       "This is a separate grob because it has to process\n"
 	       "all potential collisions between all note heads.",
 
 	       /* properties */
+	       "gap "	
+	       "length-fraction "	
+	       "minimum-length-fraction "
 	       "note-heads "
 	       "thickness "
-	       "minimum-length-fraction "
-	       "length-fraction "
-	       "gap");
+	       );
 
 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-interface}.",
+	       "note heads. See also @ref{ledger-line-spanner-interface}.",
 
 	       "no-ledgers");