X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrob.hh;h=94da56e8841bc05a5ff85d302b1dc3c4b109f4d2;hb=60fc32ec59fd97456218332612b87b821968da84;hp=e2bc0157cccbbff9902473e6234303af52bfb1cf;hpb=2893f2dd20c081c06c1c7356551344801f8a233a;p=lilypond.git
diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index e2bc0157cc..94da56e884 100644
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -1,23 +1,34 @@
/*
- grob.hh -- declare Grob
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the LilyPond music typesetter
+ Copyright (C) 1996--2010 Han-Wen Nienhuys
- (c) 1996--2006 Han-Wen Nienhuys
+ 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 .
*/
#ifndef GROB_HH
#define GROB_HH
+#include "box.hh"
#include "virtual-methods.hh"
#include "dimension-cache.hh"
#include "grob-interface.hh"
-#include "object-key.hh"
class Grob
{
private:
- DECLARE_SMOBS (Grob, foo);
+ DECLARE_SMOBS (Grob);
DECLARE_CLASSNAME(Grob);
void init ();
@@ -27,7 +38,6 @@ protected:
Dimension_cache dim_cache_[NO_AXES];
Output_def *layout_;
Grob *original_;
- Object_key const *key_;
/* SCM data */
SCM immutable_property_alist_;
@@ -43,6 +53,9 @@ protected:
void substitute_object_links (SCM, SCM);
Real get_offset (Axis a) const;
SCM try_callback (SCM, SCM);
+ SCM try_callback_on_alist (SCM *, SCM, SCM);
+ void internal_set_value_on_alist (SCM *alist, SCM sym, SCM val);
+
public:
/* friends */
@@ -52,8 +65,8 @@ public:
friend SCM ly_grob_basic_properties (SCM);
/* standard callbacks */
- DECLARE_SCHEME_CALLBACK(x_parent_positioning, (SCM));
- DECLARE_SCHEME_CALLBACK(y_parent_positioning, (SCM));
+ DECLARE_SCHEME_CALLBACK (x_parent_positioning, (SCM));
+ DECLARE_SCHEME_CALLBACK (y_parent_positioning, (SCM));
DECLARE_SCHEME_CALLBACK (stencil_height, (SCM smob));
DECLARE_SCHEME_CALLBACK (stencil_width, (SCM smob));
@@ -61,12 +74,11 @@ public:
Output_def *layout () const { return layout_; }
Grob *original () const { return original_; }
SCM interfaces () const { return interfaces_; }
- Object_key const *key () const { return key_; }
/* life & death */
- Grob (SCM basic_props, Object_key const *);
- Grob (Grob const &, int copy_count);
- virtual Grob *clone (int count) const;
+ Grob (SCM basic_props);
+ Grob (Grob const &);
+ virtual Grob *clone () const;
/* forced death */
void suicide ();
@@ -78,11 +90,15 @@ public:
/* 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_pure_property (SCM symbol, int start, int end) const;
+ SCM internal_get_maybe_pure_property (SCM symbol, bool pure, int start, int end) const;
+ SCM internal_get_non_callback_marker_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);
+ void instrumented_set_property (SCM, SCM, char const*, int, char const*);
+ void internal_set_property (SCM sym, SCM val);
/* messages */
void warning (string) const;
@@ -91,6 +107,7 @@ public:
/* class hierarchy */
virtual System *get_system () const;
+ static System *get_system (Grob *);
virtual void do_break_processing ();
virtual Grob *find_broken_piece (System *) const;
virtual void discretionary_processing ();
@@ -104,7 +121,7 @@ public:
/* interfaces */
bool internal_has_interface (SCM intf);
- static bool has_interface (Grob *me);
+ DECLARE_GROB_INTERFACE();
/* offsets */
void translate_axis (Real, Axis);
@@ -115,7 +132,7 @@ public:
/* extents */
Interval extent (Grob *refpoint, Axis) const;
void flush_extent_cache (Axis);
- Interval pure_height (Grob *refpoint, int start_col, int end_col);
+ virtual 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 */
@@ -124,7 +141,10 @@ public:
Grob *get_parent (Axis a) const;
void fixup_refpoint ();
- virtual Interval_t spanned_rank_iv ();
+ virtual Interval_t spanned_rank_interval () const;
+ virtual bool pure_is_visible (int start, int end) const;
+ bool check_cross_staff (Grob *common);
+ static bool less (Grob *g1, Grob *g2);
};
/* smob utilities */
@@ -143,8 +163,12 @@ Interval robust_relative_extent (Grob *, Grob *, Axis);
/* offset/extent callbacks. */
void add_offset_callback (Grob *g, SCM proc, Axis a);
void chain_offset_callback (Grob *g, SCM proc, Axis a);
+void chain_callback (Grob *g, SCM proc, SCM sym);
SCM axis_offset_symbol (Axis a);
SCM axis_parent_positioning (Axis a);
+SCM call_pure_function (SCM unpure, SCM args, int start, int end);
+
+void set_nested_property (Grob *, SCM property_path, SCM value);
#endif /* GROB_HH */