source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "dimension-cache.hh"
#include "super-element.hh"
#include "line-of-score.hh"
#include "debug.hh"
#include "item.hh"
#include "score-engraver.hh"
-#include "p-score.hh"
+#include "paper-score.hh"
#include "musical-request.hh"
#include "score-column.hh"
#include "command-request.hh"
#include "paper-def.hh"
-
-
Score_engraver::Score_engraver()
{
- break_penalty_i_ = 0;
scoreline_l_ =0;
command_column_l_ =0;
musical_column_l_ =0;
{
Global_translator::prepare (w);
set_columns (new Score_column (w), new Score_column (w));
-
- break_penalty_i_ = 0;
+
+ command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
post_move_processing();
}
removal_processing();
}
+/*
+ use start/finish?
+ */
void
-Score_engraver::do_creation_processing()
+Score_engraver::do_creation_processing ()
{
scoreline_l_ = pscore_p_->line_l_;
- scoreline_l_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
- command_column_l_->breakable_b_ = true;
+
+ scoreline_l_->set_bounds(LEFT, command_column_l_);
+
+ command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+
Engraver_group_engraver::do_creation_processing();
}
+
void
Score_engraver::do_removal_processing()
{
Engraver_group_engraver::do_removal_processing();
- scoreline_l_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
- command_column_l_->breakable_b_ = true;
+ scoreline_l_->set_bounds(RIGHT,command_column_l_);
+ command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
typeset_all ();
set_columns (0,0);
Score_engraver::announce_element (Score_element_info info)
{
announce_info_arr_.push (info);
- info.origin_grav_l_arr_.push (this);
+ info.origin_trans_l_arr_.push (this);
+ pscore_p_->typeset_element (info.elem_l_);
}
+/* All elements are propagated to the top upon announcement. If
+ something was created during one run of
+ Engraver_group_engraver::do_announces, then
+ announce_info_arr_.size() will be nonzero again
+*/
+/* junkme? Done by Engraver_group_engraver::do_announces ()?
+ */
+
void
Score_engraver::do_announces()
{
- /* All elements are propagated to the top upon announcement. If
- something was created during one run of
- Engraver_group_engraver::do_announces, then
- announce_info_arr_.size() will be nonzero again
-
- */
while (announce_info_arr_.size())
- {
- for (int i=0; i < announce_info_arr_.size(); i++)
- /*
- TODO
-
- More subtle spacing
- */
- if (announce_info_arr_[i].req_l_)
- {
- Musical_req *m =dynamic_cast <Musical_req *> ( announce_info_arr_[i].req_l_);
- if (m && dynamic_cast <Rhythmic_req *> (m))
- {
- musical_column_l_->add_duration (m->duration());
- }
- }
- Engraver_group_engraver::do_announces();
- }
+ Engraver_group_engraver::do_announces();
}
for (int i =0; i < elem_p_arr_.size(); i++)
{
Score_element * elem_p = elem_p_arr_[i];
- if (dynamic_cast <Spanner *> (elem_p))
+ elem_p->add_processing ();
+
+#if 0 // TODO!
+ /*
+ elem_p wants to be connected to the rest of the
+ dependency graph.
+ */
+
+ if (elem_p->get_elt_property (dangling_scm_sym) != SCM_BOOL_F)
+ scoreline_l_->add_dependency (elem_p);
+#endif
+
+ if (Spanner *s = dynamic_cast <Spanner *> (elem_p))
{
- Spanner *s = dynamic_cast <Spanner *> (elem_p);
- pscore_p_->typeset_unbroken_spanner (s);
-
/*
do something sensible if spanner not
spanned on 2 items.
if (!s->spanned_drul_[d])
{
s->set_bounds(d, command_column_l_);
- ::warning (_f ("Unbound spanner `%s\'", s->name ()));
+ ::warning (_f ("unbound spanner `%s'", classname(s)));
}
} while (flip(&d) != LEFT);
}
else
{
Item *item_p = dynamic_cast <Item *> (elem_p);
- pscore_p_->typeset_element (item_p);
- if (!item_p->axis_group_l_a_[X_AXIS]) {
- if (item_p->breakable_b_)
- command_column_l_->add_element(item_p);
- else
- musical_column_l_->add_element(item_p);
- }
+
+ if (!item_p->parent_l (X_AXIS))
+ {
+ bool br = (item_p->remove_elt_property (breakable_scm_sym) != SCM_BOOL_F);
+ if (br)
+ command_column_l_->add_element(item_p);
+ else
+ musical_column_l_->add_element(item_p);
+ }
}
- scoreline_l_->add_element (elem_p);
+ if (!elem_p->parent_l(Y_AXIS))
+ scoreline_l_->add_element (elem_p);
}
elem_p_arr_.clear();
}
void
Score_engraver::do_pre_move_processing()
{
- if (break_penalty_i_ > Break_req::DISALLOW)
+ if (command_column_l_->get_elt_property (breakable_scm_sym) != SCM_BOOL_F)
{
- get_staff_info().command_pcol_l ()-> breakable_b_ = true;
breaks_i_ ++;
if (! (breaks_i_%8))
*mlog << "[" << breaks_i_ << "]" << flush;
if (command_column_l_ && command_column_l_->linked_b())
{
pscore_p_->add_column (command_column_l_);
- scoreline_l_->add_element (command_column_l_);
+ scoreline_l_->add_column (command_column_l_);
}
else
- {
- delete command_column_l_ ;
- command_column_l_ =0;
- }
+ command_column_l_ =0;
+
if (new_command_l)
- {
- command_column_l_ = new_command_l;
- command_column_l_->musical_b_ = false;
- }
+ command_column_l_ = new_command_l;
+
if (musical_column_l_ && musical_column_l_->linked_b())
{
pscore_p_->add_column (musical_column_l_);
- scoreline_l_->add_element (musical_column_l_);
+ scoreline_l_->add_column (musical_column_l_);
}
else
- {
- delete musical_column_l_;
- musical_column_l_ = 0;
- }
+ musical_column_l_ = 0;
if (new_musical_l)
{
musical_column_l_ = new_musical_l;
- musical_column_l_->musical_b_ = true;
}
}
}
bool
-Score_engraver::do_try_request (Request*r)
+Score_engraver::do_try_music (Music*r)
{
- bool gotcha = Engraver_group_engraver::do_try_request (r);
-
- if (gotcha || !dynamic_cast <Command_req *> (r))
- return gotcha;
+ bool gotcha = Engraver_group_engraver::do_try_music (r);
- Command_req * c = dynamic_cast <Command_req *> (r);
- if (dynamic_cast <Break_req *> (c))
+ if (!gotcha)
{
- Break_req* b = (Break_req*)dynamic_cast <Break_req *> (c);
- if (b->penalty_i_ <= Break_req::DISALLOW)
- break_penalty_i_ = b->penalty_i_;
- else if (b->penalty_i_ >= Break_req::FORCE)
+ if (Break_req* b = dynamic_cast<Break_req *> (r))
{
- command_column_l_->break_penalty_i_ = b->penalty_i_;
gotcha = true;
+
+
+ SCM pen = command_column_l_->get_elt_property (penalty_scm_sym);
+ Real total_penalty = (pen == SCM_BOOL_F)
+ ? 0.0
+ : gh_scm2double (SCM_CDR(pen)); // ugh. Should typecheck.
+
+ total_penalty += b->penalty_f_;
+ if (b->penalty_f_ > 10000.0) // ugh. arbitrary.
+ forbid_breaks ();
+
+ command_column_l_->set_elt_property (penalty_scm_sym,
+ gh_double2scm (total_penalty));
}
}
- return gotcha;
+ return gotcha;
+}
+
+void
+Score_engraver::forbid_breaks ()
+{
+ /*
+ result is junked.
+ */
+ command_column_l_->remove_elt_property (breakable_scm_sym);
}
-IMPLEMENT_IS_TYPE_B1(Score_engraver,Engraver_group_engraver);
ADD_THIS_TRANSLATOR(Score_engraver);
void
Score_engraver::do_add_processing ()
{
Translator_group::do_add_processing ();
- assert (output_def_l_->is_type_b (Paper_def::static_name ()));
+ assert (dynamic_cast<Paper_def *> (output_def_l_));
assert (!daddy_trans_l_);
pscore_p_ = new Paper_score;
- pscore_p_->paper_l_ = (Paper_def*)output_def_l_;
+ pscore_p_->paper_l_ = dynamic_cast<Paper_def*>(output_def_l_);
}
projects / lilypond.git / blobdiff