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) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org> | 4 Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org> |
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 extract_grob_set (me, "note-columns", columns); | 106 extract_grob_set (me, "note-columns", columns); |
107 if (columns.size ()) | 107 if (columns.size ()) |
108 bound_grob = (dir == LEFT) | 108 bound_grob = (dir == LEFT) |
109 ? columns[0] : columns.back (); | 109 ? columns[0] : columns.back (); |
110 } | 110 } |
111 | 111 |
112 Real x_coord = (has_interface<Paper_column> (bound_grob) | 112 Real x_coord = (has_interface<Paper_column> (bound_grob) |
113 ? Axis_group_interface::generic_bound_extent (bound_grob,
commonx, X_AXIS) | 113 ? Axis_group_interface::generic_bound_extent (bound_grob,
commonx, X_AXIS) |
114 : robust_relative_extent (bound_grob, commonx, X_AXIS)).li
near_combination (attach); | 114 : robust_relative_extent (bound_grob, commonx, X_AXIS)).li
near_combination (attach); |
115 | 115 |
116 Grob *acc = unsmob<Grob> (bound_grob->get_object ("accidental-grob")); | 116 Grob *acc = Note_column::accidentals (bound_grob->get_parent (X_AXIS)); |
117 if (acc && to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-accidental"),
details, SCM_BOOL_F))) | 117 if (acc && to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-accidental"),
details, SCM_BOOL_F))) |
118 x_coord = robust_relative_extent (acc, commonx, X_AXIS).linear_combinati
on (attach); | 118 x_coord = robust_relative_extent (acc, commonx, X_AXIS).linear_combinati
on (attach); |
119 | 119 |
120 Grob *dot = unsmob<Grob> (bound_grob->get_object ("dot")); | 120 Grob *dot = unsmob<Grob> (bound_grob->get_object ("dot")); |
121 if (dot && to_boolean (ly_assoc_get (ly_symbol2scm ("start-at-dot"), detai
ls, SCM_BOOL_F))) | 121 if (dot && to_boolean (ly_assoc_get (ly_symbol2scm ("start-at-dot"), detai
ls, SCM_BOOL_F))) |
122 x_coord = robust_relative_extent (dot, commonx, X_AXIS).linear_combinati
on (attach); | 122 x_coord = robust_relative_extent (dot, commonx, X_AXIS).linear_combinati
on (attach); |
123 | 123 |
124 details = scm_acons (ly_symbol2scm ("X"), | 124 details = scm_acons (ly_symbol2scm ("X"), |
125 scm_from_double (x_coord), | 125 scm_from_double (x_coord), |
126 details); | 126 details); |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 "bound-details " | 388 "bound-details " |
389 "extra-dy " | 389 "extra-dy " |
390 "gap " | 390 "gap " |
391 "left-bound-info " | 391 "left-bound-info " |
392 "note-columns " | 392 "note-columns " |
393 "right-bound-info " | 393 "right-bound-info " |
394 "simple-Y " | 394 "simple-Y " |
395 "thickness " | 395 "thickness " |
396 "to-barline " | 396 "to-barline " |
397 ); | 397 ); |
OLD | NEW |