OLD | NEW |
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) 1998--2019 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1998--2019 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 // difference is that in self-alignment-interface we align on the parent | 338 // difference is that in self-alignment-interface we align on the parent |
339 // where as here we align on a group of grobs. | 339 // where as here we align on a group of grobs. |
340 if (dim.is_empty ()) | 340 if (dim.is_empty ()) |
341 { | 341 { |
342 dim = Skyline (dim.direction ()); | 342 dim = Skyline (dim.direction ()); |
343 dim.set_minimum_height (0.0); | 343 dim.set_minimum_height (0.0); |
344 } | 344 } |
345 | 345 |
346 Real ss = Staff_symbol_referencer::staff_space (me); | 346 Real ss = Staff_symbol_referencer::staff_space (me); |
347 Real dist = dim.distance (my_dim, robust_scm2double (me->get_maybe_pure_proper
ty ("horizon-padding", pure, start, end), 0.0)); | 347 Real dist = dim.distance (my_dim, robust_scm2double (me->get_maybe_pure_proper
ty ("horizon-padding", pure, start, end), 0.0)); |
348 Real total_off = !isinf (dist) ? dir * dist : 0.0; | 348 Real total_off = !std::isinf (dist) ? dir * dist : 0.0; |
349 | 349 |
350 total_off += dir * ss * robust_scm2double (me->get_maybe_pure_property ("paddi
ng", pure, start, end), 0.0); | 350 total_off += dir * ss * robust_scm2double (me->get_maybe_pure_property ("paddi
ng", pure, start, end), 0.0); |
351 | 351 |
352 Real minimum_space = ss * robust_scm2double (me->get_maybe_pure_property ("min
imum-space", pure, start, end), -1); | 352 Real minimum_space = ss * robust_scm2double (me->get_maybe_pure_property ("min
imum-space", pure, start, end), -1); |
353 | 353 |
354 if (minimum_space >= 0 | 354 if (minimum_space >= 0 |
355 && dir | 355 && dir |
356 && total_off * dir < minimum_space) | 356 && total_off * dir < minimum_space) |
357 total_off = minimum_space * dir; | 357 total_off = minimum_space * dir; |
358 | 358 |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
519 "minimum-space " | 519 "minimum-space " |
520 "horizon-padding " | 520 "horizon-padding " |
521 "padding " | 521 "padding " |
522 "quantize-position " | 522 "quantize-position " |
523 "side-axis " | 523 "side-axis " |
524 "side-support-elements " | 524 "side-support-elements " |
525 "slur-padding " | 525 "slur-padding " |
526 "staff-padding " | 526 "staff-padding " |
527 "use-skylines " | 527 "use-skylines " |
528 ); | 528 ); |
OLD | NEW |