X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-scheme.cc;h=be431b7e10cd62192c3c39ba7ad0b77fd5258c57;hb=66adac8fa4ba5126100ff8748a2576c6983637c5;hp=e8911d6a6bee3e5c55eb118920b92d7d853b1958;hpb=31a6650e2b2a5c1cae3237ee47b80cd43d084d53;p=lilypond.git diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index e8911d6a6b..be431b7e10 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -3,29 +3,25 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2006 Jan Nieuwenhuizen + Han-Wen Nienhuys */ -#include "grob.hh" - -#include "warn.hh" +#include "warn.hh" // error() #include "item.hh" #include "output-def.hh" #include "system.hh" #include "font-interface.hh" - - +#include "paper-score.hh" +#include "grob-array.hh" LY_DEFINE (ly_grob_property_data, "ly:grob-property-data", 2, 0, 0, (SCM grob, SCM sym), - //, SCM dfault), "Retrieve @var{sym} for @var{grob} but don't process callbacks.") { Grob *sc = unsmob_grob (grob); SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob"); SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - // SCM_ASSERT_TYPE (ly_is_procedure (proc), proc, SCM_ARG3, __FUNCTION__, "procedure"); return sc->get_property_data (sym); } @@ -38,36 +34,43 @@ LY_DEFINE (ly_grob_set_property_x, "ly:grob-set-property!", SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob"); SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - if (!type_check_assignment (sym, val, ly_symbol2scm ("backend-type?"))) + if (!ly_is_procedure (val) + && !type_check_assignment (sym, val, ly_symbol2scm ("backend-type?"))) error ("typecheck failed"); - sc->internal_set_property (sym, val); + sc->set_property (sym, val); return SCM_UNSPECIFIED; } LY_DEFINE (ly_grob_property, "ly:grob-property", - 2, 0, 0, (SCM grob, SCM sym), + 2, 1, 0, (SCM grob, SCM sym, SCM deflt), "Return the value of a value in grob @var{g} of property @var{sym}. " - "It will return @code{' ()} (end-of-list) " + "It will return @code{'()} or @var{deflt} (if specified) " "if @var{sym} is undefined in @var{g}." "\n\n") { Grob *sc = unsmob_grob (grob); SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob"); SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - - return sc->internal_get_property (sym); + if (deflt == SCM_UNDEFINED) + deflt = SCM_EOL; + + SCM retval = sc->internal_get_property (sym); + if (retval == SCM_EOL) + retval = deflt; + + return retval; } LY_DEFINE (ly_grob_interfaces, "ly:grob-interfaces", 1, 0, 0, (SCM grob), - "Return the interfaces list of grob @var{grob}.") + "Return the interfaces list of grob @var{grob}.") { Grob *sc = unsmob_grob (grob); SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob"); - return sc->get_interfaces (); + return sc->interfaces (); } LY_DEFINE (ly_grob_object, "ly:grob-object", @@ -84,7 +87,7 @@ LY_DEFINE (ly_grob_object, "ly:grob-object", return sc->internal_get_object (sym); } -LY_DEFINE (ly_spanner_get_bound, "ly:spanner-get-bound", +LY_DEFINE (ly_spanner_get_bound, "ly:spanner-bound", 2, 0, 0, (SCM slur, SCM dir), "Get one of the bounds of @var{spanner}. @var{dir} is @code{-1} " "for left, and @code{1} for right.") @@ -104,7 +107,7 @@ LY_DEFINE (ly_grob_layout, "ly:grob-layout", Grob *sc = unsmob_grob (g); SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob"); - return sc->get_layout ()->self_scm (); + return sc->layout ()->self_scm (); } LY_DEFINE (ly_grob_alist_chain, "ly:grob-alist-chain", @@ -118,7 +121,7 @@ LY_DEFINE (ly_grob_alist_chain, "ly:grob-alist-chain", if (global == SCM_UNDEFINED) { - global = sc->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults")); + global = sc->layout ()->lookup_variable (ly_symbol2scm ("font-defaults")); if (global == SCM_UNDEFINED) global = SCM_EOL; } @@ -133,13 +136,70 @@ LY_DEFINE (ly_get_extent, "ly:grob-extent", { Grob *sc = unsmob_grob (grob); Grob *ref = unsmob_grob (refp); + + SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE (ref, refp, SCM_ARG2, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis"); + + Axis a = Axis (scm_to_int (axis)); + + + if (ref->common_refpoint (sc, a) != ref) + { + // ugh. should use other error message + SCM_ASSERT_TYPE (false, refp, SCM_ARG2, __FUNCTION__, "common refpoint"); + } + return ly_interval2scm (sc->extent (ref, a)); +} + +LY_DEFINE (ly_grob_robust_relative_extent, "ly:grob-robust-relative-extent", + 3, 0, 0, (SCM grob, SCM refp, SCM axis), + "Get the extent in @var{axis} direction of @var{grob} relative to " + "the grob @var{refp}, or (0,0) if empty") +{ + Grob *sc = unsmob_grob (grob); + Grob *ref = unsmob_grob (refp); + + SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE (ref, refp, SCM_ARG2, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis"); + + Axis a = Axis (scm_to_int (axis)); + + if (ref->common_refpoint (sc, a) != ref) + { + // ugh. should use other error message + SCM_ASSERT_TYPE (false, refp, SCM_ARG2, __FUNCTION__, "common refpoint"); + } + + return ly_interval2scm (robust_relative_extent (sc, ref, a)); +} + +LY_DEFINE (ly_grob_relative_coordinate, "ly:grob-relative-coordinate", + 3, 0, 0, (SCM grob, SCM refp, SCM axis), + "Get the coordinate in @var{axis} direction of @var{grob} relative to " + "the grob @var{refp}") +{ + Grob *sc = unsmob_grob (grob); + Grob *ref = unsmob_grob (refp); + SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob"); SCM_ASSERT_TYPE (ref, refp, SCM_ARG2, __FUNCTION__, "grob"); SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis"); - return ly_interval2scm (sc->extent (ref, Axis (scm_to_int (axis)))); + Axis a = Axis (scm_to_int (axis)); + + + if (ref->common_refpoint (sc, a) != ref) + { + // ugh. should use other error message + SCM_ASSERT_TYPE (false, refp, SCM_ARG2, __FUNCTION__, "common refpoint"); + } + + return scm_from_double (sc->relative_coordinate (ref,a)); } + LY_DEFINE (ly_grob_parent, "ly:grob-parent", 2, 0, 0, (SCM grob, SCM axis), "Get the parent of @var{grob}. @var{axis} is 0 for the X-axis, " @@ -194,7 +254,7 @@ LY_DEFINE (ly_grob_original, "ly:grob-original", { Grob *me = unsmob_grob (grob); SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob"); - return me->original_ ? me->original_->self_scm () : me->self_scm (); + return me->original () ? me->original ()->self_scm () : me->self_scm (); } /* TODO: maybe we should return a vector -- random access is more @@ -207,7 +267,7 @@ LY_DEFINE (ly_spanner_broken_into, "ly:spanner-broken-into", SCM_ASSERT_TYPE (me, spanner, SCM_ARG1, __FUNCTION__, "spanner"); SCM s = SCM_EOL; - for (int i = me->broken_intos_.size (); i--;) + for (vsize i = me->broken_intos_.size (); i--;) s = scm_cons (me->broken_intos_[i]->self_scm (), s); return s; } @@ -253,7 +313,8 @@ LY_DEFINE (ly_grob_key, "ly:grob-key", { Grob *me = unsmob_grob (grob); SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "Grob"); - return me->get_key ()->self_scm (); + + return me->key () ? me->key ()->self_scm () : SCM_EOL; } LY_DEFINE (ly_grob_default_font, "ly:grob-default-font", @@ -265,3 +326,44 @@ LY_DEFINE (ly_grob_default_font, "ly:grob-default-font", return Font_interface::get_default_font (gr)->self_scm (); } + + +/* + TODO: consider swapping order, so we can do + + (grob-common-refpoint a b c d e) + */ +LY_DEFINE (ly_grob_common_refpoint, "ly:grob-common-refpoint", + 3, 0, 0, (SCM grob, SCM other, SCM axis), + "Find the common refpoint of @var{grob} and @var{other} for @var{axis}." + ) +{ + + Grob *gr = unsmob_grob (grob); + SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob"); + + Grob *o = unsmob_grob (other); + SCM_ASSERT_TYPE (o, other, SCM_ARG2, __FUNCTION__, "grob"); + + SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis"); + + Grob *refp = gr->common_refpoint (o, Axis (scm_to_int (axis))); + return refp ? refp->self_scm () : SCM_BOOL_F; +} + +LY_DEFINE (ly_grob_common_refpoint_of_array, "ly:grob-common-refpoint-of-array", + 3, 0, 0, (SCM grob, SCM others, SCM axis), + "Find the common refpoint of @var{grob} and @var{others} " + "(a grob-array) for @var{axis}." + ) +{ + Grob *gr = unsmob_grob (grob); + SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob"); + + Grob_array *ga = unsmob_grob_array (others); + SCM_ASSERT_TYPE (ga, others, SCM_ARG2, __FUNCTION__, "grob array"); + SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis"); + + Grob *refp = common_refpoint_of_array (ga->array (), gr, Axis (scm_to_int (axis))); + return refp ? refp->self_scm () : SCM_BOOL_F; +}