release: 1.3.70

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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index c4b3dfbad3d6ca56efe42be084b1de3def0a7e2b..16f298f7f2361983d612975fcd699d3e6dfff2d2 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -24,51 +24,38 @@
   NB. This doesn't mean an Item has to initialize the output field before
   spacing calculation. 
   
-
   
-  @signature
-  visibility_lambda :: int -> (bool . bool)
-     
-  @in
-  break direction
-     
-  @out
-  (transparent, empty) cons
-     
-   */
-class Item : public virtual Score_element {
-  void do_break ();
-  void try_visibility_lambda ();
-public:
-  /*
-    ugh.
+  Element properties
+  
+  visibility-lambda -- a function that takes the break
+  direction and returns a (transparent, empty) cons
+
+  breakable -- boolean indicating if this is a breakable item (clef,
+  barline, key sig, etc.)
+
    */
+class Item : public Score_element
+{
   Drul_array<Item*> broken_to_drul_;
 
-
 public:
+  VIRTUAL_COPY_CONS(Score_element);
+  Item (SCM);
+  Item (Item const &);
 
-  /// I am really to be broken?
-  bool breakable_b () const;
+  static bool breakable_b (Score_element*me);
   bool broken_b () const;
   
   Direction break_status_dir () const;
   
-  Item * find_broken_piece (Direction) const;
+  Item * find_prebroken_piece (Direction) const;
   Score_element * find_broken_piece (Line_of_score*) const;    
 
-  Item();
-  Real hpos_f() const;
-  
   virtual Line_of_score * line_l() const;
   virtual Paper_column * column_l () const;
-    
-  static int left_right_compare (Item const *, Item const*);
-  
-  Item (Item const &);
+  virtual void handle_prebroken_dependencies ();
 protected:
-  virtual void do_breakable_col_processing();
-
+  virtual void discretionary_processing ();
   void copy_breakable_items();
 };