Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 522cfd555c8280f9ce708dcf313aa262f8f54506..64fb7322a69f3065a907d5b9f45e08470e0978e3 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -9,6 +9,7 @@
 #ifndef GROB_HH
 #define GROB_HH
 
+#include "box.hh"
 #include "virtual-methods.hh"
 #include "dimension-cache.hh"
 #include "grob-interface.hh"
@@ -17,7 +18,7 @@
 class Grob
 {
 private:
-  DECLARE_SMOBS (Grob, foo);
+  DECLARE_SMOBS (Grob);
   DECLARE_CLASSNAME(Grob);
   
   void init ();
@@ -73,20 +74,25 @@ public:
   bool is_live () const;
 
   /* naming. */
-  std::string name () const;
+  string name () const;
 
   /* Properties */
   SCM get_property_alist_chain (SCM) const;
   SCM internal_get_property (SCM symbol) const;
-  SCM get_property_data (SCM symbol) const;
+  SCM internal_get_property_data (SCM symbol) const;
   SCM internal_get_object (SCM symbol) const;
-  void del_property (SCM symbol); 
-  void internal_set_property (SCM sym, SCM val);
   void internal_set_object (SCM sym, SCM val);
+  void internal_del_property (SCM symbol);
+
+#ifndef NDEBUG
+  void internal_set_property (SCM sym, SCM val, char const *file, int line, char const *fun);
+#else
+  void internal_set_property (SCM sym, SCM val);
+#endif
 
   /* messages */  
-  void warning (std::string) const;
-  void programming_error (std::string) const;
+  void warning (string) const;
+  void programming_error (string) const;
 
 
   /* class hierarchy */
@@ -109,16 +115,22 @@ public:
   /* offsets */
   void translate_axis (Real, Axis);
   Real relative_coordinate (Grob const *refp, Axis) const;
+  Real pure_relative_y_coordinate (Grob const *refp, int start, int end);
+  Real maybe_pure_coordinate (Grob const *refp, Axis a, bool pure, int start, int end);
 
   /* extents */
   Interval extent (Grob *refpoint, Axis) const;
   void flush_extent_cache (Axis);
+  Interval pure_height (Grob *refpoint, int start_col, int end_col);
+  Interval maybe_pure_extent (Grob *refpoint, Axis, bool pure, int start, int end);
 
   /* refpoints */
   Grob *common_refpoint (Grob const *s, Axis a) const;
   void set_parent (Grob *e, Axis);
   Grob *get_parent (Axis a) const;
   void fixup_refpoint ();
+
+  virtual Interval_t<int> spanned_rank_iv ();
 };
 
 /* smob utilities */
@@ -128,7 +140,7 @@ Item *unsmob_item (SCM);
 
 /* refpoints */
 Grob *common_refpoint_of_list (SCM elt_list, Grob *, Axis a);
-Grob *common_refpoint_of_array (Link_array__Grob_ const &, Grob *, Axis a);
+Grob *common_refpoint_of_array (vector<Grob*> const &, Grob *, Axis a);
 System *get_root_system (Grob *me);
 
 /* extents */ 
@@ -140,5 +152,6 @@ void chain_offset_callback (Grob *g, SCM proc, Axis a);
 SCM axis_offset_symbol (Axis a);
 SCM axis_parent_positioning (Axis a);
 
+SCM call_pure_function (SCM unpure, SCM args, int start, int end);
 
 #endif /* GROB_HH */