X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fconstrained-breaking.cc;h=725b220750ee436d3d91592bf7c84d3f2a5d275e;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=f8d4b0f5b2280d10ca669a1cb1678b3bdd5dc7ab;hpb=e30a837e32061005cc4a8d620be594938537a82b;p=lilypond.git diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc index f8d4b0f5b2..725b220750 100644 --- a/lily/constrained-breaking.cc +++ b/lily/constrained-breaking.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2012 Joe Neeman + Copyright (C) 2006--2014 Joe Neeman LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -560,7 +560,7 @@ Line_details::Line_details (Prob *pb, Output_def *paper) if (scm_is_pair (footnotes)) for (SCM s = footnotes; scm_is_pair (s); s = scm_cdr (s)) { - Stencil *sten = unsmob_stencil (scm_caddar (s)); + Stencil *sten = Stencil::unsmob (scm_caddar (s)); if (!sten) { programming_error ("expecting stencil, got empty pointer"); @@ -571,7 +571,7 @@ Line_details::Line_details (Prob *pb, Output_def *paper) last_column_ = 0; force_ = 0; - Stencil *st = unsmob_stencil (pb->get_property ("stencil")); + Stencil *st = Stencil::unsmob (pb->get_property ("stencil")); Interval stencil_extent = st->is_empty (Y_AXIS) ? Interval (0, 0) : st->extent (Y_AXIS); shape_ = Line_shape (stencil_extent, stencil_extent); // pretend it goes all the way across