#include "misc.hh"
void
-Spacing_spanner::set_interface (Score_element*me)
+Spacing_spanner::set_interface (Grob*me)
{
- me->set_extent_callback (0, X_AXIS);
- me->set_extent_callback (0, Y_AXIS);
+ me->set_extent_callback (SCM_EOL, X_AXIS);
+ me->set_extent_callback (SCM_EOL, Y_AXIS) ;
}
/*
*/
void
-Spacing_spanner::do_measure (Score_element*me, Link_array<Score_element> cols)
+Spacing_spanner::do_measure (Grob*me, Link_array<Grob> cols)
{
Moment shortest;
Moment mean_shortest;
/*
space as if this duration is present.
*/
- Moment base_shortest_duration = *unsmob_moment (me->get_elt_property ("maximum-duration-for-spacing"));
+ Moment base_shortest_duration = *unsmob_moment (me->get_grob_property ("maximum-duration-for-spacing"));
shortest.set_infinite (1);
int n = 0;
{
if (dynamic_cast<Paper_column*> (cols[i])->musical_b ())
{
- SCM st = cols[i]->get_elt_property ("shortest-starter-duration");
+ SCM st = cols[i]->get_grob_property ("shortest-starter-duration");
Moment this_shortest = *unsmob_moment(st);
shortest = shortest <? this_shortest;
if (!mean_shortest.infty_b ())
}
mean_shortest /= n;
- Real non_musical_space_strength = me->paper_l ()->get_var ("breakable_column_space_strength");
+
for (int i= 0; i < cols.size () - 1; i++)
{
Item * l = dynamic_cast<Item*> (cols[i]);
Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
+
+ /*
+ left refers to the space that is associated with items of the left column, so you have
+
+ LC <- left_space -><- right_space -> RC
+ <- total space ->
+
+
+ typically, right_space is non-zero when there are
+ accidentals in RC
+
+ */
for (int j=0; j < 4; j++)
{
Paper_column * lc = dynamic_cast<Paper_column*> (combinations[j][0]);
s.item_l_drul_[LEFT] = lc;
s.item_l_drul_[RIGHT] = rc;
- SCM hint = lc->get_elt_property ("extra-space");
- SCM next_hint = rc->get_elt_property ("extra-space");
- SCM stretch_hint = lc->get_elt_property ("stretch-distance");
- SCM next_stretch_hint = rc->get_elt_property ("stretch-distance");
+ SCM hint = lc->get_grob_property ("extra-space");
+ SCM next_hint = rc->get_grob_property ("extra-space");
+ SCM stretch_hint = lc->get_grob_property ("stretch-distance");
+ SCM next_stretch_hint = rc->get_grob_property ("stretch-distance");
- Real left_distance;
+ Real left_distance = 0;
if (gh_pair_p (hint))
{
left_distance = gh_scm2double (gh_cdr (hint));
{
left_distance = note_spacing (me,lc, rc, shortest <? base_shortest_duration);
}
-
+ else
+ programming_error ("uninitialised left_distance");
+
s.distance_f_ = left_distance;
/*
We want the space before barline to be like the note
spacing in the measure.
*/
- if (Item::breakable_b (lc) || lc->original_l_)
- s.strength_f_ = non_musical_space_strength;
- else if (!lc->musical_b ())
- left_distance *= me->paper_l ()->get_var ("decrease_nonmus_spacing_factor");
+ SCM sfac =lc->get_grob_property ("space-factor");
+ if (gh_number_p (lc->get_grob_property ("column-space-strength"))
+ && (Item::breakable_b (lc) || lc->original_l_))
+ {
+ s.strength_f_ =
+ gh_scm2double (lc->get_grob_property ("column-space-strength"));
+ }
+ else if (gh_number_p (sfac))
+ left_distance *= gh_scm2double (sfac);
Real right_dist = 0.0;
}
else
{
- Interval ext (rc->extent (X_AXIS));
+ Interval ext (rc->extent (rc, X_AXIS));
right_dist = ext.empty_b() ? 0.0 : - ext [LEFT];
}
/*
don't want to create too much extra space for accidentals
*/
- if (lc->musical_b () && rc->musical_b ())
- {
- if (!to_boolean (rc->get_elt_property ("contains-grace")))
- right_dist *= me->paper_l ()->get_var ("musical_to_musical_left_spacing_factor");
- }
+ if (rc->musical_b ())
+ {
+ if (to_boolean (rc->get_grob_property ("contains-grace")))
+ right_dist *= gh_scm2double (rc->get_grob_property ("before-grace-spacing-factor")); // fixme.
+ else
+ right_dist *= gh_scm2double (lc->get_grob_property ("before-musical-spacing-factor"));
+ }
- if (rc->musical_b () && to_boolean (rc->get_elt_property ("contains-grace")))
- right_dist *= me->paper_l ()->get_var ("before_grace_spacing_factor");
-
s.distance_f_ = left_distance + right_dist;
Real stretch_dist = 0.;
Do something if breakable column has no spacing hints set.
*/
Real
-Spacing_spanner::default_bar_spacing (Score_element*me, Score_element *lc, Score_element *rc,
+Spacing_spanner::default_bar_spacing (Grob*me, Grob *lc, Grob *rc,
Moment shortest)
{
- Real symbol_distance = lc->extent (X_AXIS)[RIGHT] ;
+ Real symbol_distance = lc->extent (lc,X_AXIS)[RIGHT] ;
Real durational_distance = 0;
Moment delta_t = Paper_column::when_mom (rc) - Paper_column::when_mom (lc);
*/
Real
-Spacing_spanner::get_duration_space (Score_element*me, Moment d, Moment shortest)
+Spacing_spanner::get_duration_space (Grob*me, Moment d, Moment shortest)
{
Real log = log_2 (shortest);
- Real k= me->paper_l ()->get_var ("arithmetic_basicspace")
+ Real k = gh_scm2double (me->get_grob_property ("arithmetic-basicspace"))
- log;
- return (log_2 (d) + k) * me->paper_l ()->get_var ("arithmetic_multiplier");
+ return (log_2 (d) + k) * gh_scm2double (me->get_grob_property ("arithmetic-multiplier"));
}
Real
-Spacing_spanner::note_spacing (Score_element*me, Score_element *lc, Score_element *rc,
+Spacing_spanner::note_spacing (Grob*me, Grob *lc, Grob *rc,
Moment shortest)
{
Moment shortest_playing_len = 0;
- SCM s = lc->get_elt_property ("shortest-playing-duration");
+ SCM s = lc->get_grob_property ("shortest-playing-duration");
- // SCM s = lc->get_elt_property ("mean-playing-duration");
+ // SCM s = lc->get_grob_property ("mean-playing-duration");
if (unsmob_moment (s))
shortest_playing_len = *unsmob_moment(s);
This routine reads the DIR-LIST property of both its L and R arguments. */
Real
-Spacing_spanner::stem_dir_correction (Score_element*me, Score_element*l, Score_element*r)
+Spacing_spanner::stem_dir_correction (Grob*me, Grob*l, Grob*r)
{
- SCM dl = l->get_elt_property ("dir-list");
- SCM dr = r->get_elt_property ("dir-list");
+ SCM dl = l->get_grob_property ("dir-list");
+ SCM dr = r->get_grob_property ("dir-list");
if (scm_ilength (dl) != 1 || scm_ilength (dr) != 1)
return 0.;
Real correction = 0.0;
- Real ssc = me->paper_l ()->get_var("stemSpacingCorrection");
-
+ Real ssc = gh_scm2double (me->get_grob_property("stem-spacing-correction"));
if (d1 && d2 && d1 * d2 == -1)
{
}
-MAKE_SCHEME_CALLBACK(Spacing_spanner, set_springs);
+MAKE_SCHEME_CALLBACK(Spacing_spanner, set_springs,1);
SCM
Spacing_spanner::set_springs (SCM smob)
{
- Score_element *me = unsmob_element (smob);
- Link_array<Score_element> all (me->pscore_l_->line_l_->column_l_arr ()) ;
+ Grob *me = unsmob_grob (smob);
+ Link_array<Grob> all (me->pscore_l_->line_l_->column_l_arr ()) ;
int j = 0;
for (int i = 1; i < all.size (); i++)
{
- Score_element *sc = all[i];
+ Grob *sc = all[i];
if (Item::breakable_b (sc))
{
- Link_array<Score_element> measure (all.slice (j, i+1));
+ Link_array<Grob> measure (all.slice (j, i+1));
do_measure (me, measure);
j = i;
}
-
-
+/*
+ maximum-duration-for-spacing
+From: bf250@freenet.carleton.ca (John Sankey)
+To: gnu-music-discuss@gnu.org
+Subject: note spacing suggestion
+Date: Mon, 10 Jul 2000 11:28:03 -0400 (EDT)
+
+Currently, Lily spaces notes by starting with a basic distance,
+arithmetic_multiplier, which it applies to the minimum duration note
+of the bar. Then she adds a logarithmic increment, scaled from
+arithmetic_basicspace, for longer notes. (Then, columns are aligned
+and justified.) Fundamentally, this matches visual spacing to musical
+weight and works well.
+
+A lot of the time in music, I see a section basically in melodic
+notes that occasionally has a rapid ornamental run (scale). So, there
+will be a section in 1/4 notes, then a brief passage in 1/32nds, then
+a return to long notes. Currently, Lily gives the same horizontal
+space to the 1/32nd notes in their bar (even if set in small size as
+is commonly done for cadenzii) as she gives to 1/4 notes in bars
+where 1/4 note is the minimum duration. The resulting visual weight
+does not match the musical weight over the page.
+
+Looking at the music I am typesetting, I feel that Lily's spacing
+could be significantly improved if, with no change in the basic
+method used, arithmetic_multiplier could be applied referred to the
+same duration throughout a piece. Of course, the current method
+should be retained for those who have already set music in it, so I
+suggest a property called something like arithmetic_base=16 to fix
+1/16 duration as the reference for arithmetic_multiplier; the default
+would be a dynamic base is it is now.
+
+Does anyone else feel that this would be a useful improvement for
+their music? (Of course, if arithmetic_multiplier became a regular
+property, this could be used to achieve a similar result by
+tweaking.)
+
+ */
projects / lilypond.git / blobdiff