X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-spacing.cc;h=1d9182c16cc719c5a5794b844830ecece10f2ce7;hb=e21e3fd69d0204424e93983460926bc0b90f448c;hp=90e6882ea2614d61e583893e55acfecaa4950061;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 90e6882ea2..1d9182c16c 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -3,12 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 2001--2005 Han-Wen Nienhuys + (c) 2001--2006 Han-Wen Nienhuys */ #include "staff-spacing.hh" #include +using namespace std; #include "paper-column.hh" #include "separation-item.hh" @@ -18,21 +19,27 @@ #include "note-column.hh" #include "stem.hh" #include "accidental-placement.hh" +#include "pointer-group-interface.hh" +#include "directional-element-interface.hh" /* Insert some more space for the next note, in case it has a stem in the wrong direction */ -Real +void Staff_spacing::next_note_correction (Grob *me, Grob *g, - Interval bar_size) + Interval bar_size, + Real *space, + Real *fix) { + (void)space; + if (!g || !Note_column::has_interface (g)) - return 0.0; + return ; Item *col = dynamic_cast (g)->get_column (); - Real max_corr = 0. >? (- g->extent (col, X_AXIS)[LEFT]); + Real max_corr = max (0., (- g->extent (col, X_AXIS)[LEFT])); /* Duh. If this gets out of hand, we should invent something more generic. @@ -41,18 +48,14 @@ Staff_spacing::next_note_correction (Grob *me, { Interval v; if (Accidental_placement::has_interface (a)) - { - v = Accidental_placement::get_relevant_accidental_extent (a, col, me); - } + v = Accidental_placement::get_relevant_accidental_extent (a, col, me); else v = a->extent (col, X_AXIS); - max_corr = max_corr >? (- v[LEFT]); - } - if (Grob *a = unsmob_grob (g->get_property ("arpeggio"))) - { - max_corr = max_corr >? (- a->extent (col, X_AXIS)[LEFT]); + max_corr = max (max_corr, (- v[LEFT])); } + if (Grob *a = unsmob_grob (g->get_object ("arpeggio"))) + max_corr = max (max_corr, - a->extent (col, X_AXIS)[LEFT]); /* Let's decrease the space a little if the problem is not located @@ -64,26 +67,26 @@ Staff_spacing::next_note_correction (Grob *me, if (!bar_size.is_empty ()) if (Grob *stem = Note_column::get_stem (g)) { - Direction d = Stem::get_direction (stem); + Direction d = get_grob_direction (stem); if (d == DOWN) { Real stem_start = Stem::head_positions (stem) [DOWN]; Real stem_end = Stem::stem_end_position (stem); - Interval stem_posns (stem_start ? stem_start); + Interval stem_posns (min (stem_start, stem_end), + max (stem_end, stem_start)); stem_posns.intersect (bar_size); - Real corr = abs (stem_posns.length () / 7.) get_property ("stem-spacing-correction"), 1); + Real corr = min (abs (stem_posns.length () / 7.0), 1.0); + corr *= robust_scm2double (me->get_property ("stem-spacing-correction"), 1); if (d != DOWN) corr = 0.0; - max_corr = max_corr >? corr; + max_corr = max (max_corr, corr); } } - return max_corr; + + *fix += max_corr; } /* @@ -96,15 +99,16 @@ Staff_spacing::bar_y_positions (Grob *bar_grob) bar_size.set_empty (); if (Bar_line::has_interface (bar_grob)) { - SCM glyph = bar_grob->get_property ("glyph"); + SCM glyph = bar_grob->get_property ("glyph-name"); + Grob *staff_sym = Staff_symbol_referencer::get_staff_symbol (bar_grob); - String glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : ""; - if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".") + string glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : ""; + if (glyph_string.substr (0, 1) == "|" + || glyph_string.substr (0, 1) == ".") { - SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm ()); - bar_size = Interval (-1, 1); - bar_size *= robust_scm2double (sz, 1) - / Staff_symbol_referencer::staff_space (bar_grob); + Grob *common = bar_grob->common_refpoint (staff_sym, Y_AXIS); + Interval bar_size = bar_grob->extent (common, Y_AXIS); + bar_size *= 1.0 / Staff_symbol_referencer::staff_space (bar_grob); } } return bar_size; @@ -117,24 +121,49 @@ Staff_spacing::bar_y_positions (Grob *bar_grob) pointers to the separation-items, not the note-columns or note-spacings. */ -Real -Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob) +void +Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob, + Real *compound_space, Real *compound_fixed + ) { Interval bar_size = bar_y_positions (last_grob); - Real max_corr = 0.0; - for (SCM s = me->get_property ("right-items"); - scm_is_pair (s); s = scm_cdr (s)) + extract_grob_set (me, "right-items", right_items); + + *compound_fixed = 0.0; + *compound_space = 0.0; + int wish_count = 0; + + for (vsize i = right_items.size (); i--;) { - Grob *g = unsmob_grob (scm_car (s)); + Grob *g = right_items[i]; + + Real space = 0.0; + Real fixed = 0.0; + + next_note_correction (me, g, bar_size, &space, &fixed); - max_corr = max_corr >? next_note_correction (me, g, bar_size); - for (SCM t = g->get_property ("elements"); - scm_is_pair (t); t = scm_cdr (t)) - max_corr = max_corr >? next_note_correction (me, unsmob_grob (scm_car (t)), bar_size); + *compound_space += space; + *compound_fixed += fixed; + wish_count ++; + + extract_grob_set (g, "elements", elts); + for (vsize j = elts.size (); j--;) + { + Real space = 0.0; + Real fixed = 0.0; + next_note_correction (me, elts[j], bar_size, &space, &fixed); + *compound_fixed += fixed; + *compound_space += space; + wish_count ++; + } } - return max_corr; + if (wish_count) + { + *compound_space /= wish_count; + *compound_fixed /= wish_count; + } } void @@ -146,16 +175,15 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed) Grob *separation_item = 0; Item *me_item = dynamic_cast (me); - for (SCM s = me->get_property ("left-items"); - scm_is_pair (s); s = scm_cdr (s)) + extract_grob_set (me, "left-items", items); + for (vsize i = items.size (); i--;) { - Grob *cand = unsmob_grob (scm_car (s)); + Grob *cand = items[i]; if (cand && Separation_item::has_interface (cand)) separation_item = cand; } // printf ("doing col %d\n" , Paper_column::get_rank (left_col)); - if (!separation_item) { programming_error ("no sep item"); @@ -198,7 +226,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed) if (!scm_is_pair (space_def)) { - programming_error ("Unknown prefatory spacing. "); + programming_error ("unknown prefatory spacing"); return; } @@ -213,29 +241,33 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed) *space = *fixed; } else if (type == ly_symbol2scm ("extra-space")) - { - *space = *fixed + distance; - } + *space = *fixed + distance; else if (type == ly_symbol2scm ("semi-fixed-space")) { *fixed += distance / 2; *space = *fixed + distance / 2; } else if (type == ly_symbol2scm ("minimum-space")) - { - *space = last_ext[LEFT] + (last_ext.length () >? distance); - } + *space = last_ext[LEFT] + max (last_ext.length (), distance); else if (type == ly_symbol2scm ("minimum-fixed-space")) { - *space = last_ext[LEFT] + (last_ext.length () >? distance); + *space = last_ext[LEFT] + max (last_ext.length (), distance); *fixed = *space; } - *space += next_notes_correction (me, last_grob); + Real correction_fixed, correction_space; + next_notes_correction (me, last_grob, &correction_space, &correction_fixed ); + *space += correction_space; + *fixed += correction_fixed; } ADD_INTERFACE (Staff_spacing, "staff-spacing-interface", "This object calculates spacing details from a " " breakable symbol (left) to another object. For example, it takes care " " of optical spacing from a bar lines to a note.", - "stem-spacing-correction left-items right-items"); + + /* properties */ + "stem-spacing-correction " + "left-items " + "right-items " + );