X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=bcde47616d9915d7032944a3d2374d2e19cb6b39;hb=324ff94afc62c7011b7377f24392f95391ed3b84;hp=9941bc13c2abf79bc36fd25f952a084633d6e635;hpb=caac677710724849651381d11577f61dd9618bcf;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index 9941bc13c2..bcde47616d 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--2012 Han-Wen Nienhuys + Copyright (C) 1997--2014 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 @@ -43,7 +43,7 @@ Item::Item (SCM s) } /** - Item copy ctor. Copy nothing: everything should be a elt property + Item copy ctor. Copy nothing: everything should be an elt property or a special purpose pointer (such as broken_to_drul_[]) */ Item::Item (Item const &s) : Grob (s) @@ -224,9 +224,9 @@ Item::derived_mark () const } Item * -unsmob_item (SCM s) +Item::unsmob (SCM s) { - return dynamic_cast (unsmob_grob (s)); + return dynamic_cast (Grob::unsmob (s)); } Interval @@ -236,7 +236,6 @@ Item::pure_height (Grob *g, int start, int end) return cached_pure_height_ + pure_relative_y_coordinate (g, start, end); /* Note: cached_pure_height_ does not notice if start changes, implicitly assuming that Items' pure_heights do not depend on 'start' or 'end'. - Accidental_interface::pure_height(), however, does depend on 'start'. */ cache_pure_height (Grob::pure_height (this, start, end));