* scm/lily.scm (collect-scores-for-book): new function.

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 441d7ea602f2cb6fef4bb19481455e2d4327fa65..7343b6bfcd072a3aefc37e6c8dda3fcf60305f23 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
 */
 
@@ -11,16 +11,29 @@
 #include "box.hh"
 #include "warn.hh"
 #include "lookup.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "lyric-extender.hh"
 #include "note-head.hh"
 #include "group-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Lyric_extender,brew_molecule,1)
+bool
+Lyric_extender::is_visible (Grob *gr)
+{
+  Spanner*me = dynamic_cast<Spanner*> (gr);
+
+  SCM heads = me->get_property ("heads");
+  int l = scm_ilength (heads);
+  if (l == 0)
+    return false;
+  
+  return true;
+}
+
+MAKE_SCHEME_CALLBACK (Lyric_extender,print,1)
 SCM 
-Lyric_extender::brew_molecule (SCM smob) 
+Lyric_extender::print (SCM smob) 
 {
   Spanner *me = unsmob_spanner (smob);
   Item *l = me->get_bound (LEFT);
@@ -28,7 +41,7 @@ Lyric_extender::brew_molecule (SCM smob)
   Grob *common = l->common_refpoint (r, X_AXIS);
   
 
-  Real sl = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
+  Real sl = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));  
 
   Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                                  "heads"));
@@ -52,22 +65,39 @@ Lyric_extender::brew_molecule (SCM smob)
     note head, but haven't found a pattern in it yet. --hwn 1/1/04
     
    */
-  SCM minlen =  me->get_grob_property ("minimum-length");
+  SCM minlen =  me->get_property ("minimum-length");
   Real right_point
     = left_point + (robust_scm2double  (minlen,0));
 
-  if (r->break_status_dir ())
-    right_point = infinity_f;
-  else
+  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 ());
+    
+
+  if (heads.size ())
     right_point = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT];
-  
-  Real h = sl * robust_scm2double (me->get_grob_property ("thickness"), 0);
+
+  Real h = sl * robust_scm2double (me->get_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->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+    right_point = right_point <? (r->extent (common, X_AXIS)[LEFT] - pad);
+  else if (Note_head::has_interface (r))
+    ; 
+  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);
+    }  
 
   left_point += pad;
 
@@ -76,7 +106,7 @@ Lyric_extender::brew_molecule (SCM smob)
   if (w < 1.5 * h)
     return SCM_EOL;
   
-  Molecule  mol (Lookup::round_filled_box (Box (Interval (0,w), Interval (0,h)),
+  Stencil  mol (Lookup::round_filled_box (Box (Interval (0,w), Interval (0,h)),
                                           0.8 * h));
   mol.translate_axis (left_point - me->relative_coordinate (common, X_AXIS), X_AXIS);
   return mol.smobbed_copy ();