LEFT | RIGHT |
(no file at all) | |
1 /* | 1 /* |
2 This file is part of LilyPond, the GNU music typesetter. | 2 This file is part of LilyPond, the GNU music typesetter. |
3 | 3 |
4 Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl> |
5 | 5 |
6 LilyPond is free software: you can redistribute it and/or modify | 6 LilyPond is free software: you can redistribute it and/or modify |
7 it under the terms of the GNU General Public License as published by | 7 it under the terms of the GNU General Public License as published by |
8 the Free Software Foundation, either version 3 of the License, or | 8 the Free Software Foundation, either version 3 of the License, or |
9 (at your option) any later version. | 9 (at your option) any later version. |
10 | 10 |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 else | 169 else |
170 { | 170 { |
171 Spring spring = Spacing_spanner::standard_breakable_column_spacing
(spacing, | 171 Spring spring = Spacing_spanner::standard_breakable_column_spacing
(spacing, |
172 loose_col, next_col, | 172 loose_col, next_col, |
173 &options); | 173 &options); |
174 | 174 |
175 base_note_space = spring.distance (); | 175 base_note_space = spring.distance (); |
176 tight_note_space = spring.min_distance (); | 176 tight_note_space = spring.min_distance (); |
177 } | 177 } |
178 | 178 |
| 179 Real loose_col_horizontal_length = loose_col->extent (loose_col, X_AXI
S).length (); |
| 180 base_note_space = max (base_note_space, loose_col_horizontal_length); |
| 181 tight_note_space = max (tight_note_space, loose_col_horizontal_length)
; |
| 182 |
179 clique_spacing.push_back (base_note_space); | 183 clique_spacing.push_back (base_note_space); |
180 clique_tight_spacing.push_back (tight_note_space); | 184 clique_tight_spacing.push_back (tight_note_space); |
181 } | 185 } |
182 | 186 |
183 Real permissible_distance = clique.back ()->relative_coordinate (common, X
_AXIS) - robust_relative_extent (clique[0], common, X_AXIS)[RIGHT]; | 187 Real permissible_distance = clique.back ()->relative_coordinate (common, X
_AXIS) - robust_relative_extent (clique[0], common, X_AXIS)[RIGHT]; |
184 Real right_point = robust_relative_extent (clique.back (), common, X_AXIS)
[LEFT]; | 188 Real right_point = robust_relative_extent (clique.back (), common, X_AXIS)
[LEFT]; |
185 Grob *finished_right_column = clique.back (); | 189 Grob *finished_right_column = clique.back (); |
186 | 190 |
187 Real sum_tight_spacing = 0; | 191 Real sum_tight_spacing = 0; |
188 Real sum_spacing = 0; | 192 Real sum_spacing = 0; |
(...skipping 15 matching lines...) Expand all Loading... |
204 | 208 |
205 Real my_offset = right_point - distance_to_next; | 209 Real my_offset = right_point - distance_to_next; |
206 | 210 |
207 clique_col->translate_axis (my_offset - clique_col->relative_coordinat
e (common, X_AXIS), X_AXIS); | 211 clique_col->translate_axis (my_offset - clique_col->relative_coordinat
e (common, X_AXIS), X_AXIS); |
208 | 212 |
209 finished_right_column = clique_col; | 213 finished_right_column = clique_col; |
210 } | 214 } |
211 } | 215 } |
212 } | 216 } |
213 | 217 |
LEFT | RIGHT |