(c) 1999 Glen Prideaux <glenprideaux@iname.com>
- (adapted from extender-spanner)
+ (adapted from lyric-extender)
*/
#include <math.h>
#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 = dynamic_cast<Spanner*> (unsmob_grob (smob));
- Real leftext = sp->get_bound (LEFT)->extent (X_AXIS).length ();
-
- Real ss = sp->paper_l ()->get_var ("staffspace");
+ Grob * common = sp;
+ Direction d = LEFT;
+ do
+ {
+ common = common->common_refpoint( sp->get_bound (d), X_AXIS);
+ }
+ while (flip (&d) != LEFT);
+ Interval bounds;
+
+ do
+ {
+ bounds[d] = sp->get_bound (d)->extent (common, X_AXIS)[-d];
+ }
+ while (flip (&d) != LEFT);
+
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;
-
-
- /* 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
+ Real th = gh_scm2double (sp->get_grob_property ("thickness")) * lt ;
+ Real h = gh_scm2double (sp->get_grob_property ("height"));
+ Real l = gh_scm2double (sp->get_grob_property ("minimum-length"));
+ // The hyphen 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))
+ {
+ 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);
-
- 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 ();
+ else
+ {
+ /* OK, we have a problem. Usually this means that we're on the
+ first column, and we have a long lyric which extends to near
+ 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());
+ if (sc != NULL &&
+ sc->break_status_dir () == RIGHT)
+ {
+ /* We are on the first column, so it's probably harmless to
+ get the minimum length back by extending leftwards into
+ the space under the clef/key sig/time sig */
+ bounds[LEFT] = bounds[RIGHT] - l;
+ }
+ else
+ {
+ /* We can't get the length desired. Maybe we should warn. */
+ l = w;
+ }
+ }
+ 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.smobbed_copy ();
}
void
-Hyphen_spanner::set_textitem (Direction d, Item* textitem_l)
+Hyphen_spanner::set_textitem (Direction d, Grob* b)
{
- elt_l_->set_bound (d, textitem_l);
- elt_l_->add_dependency (textitem_l);
+ elt_l_->set_bound (d, b);
+ elt_l_->add_dependency (b);
}
Hyphen_spanner::Hyphen_spanner (Spanner*s)
{
elt_l_ = s;
}
+