X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=495fe2437f97cbddabfb90712d08afbc9c6f3928;hb=f0e148170da8ff23b8f5647e83a323bf4d62a918;hp=b3d117e3f565c8d2c3812842e650a4f30753d1ec;hpb=8e79b6a256018e5d9b687e411d472711847ad90e;p=lilypond.git diff --git a/lily/grob.cc b/lily/grob.cc index b3d117e3f5..495fe2437f 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "grob.hh" @@ -27,15 +27,13 @@ #include "ly-smobs.icc" Grob * -Grob::clone (int count) const +Grob::clone () const { - return new Grob (*this, count); + return new Grob (*this); } -Grob::Grob (SCM basicprops, - Object_key const *key) +Grob::Grob (SCM basicprops) { - key_ = key; /* FIXME: default should be no callback. */ self_scm_ = SCM_EOL; @@ -51,26 +49,28 @@ Grob::Grob (SCM basicprops, GC. After smobify_self (), they are. */ smobify_self (); - /* - We always get a new key object for a new grob. - */ - if (key_) - ((Object_key *)key_)->unprotect (); - SCM meta = get_property ("meta"); if (scm_is_pair (meta)) - interfaces_ = scm_cdr (scm_assq (ly_symbol2scm ("interfaces"), meta)); + { + interfaces_ = scm_cdr (scm_assq (ly_symbol2scm ("interfaces"), meta)); + + SCM object_cbs = scm_assq (ly_symbol2scm ("object-callbacks"), meta); + if (scm_is_pair (object_cbs)) + { + for (SCM s = scm_cdr (object_cbs); scm_is_pair (s); s = scm_cdr (s)) + set_object (scm_caar (s), scm_cdar (s)); + } + } - if (get_property_data (ly_symbol2scm ("X-extent")) == SCM_EOL) + if (get_property_data ("X-extent") == SCM_EOL) set_property ("X-extent", Grob::stencil_width_proc); - if (get_property_data (ly_symbol2scm ("Y-extent")) == SCM_EOL) + if (get_property_data ("Y-extent") == SCM_EOL) set_property ("Y-extent", Grob::stencil_height_proc); } -Grob::Grob (Grob const &s, int copy_index) +Grob::Grob (Grob const &s) : dim_cache_ (s.dim_cache_) { - key_ = (use_object_keys) ? new Copied_key (s.key_, copy_index) : 0; original_ = (Grob *) & s; self_scm_ = SCM_EOL; @@ -82,8 +82,6 @@ Grob::Grob (Grob const &s, int copy_index) layout_ = 0; smobify_self (); - if (key_) - ((Object_key *)key_)->unprotect (); } Grob::~Grob () @@ -130,7 +128,7 @@ Grob::get_print_stencil () const Real x = scm_to_double (scm_cadr (rot)); Real y = scm_to_double (scm_caddr (rot)); - retval.rotate (angle, Offset (x, y)); + retval.rotate_degrees (angle, Offset (x, y)); } /* color support... see interpret_stencil_expression () for more... */ @@ -293,7 +291,7 @@ Grob::pure_relative_y_coordinate (Grob const *refp, int start, int end) off = *dim_cache_[Y_AXIS].offset_; else { - SCM proc = get_property_data (ly_symbol2scm ("Y-offset")); + SCM proc = get_property_data ("Y-offset"); dim_cache_[Y_AXIS].offset_ = new Real (0.0); off = robust_scm2double (call_pure_function (proc, @@ -309,13 +307,15 @@ Grob::pure_relative_y_coordinate (Grob const *refp, int start, int end) it probably means that the Alignment was fixed and it has already been calculated. */ - Grob *p = get_parent (Y_AXIS); - Real trans = 0; - if (Align_interface::has_interface (p) && !dim_cache_[Y_AXIS].offset_) - trans = Align_interface::get_pure_child_y_translation (p, this, start, end); + if (Grob *p = get_parent (Y_AXIS)) + { + Real trans = 0; + if (Align_interface::has_interface (p) && !dim_cache_[Y_AXIS].offset_) + trans = Align_interface::get_pure_child_y_translation (p, this, start, end); - return off + trans - + dim_cache_[Y_AXIS].parent_->pure_relative_y_coordinate (refp, start, end); + return off + trans + p->pure_relative_y_coordinate (refp, start, end); + } + return off; } /* Invoke callbacks to get offset relative to parent. */ @@ -394,7 +394,7 @@ Grob::extent (Grob *refp, Axis a) const (a == X_AXIS) ? ly_symbol2scm ("X-extent") : ly_symbol2scm ("Y-extent"); - + SCM ext = internal_get_property (ext_sym); if (is_number_pair (ext)) real_ext.unite (ly_scm2interval (ext)); @@ -418,11 +418,11 @@ Grob::extent (Grob *refp, Axis a) const Interval Grob::pure_height (Grob *refp, int start, int end) { - SCM proc = get_property_data ( ly_symbol2scm ("Y-extent")); - Interval iv = robust_scm2interval (call_pure_function (proc, - scm_list_1 (self_scm ()), - start, end), - Interval (0, 0)); + SCM proc = get_property_data (ly_symbol2scm ("Y-extent")); + SCM iv_scm = call_pure_function (proc, + scm_list_1 (self_scm ()), + start, end); + Interval iv = robust_scm2interval (iv_scm, Interval (0, 0)); Real offset = pure_relative_y_coordinate (refp, start, end); SCM min_ext = get_property ("minimum-Y-extent"); @@ -446,7 +446,7 @@ Grob::maybe_pure_extent (Grob *refp, Axis a, bool pure, int start, int end) } Interval_t -Grob::spanned_rank_iv () +Grob::spanned_rank_interval () const { return Interval_t (-1, 0); } @@ -566,7 +566,7 @@ Grob::programming_error (string s) const } -ADD_INTERFACE (Grob, "grob-interface", +ADD_INTERFACE (Grob, "A grob represents a piece of music notation\n" "\n" "All grobs have an X and Y-position on the page. These X and Y positions\n" @@ -607,11 +607,13 @@ ADD_INTERFACE (Grob, "grob-interface", "Y-extent " "Y-offset " "after-line-breaking " + "avoid-slur " "axis-group-parent-X " "axis-group-parent-Y " "before-line-breaking " "cause " "color " + "cross-staff " "extra-X-extent " "extra-Y-extent " "extra-offset " @@ -620,6 +622,9 @@ ADD_INTERFACE (Grob, "grob-interface", "meta " "minimum-X-extent " "minimum-Y-extent " + "outside-staff-horizontal-padding " + "outside-staff-padding " + "outside-staff-priority " "rotation " "springs-and-rods " "staff-symbol " @@ -627,15 +632,10 @@ ADD_INTERFACE (Grob, "grob-interface", "transparent " ); - - - - /**************************************************************** CALLBACKS ****************************************************************/ - static SCM grob_stencil_extent (Grob *me, Axis a) { @@ -655,7 +655,7 @@ Grob::stencil_height (SCM smob) return grob_stencil_extent (me, Y_AXIS); } -MAKE_SCHEME_CALLBACK(Grob, y_parent_positioning, 1); +MAKE_SCHEME_CALLBACK (Grob, y_parent_positioning, 1); SCM Grob::y_parent_positioning (SCM smob) { @@ -668,7 +668,7 @@ Grob::y_parent_positioning (SCM smob) } -MAKE_SCHEME_CALLBACK(Grob, x_parent_positioning, 1); +MAKE_SCHEME_CALLBACK (Grob, x_parent_positioning, 1); SCM Grob::x_parent_positioning (SCM smob) {