Fix page-count with systems-per-page.

[lilypond.git] / lily / lyric-extender.cc

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index d30a53d6681b05ddb67bcf772f1ef3d6135c61b0..047b04f0664c53e88e8333419bd135323ee5a555 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -1,14 +1,26 @@
 /*
-  lyric-extender.cc -- implement Lyric_extender
-  source file of the GNU LilyPond music typesetter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
+
+  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 "lyric-extender.hh"
 
-#include "spanner.hh"
+#include "system.hh"
 #include "item.hh"
 #include "warn.hh"
 #include "lookup.hh"
@@ -30,6 +42,8 @@ Lyric_extender::print (SCM smob)
     common = common->common_refpoint (right_text, X_AXIS);
 
   common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);
+  common = common->common_refpoint (me->get_system (), X_AXIS);
+  
   Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   extract_grob_set (me, "heads", heads);
@@ -56,6 +70,8 @@ Lyric_extender::print (SCM smob)
   Real right_point
     = left_point + (robust_scm2double (minlen, 0));
 
+  right_point = min (right_point, me->get_system ()->get_bound (RIGHT)->relative_coordinate (common, X_AXIS));
+    
   if (heads.size ())
     right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]);
 
@@ -85,9 +101,11 @@ Lyric_extender::print (SCM smob)
 }
 
 ADD_INTERFACE (Lyric_extender,
-              "The extender is a simple line at the baseline of the lyric "
-              "that helps show the length of a melissima (tied/slurred note).",
+              "The extender is a simple line at the baseline of the lyric"
+              " that helps show the length of a melisma (a tied or slurred"
+              " note).",
 
+              /* properties */
               "heads "
               "left-padding "
               "next "