/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
#include "context.hh"
#include "context-def.hh"
#include "dispatcher.hh"
+#include "grob-properties.hh"
LY_DEFINE (ly_context_current_moment,
- "ly:context-current-moment",
- 1, 0, 0, (SCM context),
- "Return the current moment of @var{context}.")
+ "ly:context-current-moment",
+ 1, 0, 0, (SCM context),
+ "Return the current moment of @var{context}.")
{
- Context *tr = unsmob_context (context);
+ Context *tr = unsmob<Context> (context);
LY_ASSERT_SMOB (Context, context, 1);
}
LY_DEFINE (ly_context_id, "ly:context-id",
- 1, 0, 0, (SCM context),
- "Return the ID string of @var{context},"
- " i.e., for @code{\\context Voice = one @dots{}}"
- " return the string @code{one}.")
+ 1, 0, 0, (SCM context),
+ "Return the ID string of @var{context},"
+ " i.e., for @code{\\context Voice = \"one\" @dots{}}"
+ " return the string @code{one}.")
{
- Context *tr = unsmob_context (context);
+ Context *tr = unsmob<Context> (context);
LY_ASSERT_SMOB (Context, context, 1);
}
LY_DEFINE (ly_context_name, "ly:context-name",
- 1, 0, 0, (SCM context),
- "Return the name of @var{context},"
- " i.e., for @code{\\context Voice = one @dots{}}"
- " return the symbol @code{Voice}.")
+ 1, 0, 0, (SCM context),
+ "Return the name of @var{context},"
+ " i.e., for @code{\\context Voice = \"one\" @dots{}}"
+ " return the symbol @code{Voice}.")
{
LY_ASSERT_SMOB (Context, context, 1);
- Context *tr = unsmob_context (context);
+ Context *tr = unsmob<Context> (context);
return ly_symbol2scm (tr->context_name ().c_str ());
}
LY_DEFINE (ly_context_grob_definition, "ly:context-grob-definition",
- 2, 0, 0, (SCM context, SCM name),
- "Return the definition of @var{name} (a symbol) within"
- " @var{context} as an alist.")
+ 2, 0, 0, (SCM context, SCM name),
+ "Return the definition of @var{name} (a symbol) within"
+ " @var{context} as an alist.")
{
- Context *tr = unsmob_context (context);
-
+ Context *tr = unsmob<Context> (context);
+
LY_ASSERT_SMOB (Context, context, 1);
LY_ASSERT_TYPE (ly_is_symbol, name, 2);
- return updated_grob_properties (tr, name);
+ return Grob_property_info (tr, name).updated ();
}
LY_DEFINE (ly_context_pushpop_property, "ly:context-pushpop-property",
- 3, 1, 0, (SCM context, SCM grob, SCM eltprop, SCM val),
- "Do a single @code{\\override} or @code{\\revert} operation"
- " in @var{context}. The grob definition @var{grob} is extended"
- " with @var{eltprop} (if @var{val} is specified) or reverted"
- " (if unspecified).")
+ 3, 1, 0, (SCM context, SCM grob, SCM eltprop, SCM val),
+ "Do @code{\\temporary \\override} or @code{\\revert} operation"
+ " in @var{context}. The grob definition @var{grob} is extended"
+ " with @var{eltprop} (if @var{val} is specified) or reverted"
+ " (if unspecified).")
{
- Context *tg = unsmob_context (context);
+ Context *tg = unsmob<Context> (context);
LY_ASSERT_SMOB (Context, context, 1);
LY_ASSERT_TYPE (ly_is_symbol, grob, 2);
return SCM_UNSPECIFIED;
}
+LY_DEFINE (ly_context_matched_pop_property, "ly:context-matched-pop-property",
+ 3, 0, 0, (SCM context, SCM grob, SCM cell),
+ "This undoes a particular @code{\\override},"
+ " @code{\\once \\override} or @code{\\once \\revert}"
+ " when given the specific alist pair to undo.")
+{
+ Context *tg = LY_ASSERT_SMOB (Context, context, 1);
+ LY_ASSERT_TYPE (ly_is_symbol, grob, 2);
+ Grob_property_info (tg, grob).matched_pop (cell);
+ return SCM_UNSPECIFIED;
+}
+
+
LY_DEFINE (ly_context_property, "ly:context-property",
- 2, 0, 0, (SCM context, SCM sym),
- "Return the value for property @var{sym} in @var{context}.")
+ 2, 1, 0, (SCM context, SCM sym, SCM def),
+ "Return the value for property @var{sym} in @var{context}."
+ " If @var{def} is given, and property value is @code{'()},"
+ " return @var{def}.")
{
LY_ASSERT_SMOB (Context, context, 1);
LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
- Context *t = unsmob_context (context);
- return t->internal_get_property (sym);
+ Context *t = unsmob<Context> (context);
+ SCM result = t->get_property (sym);
+ return !SCM_UNBNDP (def) && scm_is_null (result) ? def : result;
}
LY_DEFINE (ly_context_set_property_x, "ly:context-set-property!",
- 3, 0, 0, (SCM context, SCM name, SCM val),
- "Set value of property @var{name} in context @var{context}"
- " to @var{val}.")
+ 3, 0, 0, (SCM context, SCM name, SCM val),
+ "Set value of property @var{name} in context @var{context}"
+ " to @var{val}.")
{
LY_ASSERT_SMOB (Context, context, 1);
LY_ASSERT_TYPE (ly_is_symbol, name, 2);
- Context *tr = unsmob_context (context);
+ Context *tr = unsmob<Context> (context);
tr->set_property (name, val);
}
LY_DEFINE (ly_context_property_where_defined, "ly:context-property-where-defined",
- 2, 0, 0, (SCM context, SCM name),
- "Return the context above @var{context}"
- " where @var{name} is defined.")
+ 2, 0, 0, (SCM context, SCM name),
+ "Return the context above @var{context}"
+ " where @var{name} is defined.")
{
LY_ASSERT_SMOB (Context, context, 1);
LY_ASSERT_TYPE (ly_is_symbol, name, 2);
-
- Context *tr = unsmob_context (context);
+
+ Context *tr = unsmob<Context> (context);
SCM val;
tr = tr->where_defined (name, &val);
}
LY_DEFINE (ly_context_unset_property, "ly:context-unset-property", 2, 0, 0,
- (SCM context, SCM name),
- "Unset value of property @var{name} in context @var{context}.")
+ (SCM context, SCM name),
+ "Unset value of property @var{name} in context @var{context}.")
{
LY_ASSERT_SMOB (Context, context, 1);
LY_ASSERT_TYPE (ly_is_symbol, name, 2);
- Context *tr = unsmob_context (context);
-
+ Context *tr = unsmob<Context> (context);
+
tr->unset_property (name);
return SCM_UNSPECIFIED;
}
LY_DEFINE (ly_context_parent, "ly:context-parent",
- 1, 0, 0, (SCM context),
- "Return the parent of @var{context}, @code{#f} if none.")
+ 1, 0, 0, (SCM context),
+ "Return the parent of @var{context}, @code{#f} if none.")
{
LY_ASSERT_SMOB (Context, context, 1);
- Context *tr = unsmob_context (context);
+ Context *tr = unsmob<Context> (context);
tr = tr->get_parent_context ();
if (tr)
/* FIXME: todo: should support translator IDs, and creation? */
LY_DEFINE (ly_context_find, "ly:context-find",
- 2, 0, 0, (SCM context, SCM name),
- "Find a parent of @var{context} that has name or alias @var{name}."
- " Return @code{#f} if not found.")
+ 2, 0, 0, (SCM context, SCM name),
+ "Find a parent of @var{context} that has name or alias @var{name}."
+ " Return @code{#f} if not found.")
{
LY_ASSERT_SMOB (Context, context, 1);
LY_ASSERT_TYPE (ly_is_symbol, name, 2);
- Context *tr = unsmob_context (context);
+ Context *tr = unsmob<Context> (context);
while (tr)
{
if (tr->is_alias (name))
- return tr->self_scm ();
+ return tr->self_scm ();
tr = tr->get_parent_context ();
}
}
LY_DEFINE (ly_context_now, "ly:context-now",
- 1, 0, 0, (SCM context),
- "Return @code{now-moment} of context @var{context}.")
+ 1, 0, 0, (SCM context),
+ "Return @code{now-moment} of context @var{context}.")
{
LY_ASSERT_SMOB (Context, context, 1);
- Context *ctx = unsmob_context (context);
+ Context *ctx = unsmob<Context> (context);
return ctx->now_mom ().smobbed_copy ();
}
"Return @code{event-source} of context @var{context}.")
{
LY_ASSERT_SMOB (Context, context, 1);
- Context *ctx = unsmob_context (context);
+ Context *ctx = unsmob<Context> (context);
return ctx->event_source ()->self_scm ();
}
" from @var{context} and all its subcontexts.")
{
LY_ASSERT_SMOB (Context, context, 1);
- Context *ctx = unsmob_context (context);
+ Context *ctx = unsmob<Context> (context);
return ctx->events_below ()->self_scm ();
}
projects / lilypond.git / blobdiff