Emit not-quite-cross-staff beams in the right context.

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

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 4a62aa7e4da1c8f2dd14476d72d8ef009888968b..a518bc9225b5ef0abdd819cb42436c8336d6cda5 100644 (file)
--- 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);
 
-  DECLARE_GROB_INTERFACE();
+  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)
     {
@@ -310,7 +320,7 @@ Ledger_line_spanner::print (SCM smob)
       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;
@@ -352,10 +362,9 @@ Ledger_line_spanner::print (SCM smob)
 }
 
 ADD_INTERFACE (Ledger_line_spanner,
-
-              "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 "   
@@ -367,12 +376,13 @@ ADD_INTERFACE (Ledger_line_spanner,
 
 struct Ledgered_interface
 {
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 };
 
 ADD_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-spanner-interface}.",
-
-              "no-ledgers");
+              /* properties */
+              "no-ledgers "
+              );