X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fskyline.hh;h=21693420c88419fd0fc8834eb3e7e749d4fafb6d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=8e75123cdab3c322a94b851d0a39dd4dcd5b9ce8;hpb=b9f170d5efc8d7ff0d3b13fcd98b6252a7fcb7d3;p=lilypond.git diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh index 8e75123cda..21693420c8 100644 --- a/lily/include/skyline.hh +++ b/lily/include/skyline.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2014 Joe Neeman + Copyright (C) 2006--2015 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 @@ -44,7 +44,7 @@ struct Building Real height (Real x) const; Real intersection_x (Building const &other) const; - void leading_part (Real chop); + bool above (Building const &other, Real x) const; Real shift_to_intersect (Real x, Real y) const; }; @@ -73,7 +73,6 @@ public: Skyline (Box const &b, Axis a, Direction sky); vector to_points (Axis) const; - void deholify (); void merge (Skyline const &); void insert (Box const &, Axis); void print () const;