Run `make grand-replace'.

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

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 31fc8d0b26b814a5b3cdc9eda6c8d0d55175abab..59ae3e55c9b18290c7e043a7012dd8b95cf9bda5 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--2008 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);
@@ -290,7 +292,7 @@ Ledger_line_spanner::print (SCM smob)
                       && !staff_extent.contains (i->second[d].position_
                                                  - sign (i->second[d].position_)));
                  Real limit = (center + (both ? which * gap / 2 : 0));
-                 lr.ledger_extent_.elem_ref (-which)
+                 lr.ledger_extent_.at (-which)
                    = which * max (which * lr.ledger_extent_[-which], which * limit);
                }
              while (flip (&which) != LEFT);
@@ -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.",
+              "This spanner draws the ledger lines of a staff.  This is a"
+              " separate grob because it has to process 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-spanner-interface}.",
 
-              "Objects that need ledger lines, typically "
-              "note heads. See also @ref{ledger-line-interface}.",
-
-              "no-ledgers");
+              /* properties */
+              "no-ledgers "
+              );