Imported Upstream version 2.19.45

[lilypond.git] / lily / include / item.hh

diff --git a/lily/include/item.hh b/lily/include/item.hh
index c67b160636b5afa894975abb83dd50694a8ac85d..07f1261a525c72fca408cd4085d26c0df80da42d 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 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
@@ -52,9 +52,8 @@ public:
   virtual Paper_column *get_column () const;
   virtual void handle_prebroken_dependencies ();
   virtual Interval_t<int> spanned_rank_interval () const;
-  virtual Interval pure_height (Grob *ref, int start, int end);
+  virtual Interval pure_y_extent (Grob *ref, int start, int end);
   virtual void cache_pure_height (Interval height);
-  DECLARE_GROB_INTERFACE ();
 protected:
   virtual void discretionary_processing ();
   void copy_breakable_items ();