X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-spacing.cc;h=305d3a2468902d439ed477c665e16f817350560a;hb=64313890b232c731d432e5b096f30bffc3f3756d;hp=58603069848d47a76fa4f45acdfe6fa1e39aa41e;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 5860306984..305d3a2468 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" @@ -19,18 +20,23 @@ #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 = max (0., (- g->extent (col, X_AXIS)[LEFT])); @@ -61,7 +67,7 @@ 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]; @@ -72,15 +78,15 @@ Staff_spacing::next_note_correction (Grob *me, stem_posns.intersect (bar_size); Real corr = min (abs (stem_posns.length () / 7.0), 1.0); - corr - *= robust_scm2double (me->get_property ("stem-spacing-correction"), 1); + corr *= robust_scm2double (me->get_property ("stem-spacing-correction"), 1); if (d != DOWN) corr = 0.0; max_corr = max (max_corr, corr); } } - return max_corr; + + *fix += max_corr; } /* @@ -93,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) == ".") + std::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; @@ -114,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; extract_grob_set (me, "right-items", right_items); - for (int i = right_items.size (); i--;) + + *compound_fixed = 0.0; + *compound_space = 0.0; + int wish_count = 0; + + for (vsize i = right_items.size (); i--;) { Grob *g = right_items[i]; - max_corr = max (max_corr, next_note_correction (me, g, bar_size)); + Real space = 0.0; + Real fixed = 0.0; + + next_note_correction (me, g, bar_size, &space, &fixed); + + *compound_space += space; + *compound_fixed += fixed; + wish_count ++; + extract_grob_set (g, "elements", elts); - for (int j = elts.size (); j--;) - max_corr = max (max_corr, next_note_correction (me, elts[j], bar_size)); + 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 @@ -144,7 +176,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed) Item *me_item = dynamic_cast (me); extract_grob_set (me, "left-items", items); - for (int i = items.size (); i--;) + for (vsize i = items.size (); i--;) { Grob *cand = items[i]; if (cand && Separation_item::has_interface (cand)) @@ -152,7 +184,6 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed) } // printf ("doing col %d\n" , Paper_column::get_rank (left_col)); - if (!separation_item) { programming_error ("no sep item"); @@ -224,11 +255,19 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed) *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 " + );