*/
#include "paper-book.hh"
-#include "paper-score.hh"
+
#include "main.hh"
#include "output-def.hh"
#include "paper-score.hh"
#include "paper-system.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "warn.hh"
#include "ly-smobs.icc"
header_0_ = SCM_EOL;
pages_ = SCM_BOOL_F;
scores_ = SCM_EOL;
+ performances_ = SCM_EOL;
systems_ = SCM_BOOL_F;
paper_ = 0;
}
IMPLEMENT_DEFAULT_EQUAL_P (Paper_book);
-IMPLEMENT_SMOBS (Paper_book)
- IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?")
+IMPLEMENT_SMOBS (Paper_book);
+IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?");
- SCM
+SCM
Paper_book::mark_smob (SCM smob)
{
Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
scm_gc_mark (b->header_);
scm_gc_mark (b->header_0_);
scm_gc_mark (b->pages_);
+ scm_gc_mark (b->performances_);
scm_gc_mark (b->scores_);
return b->systems_;
}
scores_ = scm_cons (s, scores_);
}
+
+void
+Paper_book::add_performance (SCM s)
+{
+ performances_ = scm_cons (s, performances_);
+}
+
+
void
-Paper_book::output (String outname)
+Paper_book::output (SCM output_channel)
{
if (scores_ == SCM_EOL)
return;
pages ();
SCM scopes = SCM_EOL;
- if (ly_c_module_p (header_))
+ if (ly_is_module (header_))
scopes = scm_cons (header_, scopes);
String mod_nm = "scm framework-" + output_backend_global;
SCM func = scm_c_module_lookup (mod, "output-framework");
func = scm_variable_ref (func);
- scm_apply_0 (func, scm_list_n (scm_makfrom0str (outname.to_str0 ()),
+ scm_apply_0 (func, scm_list_n (output_channel,
self_scm (),
scopes,
dump_fields (),
{
SCM func = scm_c_module_lookup (mod, "output-preview-framework");
func = scm_variable_ref (func);
- scm_apply_0 (func, scm_list_n (scm_makfrom0str (outname.to_str0 ()),
+ scm_apply_0 (func, scm_list_n (output_channel,
self_scm (),
scopes,
dump_fields (),
}
void
-Paper_book::classic_output (String outname)
+Paper_book::classic_output (SCM output)
{
/* Generate all stencils to trigger font loads. */
systems ();
SCM scopes = SCM_EOL;
- if (ly_c_module_p (header_))
+ if (ly_is_module (header_))
scopes = scm_cons (header_, scopes);
- if (ly_c_module_p (header_0_))
+ if (ly_is_module (header_0_))
scopes = scm_cons (header_0_, scopes);
String format = output_backend_global;
SCM func = scm_c_module_lookup (mod, "output-classic-framework");
func = scm_variable_ref (func);
- scm_apply_0 (func, scm_list_n (scm_makfrom0str (outname.to_str0 ()),
+ scm_apply_0 (func, scm_list_n (output,
self_scm (),
scopes,
dump_fields (),
Stencil title;
SCM scopes = SCM_EOL;
- if (ly_c_module_p (header_))
+ if (ly_is_module (header_))
scopes = scm_cons (header_, scopes);
SCM tit = SCM_EOL;
- if (ly_c_procedure_p (title_func))
+ if (ly_is_procedure (title_func))
tit = scm_call_2 (title_func,
paper_->self_scm (),
scopes);
Stencil title;
SCM scopes = SCM_EOL;
- if (ly_c_module_p (header_))
+ if (ly_is_module (header_))
scopes = scm_cons (header_, scopes);
- if (ly_c_module_p (header))
+ if (ly_is_module (header))
scopes = scm_cons (header, scopes);
SCM tit = SCM_EOL;
- if (ly_c_procedure_p (title_func))
+ if (ly_is_procedure (title_func))
tit = scm_call_2 (title_func,
paper_->self_scm (),
scopes);
void
set_system_penalty (Paper_system *ps, SCM header)
{
- if (ly_c_module_p (header))
+ if (ly_is_module (header))
{
SCM force = ly_module_lookup (header, ly_symbol2scm ("breakbefore"));
if (SCM_VARIABLEP (force)
SCM header = SCM_EOL;
for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
{
- if (ly_c_module_p (scm_car (s)))
+ if (ly_is_module (scm_car (s)))
{
header = scm_car (s);
if (header_0_ == SCM_EOL)
header_0_ = header;
}
- else if (Paper_score *pscore
- = dynamic_cast<Paper_score *> (unsmob_music_output (scm_car (s))))
+ else if (Music_output *mop = unsmob_music_output (scm_car (s)))
+
{
- add_score_title (header);
+ if (Paper_score *pscore = dynamic_cast<Paper_score *> (mop))
+ {
+ add_score_title (header);
- header = SCM_EOL;
-
+ header = SCM_EOL;
- SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
- system_list = scm_reverse (system_list);
- systems_ = scm_append (scm_list_2 (system_list, systems_));
+ SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
+ system_list = scm_reverse (system_list);
+ systems_ = scm_append (scm_list_2 (system_list, systems_));
+ }
+ else
+ {
+ /*
+ Ignore MIDI
+ */
+ }
}
else if (scm_is_vector (scm_car (s)))
{
/*
UGH. code dup.
- */
+ */
add_score_title (header);
header = SCM_EOL;
pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ()));
return pages_;
}
+
+SCM
+Paper_book::performances () const
+{
+ return scm_reverse (performances_);
+}