2003 -> 2004

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index a809f892caf8bc0ec7999aa966b2b047caf794e1..1fdce62b9a4a71d85ee11575e023f762831680f5 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,10 +2,11 @@
   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
 */
 
+#include <math.h>
 
 #include "box.hh"
 #include "warn.hh"
@@ -14,59 +15,104 @@
 #include "paper-column.hh"
 #include "paper-def.hh"
 #include "lyric-extender.hh"
+#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) 
 {
-  Spanner *sp = unsmob_spanner (smob);
-  Item* l = sp->get_bound (LEFT);
-  Item*r = sp->get_bound (RIGHT);
+  Spanner *me = unsmob_spanner (smob);
+  Item *l = me->get_bound (LEFT);
+  Item *r = me->get_bound (RIGHT);
+  Grob *common = l->common_refpoint (r, X_AXIS);
   
-  Real leftext = l->extent (l, X_AXIS).length ();
 
-  Real sl = sp->get_paper ()->get_var ("linethickness");  
-  Real righttrim = 0.5; // default to half a space gap on the right
+  Real sl = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
+
+  Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
+                                                                 "heads"));
 
+  if (!heads.size () && r->break_status_dir () == CENTER)
+    return SCM_EOL;
+
+  common = common_refpoint_of_array (heads, common, X_AXIS);
+  
+  Real left_point = 0.0;
+  if (l->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+    left_point = l->extent (common, X_AXIS)[RIGHT];
+  else
+    left_point = heads[0]->extent (common, X_AXIS)[LEFT];
+
+  if (isinf (left_point))
+    return SCM_EOL;
 
   /*
-    If we're broken, we shouldn't extend past the end of the line.
+    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
+    
    */
-  if (r->break_status_dir () == CENTER)
+  SCM minlen =  me->get_grob_property ("minimum-length");
+  Real right_point
+    = 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 ());
+    
+
+  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 pad = 2* h;
+
+  if (!r->break_status_dir ())
+    right_point = right_point <? (r->extent (common, X_AXIS)[LEFT] - pad);
+  else if (!last_line)
     {
-      SCM righttrim_scm = sp->get_grob_property ("right-trim-amount");
-      if (gh_number_p (righttrim_scm))
-       {
-         righttrim = gh_scm2double (righttrim_scm);
-       }
+      /*
+       run to end of line.
+       */
+      right_point = right_point >? (r->extent (common, X_AXIS)[LEFT] - pad);
     }
   
-  // The extender can exist in the word space of the left lyric ...
-  SCM space =  sp->get_bound (LEFT)->get_grob_property ("word-space");
-  if (gh_number_p (space))
+  if (isinf (right_point))
     {
-      leftext -=  gh_scm2double (space);
-    }
-  Real w = sp->spanner_length () - leftext - righttrim;
-  
-  Real h = sl * gh_scm2double (sp->get_grob_property ("height"));
-  Molecule  mol (Lookup::filledbox (Box (Interval (0,w), Interval (0,h))));
-  mol.translate (Offset (leftext, 0));
-  return mol.smobbed_copy ();
-}
+      programming_error ("Right point of extender not defined?");
+      right_point = r->relative_coordinate (common, X_AXIS);
+    }  
 
-void
-Lyric_extender::set_textitem (Spanner*sp, Direction d, Grob*s)
-{
-  sp->set_bound (d, s);
-  sp->add_dependency (s);
-}
+  left_point += pad;
 
+  Real w = right_point - left_point;
 
+  if (w < 1.5 * h)
+    return SCM_EOL;
+  
+  Molecule  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 ();
+}
 
 
 ADD_INTERFACE (Lyric_extender,"lyric-extender-interface",
-  "The extender is a simple line at the baseline of the lyric
-that helps show the length of a melissima (tied/slurred note).",
-  "word-space height right-trim-amount");
+  "The extender is a simple line at the baseline of the lyric "
+  " that helps show the length of a melissima (tied/slurred note).",
+  "thickness heads");