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) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1997--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 |
11 LilyPond is distributed in the hope that it will be useful, | 11 LilyPond is distributed in the hope that it will be useful, |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 GNU General Public License for more details. | 14 GNU General Public License for more details. |
15 | 15 |
16 You should have received a copy of the GNU General Public License | 16 You should have received a copy of the GNU General Public License |
17 along with LilyPond. If not, see <http://www.gnu.org/licenses/>. | 17 along with LilyPond. If not, see <http://www.gnu.org/licenses/>. |
18 */ | 18 */ |
19 | 19 |
20 #include "hairpin.hh" | 20 #include "hairpin.hh" |
21 | 21 |
| 22 #include "axis-group-interface.hh" |
22 #include "dimensions.hh" | 23 #include "dimensions.hh" |
23 #include "international.hh" | 24 #include "international.hh" |
24 #include "line-interface.hh" | 25 #include "line-interface.hh" |
25 #include "output-def.hh" | 26 #include "output-def.hh" |
26 #include "paper-column.hh" | 27 #include "paper-column.hh" |
27 #include "pointer-group-interface.hh" | 28 #include "pointer-group-interface.hh" |
28 #include "spanner.hh" | 29 #include "spanner.hh" |
29 #include "staff-symbol-referencer.hh" | 30 #include "staff-symbol-referencer.hh" |
30 #include "text-interface.hh" | 31 #include "text-interface.hh" |
31 #include "note-column.hh" | 32 #include "note-column.hh" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 adjacent = dynamic_cast<Spanner *> (neighbors[i]); | 134 adjacent = dynamic_cast<Spanner *> (neighbors[i]); |
134 if (adjacent | 135 if (adjacent |
135 && (adjacent->get_bound (-d)->get_column () | 136 && (adjacent->get_bound (-d)->get_column () |
136 == b->get_column ())) | 137 == b->get_column ())) |
137 { | 138 { |
138 neighbor_found = true; | 139 neighbor_found = true; |
139 break; | 140 break; |
140 } | 141 } |
141 } | 142 } |
142 | 143 |
143 Interval e = robust_relative_extent (b, common, X_AXIS); | 144 » Interval e = (Axis_group_interface::has_interface (b) |
| 145 ? Axis_group_interface::generic_bound_extent (b, com
mon, X_AXIS) |
| 146 : robust_relative_extent (b, common, X_AXIS)); |
144 if (neighbor_found) | 147 if (neighbor_found) |
145 { | 148 { |
146 if (Hairpin::has_interface (adjacent)) | 149 if (Hairpin::has_interface (adjacent)) |
147 { | 150 { |
148 /* | 151 /* |
149 Handle back-to-back hairpins with a circle in the middle | 152 Handle back-to-back hairpins with a circle in the middle |
150 */ | 153 */ |
151 if (circled_tip && (grow_dir != d)) | 154 if (circled_tip && (grow_dir != d)) |
152 x_points[d] = e.center () + d * (rad - thick / 2.0); | 155 x_points[d] = e.center () + d * (rad - thick / 2.0); |
153 /* | 156 /* |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 ADD_INTERFACE (Hairpin, | 259 ADD_INTERFACE (Hairpin, |
257 "A hairpin crescendo or decrescendo.", | 260 "A hairpin crescendo or decrescendo.", |
258 | 261 |
259 /* properties */ | 262 /* properties */ |
260 "adjacent-spanners " | 263 "adjacent-spanners " |
261 "circled-tip " | 264 "circled-tip " |
262 "bound-padding " | 265 "bound-padding " |
263 "grow-direction " | 266 "grow-direction " |
264 "height " | 267 "height " |
265 ); | 268 ); |
OLD | NEW |