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--2019 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1997--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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 Item::break_visible (Grob *g) | 146 Item::break_visible (Grob *g) |
147 { | 147 { |
148 Item *it = dynamic_cast<Item *> (g); | 148 Item *it = dynamic_cast<Item *> (g); |
149 SCM vis = g->get_property ("break-visibility"); | 149 SCM vis = g->get_property ("break-visibility"); |
150 if (scm_is_vector (vis)) | 150 if (scm_is_vector (vis)) |
151 return to_boolean (scm_c_vector_ref (vis, it->break_status_dir () + 1)); | 151 return to_boolean (scm_c_vector_ref (vis, it->break_status_dir () + 1)); |
152 return true; | 152 return true; |
153 } | 153 } |
154 | 154 |
155 bool | 155 bool |
156 Item::pure_is_visible (int start, int end) const | 156 Item::pure_is_visible (vsize start, vsize end) const |
157 { | 157 { |
158 SCM vis = get_property ("break-visibility"); | 158 SCM vis = get_property ("break-visibility"); |
159 if (scm_is_vector (vis)) | 159 if (scm_is_vector (vis)) |
160 { | 160 { |
161 int pos = 1; | 161 vsize pos = 1; |
162 int pc_rank = get_column ()->get_rank (); | 162 vsize pc_rank = get_column ()->get_rank (); |
163 if (pc_rank == start) | 163 if (pc_rank == start) |
164 pos = 2; | 164 pos = 2; |
165 else if (pc_rank == end) | 165 else if (pc_rank == end) |
166 pos = 0; | 166 pos = 0; |
167 return to_boolean (scm_vector_ref (vis, scm_from_int (pos))); | 167 return to_boolean (scm_c_vector_ref (vis, pos)); |
168 } | 168 } |
169 return true; | 169 return Grob::pure_is_visible (start, end); |
170 } | 170 } |
171 | 171 |
172 bool | 172 bool |
173 Item::internal_set_as_bound_of_spanner (Spanner *s, Direction) | 173 Item::internal_set_as_bound_of_spanner (Spanner *s, Direction) |
174 { | 174 { |
175 return s->accepts_as_bound_item (this); | 175 return s->accepts_as_bound_item (this); |
176 } | 176 } |
177 | 177 |
178 Interval_t<int> | 178 Interval_t<int> |
179 Item::spanned_rank_interval () const | 179 Item::spanned_rank_interval () const |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 " end-of-line-invisible no yes yes\n" | 270 " end-of-line-invisible no yes yes\n" |
271 " center-invisible yes no yes\n" | 271 " center-invisible yes no yes\n" |
272 "@end example", | 272 "@end example", |
273 | 273 |
274 /* properties */ | 274 /* properties */ |
275 "break-visibility " | 275 "break-visibility " |
276 "extra-spacing-height " | 276 "extra-spacing-height " |
277 "extra-spacing-width " | 277 "extra-spacing-width " |
278 "non-musical " | 278 "non-musical " |
279 ); | 279 ); |
OLD | NEW |