X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=3ff7b5df468f3cbf59211a43b5a4bb9db596cb23;hb=7653e2f45f427ecb67ad8231bd5e24afb8d204e4;hp=cb3f90467cd4b2e8c75676897b713f9f7f2549fe;hpb=7556e96abb66c88ae653c96898bcad2c3f18b645;p=lilypond.git diff --git a/lily/grob.cc b/lily/grob.cc index cb3f90467c..3ff7b5df46 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -10,21 +10,21 @@ #include +#include "align-interface.hh" +#include "input.hh" +#include "international.hh" +#include "item.hh" #include "main.hh" -#include "input-smob.hh" -#include "warn.hh" -#include "pointer-group-interface.hh" #include "misc.hh" +#include "music.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" #include "stencil.hh" -#include "warn.hh" +#include "stream-event.hh" #include "system.hh" -#include "item.hh" -#include "stencil.hh" -#include "misc.hh" -#include "music.hh" -#include "item.hh" +#include "warn.hh" + #include "ly-smobs.icc" -#include "output-def.hh" Grob * Grob::clone (int count) const @@ -36,6 +36,7 @@ Grob::Grob (SCM basicprops, Object_key const *key) { key_ = key; + /* FIXME: default should be no callback. */ self_scm_ = SCM_EOL; layout_ = 0; @@ -60,9 +61,9 @@ Grob::Grob (SCM basicprops, if (scm_is_pair (meta)) interfaces_ = scm_cdr (scm_assq (ly_symbol2scm ("interfaces"), meta)); - 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); } @@ -116,23 +117,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) + if (scm_is_pair (color)) { - 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); } } @@ -272,6 +281,45 @@ 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; + + Real off = 0; + + if (dim_cache_[Y_AXIS].offset_) + off = *dim_cache_[Y_AXIS].offset_; + else + { + SCM proc = get_property_data ("Y-offset"); + + dim_cache_[Y_AXIS].offset_ = new Real (0.0); + off = robust_scm2double (call_pure_function (proc, + scm_list_1 (self_scm ()), + start, end), + 0.0); + delete dim_cache_[Y_AXIS].offset_; + dim_cache_[Y_AXIS].offset_ = 0; + } + + /* we simulate positioning-done if we are the child of a VerticalAlignment, + but only if we don't have a cached offset. If we do have a cached offset, + it probably means that the Alignment was fixed and it has already been + calculated. + */ + 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 + p->pure_relative_y_coordinate (refp, start, end); + } + return off; +} + /* Invoke callbacks to get offset relative to parent. */ Real Grob::get_offset (Axis a) const @@ -299,6 +347,14 @@ Grob::get_offset (Axis a) const 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 @@ -352,7 +408,7 @@ 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); } @@ -361,6 +417,42 @@ Grob::extent (Grob *refp, Axis a) const return real_ext; } +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)); + Real offset = pure_relative_y_coordinate (refp, start, end); + + SCM min_ext = get_property ("minimum-Y-extent"); + + /* we don't add minimum-Y-extent if the extent is empty. This solves + a problem with Hara-kiri spanners. They would request_suicide and + return empty extents, but we would force them here to be large. */ + if (!iv.is_empty () && 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 ****************************************************************/ @@ -432,20 +524,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"); @@ -455,7 +550,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)) @@ -463,14 +558,17 @@ 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); } -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" @@ -511,6 +609,7 @@ 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 " @@ -524,6 +623,9 @@ ADD_INTERFACE (Grob, "grob-interface", "meta " "minimum-X-extent " "minimum-Y-extent " + "outside-staff-padding " + "outside-staff-priority " + "rotation " "springs-and-rods " "staff-symbol " "stencil " @@ -610,9 +712,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)