X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-spacing.cc;h=f3e54e904c508bac16482ede9e03b814cc974714;hb=28976d28a04cfb9abe97af7214d7dce11f732604;hp=40cb91d5ba79727d05542d814a9ed9e1940978cb;hpb=1627b4aa769bc3290e58d876112746ea62a5cb54;p=lilypond.git diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc index 40cb91d5ba..f3e54e904c 100644 --- a/lily/note-spacing.cc +++ b/lily/note-spacing.cc @@ -33,8 +33,8 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, Real base_space, Real increment, Real *space, Real *fixed) { - Drul_array props(me->get_grob_property ("left-items"), - me->get_grob_property ("right-items")); + Drul_array props (me->get_property ("left-items"), + me->get_property ("right-items")); Direction d = LEFT; Direction col_dir = right_col->break_status_dir (); Drul_array extents; @@ -42,9 +42,9 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, Interval left_head_wid; do { - for (SCM s = props[d]; gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = props[d]; is_pair (s); s = ly_cdr (s)) { - Item * it= dynamic_cast (unsmob_grob (gh_car(s))); + Item * it= dynamic_cast (unsmob_grob (ly_car (s))); if (d == RIGHT && it->break_status_dir () != col_dir) { @@ -70,7 +70,7 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, if (d == LEFT) { - SCM r = it->get_grob_property ("rest"); + SCM r = it->get_property ("rest"); Grob * g = unsmob_grob (r); if (!g) g = Note_column::first_head (it); @@ -80,7 +80,7 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, first note head will be. */ if (g) - left_head_wid = g->extent(it_col, X_AXIS); + left_head_wid = g->extent (it_col, X_AXIS); } extents[d].unite (it->extent (it_col, X_AXIS)); @@ -140,17 +140,22 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, */ *space = (base_space - increment) + *fixed ; - if (Item::breakable_b (right_col) - || right_col->original_) + if (!extents[RIGHT].is_empty () + && (Item::is_breakable (right_col) + || right_col->original_)) { /* This is for the situation rest | 3/4 (eol) - + + Since we only take half of the right-object space above, the + barline will bump into the notes preceding it, if the right + thing is big. We add the rest of the extents here: */ - *space += -extents[RIGHT][LEFT]; - *fixed += -extents[RIGHT][LEFT]; + + *space += -extents[RIGHT][LEFT] / 2; + *fixed += -extents[RIGHT][LEFT] / 2; } stem_dir_correction (me, right_col, increment, space, fixed); @@ -159,7 +164,7 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, Item * Note_spacing::left_column (Grob *me) { - if (!me->live()) + if (!me->live ()) return 0; return dynamic_cast (me)->get_column (); @@ -176,16 +181,16 @@ prune RIGHT-ITEMS. Item * Note_spacing::right_column (Grob*me) { - if (!me->live()) + if (!me->live ()) return 0; - SCM right = me->get_grob_property ("right-items"); + SCM right = me->get_property ("right-items"); Item *mincol = 0; int min_rank = INT_MAX; bool prune = false; - for (SCM s = right ; gh_pair_p (s) ; s = gh_cdr (s)) + for (SCM s = right ; is_pair (s) ; s = ly_cdr (s)) { - Item * ri = unsmob_item (gh_car (s)); + Item * ri = unsmob_item (ly_car (s)); Item * col = ri->get_column (); int rank = Paper_column::get_rank (col); @@ -204,20 +209,20 @@ Note_spacing::right_column (Grob*me) { // I'm a lazy bum. We could do this in-place. SCM newright = SCM_EOL; - for (SCM s = right ; gh_pair_p (s) ; s =gh_cdr (s)) + for (SCM s = right ; is_pair (s) ; s =ly_cdr (s)) { - if (unsmob_item (gh_car (s))->get_column () == mincol) - newright = gh_cons (gh_car (s), newright); + if (unsmob_item (ly_car (s))->get_column () == mincol) + newright = scm_cons (ly_car (s), newright); } - me->set_grob_property ("right-items", newright); + me->set_property ("right-items", newright); } if (!mincol) { /* int r = Paper_column::get_rank (dynamic_cast(me)->get_column ()); - programming_error (_f("Spacing wish column %d has no right item.", r)); + programming_error (_f ("Spacing wish column %d has no right item.", r)); */ return 0; @@ -239,14 +244,14 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, Real increment, Real * space, Real *fixed) { - Drul_array stem_dirs(CENTER,CENTER); + Drul_array stem_dirs (CENTER,CENTER); Drul_array stem_posns; Drul_array head_posns; - Drul_array props(me->get_grob_property ("left-items"), - me->get_grob_property ("right-items")); + Drul_array props (me->get_property ("left-items"), + me->get_property ("right-items")); - Drul_array beams_drul(0,0); - Drul_array stems_drul(0,0); + Drul_array beams_drul (0,0); + Drul_array stems_drul (0,0); stem_dirs[LEFT] = stem_dirs[RIGHT] = CENTER; Interval intersect; @@ -259,9 +264,9 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, do { - for (SCM s = props[d]; gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = props[d]; is_pair (s); s = ly_cdr (s)) { - Item * it= dynamic_cast (unsmob_grob (gh_car(s))); + Item * it= dynamic_cast (unsmob_grob (ly_car (s))); if (d == RIGHT) acc_right = acc_right || Note_column::accidentals (it); @@ -288,7 +293,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, return ; } - if(Stem::invisible_b (stem)) + if (Stem::is_invisible (stem)) { correct_stem_dirs = false; continue; @@ -320,7 +325,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, Real chord_start = hp[sd]; Real stem_end = Stem::stem_end_position (stem); - stem_posns[d] = Interval(chord_start? stem_end); + stem_posns[d] = Interval (chord_start? stem_end); head_posns[d].unite (hp); } } @@ -370,13 +375,13 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, } correction = note_head_width* stem_dirs[LEFT]; - correction *= robust_scm2double (me->get_grob_property ("knee-spacing-correction"), 0); + correction *= robust_scm2double (me->get_property ("knee-spacing-correction"), 0); *fixed += correction; } else { intersect = stem_posns[LEFT]; - intersect.intersect(stem_posns[RIGHT]); + intersect.intersect (stem_posns[RIGHT]); correct_stem_dirs = correct_stem_dirs && !intersect.is_empty (); if (correct_stem_dirs) @@ -390,7 +395,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, correction = (correction/7) get_grob_property ("stem-spacing-correction"), 0); + robust_scm2double (me->get_property ("stem-spacing-correction"), 0); } if (!bar_yextent.is_empty ()) @@ -430,7 +435,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, (head_posns[LEFT][DOWN] > head_posns[RIGHT][UP]) ? RIGHT : LEFT; Real delta = head_posns[-lowest][DOWN] - head_posns[lowest][UP] ; - Real corr = robust_scm2double (me->get_grob_property ("stem-spacing-correction"), 0); + Real corr = robust_scm2double (me->get_property ("stem-spacing-correction"), 0); corr = (delta <= 1) ? 0.0 : 0.25; correction= -lowest * corr ; @@ -438,7 +443,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, *space += correction; - /* there used to be a correction for bar_xextent() here, but + /* there used to be a correction for bar_xextent () here, but it's unclear what that was good for ? */ @@ -448,6 +453,6 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, ADD_INTERFACE (Note_spacing,"note-spacing-interface", - "", + "This object calculates spacing wishes for individual voices.", "left-items right-items stem-spacing-correction knee-spacing-correction");