#include <string.h>
+#include "misc.hh"
#include "paper-score.hh"
#include "paper-def.hh"
#include "lookup.hh"
Interval
-Score_element::dim_cache_callback (Dimension_cache*c)
+Score_element::dim_cache_callback (Dimension_cache const*c)
{
- Score_element * e =dynamic_cast<Score_element*>( c->element_l());
+ Score_element * e =dynamic_cast<Score_element*> (c->element_l());
if(e->dim_cache_[X_AXIS] == c)
return e->do_width ();
else
return e->do_height ();
}
+
+
+Real
+set_alignment_callback (Dimension_cache const *c)
+{
+ String s ("self-alignment-");
+ Axis ax = c->axis ();
+ s += (ax == X_AXIS) ? "X" : "Y";
+ Score_element *elm = dynamic_cast<Score_element*> (c->element_l ());
+ SCM align (elm->get_elt_property (s));
+ if (isdir_b (align))
+ {
+ Direction d = to_dir (align);
+ Interval ext(elm->extent (ax));
+ if (d)
+ {
+ return - ext[d];
+ }
+ return - ext.center ();
+ }
+ else
+ return 0.0;
+}
+
+
Score_element::Score_element()
{
output_p_ =0;
status_i_ = 0;
self_scm_ = SCM_EOL;
original_l_ = 0;
- element_property_alist_ = scm_protect_object (gh_cons (gh_cons (void_scm_sym, SCM_BOOL_T) , SCM_EOL));
+ element_property_alist_ = SCM_EOL;
smobify_self ();
}
return dependency_arr_.size ();
}
+// should also have one that takes SCM arg.
SCM
-Score_element::get_elt_property (SCM sym) const
+Score_element::get_elt_property (String nm) const
{
- SCM s = scm_assq(sym, element_property_alist_);
+ SCM sym = ly_symbol2scm (nm.ch_C());
+ SCM s = scm_assq(sym, element_property_alist_);
- // is this a good idea?
- if (s == SCM_BOOL_F && pscore_l_ && pscore_l_->paper_l_)
- s = pscore_l_->paper_l_->get_scm_var (sym);
-
- return s;
+ if (s != SCM_BOOL_F)
+ return SCM_CDR (s);
+
+ if (pscore_l_)
+ {
+ SCM sym2 = ly_symbol2scm ((name () + ("::" + nm)).ch_C());
+ SCM val;
+
+ // should probably check for Type::sym as well.
+ Paper_def * p= pscore_l_->paper_l_;
+ if (p->default_properties_.try_retrieve (sym2, &val))
+ return val;
+ else if (p->default_properties_.try_retrieve (sym, &val))
+ return val;
+ }
+
+ return SCM_UNDEFINED;
}
SCM
-Score_element::remove_elt_property (SCM key)
+Score_element::remove_elt_property (String key)
{
SCM s = get_elt_property (key);
- SCM_CDR(element_property_alist_) = scm_assq_remove_x (SCM_CDR (element_property_alist_), key);
+ SCM sym = ly_symbol2scm (key.ch_C());
+ element_property_alist_ = scm_assq_remove_x (element_property_alist_, sym);
return s;
}
+/*
+ UGH. assoc vs. assq
+ */
void
-Score_element::set_elt_property (SCM s, SCM v)
+Score_element::set_elt_property (String k, SCM v)
{
- SCM_CDR(element_property_alist_) =
- scm_assoc_set_x (SCM_CDR (element_property_alist_), s, v);
+ SCM s = ly_symbol2scm (k.ch_C( ));
+ element_property_alist_ = scm_assoc_set_x (element_property_alist_, s, v);
}
Interval
if (!lookup_l_)
{
Score_element * urg = (Score_element*)this;
- SCM sz = urg->remove_elt_property (fontsize_scm_sym);
- int i = (sz != SCM_BOOL_F)
- ? gh_scm2int (SCM_CDR (sz))
+ SCM sz = urg->remove_elt_property ("fontsize");
+ int i = (sz != SCM_UNDEFINED)
+ ? gh_scm2int (sz)
: 0;
urg->lookup_l_ = (Lookup*)pscore_l_->paper_l_->lookup_l (i);
if (status_i_)
return;
status_i_ ++;
+
+ if (get_elt_property ("self-alignment-X") != SCM_UNDEFINED)
+ {
+ dim_cache_[X_AXIS]->set_offset_callback (set_alignment_callback);
+ }
+
+ if (get_elt_property ("self-alignment-Y") != SCM_UNDEFINED)
+ {
+ dim_cache_[Y_AXIS]->set_offset_callback (set_alignment_callback);
+ }
+
do_add_processing();
}
void
Score_element::calculate_dependencies (int final, int busy,
- Score_element_method_pointer funcptr)
+ Score_element_method_pointer funcptr)
{
assert (status_i_ >=0);
void
Score_element::output_processing ()
{
- if (get_elt_property (transparent_scm_sym) != SCM_BOOL_F)
+ if (get_elt_property ("transparent") != SCM_UNDEFINED)
return;
// we're being silly here.
output_p_ = do_brew_molecule_p ();
Offset o (relative_coordinate (0, X_AXIS), relative_coordinate (0, Y_AXIS));
+
+ SCM s = get_elt_property ("extra-offset");
+ if (gh_pair_p (s))
+ {
+ Real il = paper_l ()->get_var ("interline");
+ o[X_AXIS] += il * gh_scm2double (gh_car (s));
+ o[Y_AXIS] += il * gh_scm2double (gh_cdr (s));
+ }
pscore_l_->outputter_l_->output_molecule (output_p_,
o,
old->do_substitute_element_pointer (this, 0);
}
+
+/**
+ Do break substitution, and return new value.
+ */
+SCM
+Score_element::handle_broken_smobs (SCM s, Line_of_score * line)
+{
+ if (SMOB_IS_TYPE_B (Score_element, s))
+ {
+ Score_element *sc = SMOB_TO_TYPE (Score_element, s);
+ Score_element * br =0;
+ if (sc->line_l () != line)
+ {
+ br = sc->find_broken_piece (line);
+ }
+
+ if (br)
+ return br->self_scm_;
+ }
+ else if (gh_pair_p (s))
+ {
+ /*
+ UGH! breaks on circular lists.
+ */
+ gh_set_car_x (s, handle_broken_smobs (gh_car (s), line));
+ gh_set_cdr_x (s, handle_broken_smobs (gh_cdr (s), line));
+ }
+ return s;
+}
+
void
Score_element::handle_broken_dependencies()
{
if (!line)
return;
- do_substitute_arrays ();
+ element_property_alist_ = handle_broken_smobs (element_property_alist_, line);
Link_array<Score_element> new_deps;
/*
- This sux.
-
- unlike with spanners, the number of items can increase
-
- span: item1
-
- becomes
-
- span: item1 item2 item3
-
- How to let span (a derived class) know that this happened?
-
-
TODO: cleanify.
*/
void
Score_element::handle_prebroken_dependencies()
{
- /* dynamic_cast<Item*> (this) &&
- if (!break_status_dir ())
- return;
- */
+ element_property_alist_
+ = handle_broken_smobs (element_property_alist_, line_l ());
+
Link_array<Score_element> old_arr, new_arr;
for (int i=0; i < dependency_size(); i++)
{
}
-void
-Score_element::do_substitute_arrays ()
-{
-}
Score_element*
scm_puts ("#<Score_element ", port);
scm_puts ((char *)sc->name (), port);
+ scm_puts ("properties = ", port);
+ scm_display (sc->element_property_alist_, port);
scm_puts (" >", port);
return 1;
}
}
#include "ly-smobs.icc"
IMPLEMENT_SMOBS(Score_element);
+
+SCM
+Score_element::equal_p (SCM a, SCM b)
+{
+ return SCM_CDR(a) == SCM_CDR(b) ? SCM_BOOL_T : SCM_BOOL_F;
+}
+
projects / lilypond.git / blobdiff