#include <string.h>
-#include "p-score.hh"
+#include "paper-score.hh"
#include "paper-def.hh"
#include "lookup.hh"
#include "molecule.hh"
#include "spanner.hh"
#include "line-of-score.hh"
#include "item.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
#include "molecule.hh"
#include "misc.hh"
#include "paper-outputter.hh"
+#include "dimension-cache.hh"
+
Interval
Score_element::dim_cache_callback (Dimension_cache*c)
pscore_l_=0;
lookup_l_ =0;
status_i_ = 0;
+ self_scm_ = SCM_EOL;
original_l_ = 0;
- element_property_alist_ = SCM_EOL;
+ element_property_alist_ = scm_protect_object (gh_cons (gh_cons (void_scm_sym, SCM_BOOL_T) , SCM_EOL));
+
+ smobify_self ();
}
Score_element::Score_element (Score_element const&s)
: Graphical_element (s)
{
+
+ self_scm_ = SCM_EOL;
used_b_ = true;
original_l_ =(Score_element*) &s;
- element_property_alist_ = scm_list_copy (s.element_property_alist_);
+ element_property_alist_ = scm_protect_object (scm_list_copy (s.element_property_alist_));
dependency_arr_ = s.dependency_arr_;
output_p_ =0;
status_i_ = s.status_i_;
lookup_l_ = s.lookup_l_;
pscore_l_ = s.pscore_l_;
+
+ smobify_self ();
}
Score_element::~Score_element()
{
- delete output_p_;
+ assert (!output_p_);
assert (status_i_ >=0);
status_i_ = -1;
}
Score_element::remove_elt_property (SCM key)
{
SCM s = get_elt_property (key);
- element_property_alist_ = scm_assq_remove_x (element_property_alist_, key);
+ SCM_CDR(element_property_alist_) = scm_assq_remove_x (SCM_CDR (element_property_alist_), key);
return s;
}
void
Score_element::set_elt_property (SCM s, SCM v)
{
- element_property_alist_ =
- scm_assoc_set_x (element_property_alist_, s, v);
+ SCM_CDR(element_property_alist_) =
+ scm_assoc_set_x (SCM_CDR (element_property_alist_), s, v);
}
Interval
Score_element::print() const
{
#ifndef NPRINT
- DOUT << classname(this) << "{\n";
- if (check_debug && !monitor->silent_b ("Score_element"))
+ DEBUG_OUT << classname(this) << "{\n";
+ if (flower_dstream && !flower_dstream->silent_b ("Score_element"))
ly_display_scm (element_property_alist_);
- DOUT << "dependencies: " << dependency_size();
+ DEBUG_OUT << "dependencies: " << dependency_size();
if (original_l_)
- DOUT << "Copy ";
+ DEBUG_OUT << "Copy ";
Graphical_element::do_print ();
do_print();
- DOUT << "}\n";
+ DEBUG_OUT << "}\n";
#endif
}
{
if (!lookup_l_)
{
- Score_element * me = (Score_element*)this;
- SCM sz = me->remove_elt_property (fontsize_scm_sym);
+ 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))
: 0;
- me->lookup_l_ = pscore_l_->paper_l_->lookup_l (i);
+ urg->lookup_l_ = (Lookup*)pscore_l_->paper_l_->lookup_l (i);
}
return lookup_l_;
}
delete output_p_;
output_p_ = do_brew_molecule_p ();
- Offset o (absolute_coordinate (X_AXIS), absolute_coordinate (Y_AXIS));
+ Offset o (relative_coordinate (0, X_AXIS), relative_coordinate (0, Y_AXIS));
pscore_l_->outputter_l_->output_molecule (output_p_,
o,
classname(this));
- pscore_l_->schedule_for_delete (this);
+ delete output_p_;
+ output_p_ =0;
}
/*
return 0;
}
-/*
-
- DEPENDENCIES
-
- */
-
-void
-Score_element::remove_dependency (Score_element*e)
-{
- int i;
- while ((i = dependency_arr_.find_i (e)) >=0 )
- dependency_arr_.unordered_del (i);
-
- substitute_dependency (e, 0);
-}
-
void
Score_element::add_dependency (Score_element*e)
{
e->used_b_ = true;
}
else
- warning("Null dependency added");
-
+ programming_error ("Null dependency added");
}
+
void
Score_element::substitute_dependency (Score_element* old, Score_element* new_l)
{
if (!line)
return;
- Link_array<Score_element> remove_us_arr;
+ do_substitute_arrays ();
+
+ Link_array<Score_element> new_deps;
+
for (int i=0; i < dependency_size(); i++)
{
Score_element * elt = dependency (i);
if (elt->line_l() != line)
{
- if (Spanner *sp = dynamic_cast<Spanner *> (elt))
- {
- Spanner * broken = sp->find_broken_piece (line);
- substitute_dependency (sp, broken);
-
- if (broken)
- add_dependency (broken);
- }
- else if (Item *original = dynamic_cast <Item *> (elt))
- {
- Item * my_item = original->find_prebroken_piece (line);
-
- substitute_dependency (elt, my_item);
- if (my_item)
- add_dependency (my_item);
- }
- remove_us_arr.push (elt);
+ Score_element * broken = elt->find_broken_piece (line);
+ substitute_dependency (elt, broken);
+ elt = broken ;
}
+ if (elt)
+ new_deps.push (elt);
}
+ dependency_arr_ = new_deps;
- remove_us_arr.default_sort();
- remove_us_arr.uniq();
- for (int i=0; i <remove_us_arr.size(); i++)
- remove_dependency (remove_us_arr[i]);
}
+
/*
This sux.
span: item1 item2 item3
How to let span (a derived class) know that this happened?
+
+
+ TODO: cleanify.
*/
void
Score_element::handle_prebroken_dependencies()
if (it_l && it_l->broken_original_b ())
if (Item *me = dynamic_cast<Item*> (this) )
{
- Score_element *new_l = it_l->find_prebroken_piece (me->break_status_dir ());
+ Score_element *new_l = it_l->find_broken_piece (me->break_status_dir ());
if (new_l != elt)
{
new_arr.push (new_l);
Direction d = LEFT;
do {
old_arr.push (0);
- new_arr.push (it_l->find_prebroken_piece (d));
+ new_arr.push (it_l->find_broken_piece (d));
} while (flip(&d)!= LEFT);
}
}
{
}
+void
+Score_element::handle_broken_dependents()
+{
+}
+
Link_array<Score_element>
Score_element::do_print () const
{
}
+
+void
+Score_element::do_substitute_arrays ()
+{
+}
+
+
+Score_element*
+Score_element::find_broken_piece (Line_of_score*) const
+{
+ return 0;
+}
+
+SCM
+Score_element::mark_smob (SCM ses)
+{
+ void * mp = (void*) SCM_CDR(ses);
+ Score_element * s = (Score_element*) mp;
+
+ assert (s->self_scm_ == ses);
+ return s->element_property_alist_;
+}
+
+
+int
+Score_element::print_smob (SCM s, SCM port, scm_print_state *)
+{
+ Score_element *sc = (Score_element *) SCM_CDR (s);
+
+ scm_puts ("#<Score_element ", port);
+ scm_puts ((char *)sc->name (), port);
+ scm_puts (" >", port);
+ return 1;
+}
+
+void
+Score_element::do_smobify_self ()
+{
+ scm_unprotect_object (element_property_alist_); // ugh
+}
+#include "ly-smobs.icc"
+IMPLEMENT_SMOBS(Score_element);
projects / lilypond.git / blobdiff