X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-loose-columns.cc;h=5aeb357b37bc739a874e88aa9c5af27ffd8312d3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=fdcc77f1b2797e34697fe892a541ca4974edbb96;hpb=8feb4129f717f38c6bf41a924ec298424ec63065;p=lilypond.git diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc index fdcc77f1b2..5aeb357b37 100644 --- a/lily/spacing-loose-columns.cc +++ b/lily/spacing-loose-columns.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ #include "system.hh" @@ -13,8 +13,9 @@ #include "staff-spacing.hh" #include "note-spacing.hh" #include "spacing-spanner.hh" - +#include "warn.hh" #include "moment.hh" +#include "spacing-options.hh" /* Find the loose columns in POSNS, and drape them around the columns specified in BETWEEN-COLS. */ @@ -25,7 +26,6 @@ set_loose_columns (System *which, Column_x_positions const *posns) if (!loose_col_count) return; - Real default_padding = 1.0; for (int i = 0; i < loose_col_count; i++) { int divide_over = 1; @@ -66,76 +66,105 @@ set_loose_columns (System *which, Column_x_positions const *posns) loose = right = re->get_column (); } - if (!right->get_system ()) + if (right->get_system ()) + ; /* do nothing */ + else if (right->find_prebroken_piece (LEFT) + && right->find_prebroken_piece (LEFT)->get_system () == which) right = right->find_prebroken_piece (LEFT); - - clique.push_back (right); - - Grob *common = right->common_refpoint (left, X_AXIS); - Item *finished_right_column = clique.back (); - - for (vsize j = clique.size () - 2; j > 0; j--) + else if (Paper_column::get_rank (which->get_bound (RIGHT)) < Paper_column::get_rank (right)) + + right = which->get_bound (RIGHT); + else { - int count = 0; - Real total_space = 0.0; - Real total_fixed = 0.0; - - extract_grob_set (col, "spacing-wishes", wishes); - for (vsize i = 0; i < wishes.size (); i++) + clique.back ()->programming_error ("Loose column does not have right side to attach to."); + System *base_system = dynamic_cast (which->original ()); + int j = Paper_column::get_rank (clique.back ()) + 1; + int end_rank = Paper_column::get_rank (which->get_bound (RIGHT)); + extract_grob_set (base_system, "columns", base_cols); + for (; j < end_rank; j++) { - Grob *spacing = wishes[i]; - Real space = 0.0; - Real fixed = 0.0; - - if (Staff_spacing::has_interface (spacing)) - Staff_spacing::get_spacing_params (spacing, &space, &fixed); - else if (Note_spacing::has_interface (spacing)) - { - Spacing_options options; + if (base_cols[j]->get_system () == which) + right = dynamic_cast ((Grob*)base_cols[j]); + } + } + - fixed = robust_relative_extent (col, col, X_AXIS)[RIGHT]; + if (!right) + { + programming_error ("Can't attach loose column sensibly. Attaching to end of system."); + right = which->get_bound (RIGHT); + } + Grob *common = right->common_refpoint (left, X_AXIS); - Moment dt = Paper_column::when_mom (right) - Paper_column::when_mom (col); - bool expand = false; + clique.push_back (right); - space = options.get_duration_space (dt.main_part_, &expand); - Note_spacing::get_spacing (spacing, right, space, options.increment_, - &space, &fixed); - } - else - continue; + vector clique_spacing; + clique_spacing.push_back (0.0); + for (vsize j = 1; j + 1 < clique.size (); j ++) + { + Grob *clique_col = clique[j]; - count++; + Paper_column *loose_col = dynamic_cast (clique[j]); + Paper_column *next_col = dynamic_cast (clique[j + 1]); - total_space += space; - total_fixed += fixed; + Grob *spacing = unsmob_grob (clique_col->get_object ("spacing")); + if (Grob *grace_spacing = unsmob_grob (clique_col->get_object ("grace-spacing"))) + { + spacing = grace_spacing; } + + Spacing_options options; + if (spacing) + options.init_from_grob (spacing); + else + programming_error ("Column without spacing object"); - Real distance_to_next = 0.0; - Real right_point = 0.0; - if (count) - { - total_space /= count; - total_fixed /= count; + Real base_note_space = 0.0; - distance_to_next = total_space; - right_point - = finished_right_column->relative_coordinate (common, X_AXIS); - } + if (Paper_column::is_musical (next_col) + && Paper_column::is_musical (loose_col)) + base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col, + &options); else { - Interval my_extent = robust_relative_extent (col, col, X_AXIS); - distance_to_next = my_extent[RIGHT] + default_padding; - right_point = robust_relative_extent (finished_right_column, common, X_AXIS)[LEFT]; + Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing, + loose_col, next_col, + &options); + + base_note_space = spring.distance (); } + base_note_space = max (base_note_space, + robust_relative_extent (loose_col, loose_col, X_AXIS)[RIGHT] + - robust_relative_extent (next_col, next_col, X_AXIS)[LEFT]); + + clique_spacing.push_back (base_note_space); + } + + Real default_padding = 1.0; + clique_spacing.push_back (default_padding); + + Real right_point = robust_relative_extent (clique.back (), common, X_AXIS)[LEFT]; + + + Grob *finished_right_column = clique.back (); + + for (vsize j = clique.size () - 2; j > 0; j--) + { + Paper_column *clique_col = dynamic_cast (clique[j]); + + right_point = finished_right_column->relative_coordinate (common, X_AXIS); + + Real distance_to_next = clique_spacing[j]; + Real my_offset = right_point - distance_to_next; - col->system_ = which; - col->translate_axis (my_offset - col->relative_coordinate (common, X_AXIS), X_AXIS); + clique_col->set_system (which); + clique_col->translate_axis (my_offset - clique_col->relative_coordinate (common, X_AXIS), X_AXIS); - finished_right_column = col; + finished_right_column = clique_col; } + } }