X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=2a7ee0eac6a1f2b8703aa65d2bdfdce0e9611c62;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=650669f8c54768e41791ac488f18ae529960227c;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 650669f8c5..2a7ee0eac6 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -100,7 +100,7 @@ Vertical_align_engraver::process_music () top_level_ = to_boolean (get_property ("topLevelAlignment")); valign_ = make_spanner (top_level_ ? "VerticalAlignment" : "StaffGrouper", SCM_EOL); - valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + valign_->set_bound (LEFT, Grob::unsmob (get_property ("currentCommandColumn"))); Align_interface::set_ordered (valign_); } } @@ -110,7 +110,7 @@ Vertical_align_engraver::finalize () { if (valign_) { - valign_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); + valign_->set_bound (RIGHT, Grob::unsmob (get_property ("currentCommandColumn"))); valign_ = 0; } } @@ -145,14 +145,14 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i) SCM before = scm_hash_ref (id_to_group_hashtab_, before_id, SCM_BOOL_F); SCM after = scm_hash_ref (id_to_group_hashtab_, after_id, SCM_BOOL_F); - Grob *before_grob = unsmob_grob (before); - Grob *after_grob = unsmob_grob (after); + Grob *before_grob = Grob::unsmob (before); + Grob *after_grob = Grob::unsmob (after); Align_interface::add_element (valign_, i.grob ()); if (before_grob || after_grob) { - Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements")); + Grob_array *ga = Grob_array::unsmob (valign_->get_object ("elements")); vector &arr = ga->array_reference (); Grob *added = arr.back (); @@ -182,7 +182,7 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i) else if (qualifies (i)) { Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ()); - if (!unsmob_grob (i.grob ()->get_object ("staff-grouper"))) + if (!Grob::unsmob (i.grob ()->get_object ("staff-grouper"))) i.grob ()->set_object ("staff-grouper", valign_->self_scm ()); } }