2003 -> 2004

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

diff --git a/lily/hyphen-spanner.cc b/lily/hyphen-spanner.cc
index 624f682be20234a3c1085a7c60e04e85ae908856..09699d7546cf4c55676f86ac1b0429f2351684bf 100644 (file)
--- a/lily/hyphen-spanner.cc
+++ b/lily/hyphen-spanner.cc
@@ -3,9 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>
+  (c) 1999--2004 Glen Prideaux <glenprideaux@iname.com>
 
-  (adapted from extender-spanner)
+ (adapted from lyric-extender)
 */
 
 #include <math.h>
@@ -15,47 +15,76 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "hyphen-spanner.hh"
+#include "paper-column.hh"
 #include "spanner.hh"
 #include "item.hh"
 
-MAKE_SCHEME_SCORE_ELEMENT_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));
-  Molecule  mol;
+  Spanner * sp = unsmob_spanner (smob);
+  Drul_array<Item*> bounds (sp->get_bound (LEFT),
+                           sp->get_bound (RIGHT));
+  
+  Grob * common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
 
-  Real leftext = sp->get_bound (LEFT)->extent (X_AXIS).length ();
+  Interval span_points;
+  Direction d = LEFT;
+  do
+    {
+      Interval iv = bounds[d]->extent (common, X_AXIS);
 
-  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 w = sp->spanner_length () - leftext - ss/2; 
+      span_points[d] = iv.is_empty ()
+       ? bounds[d]->relative_coordinate (common, X_AXIS)
+       : iv[-d];
+    }
+  while (flip (&d) != LEFT);
+  
+  Real lt = sp->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real th = robust_scm2double (sp->get_grob_property ("thickness"), 1) * lt ;
+  Real h = robust_scm2double (sp->get_grob_property ("height"), 0.5);
 
+  // interval?
+  
+  Real dp = robust_scm2double (sp->get_grob_property ("dash-period"), 1.0);
+  Real dl = robust_scm2double (sp->get_grob_property ("length"), .5 );
 
-  /* First try: just make the hyphen take 1/3 of the available space  
-   for length, use a geometric mean of the available space and some minimum
-  */
-  if(l < w)
-    l = sqrt(l*w);
+  if (dp < dl)
+    dp = 1.5 * dl;
 
-  Box b  (Interval ( (w-l)/2, (w+l)/2), Interval (h,h+th));
-  mol.add_molecule (sp->lookup_l ()->filledbox (b));
-  mol.translate_axis(leftext, X_AXIS);
-  return mol.create_scheme ();
-}
+  Real l = span_points.length ();
+  int n = int (ceil (l/dp - 0.5));
+  if (n <= 0)
+    n = 1;
+
+  Real space_left = l - dl - (n-1)* dp;
+
+  /*
+    If there is not enough space, the hyphen should disappear.
+   */
+  if (space_left < 0)
+    return SCM_EOL;
   
-void
-Hyphen_spanner::set_textitem (Direction d, Item* textitem_l)
-{
-  elt_l_->set_bound (d, textitem_l);
-  elt_l_->add_dependency (textitem_l);
-}
+  Box b (Interval (0, dl), Interval (h,h+th));
+  Molecule dash_mol (Lookup::round_filled_box (b, 0.8 * lt));
 
-Hyphen_spanner::Hyphen_spanner (Spanner*s)
-{
-  elt_l_ = s;
+  Molecule total;
+  for (int i = 0; i < n; i++)
+    {
+      Molecule m (dash_mol);
+      m.translate_axis (span_points[LEFT] + i * dp + space_left / 2, X_AXIS);
+      total.add_molecule (m);
+    }
+
+  total.translate_axis ( -sp->relative_coordinate (common, X_AXIS), X_AXIS);
+  return total.smobbed_copy ();
 }
+
+
+ADD_INTERFACE (Hyphen_spanner, "lyric-hyphen-interface",
+              "A centred hyphen is a simple line between lyrics used to divide syllables",
+              "thickness height dash-period length");
+
+