X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fitem.hh;h=3fa1fcddc2324502317e95e313915af755e8b2a7;hb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;hp=aa8bcb4b664dd7b2d36581a3c5411070467d42bb;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/item.hh b/lily/include/item.hh
index aa8bcb4b66..3fa1fcddc2 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -1,14 +1,24 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
 
-#include "box.hh"
 #include "grob.hh"
 
 /**
@@ -21,14 +31,17 @@ class Item : public Grob
 {
   Drul_array<Item *> broken_to_drul_;
 
+  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_breakable (Grob *);
+  static bool is_non_musical (Grob *);
+  static bool break_visible (Grob *);
   bool is_broken () const;
+  virtual bool pure_is_visible (int start, int end) const;
 
   Direction break_status_dir () const;
 
@@ -37,11 +50,18 @@ public:
   virtual System *get_system () const;
   virtual Paper_column *get_column () const;
   virtual void handle_prebroken_dependencies ();
-  static bool has_interface (Grob *);
+  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 SCM do_derived_mark () const;
+  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