X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-extender.cc;h=d543b27ada3eac61ad29765e5b133fff18a4874e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0c7bb4ec448b3ec143f642b437a5c871ad522023;hpb=2210b90dc27efb3abd756dfccd9048785130ad4a;p=lilypond.git

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 0c7bb4ec44..d543b27ada 100644
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,61 +2,101 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
-
-#include "box.hh"
-#include "debug.hh"
-#include "lookup.hh"
-#include "molecule.hh"
-#include "paper-column.hh"
-#include "paper-def.hh"
 #include "lyric-extender.hh"
 
+#include "system.hh"
+#include "item.hh"
+#include "warn.hh"
+#include "lookup.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 *sp = unsmob_spanner (smob);
-
-  // ugh: refp
-  Real leftext = sp->get_bound (LEFT)->extent (sp->get_bound (LEFT),
-					       X_AXIS).length ();
-
-  Real sl = sp->paper_l ()->get_var ("linethickness");  
-  Real righttrim = 0.5; // default to half a space gap on the right
-  SCM righttrim_scm = sp->get_grob_property ("right-trim-amount");
-  if (gh_number_p (righttrim_scm)) {
-    righttrim = gh_scm2double (righttrim_scm);
-  }
-  // 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))
-    {
-      leftext -=  gh_scm2double (space);
-    }
-  Real w = sp->spanner_length () - leftext - righttrim;
+  Spanner *me = unsmob_spanner (smob);
+  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 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 ();
-}
+  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
-void
-Lyric_extender::set_textitem (Spanner*sp, Direction d, Grob*s)
-{
-  sp->set_bound (d, s);
-  sp->add_dependency (s);
-}
+  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];
+
+  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));
+
+  right_point = min (right_point, me->get_system ()->get_bound (RIGHT)->relative_coordinate (common, X_AXIS));
+    
+  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));
+
+  if (right_text)
+    right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - paddings[RIGHT]));
+
+  /* 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 < 1.5 * h)
+    return SCM_EOL;
+
+  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,
+	       "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).",
 
-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");
+	       /* properties */
+	       "heads "
+	       "left-padding "
+	       "next "
+	       "right-padding "
+	       "thickness "
+	       );