2003 -> 2004

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 4a6a54d5c559009912587e4a4f83f0b494f28b90..1fdce62b9a4a71d85ee11575e023f762831680f5 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,7 +2,7 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
@@ -18,6 +18,20 @@
 #include "note-head.hh"
 #include "group-interface.hh"
 
+
+bool
+Lyric_extender::is_visible (Grob *gr)
+{
+  Spanner*me = dynamic_cast<Spanner*> (gr);
+
+  SCM heads = me->get_grob_property ("heads");
+  int l = scm_ilength (heads);
+  if (l == 0)
+    return false;
+  
+  return true;
+}
+
 MAKE_SCHEME_CALLBACK (Lyric_extender,brew_molecule,1)
 SCM 
 Lyric_extender::brew_molecule (SCM smob) 
@@ -33,7 +47,7 @@ Lyric_extender::brew_molecule (SCM smob)
   Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                                  "heads"));
 
-  if (!heads.size ())
+  if (!heads.size () && r->break_status_dir () == CENTER)
     return SCM_EOL;
 
   common = common_refpoint_of_array (heads, common, X_AXIS);
@@ -44,36 +58,51 @@ Lyric_extender::brew_molecule (SCM smob)
   else
     left_point = heads[0]->extent (common, X_AXIS)[LEFT];
 
-
   if (isinf (left_point))
     return SCM_EOL;
-  
 
   /*
-    It seems that short extenders are even lengthened to go past the note head,  but
-    haven't found a pattern in it yet. --hwn  1/1/04
+    It seems that short extenders are even lengthened to go past the
+    note head, but haven't found a pattern in it yet. --hwn 1/1/04
     
    */
-  
   SCM minlen =  me->get_grob_property ("minimum-length");
   Real right_point
-    = left_point + (gh_number_p (minlen) ? gh_scm2double (minlen) : 0.0);
+    = left_point + (robust_scm2double  (minlen,0));
+
+  Spanner *orig = dynamic_cast<Spanner*> (me->original_);
+  bool last_line = orig
+    && (me->get_break_index () == orig->broken_intos_.size() - 2)
+    && !Lyric_extender::is_visible (orig->broken_intos_.top ());
+    
 
-  right_point = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT];
+  if (heads.size ())
+    right_point = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT];
 
-  Real h = sl * gh_scm2double (me->get_grob_property ("thickness"));
+  Real h = sl * robust_scm2double (me->get_grob_property ("thickness"), 0);
   Real pad = 2* h;
-  right_point = right_point <? (r->extent (common, X_AXIS)[LEFT] - pad);
 
-  if (isinf (right_point))
-    return SCM_EOL;
+  if (!r->break_status_dir ())
+    right_point = right_point <? (r->extent (common, X_AXIS)[LEFT] - pad);
+  else if (!last_line)
+    {
+      /*
+       run to end of line.
+       */
+      right_point = right_point >? (r->extent (common, X_AXIS)[LEFT] - pad);
+    }
   
+  if (isinf (right_point))
+    {
+      programming_error ("Right point of extender not defined?");
+      right_point = r->relative_coordinate (common, X_AXIS);
+    }  
 
-  right_point += pad;
+  left_point += pad;
 
   Real w = right_point - left_point;
 
-  if (w < 0)
+  if (w < 1.5 * h)
     return SCM_EOL;
   
   Molecule  mol (Lookup::round_filled_box (Box (Interval (0,w), Interval (0,h)),