X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=fc49f16d4ddd7b5b6b67fc3da0629f5252d87d56;hb=31568c504806f35aac420a394c9eab07abd9faa7;hp=9b86dea40fef61bcd4e66ee0b9890fe023ccc333;hpb=0d62b92a5223ca91014e0a6d765f2b27c52feaf7;p=lilypond.git diff --git a/lily/grob.cc b/lily/grob.cc index 9b86dea40f..fc49f16d4d 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -3,59 +3,26 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "grob.hh" #include -#include "main.hh" #include "input-smob.hh" -#include "warn.hh" -#include "pointer-group-interface.hh" -#include "misc.hh" -#include "paper-score.hh" -#include "stencil.hh" -#include "warn.hh" -#include "system.hh" +#include "international.hh" #include "item.hh" -#include "stencil.hh" +#include "main.hh" #include "misc.hh" #include "music.hh" -#include "item.hh" -#include "paper-score.hh" -#include "ly-smobs.icc" #include "output-def.hh" +#include "pointer-group-interface.hh" +#include "stencil.hh" +#include "system.hh" +#include "warn.hh" - - - -MAKE_SCHEME_CALLBACK(Grob, y_parent_positioning, 1); -SCM -Grob::y_parent_positioning (SCM smob) -{ - Grob *me = unsmob_grob (smob); - Grob *par = me->get_parent (Y_AXIS); - if (par) - (void) par->get_property ("positioning-done"); - - return scm_from_double (0.0); -} - - -MAKE_SCHEME_CALLBACK(Grob, x_parent_positioning, 1); -SCM -Grob::x_parent_positioning (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - Grob *par = me->get_parent (X_AXIS); - if (par) - (void) par->get_property ("positioning-done"); - - return scm_from_double (0.0); -} +#include "ly-smobs.icc" Grob * Grob::clone (int count) const @@ -63,21 +30,13 @@ Grob::clone (int count) const return new Grob (*this, count); } -/* TODO: - -- remove dynamic_cast and put this code into respective -subclass. */ - -#define HASH_SIZE 3 -#define INFINITY_MSG "Infinity or NaN encountered" - Grob::Grob (SCM basicprops, Object_key const *key) { key_ = key; /* FIXME: default should be no callback. */ self_scm_ = SCM_EOL; - pscore_ = 0; + layout_ = 0; original_ = 0; interfaces_ = SCM_EOL; immutable_property_alist_ = basicprops; @@ -117,7 +76,7 @@ Grob::Grob (Grob const &s, int copy_index) interfaces_ = s.interfaces_; object_alist_ = SCM_EOL; - pscore_ = 0; + layout_ = 0; smobify_self (); if (key_) @@ -127,49 +86,9 @@ Grob::Grob (Grob const &s, int copy_index) Grob::~Grob () { } - - -MAKE_SCHEME_CALLBACK (Grob, stencil_height, 1); -SCM -Grob::stencil_height (SCM smob) -{ - Grob *me = unsmob_grob (smob); - return stencil_extent (me, Y_AXIS); -} - -MAKE_SCHEME_CALLBACK (Grob, stencil_width, 1); -SCM -Grob::stencil_width (SCM smob) -{ - Grob *me = unsmob_grob (smob); - return stencil_extent (me, X_AXIS); -} - -SCM -Grob::stencil_extent (Grob *me, Axis a) -{ - Stencil *m = me->get_stencil (); - Interval e; - if (m) - e = m->extent (a); - return ly_interval2scm (e); -} - -Interval -robust_relative_extent (Grob *me, Grob *refpoint, Axis a) -{ - Interval ext = me->extent (refpoint, a); - if (ext.is_empty ()) - ext.add_point (me->relative_coordinate (refpoint, a)); - - return ext; -} - -Output_def * -Grob::get_layout () const -{ - return pscore_ ? pscore_->layout () : 0; -} +/**************************************************************** + STENCILS +****************************************************************/ Stencil * Grob::get_stencil () const @@ -219,14 +138,19 @@ Grob::get_print_stencil () const return retval; } -/* +/**************************************************************** VIRTUAL STUBS -*/ +****************************************************************/ void Grob::do_break_processing () { } +void +Grob::discretionary_processing () +{ +} + System * Grob::get_system () const { @@ -238,7 +162,7 @@ void Grob::handle_broken_dependencies () { Spanner *sp = dynamic_cast (this); - if (original_ && sp) + if (original () && sp) return; if (sp) @@ -278,6 +202,9 @@ Grob::suicide () if (!is_live ()) return; + for (int a = X_AXIS; a < NO_AXES; a++) + dim_cache_[a].clear (); + mutable_property_alist_ = SCM_EOL; object_alist_ = SCM_EOL; immutable_property_alist_ = SCM_EOL; @@ -289,11 +216,11 @@ Grob::handle_prebroken_dependencies () { /* Don't do this in the derived method, since we want to keep access to object_alist_ centralized. */ - if (original_) + if (original ()) { Item *it = dynamic_cast (this); substitute_object_links (scm_from_int (it->break_status_dir ()), - original_->object_alist_); + original ()->object_alist_); } } @@ -303,13 +230,16 @@ Grob::find_broken_piece (System *) const return 0; } -/* Translate in one direction. */ +/**************************************************************** + OFFSETS +****************************************************************/ + void Grob::translate_axis (Real y, Axis a) { if (isinf (y) || isnan (y)) { - programming_error (_ (INFINITY_MSG)); + programming_error (_ ("Infinity or NaN encountered")); return ; } @@ -351,12 +281,27 @@ Grob::get_offset (Axis a) const SCM sym = axis_offset_symbol (a); me->dim_cache_[a].offset_ = new Real (0.0); - *me->dim_cache_[a].offset_ += robust_scm2double (internal_get_property (sym), 0.0); - me->del_property (sym); - return *me->dim_cache_[a].offset_; + /* + UGH: can't fold next 2 statements together. Apparently GCC thinks + dim_cache_[a].offset_ is unaliased. + */ + Real off = robust_scm2double (internal_get_property (sym), 0.0); + if (me->dim_cache_[a].offset_) + { + *me->dim_cache_[a].offset_ += off; + me->del_property (sym); + return *me->dim_cache_[a].offset_; + } + else + return 0.0; } + +/**************************************************************** + extents +****************************************************************/ + void Grob::flush_extent_cache (Axis axis) { @@ -386,24 +331,25 @@ Grob::extent (Grob *refp, Axis a) const } else { - SCM min_ext_sym = - (a == X_AXIS) - ? ly_symbol2scm ("minimum-X-extent") - : ly_symbol2scm ("minimum-Y-extent"); - + /* + Order is significant: ?-extent may trigger suicide. + */ SCM ext_sym = (a == X_AXIS) ? ly_symbol2scm ("X-extent") : ly_symbol2scm ("Y-extent"); - - SCM min_ext = internal_get_property (min_ext_sym); - SCM ext = internal_get_property (ext_sym); - if (is_number_pair (min_ext)) - real_ext.unite (ly_scm2interval (min_ext)); + SCM ext = internal_get_property (ext_sym); if (is_number_pair (ext)) real_ext.unite (ly_scm2interval (ext)); + SCM min_ext_sym = + (a == X_AXIS) + ? ly_symbol2scm ("minimum-X-extent") + : ly_symbol2scm ("minimum-Y-extent"); + SCM min_ext = internal_get_property (min_ext_sym); + if (is_number_pair (min_ext)) + real_ext.unite (ly_scm2interval (min_ext)); ((Grob*)this)->del_property (ext_sym); ((Grob*)this)->dim_cache_[a].extent_ = new Interval (real_ext); } @@ -413,6 +359,10 @@ Grob::extent (Grob *refp, Axis a) const return real_ext; } +/**************************************************************** + REFPOINTS +****************************************************************/ + /* Find the group-element which has both #this# and #s# */ Grob * Grob::common_refpoint (Grob const *s, Axis a) const @@ -428,50 +378,18 @@ Grob::common_refpoint (Grob const *s, Axis a) const return 0; } -Grob * -common_refpoint_of_list (SCM elist, Grob *common, Axis a) +void +Grob::set_parent (Grob *g, Axis a) { - for (; scm_is_pair (elist); elist = scm_cdr (elist)) - if (Grob *s = unsmob_grob (scm_car (elist))) - { - if (common) - common = common->common_refpoint (s, a); - else - common = s; - } - - return common; + dim_cache_[a].parent_ = g; } Grob * -common_refpoint_of_array (Link_array const &arr, Grob *common, Axis a) -{ - for (int i = arr.size (); i--;) - if (Grob *s = arr[i]) - { - if (common) - common = common->common_refpoint (s, a); - else - common = s; - } - - return common; -} - -String -Grob::name () const +Grob::get_parent (Axis a) const { - SCM meta = get_property ("meta"); - SCM nm = scm_assq (ly_symbol2scm ("name"), meta); - nm = (scm_is_pair (nm)) ? scm_cdr (nm) : SCM_EOL; - return scm_is_symbol (nm) ? ly_symbol2string (nm) : this->class_name (); + return dim_cache_[a].parent_; } -void -Grob::set_parent (Grob *g, Axis a) -{ - dim_cache_[a].parent_ = g; -} void Grob::fixup_refpoint () @@ -507,8 +425,12 @@ Grob::fixup_refpoint () } } + +/**************************************************************** + MESSAGES +****************************************************************/ void -Grob::warning (String s) const +Grob::warning (string s) const { SCM cause = self_scm (); while (Grob *g = unsmob_grob (cause)) @@ -520,8 +442,18 @@ Grob::warning (String s) const ::warning (s); } + +string +Grob::name () const +{ + SCM meta = get_property ("meta"); + SCM nm = scm_assq (ly_symbol2scm ("name"), meta); + nm = (scm_is_pair (nm)) ? scm_cdr (nm) : SCM_EOL; + return scm_is_symbol (nm) ? ly_symbol2string (nm) : this->class_name (); +} + void -Grob::programming_error (String s) const +Grob::programming_error (string s) const { SCM cause = self_scm (); while (Grob *g = unsmob_grob (cause)) @@ -534,55 +466,7 @@ Grob::programming_error (String s) const else ::message (s); } -void -Grob::discretionary_processing () -{ -} - -bool -Grob::internal_has_interface (SCM k) -{ - return scm_c_memq (k, interfaces_) != SCM_BOOL_F; -} - -Grob * -Grob::get_parent (Axis a) const -{ - return dim_cache_[a].parent_; -} - -/** Return Array of Grobs in SCM list LST */ -Link_array -ly_scm2grobs (SCM lst) -{ - Link_array arr; - - for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s)) - { - SCM e = scm_car (s); - arr.push (unsmob_grob (e)); - } - - arr.reverse (); - return arr; -} -Object_key const * -Grob::get_key () const -{ - return key_; -} - -/** Return SCM list of Grob array A */ -SCM -ly_grobs2scm (Link_array a) -{ - SCM s = SCM_EOL; - for (int i = a.size (); i; i--) - s = scm_cons (a[i - 1]->self_scm (), s); - - return s; -} ADD_INTERFACE (Grob, "grob-interface", "A grob represents a piece of music notation\n" @@ -644,3 +528,107 @@ ADD_INTERFACE (Grob, "grob-interface", "transparent " ); + + + + +/**************************************************************** + CALLBACKS +****************************************************************/ + + +static SCM +grob_stencil_extent (Grob *me, Axis a) +{ + Stencil *m = me->get_stencil (); + Interval e; + if (m) + e = m->extent (a); + return ly_interval2scm (e); +} + + +MAKE_SCHEME_CALLBACK (Grob, stencil_height, 1); +SCM +Grob::stencil_height (SCM smob) +{ + Grob *me = unsmob_grob (smob); + return grob_stencil_extent (me, Y_AXIS); +} + +MAKE_SCHEME_CALLBACK(Grob, y_parent_positioning, 1); +SCM +Grob::y_parent_positioning (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Grob *par = me->get_parent (Y_AXIS); + if (par) + (void) par->get_property ("positioning-done"); + + return scm_from_double (0.0); +} + + +MAKE_SCHEME_CALLBACK(Grob, x_parent_positioning, 1); +SCM +Grob::x_parent_positioning (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + Grob *par = me->get_parent (X_AXIS); + if (par) + (void) par->get_property ("positioning-done"); + + return scm_from_double (0.0); +} + +MAKE_SCHEME_CALLBACK (Grob, stencil_width, 1); +SCM +Grob::stencil_width (SCM smob) +{ + Grob *me = unsmob_grob (smob); + return grob_stencil_extent (me, X_AXIS); +} + + + +Grob * +common_refpoint_of_list (SCM elist, Grob *common, Axis a) +{ + for (; scm_is_pair (elist); elist = scm_cdr (elist)) + if (Grob *s = unsmob_grob (scm_car (elist))) + { + if (common) + common = common->common_refpoint (s, a); + else + common = s; + } + + return common; +} + +Grob * +common_refpoint_of_array (vector const &arr, Grob *common, Axis a) +{ + for (vsize i = arr.size (); i--;) + if (Grob *s = arr[i]) + { + if (common) + common = common->common_refpoint (s, a); + else + common = s; + } + + return common; +} + +Interval +robust_relative_extent (Grob *me, Grob *refpoint, Axis a) +{ + Interval ext = me->extent (refpoint, a); + if (ext.is_empty ()) + ext.add_point (me->relative_coordinate (refpoint, a)); + + return ext; +} +