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) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 2005--2015 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 void | 222 void |
223 Paper_column_engraver::stop_translation_timestep () | 223 Paper_column_engraver::stop_translation_timestep () |
224 { | 224 { |
225 if (to_boolean (get_property ("skipTypesetting"))) | 225 if (to_boolean (get_property ("skipTypesetting"))) |
226 return; | 226 return; |
227 | 227 |
228 SCM m = now_mom ().smobbed_copy (); | 228 SCM m = now_mom ().smobbed_copy (); |
229 command_column_->set_property ("when", m); | 229 command_column_->set_property ("when", m); |
230 musical_column_->set_property ("when", m); | 230 musical_column_->set_property ("when", m); |
231 | 231 |
| 232 SCM mpos = get_property ("measurePosition"); |
| 233 SCM barnum = get_property ("internalBarNumber"); |
| 234 if (unsmob<Moment> (mpos) |
| 235 && scm_is_integer (barnum)) |
| 236 { |
| 237 SCM where = scm_cons (barnum, |
| 238 mpos); |
| 239 |
| 240 command_column_->set_property ("rhythmic-location", where); |
| 241 musical_column_->set_property ("rhythmic-location", where); |
| 242 } |
| 243 |
232 for (vsize i = 0; i < items_.size (); i++) | 244 for (vsize i = 0; i < items_.size (); i++) |
233 { | 245 { |
234 Item *elem = items_[i]; | 246 Item *elem = items_[i]; |
235 Grob *col = Item::is_non_musical (elem) ? command_column_ : musical_column
_; | 247 Grob *col = Item::is_non_musical (elem) ? command_column_ : musical_column
_; |
236 | 248 |
237 if (!elem->get_parent (X_AXIS)) | 249 if (!elem->get_parent (X_AXIS)) |
238 elem->set_parent (col, X_AXIS); | 250 elem->set_parent (col, X_AXIS); |
239 if (!unsmob<Grob> (elem->get_object ("axis-group-parent-X"))) | 251 if (!unsmob<Grob> (elem->get_object ("axis-group-parent-X"))) |
240 elem->set_object ("axis-group-parent-X", col->self_scm ()); | 252 elem->set_object ("axis-group-parent-X", col->self_scm ()); |
241 | 253 |
(...skipping 25 matching lines...) Expand all Loading... |
267 breaks_++; | 279 breaks_++; |
268 | 280 |
269 if (! (breaks_ % 8)) | 281 if (! (breaks_ % 8)) |
270 progress_indication ("[" + ::to_string (breaks_) + "]"); | 282 progress_indication ("[" + ::to_string (breaks_) + "]"); |
271 } | 283 } |
272 | 284 |
273 context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak"
)); | 285 context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak"
)); |
274 | 286 |
275 first_ = false; | 287 first_ = false; |
276 label_events_.clear (); | 288 label_events_.clear (); |
277 | |
278 SCM mpos = get_property ("measurePosition"); | |
279 SCM barnum = get_property ("internalBarNumber"); | |
280 if (unsmob<Moment> (mpos) | |
281 && scm_is_integer (barnum)) | |
282 { | |
283 SCM where = scm_cons (barnum, | |
284 mpos); | |
285 | |
286 command_column_->set_property ("rhythmic-location", where); | |
287 musical_column_->set_property ("rhythmic-location", where); | |
288 } | |
289 } | 289 } |
290 | 290 |
291 void | 291 void |
292 Paper_column_engraver::start_translation_timestep () | 292 Paper_column_engraver::start_translation_timestep () |
293 { | 293 { |
294 break_events_.clear (); | 294 break_events_.clear (); |
295 if (!first_ && !to_boolean (get_property ("skipTypesetting"))) | 295 if (!first_ && !to_boolean (get_property ("skipTypesetting"))) |
296 { | 296 { |
297 make_columns (); | 297 make_columns (); |
298 made_columns_ = true; | 298 made_columns_ = true; |
(...skipping 29 matching lines...) Expand all Loading... |
328 "NonMusicalPaperColumn ", | 328 "NonMusicalPaperColumn ", |
329 | 329 |
330 /* read */ | 330 /* read */ |
331 "forbidBreak ", | 331 "forbidBreak ", |
332 | 332 |
333 /* write */ | 333 /* write */ |
334 "forbidBreak " | 334 "forbidBreak " |
335 "currentCommandColumn " | 335 "currentCommandColumn " |
336 "currentMusicalColumn " | 336 "currentMusicalColumn " |
337 ); | 337 ); |
OLD | NEW |