X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=f90b29d30a78445c0789de622aadd1275d916ca3;hb=ee1c498891ef92ebcd7d043b46e07ea2d3a9d3ae;hp=ec5c943f2a84b8cfd8170dd73646588f3ac22c93;hpb=0fe24db3936774a8fb913cb14c997036db7aeb1c;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index ec5c943f2a..f90b29d30a 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2014 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -224,7 +224,7 @@ Item::derived_mark () const } Interval -Item::pure_height (Grob *g, int start, int end) +Item::pure_y_extent (Grob *g, int start, int end) { if (cached_pure_height_valid_) return cached_pure_height_ + pure_relative_y_coordinate (g, start, end); @@ -232,7 +232,7 @@ Item::pure_height (Grob *g, int start, int end) assuming that Items' pure_heights do not depend on 'start' or 'end'. */ - cache_pure_height (Grob::pure_height (this, start, end)); + cache_pure_height (Grob::pure_y_extent (this, start, end)); return cached_pure_height_ + pure_relative_y_coordinate (g, start, end); }