/*
- context-property.cc -- implement manipulation of immutable Grob
- property lists.
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "context.hh"
assert (false);
}
- execute_general_pushpop_property (context, context_property,
- grob_property_path, new_value);
+ sloppy_general_pushpop_property (context, context_property,
+ grob_property_path, new_value);
}
/*
-
Grob descriptions (ie. alists with layout properties) are
represented as a (ALIST . BASED-ON) pair, where BASED-ON is the
alist defined in a parent context. BASED-ON should always be a tail
of ALIST.
- Push or pop (depending on value of VAL) a single entry entry from a
+ Push or pop (depending on value of VAL) a single entry from a
translator property list by name of PROP. GROB_PROPERTY_PATH
indicates nested alists, eg. '(beamed-stem-lengths details)
-
+
*/
void
execute_override_property (Context *context,
SCM new_value)
{
SCM current_context_val = SCM_EOL;
-
+
Context *where = context->where_defined (context_property,
¤t_context_val);
SCM target_alist = scm_car (current_context_val);
+ /*
+ If the car is a list, the property path comes from a nested override
+ using list syntax inside a \context block
+ */
+ if (scm_is_pair (scm_car (grob_property_path)))
+ grob_property_path = scm_car (grob_property_path);
+
SCM symbol = scm_car (grob_property_path);
if (scm_is_pair (scm_cdr (grob_property_path)))
{
- new_value = nested_property_alist (ly_assoc_get (symbol, target_alist,
+ new_value = nested_property_alist (ly_assoc_get (symbol, target_alist,
SCM_EOL),
scm_cdr (grob_property_path),
new_value);
}
}
+/*
+ do a pop (indicated by new_value==SCM_UNDEFINED) or push
+ */
void
-execute_general_pushpop_property (Context *context,
- SCM context_property,
- SCM grob_property_path,
- SCM new_value)
+sloppy_general_pushpop_property (Context *context,
+ SCM context_property,
+ SCM grob_property_path,
+ SCM new_value)
{
- if (new_value != SCM_UNDEFINED)
+ if (new_value == SCM_UNDEFINED)
+ execute_revert_property (context, context_property,
+ grob_property_path);
+ else
execute_override_property (context, context_property,
grob_property_path,
new_value);
- else
- execute_revert_property (context, context_property,
- grob_property_path);
}
+/*
+ Revert the property given by property_path.
+*/
void
execute_revert_property (Context *context,
SCM context_property,
SCM grob_property_path)
{
- /*
- revert.
- */
SCM current_context_val = SCM_EOL;
- if (context->where_defined (context_property, ¤t_context_val) == context)
+ if (context->where_defined (context_property, ¤t_context_val)
+ == context)
{
SCM current_alist = scm_car (current_context_val);
SCM daddy = scm_cdr (current_context_val);
programming_error ("Grob property path should be list of symbols.");
return;
}
-
- SCM symbol = scm_car (grob_property_path);
+ SCM symbol = scm_car (grob_property_path);
if (scm_is_pair (scm_cdr (grob_property_path)))
{
SCM current_sub_alist = ly_assoc_get (symbol, current_alist, SCM_EOL);
SCM new_val
= nested_property_revert_alist (current_sub_alist,
scm_cdr (grob_property_path));
-
+
if (scm_is_pair (current_alist)
&& scm_caar (current_alist) == symbol
&& current_alist != daddy)
else
{
SCM new_alist = evict_from_alist (symbol, current_alist, daddy);
-
+
if (new_alist == daddy)
context->unset_property (context_property);
else
}
}
}
-
+/*
+ Convenience: a push/pop grob property using a single grob_property
+ as argument.
+*/
void
execute_pushpop_property (Context *context,
SCM context_property,
SCM grob_property,
- SCM new_value
- )
+ SCM new_value)
{
general_pushpop_property (context, context_property,
scm_list_1 (grob_property),
new_value);
}
-
+
/*
PRE_INIT_OPS is in the order specified, and hence must be reversed.
*/
SCM context_prop = scm_car (entry);
SCM val = scm_cadr (entry);
SCM grob_prop_path = scm_cddr (entry);
- execute_general_pushpop_property (tg, context_prop, grob_prop_path, val);
+ sloppy_general_pushpop_property (tg, context_prop, grob_prop_path, val);
}
else if (type == ly_symbol2scm ("pop"))
{
SCM context_prop = scm_car (entry);
SCM val = SCM_UNDEFINED;
SCM grob_prop_path = scm_cdr (entry);
- execute_general_pushpop_property (tg, context_prop, grob_prop_path, val);
+ sloppy_general_pushpop_property (tg, context_prop, grob_prop_path, val);
}
else if (type == ly_symbol2scm ("assign"))
tg->set_property (scm_car (entry), scm_cadr (entry));