X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-extender.cc;h=5e254b45ee3a89f9d56f70c4338e97c909662d84;hb=3851c34c62543c07832d5d86c75c428bd27d9d80;hp=adb6340357b1722e2d887b7d6eb4717d7c5410a7;hpb=40e1749088af2d15d50901862fc500ceee57aa41;p=lilypond.git

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index adb6340357..5e254b45ee 100644
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,68 +2,101 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
+#include "lyric-extender.hh"
 
-#include "box.hh"
+#include "system.hh"
+#include "item.hh"
 #include "warn.hh"
 #include "lookup.hh"
-#include "molecule.hh"
-#include "paper-column.hh"
-#include "paper-def.hh"
-#include "lyric-extender.hh"
+#include "output-def.hh"
 #include "note-head.hh"
+#include "pointer-group-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Lyric_extender,brew_molecule,1)
-SCM 
-Lyric_extender::brew_molecule (SCM smob) 
+MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1);
+SCM
+Lyric_extender::print (SCM smob)
 {
   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);
+  Item *left_edge = me->get_bound (LEFT);
+  Item *right_text = unsmob_item (me->get_object ("next"));
+
+  Grob *common = left_edge;
+
+  if (right_text)
+    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 left_point = l->extent (common, X_AXIS)[RIGHT];
+  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+
+  extract_grob_set (me, "heads", heads);
+
+  if (!heads.size ())
+    return SCM_EOL;
+
+  common = common_refpoint_of_array (heads, common, X_AXIS);
+
+  Real left_point = 0.0;
+  if (left_edge->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+    left_point = left_edge->extent (common, X_AXIS)[RIGHT];
+  else if (heads.size ())
+    left_point = heads[0]->extent (common, X_AXIS)[LEFT];
+  else
+    left_point = left_edge->extent (common, X_AXIS)[RIGHT];
 
-  Real sl = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
+  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_property ("minimum-length");
+  Real right_point
+    = left_point + (robust_scm2double (minlen, 0));
 
-  /*
-    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
+  right_point = min (right_point, me->get_system ()->get_bound (RIGHT)->relative_coordinate (common, X_AXIS));
     
-   */
-  Real right_point = r->extent (common, X_AXIS)
-    [(Note_head::has_interface (r)) ? RIGHT : LEFT];
+  if (heads.size ())
+    right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]);
+
+  Real h = sl * robust_scm2double (me->get_property ("thickness"), 0);
+  Drul_array<Real> paddings (robust_scm2double (me->get_property ("left-padding"), h),
+			     robust_scm2double (me->get_property ("right-padding"), h));
 
-  Real h = sl * gh_scm2double (me->get_grob_property ("thickness"));
+  if (right_text)
+    right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - paddings[RIGHT]));
 
-  right_point += h;
+  /* run to end of line. */
+  if (me->get_bound (RIGHT)->break_status_dir ())
+    right_point = max (right_point, (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - paddings[RIGHT]));
 
+  left_point += paddings[LEFT];
   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)),
-					   0.8 * h));
-  mol.translate_axis (left_point - me->relative_coordinate (common, X_AXIS), X_AXIS);
-  return mol.smobbed_copy ();
-}
 
-void
-Lyric_extender::set_textitem (Spanner *me, Direction d, Grob *s)
-{
-  me->set_bound (d, s);
-  me->add_dependency (s);
+  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 ();
 }
 
-
-
-
-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");
+ADD_INTERFACE (Lyric_extender,
+	       "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 "
+	       "right-padding "
+	       "thickness "
+	       );