#include "score-engraver.hh"
#include "paper-score.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "axis-group-interface.hh"
#include "context-def.hh"
#include "staff-spacing.hh"
SCM nmp
= updated_grob_properties (context (),
ly_symbol2scm ("NonMusicalPaperColumn"));
+
+ Object_key const *key1 = context()->get_grob_key ("NonMusicalPaperColumn");
+
SCM pc = updated_grob_properties (context (),
ly_symbol2scm ("PaperColumn"));
-
- set_columns (new Paper_column (nmp), new Paper_column (pc));
+ Object_key const *key2 = context()->get_grob_key ("PaperColumn");
+ set_columns (new Paper_column (nmp, key1), new Paper_column (pc, key2));
+
+
+ scm_gc_unprotect_object (key1->self_scm());
+ scm_gc_unprotect_object (key2->self_scm());
Grob_info i1;
i1.grob_ = command_column_;
SCM w = m.smobbed_copy ();
command_column_->set_property ("when", w);
musical_column_->set_property ("when", w);
-
+
recurse_over_translators (context (), &Translator::start_translation_timestep, DOWN);
}
Font_metric *fm = all_fonts_global->find_afm ("feta20");
if (!fm)
error (_f ("can't find `%s'", "feta20.afm")
- + "\n" +_ ("Fonts have not been installed properly. Aborting"));
+ + "\n" +_ ("Music font has not been installed properly. Aborting"));
+
+ SCM pfa_path = ly_kpathsea_expand_path (scm_makfrom0str ("ecrm10.pfa"));
+ if (!scm_is_string (pfa_path))
+ error (_f ("can't find `%s'", "ecrm10.pfa")
+ + "\n" +_f ("Install the ec-mftraced package from %s. Aborting",
+ "http://lilypond.org/download/fonts/"));
pscore_ = new Paper_score;
- pscore_->paper_ = dynamic_cast<Paper_def*> (get_output_def ());
+ pscore_->layout_ = dynamic_cast<Output_def*> (get_output_def ());
SCM props = updated_grob_properties (context (), ly_symbol2scm ("System"));
- pscore_->typeset_line (new System (props));
+ Object_key const *sys_key = context()->get_grob_key ("System");
+ pscore_->typeset_line (new System (props, sys_key));
+ scm_gc_unprotect_object (sys_key->self_scm ());
make_columns ();
system_ = pscore_->system_;
if (!to_boolean (get_property ("skipTypesetting")))
{
recurse_over_translators (context (), &Engraver::process_music, UP);
- recurse_over_translators (context (), &Engraver::do_announces, UP);
+ Engraver_group_engraver::do_announces();
}
recurse_over_translators (context (), &Translator::stop_translation_timestep, UP);
{
announce_infos_.push (info);
pscore_->system_->typeset_grob (info.grob_);
- elems_.push (info.grob_);
+ elems_.push (info.grob_);
}
-void
-Score_engraver::typeset_grob (Grob *elem)
-{
- (void) elem;
- // elems_.push (elem);
-}
void
Score_engraver::typeset_all ()
{
Grob * elem = elems_[i];
-#if 0
- if (Spanner *s = dynamic_cast <Spanner *> (elem))
- {
- /*
- do something sensible if spanner not
- spanned on 2 items.
- */
- Direction d = LEFT;
- do {
- if (!s->get_bound (d))
- {
- Grob * cc
- = unsmob_grob (get_property ("currentCommandColumn"));
- s->set_bound (d, cc);
- /* don't warn for empty/suicided spanners,
- it makes real warningsinvisible.
- maybe should be junked earlier? */
- if (elem->live ())
- elem->warning (_f ("unbound spanner `%s'", s->name ().to_str0 ()));
- }
- }
- while (flip (&d) != LEFT);
-
- if (dynamic_cast<Item*> (s->get_parent (Y_AXIS)))
- programming_error ("Spanner Y-parent is an item.");
- }
-#endif
- if (dynamic_cast<Item*> (elem))
+ if (dynamic_cast<Item*> (elem))
{
if (!elem->get_parent (X_AXIS)
&& elem != command_column_
if (m->is_mus_type ("break-event"))
{
SCM pen = command_column_->get_property ("penalty");
- Real total_penalty = ly_c_number_p (pen) ? ly_scm2double (pen) : 0.0;
+ Real total_penalty = scm_is_number (pen) ? scm_to_double (pen) : 0.0;
SCM mpen = m->get_property ("penalty");
- if (ly_c_number_p (mpen))
- total_penalty += ly_scm2double (mpen);
+ if (scm_is_number (mpen))
+ total_penalty += scm_to_double (mpen);
command_column_->set_property ("penalty", scm_make_real (total_penalty));
forbid_breaks ();
SCM page_pen = command_column_->get_property ("page-penalty");
- Real total_pp = ly_c_number_p (page_pen) ? ly_scm2double (page_pen) : 0.0;
+ Real total_pp = scm_is_number (page_pen) ? scm_to_double (page_pen) : 0.0;
SCM mpage_pen = m->get_property ("page-penalty");
- if (ly_c_number_p (mpage_pen))
- total_pp += ly_scm2double (mpage_pen);
+ if (scm_is_number (mpage_pen))
+ total_pp += scm_to_double (mpage_pen);
command_column_->set_property ("page-penalty", scm_make_real (total_pp));
return true;
ly_symbol2scm ("spacing-wishes"),
gi.grob_);
}
+
+ if (Axis_group_interface::has_interface (gi.grob_)
+ && gi.grob_->internal_has_interface (ly_symbol2scm ("vertically-spaceable-interface")))
+ {
+ SCM spaceable = get_property ("verticallySpacedContexts");
+ Context *orig = gi.origin_contexts (this)[0];
+
+ if (scm_memq (ly_symbol2scm (orig->context_name ().to_str0()),
+ spaceable) != SCM_BOOL_F)
+ {
+ Pointer_group_interface::add_grob (system_,
+ ly_symbol2scm ("spaceable-staves"),
+ gi.grob_);
+ }
+ }
+
}
,
/* creats*/ "System PaperColumn NonMusicalPaperColumn",
/* accepts */ "break-event",
-/* acks */ "note-spacing-interface staff-spacing-interface",
-/* reads */ "currentMusicalColumn currentCommandColumn",
+/* acks */ "note-spacing-interface staff-spacing-interface axis-group-interface",
+/* reads */ "currentMusicalColumn currentCommandColumn verticallySpacedContexts",
/* write */ "");
projects / lilypond.git / blobdiff