2003 -> 2004

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 879fa63772e81f72b36b0f0d80cf21c6f2b0415b..1fdce62b9a4a71d85ee11575e023f762831680f5 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,79 +2,117 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys
 */
 
-/*
-  TODO: too complicated implementation.  Why the dx_drul?.
- */
+#include <math.h>
 
-#
-#include "dimension-cache.hh"
 #include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "lookup.hh"
 #include "molecule.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
-#include "extender-spanner.hh"
+#include "lyric-extender.hh"
+#include "note-head.hh"
+#include "group-interface.hh"
 
-Lyric_extender::Lyric_extender (SCM s)
-  : Spanner (s)
 
+bool
+Lyric_extender::is_visible (Grob *gr)
 {
-  dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
-  set_extent_callback (Score_element::point_dimension_callback, Y_AXIS);
-}
-
-
+  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_SCORE_ELEMENT_CALLBACKS(Lyric_extender)
-Molecule 
-Lyric_extender::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK (Lyric_extender,brew_molecule,1)
+SCM 
+Lyric_extender::brew_molecule (SCM smob) 
 {
-  Molecule  mol;
-
-  Real w = spanner_length ();
+  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);
   
-  w += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
-  Real h = paper_l ()->get_var ("extender_height");
-  Molecule a = lookup_l ()->filledbox ( Box (Interval (0,w), Interval (0,h)));
-  a.translate (Offset (dx_f_drul_[LEFT], 0));
-
-  mol.add_molecule (a);
-
-  return mol;
-}
 
+  Real sl = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
 
+  Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
+                                                                 "heads"));
 
-void
-Lyric_extender::after_line_breaking ()
-{
-  // UGH
-  Real gap = paper_l ()->get_var ("interline");
+  if (!heads.size () && r->break_status_dir () == CENTER)
+    return SCM_EOL;
 
-  Direction d = LEFT;
-  do
+  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;
+
+  /*
+    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 + (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)
     {
-      Item* t = get_bound (d)
-       ? get_bound (d) : get_bound ((Direction)-d);
-      if (d == LEFT)
-        dx_f_drul_[d] += t->extent (X_AXIS).length ();
-      else
-       dx_f_drul_[d] -= d * gap / 2;
+      /*
+       run to end of line.
+       */
+      right_point = right_point >? (r->extent (common, X_AXIS)[LEFT] - pad);
     }
-  while (flip(&d) != LEFT);
-}
+  
+  if (isinf (right_point))
+    {
+      programming_error ("Right point of extender not defined?");
+      right_point = r->relative_coordinate (common, X_AXIS);
+    }  
+
+  left_point += pad;
 
+  Real w = right_point - left_point;
+
+  if (w < 1.5 * h)
+    return SCM_EOL;
   
-void
-Lyric_extender::set_textitem (Direction d, Item* textitem_l)
-{
-  set_bound (d, textitem_l);
-  add_dependency (textitem_l);
+  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).",
+  "thickness heads");