* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 4a6a54d5c559009912587e4a4f83f0b494f28b90..5776e88486e4a0d78d8f204102ccc1f054ac86fb 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,34 +2,36 @@
   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 "lyric-extender.hh"
+
+#include <cmath>
 
-#include "box.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 "group-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Lyric_extender,brew_molecule,1)
+MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1)
 SCM 
-Lyric_extender::brew_molecule (SCM smob) 
+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_property ("next"));
   
+  Grob *common = left_edge;
 
-  Real sl = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
-
+  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_layout ()->get_dimension (ly_symbol2scm ("linethickness"));  
   Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                                  "heads"));
 
@@ -39,51 +41,51 @@ Lyric_extender::brew_molecule (SCM smob)
   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
+  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_grob_property ("minimum-length");
+  /* 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 + (gh_number_p (minlen) ? gh_scm2double (minlen) : 0.0);
+    = left_point + (robust_scm2double  (minlen, 0));
 
-  right_point = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT];
+  if (heads.size ())
+    right_point = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT];
 
-  Real h = sl * gh_scm2double (me->get_grob_property ("thickness"));
+  Real h = sl * robust_scm2double (me->get_property ("thickness"), 0);
   Real pad = 2* h;
-  right_point = right_point <? (r->extent (common, X_AXIS)[LEFT] - pad);
 
-  if (isinf (right_point))
-    return SCM_EOL;
-  
-
-  right_point += pad;
+  if (right_text)
+    right_point = right_point <? (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - pad);
 
+  /* run to end of line. */
+  if (me->get_bound (RIGHT)->break_status_dir ())
+    right_point = right_point >? (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - pad);
+  
+  left_point += pad;
   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);
+  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 heads");
+              "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");