X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fitem.hh;h=e80d1f8fd476e354db08bc9323fffee92d767242;hb=60fc32ec59fd97456218332612b87b821968da84;hp=cb8c61523e6396440dd071b9a437c2113a8d1302;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/include/item.hh b/lily/include/item.hh
index cb8c61523e..e80d1f8fd4 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -1,9 +1,20 @@
 /*
-  item.hh -- declare Item
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef ITEM_HH
 #define ITEM_HH
@@ -22,14 +33,15 @@ class Item : public Grob
 
   DECLARE_CLASSNAME(Item);
 public:
-  Item (SCM, Object_key const *);
-  Item (Item const &, int count);
+  Item (SCM);
+  Item (Item const &);
 
-  virtual Grob *clone (int count) const;
+  virtual Grob *clone () const;
 
   static bool is_non_musical (Grob *);
+  static bool break_visible(Grob *);
   bool is_broken () const;
-  bool pure_is_visible (int start, int end) const;
+  virtual bool pure_is_visible (int start, int end) const;
 
   Direction break_status_dir () const;
 
@@ -38,12 +50,18 @@ public:
   virtual System *get_system () const;
   virtual Paper_column *get_column () const;
   virtual void handle_prebroken_dependencies ();
-  virtual Interval_t<int> spanned_rank_iv ();
+  virtual Interval_t<int> spanned_rank_interval () const;
+  virtual Interval pure_height (Grob *ref, int start, int end);
   DECLARE_GROB_INTERFACE();
 protected:
   virtual void discretionary_processing ();
   void copy_breakable_items ();
   virtual void derived_mark () const;
+
+  bool cached_pure_height_valid_;
+  Interval cached_pure_height_;
 };
 
+Interval_t<Moment> spanned_time_interval (Item *l, Item *r);
+
 #endif