X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=a1963e5fe47e3aed5a5f6cce389171d8a7031aba;hb=ac85b25839eb08f55900da2862f4bc1dae079240;hp=8d0529b41008eb986b58a6c3025643a0f376b142;hpb=494716082b964917ca284fad248b1fdee3b40986;p=lilypond.git diff --git a/lily/grob.cc b/lily/grob.cc index 8d0529b410..a1963e5fe4 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -3,34 +3,28 @@ 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 "align-interface.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 "stream-event.hh" +#include "system.hh" +#include "warn.hh" - - - +#include "ly-smobs.icc" Grob * Grob::clone (int count) const @@ -122,23 +116,31 @@ Grob::get_print_stencil () const else { SCM expr = m->expr (); - if (point_and_click_global) - expr = scm_list_3 (ly_symbol2scm ("grob-cause"), - self_scm (), expr); + expr = scm_list_3 (ly_symbol2scm ("grob-cause"), + self_scm (), expr); retval = Stencil (m->extent_box (), expr); } + SCM rot = get_property ("rotation"); + if (scm_is_pair (rot)) + { + Real angle = scm_to_double (scm_car (rot)); + Real x = scm_to_double (scm_cadr (rot)); + Real y = scm_to_double (scm_caddr (rot)); + + retval.rotate (angle, Offset (x, y)); + } + /* color support... see interpret_stencil_expression () for more... */ SCM color = get_property ("color"); if (color != SCM_EOL) { - m = unsmob_stencil (stil); SCM expr = scm_list_3 (ly_symbol2scm ("color"), color, - m->expr ()); + retval.expr ()); - retval = Stencil (m->extent_box (), expr); + retval = Stencil (retval.extent_box (), expr); } } @@ -278,6 +280,37 @@ Grob::relative_coordinate (Grob const *refp, Axis a) const return off; } +Real +Grob::pure_relative_y_coordinate (Grob const *refp, int start, int end) +{ + if (refp == this) + return 0.0; + + SCM pure_off = ly_lily_module_constant ("pure-Y-offset"); + Real off = 0; + + if (dim_cache_[Y_AXIS].offset_) + off = *dim_cache_[Y_AXIS].offset_; + else if (ly_is_procedure (pure_off)) + { + dim_cache_[Y_AXIS].offset_ = new Real (0.0); + off = scm_to_double (scm_apply_3 (pure_off, self_scm (), + scm_from_int (start), scm_from_int (end), + SCM_EOL)); + delete dim_cache_[Y_AXIS].offset_; + dim_cache_[Y_AXIS].offset_ = 0; + } + + /* we simulate positioning-done if we are the child of a VerticalAlignment */ + Grob *p = get_parent (Y_AXIS); + Real trans = 0; + if (Align_interface::has_interface (p)) + 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); +} + /* Invoke callbacks to get offset relative to parent. */ Real Grob::get_offset (Axis a) const @@ -295,12 +328,24 @@ Grob::get_offset (Axis a) const dim_cache_[a].offset_ is unaliased. */ Real off = robust_scm2double (internal_get_property (sym), 0.0); - *me->dim_cache_[a].offset_ += off; - - me->del_property (sym); - return *me->dim_cache_[a].offset_; + 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; } +Real +Grob::maybe_pure_coordinate (Grob const *refp, Axis a, bool pure, int start, int end) +{ + if (pure && a != Y_AXIS) + programming_error ("tried to get pure X-offset"); + return (pure && a == Y_AXIS) ? pure_relative_y_coordinate (refp, start, end) + : relative_coordinate (refp, a); +} /**************************************************************** extents @@ -354,7 +399,6 @@ Grob::extent (Grob *refp, Axis a) const 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); } @@ -363,6 +407,40 @@ Grob::extent (Grob *refp, Axis a) const return real_ext; } +Interval +Grob::pure_height (Grob *refp, int start, int end) +{ + SCM pure_height = ly_lily_module_constant ("pure-Y-extent"); + Interval iv (0, 0); + + if (ly_is_procedure (pure_height)) + iv = ly_scm2interval (scm_apply_3 (pure_height, self_scm (), + scm_from_int (start), scm_from_int (end), + SCM_EOL)); + Real offset = pure_relative_y_coordinate (refp, start, end); + + SCM min_ext = get_property ("minimum-Y-extent"); + if (is_number_pair (min_ext)) + iv.unite (ly_scm2interval (min_ext)); + + iv.translate (offset); + return iv; +} + +Interval +Grob::maybe_pure_extent (Grob *refp, Axis a, bool pure, int start, int end) +{ + if (pure && a != Y_AXIS) + programming_error ("tried to get pure width"); + return (pure && a == Y_AXIS) ? pure_height (refp, start, end) : extent (refp, a); +} + +Interval_t +Grob::spanned_rank_iv () +{ + return Interval_t (-1, 0); +} + /**************************************************************** REFPOINTS ****************************************************************/ @@ -434,20 +512,23 @@ 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)) cause = g->get_property ("cause"); + /* ES TODO: cause can't be Music*/ if (Music *m = unsmob_music (cause)) m->origin ()->warning (s); + else if (Stream_event *ev = unsmob_stream_event (cause)) + ev->origin ()->warning (s); else ::warning (s); } -String +string Grob::name () const { SCM meta = get_property ("meta"); @@ -457,7 +538,7 @@ Grob::name () const } void -Grob::programming_error (String s) const +Grob::programming_error (string s) const { SCM cause = self_scm (); while (Grob *g = unsmob_grob (cause)) @@ -465,8 +546,11 @@ Grob::programming_error (String s) const s = _f ("programming error: %s", s); + /* ES TODO: cause can't be Music*/ if (Music *m = unsmob_music (cause)) m->origin ()->message (s); + else if (Stream_event *ev = unsmob_stream_event (cause)) + ev->origin ()->warning (s); else ::message (s); } @@ -526,6 +610,7 @@ ADD_INTERFACE (Grob, "grob-interface", "meta " "minimum-X-extent " "minimum-Y-extent " + "rotation " "springs-and-rods " "staff-symbol " "stencil " @@ -612,9 +697,9 @@ common_refpoint_of_list (SCM elist, Grob *common, Axis a) } Grob * -common_refpoint_of_array (Link_array const &arr, Grob *common, Axis a) +common_refpoint_of_array (vector const &arr, Grob *common, Axis a) { - for (int i = arr.size (); i--;) + for (vsize i = arr.size (); i--;) if (Grob *s = arr[i]) { if (common)