X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fledger-line-spanner.cc;h=a518bc9225b5ef0abdd819cb42436c8336d6cda5;hb=8dec1b16ae6daff5b9a0f9fb806db66cf87bc5bd;hp=43bc35b69596a01107fbb5a11b86ab1683466913;hpb=7e33691750a97e1b66192cb484f479a173390132;p=lilypond.git

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 43bc35b695..a518bc9225 100644
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -1,15 +1,25 @@
 /*
-  ledger-line-spanner.cc -- implement Ledger_line_spanner
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2006 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/>.
 */
 
 #include <map>
 using namespace std;
 
-#include "item.hh"
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
@@ -29,7 +39,7 @@ struct Ledger_line_spanner
 				    Interval x_extent,
 				    Real left_shorten);
 
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 
 Stencil
@@ -43,7 +53,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 +129,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);
@@ -139,7 +152,7 @@ Ledger_line_spanner::set_spacing_rods (SCM smob)
     contain a lot of noteheads, superlinear performance is too slow.
   */
   extract_item_set (me, "note-heads", heads);
-  for (int i = heads.size (); i--;)
+  for (vsize i = heads.size (); i--;)
     {
       Item *h = heads[i];
 
@@ -206,7 +219,7 @@ Ledger_line_spanner::print (SCM smob)
 
   extract_grob_set (me, "note-heads", heads);
 
-  if (heads.is_empty ())
+  if (heads.empty ())
     return SCM_EOL;
 
   // find size of note heads.
@@ -231,13 +244,13 @@ Ledger_line_spanner::print (SCM smob)
     {
       Axis a = Axis (i);
       common[a] = common_refpoint_of_array (heads, me, a);
-      for (int i = heads.size (); i--;)
+      for (vsize i = heads.size (); i--;)
 	if (Grob *g = unsmob_grob (me->get_object ("accidental-grob")))
 	  common[a] = common[a]->common_refpoint (g, a);
     }
 
   Ledger_requests reqs;
-  for (int i = heads.size (); i--;)
+  for (vsize i = heads.size (); i--;)
     {
       Item *h = dynamic_cast<Item *> (heads[i]);
 
@@ -290,7 +303,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);
@@ -302,12 +315,12 @@ Ledger_line_spanner::print (SCM smob)
   // create ledgers for note heads
   Real ledgerlinethickness
     = Staff_symbol::get_ledger_line_thickness (staff);
-  for (int i = heads.size (); i--;)
+  for (vsize i = heads.size (); i--;)
     {
       Item *h = dynamic_cast<Item *> (heads[i]);
 
       int pos = Staff_symbol_referencer::get_rounded_position (h);
-      if (!staff_extent.contains (pos - sign (pos)))
+      if (!staff_extent.contains (pos - sign (pos)) && !staff_extent.is_empty ())
 	{
 	  Interval head_size = h->extent (common[X_AXIS], X_AXIS);
 	  Interval ledger_size = head_size;
@@ -349,28 +362,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 "
+	       );