#include "input-smob.hh"
#include "axis-group-interface.hh"
-#include "debug.hh"
-#include "line-of-score.hh"
+#include "warn.hh"
+#include "system.hh"
#include "main.hh"
#include "paper-column.hh"
#include "paper-def.hh"
#include "dimensions.hh"
#include "molecule.hh"
#include "all-font-metrics.hh"
+#include "spacing-interface.hh"
// todo: use map.
void
System::System (SCM s)
: Spanner (s)
{
- rank_i_ = 0;
-
- Axis_group_interface::set_interface (this);
- Axis_group_interface::set_axes (this, Y_AXIS,X_AXIS);
+ rank_ = 0;
}
int
}
void
-System::typeset_grob (Grob * elem_p)
+System::typeset_grob (Grob * elem)
{
- elem_p->pscore_l_ = pscore_l_;
- Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"),elem_p);
- scm_gc_unprotect_object (elem_p->self_scm ());
+ elem->pscore_ = pscore_;
+ Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"),elem);
+ scm_gc_unprotect_object (elem->self_scm ());
}
void
for (SCM s = get_grob_property ("all-elements");
gh_pair_p (s); s = ly_cdr (s))
{
- unsmob_grob (ly_car (s))->do_break_processing ();
+ Grob * g = unsmob_grob (ly_car (s));
+ if (Spacing_interface::has_interface (g))
+ {
+ /*
+ Kill no longer needed grobs.
+ */
+ Item * it = dynamic_cast<Item*> (g);
+ if (it && Item::breakable_b(it))
+ {
+ it->find_prebroken_piece (LEFT)->suicide();
+ it->find_prebroken_piece (RIGHT)->suicide();
+ }
+ g->suicide ();
+ }
+ else if (g->live ())
+ g->do_break_processing ();
}
/*
fixups must be done in broken line_of_scores, because new elements
are put over there. */
int count = 0;
- for (int i=0; i < broken_into_l_arr_.size (); i++)
+ for (int i=0; i < broken_intos_.size (); i++)
{
- Grob *se = broken_into_l_arr_[i];
+ Grob *se = broken_intos_[i];
SCM all = se->get_grob_property ("all-elements");
for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
{
progress_indication (_f ("Element count %d.", count + element_count ()));
- for (int i=0; i < broken_into_l_arr_.size (); i++)
+ for (int i=0; i < broken_intos_.size (); i++)
{
- System *line_l = dynamic_cast<System*> (broken_into_l_arr_[i]);
+ System *system = dynamic_cast<System*> (broken_intos_[i]);
if (verbose_global_b)
progress_indication ("[");
- line_l->post_processing (i+1 == broken_into_l_arr_.size ());
+ system->post_processing (i+1 == broken_intos_.size ());
if (verbose_global_b)
{
- progress_indication (to_str (i));
+ progress_indication (to_string (i));
progress_indication ("]");
}
- if (i < broken_into_l_arr_.size () - 1)
+ if (i < broken_intos_.size () - 1)
{
- SCM lastcol = ly_car (line_l->get_grob_property ("columns"));
+ SCM lastcol = ly_car (system->get_grob_property ("columns"));
Grob* e = unsmob_grob (lastcol);
SCM between = ly_symbol2scm ("between-system-string");
SCM inter = e->internal_get_grob_property (between);
if (gh_string_p (inter))
{
- pscore_l_->outputter_l_
+ pscore_->outputter_
->output_scheme (scm_list_n (between,
inter, SCM_UNDEFINED));
}
Item *loose = dynamic_cast<Item*> (posns->loose_cols_[i]);
Paper_column* col = dynamic_cast<Paper_column*> (loose);
- if (col->line_l_)
+ if (col->system_)
continue;
if (!left && l)
{
- left = l->column_l ();
+ left = l->get_column ();
}
divide_over ++;
- loose = right = r->column_l ();
+ loose = right = r->get_column ();
}
while (1);
Paper_column *thiscol = dynamic_cast<Paper_column*> (loose);
- thiscol->line_l_ = which;
+ thiscol->system_ = which;
thiscol->translate_axis (lx + j*(rx - lx)/divide_over, X_AXIS);
j ++;
else
dx *= 0.5;
- col->line_l_ = which;
+ col->system_ = which;
col->translate_axis (lx + dx - cval[LEFT], X_AXIS);
#endif
}
{
for (int i=0; i < breaking.size (); i++)
{
- System *line_l = dynamic_cast <System*> (clone ());
- line_l->rank_i_ = i;
- // line_l->set_immutable_grob_property ("rank", gh_int2scm (i));
+ System *system = dynamic_cast <System*> (clone ());
+ system->rank_ = i;
+ // system->set_immutable_grob_property ("rank", gh_int2scm (i));
Link_array<Grob> c (breaking[i].cols_);
- pscore_l_->typeset_line (line_l);
+ pscore_->typeset_line (system);
- line_l->set_bound (LEFT,c[0]);
- line_l->set_bound (RIGHT,c.top ());
+ system->set_bound (LEFT,c[0]);
+ system->set_bound (RIGHT,c.top ());
for (int j=0; j < c.size (); j++)
{
c[j]->translate_axis (breaking[i].config_[j],X_AXIS);
- dynamic_cast<Paper_column*> (c[j])->line_l_ = line_l;
+ dynamic_cast<Paper_column*> (c[j])->system_ = system;
}
- set_loose_columns (line_l, &breaking[i]);
- broken_into_l_arr_.push (line_l);
+ set_loose_columns (system, &breaking[i]);
+ broken_intos_.push (system);
}
}
-#define GLOBAL_SYMBOL(cname, name) \
-SCM cname ; \
-void \
-cname ## _init_func () \
-{ \
- cname = ly_symbol2scm (name); \
- scm_permanent_object (cname); \
-} \
-ADD_SCM_INIT_FUNC (cname,cname ## _init_func);\
-
-
-GLOBAL_SYMBOL (offset_sym , "translate-molecule");
-GLOBAL_SYMBOL (placebox_sym , "placebox");
-GLOBAL_SYMBOL (combine_sym , "combine-molecule");
-
-
-
void
System::output_molecule (SCM expr, Offset o)
{
Input * ip = unsmob_input (head);
- pscore_l_->outputter_l_->output_scheme (scm_list_n (ly_symbol2scm ("define-origin"),
- ly_str02scm (ip->file_str ().ch_C ()),
+ pscore_->outputter_->output_scheme (scm_list_n (ly_symbol2scm ("define-origin"),
+ scm_makfrom0str (ip->file_string ().to_str0 ()),
gh_int2scm (ip->line_number ()),
gh_int2scm (ip->column_number ()),
SCM_UNDEFINED));
}
else if (head == ly_symbol2scm ("no-origin"))
{
- pscore_l_->outputter_l_->output_scheme (scm_list_n (head, SCM_UNDEFINED));
+ pscore_->outputter_->output_scheme (scm_list_n (head, SCM_UNDEFINED));
expr = ly_cadr (expr);
}
else if (head == ly_symbol2scm ("translate-molecule"))
}
else
{
- pscore_l_->outputter_l_->
- output_scheme (scm_list_n (placebox_sym,
+ pscore_->outputter_->
+ output_scheme (scm_list_n (ly_symbol2scm ("placebox"),
gh_double2scm (o[X_AXIS]),
gh_double2scm (o[Y_AXIS]),
expr,
void
System::output_scheme (SCM s)
{
- pscore_l_->outputter_l_->output_scheme (s);
+ pscore_->outputter_->output_scheme (s);
}
void
SCM cs = me->get_grob_property ("columns");
Grob * prev = gh_pair_p (cs) ? unsmob_grob (ly_car (cs)) : 0;
- p->rank_i_ = prev ? Paper_column::rank_i (prev) + 1 : 0;
+ p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0;
me->set_grob_property ("columns", gh_cons (p->self_scm (), cs));
unsmob_grob (ly_car (s))->discretionary_processing ();
if (verbose_global_b)
- progress_indication (_f ("Element count %d ", element_count ()));
+ progress_indication (_f ("Grob count %d ", element_count ()));
for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
/*
font defs;
*/
- SCM font_names = ly_quote_scm (paper_l ()->font_descriptions ());
+ SCM font_names = ly_quote_scm (get_paper ()->font_descriptions ());
output_scheme (scm_list_n (ly_symbol2scm ("define-fonts"),
font_names,
SCM_UNDEFINED));
/*
line preamble.
*/
- output_scheme (scm_list_n (ly_symbol2scm ("start-line"),
+ output_scheme (scm_list_n (ly_symbol2scm ("start-system"),
gh_double2scm (height),
SCM_UNDEFINED));
if (last_line)
{
- output_scheme (scm_list_n (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED));
+ output_scheme (scm_list_n (ly_symbol2scm ("stop-last-system"), SCM_UNDEFINED));
}
else
{
- output_scheme (scm_list_n (ly_symbol2scm ("stop-line"), SCM_UNDEFINED));
+ output_scheme (scm_list_n (ly_symbol2scm ("stop-system"), SCM_UNDEFINED));
}
}
{
Link_array<Item> ret;
- l = l->column_l ();
- r = r->column_l ();
+ l = l->get_column ();
+ r = r->get_column ();
SCM s = get_grob_property ("columns");
while (gh_pair_p (s) && ly_car (s) != r->self_scm ())
while (gh_pair_p (s) && ly_car (s) != l->self_scm ())
{
Paper_column*c = dynamic_cast<Paper_column*> (unsmob_grob (ly_car (s)));
- if (Item::breakable_b (c) && !c->line_l_)
+ if (Item::breakable_b (c) && !c->system_)
ret.push (c);
s = ly_cdr (s);
disrupt the spacing problem.
*/
Link_array<Grob>
-System::column_l_arr ()const
+System::columns ()const
{
Link_array<Grob> acs
= Pointer_group_interface__extract_grobs (this, (Grob*) 0, "columns");
return acs;
}
+
+
+
+ADD_INTERFACE (System,"system-interface",
+ "Super grob, parent of all:
+
+The columns of a score that form one line. The toplevel grob. Any
+grob has a Line_of_score as both X and Y reference point. The
+Paper_score contains one grob of this type. Control enters the
+Grob dependency calculation from this single Line_of_score
+object.",
+ "between-system-string all-elements columns");
projects / lilypond.git / blobdiff