Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index bcde47616d9915d7032944a3d2374d2e19cb6b39..f90b29d30a78445c0789de622aadd1275d916ca3 100644 (file)
--- 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 <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -223,14 +223,8 @@ Item::derived_mark () const
     scm_gc_mark (broken_to_drul_[RIGHT]->self_scm ());
 }
 
-Item *
-Item::unsmob (SCM s)
-{
-  return dynamic_cast<Item *> (Grob::unsmob (s));
-}
-
 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);
@@ -238,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);
 }