X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=660a34d07243c7d5296cfcb73a3f9a9d51d9f7c1;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a6b862e04eee586495fd6e1b3aff343e0340678b;hpb=74e4d219b24ec6d6f28d663c0285418e6c8e122e;p=lilypond.git diff --git a/lily/grob.cc b/lily/grob.cc index a6b862e04e..660a34d072 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 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 @@ -39,7 +39,6 @@ #include "unpure-pure-container.hh" #include "warn.hh" -#include "ly-smobs.icc" Grob * Grob::clone () const @@ -51,7 +50,6 @@ Grob::Grob (SCM basicprops) { /* FIXME: default should be no callback. */ - self_scm_ = SCM_EOL; layout_ = 0; original_ = 0; interfaces_ = SCM_EOL; @@ -81,22 +79,22 @@ Grob::Grob (SCM basicprops) set_property ("X-extent", Grob::stencil_width_proc); if (get_property_data ("Y-extent") == SCM_EOL) set_property ("Y-extent", - ly_make_unpure_pure_container (Grob::stencil_height_proc, - Grob::pure_stencil_height_proc)); + Unpure_pure_container::make_smob (Grob::stencil_height_proc, + Grob::pure_stencil_height_proc)); if (get_property_data ("vertical-skylines") == SCM_EOL) set_property ("vertical-skylines", - ly_make_unpure_pure_container (Grob::simple_vertical_skylines_from_extents_proc, - Grob::pure_simple_vertical_skylines_from_extents_proc)); + Unpure_pure_container::make_smob (Grob::simple_vertical_skylines_from_extents_proc, + Grob::pure_simple_vertical_skylines_from_extents_proc)); if (get_property_data ("horizontal-skylines") == SCM_EOL) set_property ("horizontal-skylines", - ly_make_unpure_pure_container (Grob::simple_horizontal_skylines_from_extents_proc, - Grob::pure_simple_horizontal_skylines_from_extents_proc)); + Unpure_pure_container::make_smob (Grob::simple_horizontal_skylines_from_extents_proc, + Grob::pure_simple_horizontal_skylines_from_extents_proc)); } Grob::Grob (Grob const &s) + : Smob () { original_ = (Grob *) & s; - self_scm_ = SCM_EOL; immutable_property_alist_ = s.immutable_property_alist_; mutable_property_alist_ = SCM_EOL; @@ -129,7 +127,7 @@ Grob::get_stencil () const return 0; SCM stil = get_property ("stencil"); - return unsmob_stencil (stil); + return Stencil::unsmob (stil); } Stencil @@ -138,7 +136,7 @@ Grob::get_print_stencil () const SCM stil = get_property ("stencil"); Stencil retval; - if (Stencil *m = unsmob_stencil (stil)) + if (Stencil *m = Stencil::unsmob (stil)) { retval = *m; bool transparent = to_boolean (get_property ("transparent")); @@ -182,7 +180,7 @@ Grob::get_print_stencil () const /* Call the scheme procedure stencil-whiteout in scm/stencils.scm */ /* to add a round-filled-box stencil to the stencil list */ retval - = *unsmob_stencil (scm_call_1 (ly_lily_module_constant ("stencil-whiteout"), + = *Stencil::unsmob (scm_call_1 (ly_lily_module_constant ("stencil-whiteout"), retval.smobbed_copy ())); } @@ -406,7 +404,7 @@ Grob::get_offset (Axis a) const 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); + Real off = robust_scm2double (get_property (sym), 0.0); if (me->dim_cache_[a].offset_) { *me->dim_cache_[a].offset_ += off; @@ -461,20 +459,15 @@ Grob::extent (Grob *refp, Axis a) const /* Order is significant: ?-extent may trigger suicide. */ - SCM ext_sym - = (a == X_AXIS) - ? ly_symbol2scm ("X-extent") - : ly_symbol2scm ("Y-extent"); - - SCM ext = internal_get_property (ext_sym); + SCM ext = (a == X_AXIS) + ? get_property ("X-extent") + : get_property ("Y-extent"); 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); + SCM min_ext = (a == X_AXIS) + ? get_property ("minimum-X-extent") + : get_property ("minimum-Y-extent"); if (is_number_pair (min_ext)) real_ext.unite (ly_scm2interval (min_ext)); @@ -724,32 +717,32 @@ Grob::internal_vertical_less (Grob *g1, Grob *g2, bool pure) MESSAGES ****************************************************************/ void -Grob::programming_error (string s) const +Grob::programming_error (const string &s) const { SCM cause = self_scm (); - while (Grob *g = unsmob_grob (cause)) + while (Grob *g = Grob::unsmob (cause)) cause = g->get_property ("cause"); /* ES TODO: cause can't be Music*/ - if (Music *m = unsmob_music (cause)) + if (Music *m = Music::unsmob (cause)) m->origin ()->programming_error (s); - else if (Stream_event *ev = unsmob_stream_event (cause)) + else if (Stream_event *ev = Stream_event::unsmob (cause)) ev->origin ()->programming_error (s); else ::programming_error (s); } void -Grob::warning (string s) const +Grob::warning (const string &s) const { SCM cause = self_scm (); - while (Grob *g = unsmob_grob (cause)) + while (Grob *g = Grob::unsmob (cause)) cause = g->get_property ("cause"); /* ES TODO: cause can't be Music*/ - if (Music *m = unsmob_music (cause)) + if (Music *m = Music::unsmob (cause)) m->origin ()->warning (s); - else if (Stream_event *ev = unsmob_stream_event (cause)) + else if (Stream_event *ev = Stream_event::unsmob (cause)) ev->origin ()->warning (s); else ::warning (s); @@ -825,9 +818,6 @@ ADD_INTERFACE (Grob, "meta " "minimum-X-extent " "minimum-Y-extent " - "outside-staff-horizontal-padding " - "outside-staff-padding " - "outside-staff-priority " "pure-Y-offset-in-progress " "rotation " "skyline-horizontal-padding " @@ -857,7 +847,7 @@ MAKE_SCHEME_CALLBACK (Grob, stencil_height, 1); SCM Grob::stencil_height (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); return grob_stencil_extent (me, Y_AXIS); } @@ -865,8 +855,8 @@ MAKE_SCHEME_CALLBACK (Grob, pure_stencil_height, 3); SCM Grob::pure_stencil_height (SCM smob, SCM /* beg */, SCM /* end */) { - Grob *me = unsmob_grob (smob); - if (unsmob_stencil (me->get_property_data ("stencil"))) + Grob *me = Grob::unsmob (smob); + if (Stencil::is_smob (me->get_property_data ("stencil"))) return grob_stencil_extent (me, Y_AXIS); return ly_interval2scm (Interval ()); @@ -877,7 +867,7 @@ MAKE_SCHEME_CALLBACK (Grob, y_parent_positioning, 1); SCM Grob::y_parent_positioning (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); Grob *par = me->get_parent (Y_AXIS); if (par) (void) par->get_property ("positioning-done"); @@ -889,7 +879,7 @@ MAKE_SCHEME_CALLBACK (Grob, x_parent_positioning, 1); SCM Grob::x_parent_positioning (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); Grob *par = me->get_parent (X_AXIS); if (par) @@ -902,7 +892,7 @@ MAKE_SCHEME_CALLBACK (Grob, stencil_width, 1); SCM Grob::stencil_width (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); return grob_stencil_extent (me, X_AXIS); } @@ -910,7 +900,7 @@ 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 (Grob *s = Grob::unsmob (scm_car (elist))) { if (common) common = common->common_refpoint (s, a); @@ -972,3 +962,50 @@ Grob::check_cross_staff (Grob *commony) return false; } +static +bool +indirect_less (Grob **a, Grob **b) +{ + // Use original order as tie breaker. That gives us a stable sort + // at the lower price tag of an unstable one, and we want a stable + // sort in order to reliably retain the first instance of a grob + // pointer. + return *a < *b || (*a == *b && a < b); +} + +static +bool +indirect_eq (Grob **a, Grob **b) +{ + return *a == *b; +} + +static +bool +direct_less (Grob **a, Grob **b) +{ + return a < b; +} + +// uniquify uniquifies on the memory addresses of the Grobs, but then +// uses the original order. This makes results independent from the +// memory allocation of Grobs. + +void +uniquify (vector & grobs) +{ + vector vec (grobs.size ()); + for (vsize i = 0; i < grobs.size (); i++) + vec[i] = &grobs[i]; + vector_sort (vec, indirect_less); + vec.erase (unique (vec.begin (), vec.end (), indirect_eq), vec.end ()); + vector_sort (vec, direct_less); + + // Since the output is a sorted copy of the input with some elements + // removed, we can fill in the vector in-place if we do it starting + // from the front. + for (vsize i = 0; i < vec.size (); i++) + grobs[i] = *vec[i]; + grobs.erase (grobs.begin () + vec.size (), grobs.end ()); + return; +}