Run `make grand-replace'.

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index d57244cdb46f0c80e9f246a5afb9ff71236b9167..d543b27ada3eac61ad29765e5b133fff18a4874e 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,51 +2,52 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
-#include <math.h>
+#include "lyric-extender.hh"
 
-#include "box.hh"
+#include "system.hh"
+#include "item.hh"
 #include "warn.hh"
 #include "lookup.hh"
-#include "stencil.hh"
-#include "paper-column.hh"
 #include "output-def.hh"
-#include "lyric-extender.hh"
 #include "note-head.hh"
-#include "group-interface.hh"
-
-
+#include "pointer-group-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1)
-SCM 
-Lyric_extender::print (SCM smob) 
+MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1);
+SCM
+Lyric_extender::print (SCM smob)
 {
   Spanner *me = unsmob_spanner (smob);
-  Item *le = me->get_bound (LEFT);
-  Item *right_text = unsmob_item (me->get_property ("next"));
-  
-  Grob *common = le->common_refpoint (right_text, 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);
-  Real sl = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));  
+  common = common->common_refpoint (me->get_system (), X_AXIS);
+  
+  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
-  Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
-                                                                 "heads"));
+  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 (le->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
-    left_point = le->extent (common, X_AXIS)[RIGHT];
+  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 = le->extent (common, X_AXIS)[RIGHT];
+    left_point = left_edge->extent (common, X_AXIS)[RIGHT];
 
   if (isinf (left_point))
     return SCM_EOL;
@@ -55,37 +56,47 @@ Lyric_extender::print (SCM smob)
      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));
+    = 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 = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT];
+    right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]);
 
   Real h = sl * robust_scm2double (me->get_property ("thickness"), 0);
-  Real pad = 2* h;
+  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 = right_point <? (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - pad);
+    right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - paddings[RIGHT]));
 
   /* run to end of line. */
-  right_point = right_point >? (me->get_bound (RIGHT)->extent (common, X_AXIS)[LEFT] - pad);
-  
-  left_point += pad;
+  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));
+
+  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).",
-              "next thickness heads");
+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 "
+              );