patch::: 1.4.0.jcn4

[lilypond.git] / lily / hyphen-spanner.cc

diff --git a/lily/hyphen-spanner.cc b/lily/hyphen-spanner.cc
index a798afe422412590d597bd3c11d4c270a8ed8ef4..1a35efaaed73a4fd3be307bf0458e754657f40eb 100644 (file)
--- a/lily/hyphen-spanner.cc
+++ b/lily/hyphen-spanner.cc
@@ -5,7 +5,7 @@
 
   (c) 1999 Glen Prideaux <glenprideaux@iname.com>
 
-  (adapted from lyric-extender)
+ (adapted from lyric-extender)
 */
 
 #include <math.h>
@@ -19,48 +19,56 @@
 #include "spanner.hh"
 #include "item.hh"
 
-MAKE_SCHEME_CALLBACK(Hyphen_spanner,brew_molecule)
+MAKE_SCHEME_CALLBACK (Hyphen_spanner,brew_molecule,1)
 
 SCM 
 Hyphen_spanner::brew_molecule (SCM smob)
 {
-  Spanner * sp = dynamic_cast<Spanner*> (unsmob_element (smob));
+  Spanner * sp = dynamic_cast<Spanner*> (unsmob_grob (smob));
 
-  Score_element * common = sp;
+  Grob * common = sp;
   Direction d = LEFT;
   do
     {
-      common = common->common_refpoint( sp->get_bound (d), X_AXIS);
+      common = common->common_refpoint (sp->get_bound (d), X_AXIS);
     }
   while (flip (&d) != LEFT);
   Interval bounds;
   
   do
     {
-      Real  x = sp->get_bound (d)->relative_coordinate (common, X_AXIS);
-      Interval ext =  sp->get_bound (d)->extent (X_AXIS);
-      bounds[d] = (x + ext[-d]);
+      Interval iv = sp->get_bound (d)->extent (common, X_AXIS);
+
+      bounds[d] = iv.empty_b ()
+       ? sp->get_bound (d)->relative_coordinate (common, X_AXIS)
+       : iv[-d];
     }
   while (flip (&d) != LEFT);
-
   
-  
-  Real ss = sp->paper_l ()->get_var ("staffspace");
   Real lt = sp->paper_l ()->get_var ("stafflinethickness");
-  Real th = gh_scm2double (sp->get_elt_property ("thickness")) * lt ;
-  Real h = gh_scm2double (sp->get_elt_property ("height")) * ss;
-  Real l = gh_scm2double (sp->get_elt_property ("minimum-length")) * ss;  
+  Real th = gh_scm2double (sp->get_grob_property ("thickness")) * lt ;
+  Real h = gh_scm2double (sp->get_grob_property ("height"));
+
+  // interval?
+  Real l = gh_scm2double (sp->get_grob_property ("minimum-length"));  
+  Real x = gh_scm2double (sp->get_grob_property ("maximum-length"));
   // The hyphen can exist in the word space of the left lyric ...
-  SCM space =  sp->get_bound (LEFT)->get_elt_property ("word-space");
+  SCM space =  sp->get_bound (LEFT)->get_grob_property ("word-space");
   if (gh_number_p (space))
     {
-      bounds[LEFT] -=  gh_scm2double (space)*ss;
+      bounds[LEFT] -=  gh_scm2double (space);
     }
   Real w  = bounds.length ();
+
+  
   /* for length, use a geometric mean of the available space and some minimum
-  */
-  if(l < w)
-    l = sqrt(l*w);
+   */
+  if (l < w)
+    {
+      l = sqrt (l*w);
+      if (l > x)
+       l = x;
+    }
   else
     {
       /* OK, we have a problem. Usually this means that we're on the
@@ -68,7 +76,7 @@ Hyphen_spanner::brew_molecule (SCM smob)
          the offset for stuff */
       /* This test for being on the first column has been shamelessly
          ripped from spanner.cc */
-      Paper_column *sc = dynamic_cast<Paper_column*> (sp->get_bound(LEFT)->column_l());
+      Paper_column *sc = dynamic_cast<Paper_column*> (sp->get_bound (LEFT)->column_l ());
       if (sc != NULL &&
          sc->break_status_dir () == RIGHT)
        {
@@ -83,16 +91,16 @@ Hyphen_spanner::brew_molecule (SCM smob)
          l = w;
        }
     }
-  Box b  (Interval (-l/2,l/2), Interval (h,h+th));
-  Molecule mol (sp->lookup_l ()->filledbox (b));
+  Box b (Interval (-l/2,l/2), Interval (h,h+th));
+  Molecule mol (Lookup::filledbox (b));
   mol.translate_axis (bounds.center ()
                      -sp->relative_coordinate (common, X_AXIS),
                      X_AXIS);
-  return mol.create_scheme ();
+  return mol.smobbed_copy ();
 }
   
 void
-Hyphen_spanner::set_textitem (Direction d, Score_element* b)
+Hyphen_spanner::set_textitem (Direction d, Grob* b)
 {
   elt_l_->set_bound (d, b);
   elt_l_->add_dependency (b);