X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-loose-columns.cc;h=5aeb357b37bc739a874e88aa9c5af27ffd8312d3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ab287477349afb8cee54183aa1139c20ded175df;hpb=1402d6d957bee7d47e0bddf4c57dd89912182b26;p=lilypond.git diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc index ab28747734..5aeb357b37 100644 --- a/lily/spacing-loose-columns.cc +++ b/lily/spacing-loose-columns.cc @@ -1,17 +1,21 @@ /* - spacing-loose-columns.cc -- implement loose column spacing. + spacing-loose-columns.cc -- implement loose column spacing. source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ - #include "system.hh" #include "paper-column.hh" #include "column-x-positions.hh" -#include "staff-spacing.hh" #include "pointer-group-interface.hh" +#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. */ @@ -19,6 +23,9 @@ void set_loose_columns (System *which, Column_x_positions const *posns) { int loose_col_count = posns->loose_cols_.size (); + if (!loose_col_count) + return; + for (int i = 0; i < loose_col_count; i++) { int divide_over = 1; @@ -30,6 +37,8 @@ set_loose_columns (System *which, Column_x_positions const *posns) Item *left = 0; Item *right = 0; + + vector clique; while (1) { SCM between = loose->get_object ("between-cols"); @@ -47,58 +56,115 @@ set_loose_columns (System *which, Column_x_positions const *posns) left = le->get_column (); if (!left->get_system ()) left = left->find_prebroken_piece (RIGHT); + + clique.push_back (left); } + clique.push_back (loose); + divide_over++; 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); + else if (Paper_column::get_rank (which->get_bound (RIGHT)) < Paper_column::get_rank (right)) + + right = which->get_bound (RIGHT); + else + { + 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++) + { + if (base_cols[j]->get_system () == which) + right = dynamic_cast ((Grob*)base_cols[j]); + } + } + + 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); - int count = 0; - Real total_space = 0.0; - Real total_fixed = 0.0; + clique.push_back (right); - extract_grob_set (col, "spacing-wishes", wishes); - for (int i = 0; i < wishes.size (); i++) + vector clique_spacing; + clique_spacing.push_back (0.0); + for (vsize j = 1; j + 1 < clique.size (); j ++) { - Grob *spacing = wishes[i]; - if (Staff_spacing::has_interface (spacing)) + Grob *clique_col = clique[j]; + + Paper_column *loose_col = dynamic_cast (clique[j]); + Paper_column *next_col = dynamic_cast (clique[j + 1]); + + Grob *spacing = unsmob_grob (clique_col->get_object ("spacing")); + if (Grob *grace_spacing = unsmob_grob (clique_col->get_object ("grace-spacing"))) { - Real space = 0.0; - Real fixed = 0.0; - Staff_spacing::get_spacing_params (spacing, &space, &fixed); + spacing = grace_spacing; + } + + Spacing_options options; + if (spacing) + options.init_from_grob (spacing); + else + programming_error ("Column without spacing object"); + + Real base_note_space = 0.0; + + 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 + { + Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing, + loose_col, next_col, + &options); - total_fixed += fixed; - total_space += space; - count++; + 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 right_point = 0.0; - Real distance_to_next = 0.0; - if (count) - { - total_space /= count; - total_fixed /= count; + Real default_padding = 1.0; + clique_spacing.push_back (default_padding); - distance_to_next = total_space; - right_point = right->relative_coordinate (common, X_AXIS); - } - else + 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--) { - Interval my_extent = col->extent (col, X_AXIS); - distance_to_next = my_extent[RIGHT] + 1.0; - right_point = right->extent (common, X_AXIS)[LEFT]; - } + 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; - Real my_offset = right_point - distance_to_next; + clique_col->set_system (which); + clique_col->translate_axis (my_offset - clique_col->relative_coordinate (common, X_AXIS), X_AXIS); - col->system_ = which; - col->translate_axis (my_offset - col->relative_coordinate (common, X_AXIS), X_AXIS); + finished_right_column = clique_col; + } + } }