X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fitem.hh;h=07f1261a525c72fca408cd4085d26c0df80da42d;hb=915348828137a10d92ceeafd971be3f62ae4d089;hp=109a9c8191d30e44f8e8e37ed5f57c34caeb4628;hpb=036af34aa44a151b9e67c18e0acccaafdfae9de8;p=lilypond.git

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 109a9c8191..07f1261a52 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -1,52 +1,68 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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 "glob.hh"
-#include "boxes.hh"
-#include "string.hh"
-#include "score-elem.hh"
+#include "grob.hh"
 
 /**
- a horizontally fixed size element of the score
-
-  Item is the datastructure for printables whose width is known
-  before the spacing is calculated
+   A horizontally fixed size element of the score.
 
-  NB. This doesn't mean an Item has to initialize the output field before
-  spacing calculation. 
-  
+   Item is the datastructure for printables whose width is known
+   before the spacing is calculated
 */
-class Item : public virtual Score_elem {
+class Item : public Grob
+{
+  Drul_array<Item *> broken_to_drul_;
+
+  DECLARE_CLASSNAME (Item);
 public:
-    /// indirection to the column it is in
-    PCol * pcol_l_;
-    
-    Item * broken_to_a_[2];
-
-    // nobreak = 0, pre =1, post = 2
-    int break_status_i()const;
-    Item * find_prebroken_piece(PCol*)const;
-    Item * find_prebroken_piece(Line_of_score*)const;    
-
-    virtual Item *item() { return this; }
-    Item();
-    Real hpos_f() const;
-    NAME_MEMBERS();
-    virtual Line_of_score * line_l() const;
+  Item (SCM);
+  Item (Item const &);
+
+  virtual Grob *clone () const;
+
+  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;
+
+  Item *find_prebroken_piece (Direction) const;
+  Grob *find_broken_piece (System *) const;
+  virtual System *get_system () const;
+  virtual Paper_column *get_column () const;
+  virtual void handle_prebroken_dependencies ();
+  virtual Interval_t<int> spanned_rank_interval () const;
+  virtual Interval pure_y_extent (Grob *ref, int start, int end);
+  virtual void cache_pure_height (Interval height);
 protected:
-    virtual void  do_breakable_col_processing();
-    virtual void handle_prebroken_dependencies();
-    virtual void do_print()const;
+  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