Paper_book::Paper_book ()
{
+ header_ = SCM_EOL;
+ header_0_ = SCM_EOL;
pages_ = SCM_BOOL_F;
+ scores_ = SCM_EOL;
systems_ = SCM_BOOL_F;
- header_ = SCM_EOL;
-
+
paper_ = 0;
smobify_self ();
}
IMPLEMENT_DEFAULT_EQUAL_P (Paper_book);
IMPLEMENT_SMOBS (Paper_book)
-IMPLEMENT_TYPE_P (Paper_book, "ly: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);
- for (int i = 0; i < b->score_systems_.size (); i++)
- b->score_systems_[i].gc_mark ();
-
+ Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
if (b->paper_)
scm_gc_mark (b->paper_->self_scm ());
scm_gc_mark (b->header_);
+ scm_gc_mark (b->header_0_);
scm_gc_mark (b->pages_);
+ scm_gc_mark (b->scores_);
return b->systems_;
}
int
Paper_book::print_smob (SCM smob, SCM port, scm_print_state*)
{
- Paper_book *b = (Paper_book*) SCM_CELL_WORD_1 (smob);
-
+ Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
+
scm_puts ("#<", port);
scm_puts (classname (b), port);
scm_puts (" ", port);
dump_fields ()
{
SCM fields = SCM_EOL;
- for (int i = dump_header_fieldnames_global.size (); i--; )
+ for (int i = dump_header_fieldnames_global.size (); i--;)
fields
= scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
fields);
return fields;
}
+void
+Paper_book::add_score (SCM s)
+{
+ scores_ = scm_cons (s, scores_);
+}
+
void
Paper_book::output (String outname)
{
- if (!score_systems_.size ())
+ if (scores_ == SCM_EOL)
return;
/* Generate all stencils to trigger font loads. */
pages ();
-
+
SCM scopes = SCM_EOL;
if (ly_c_module_p (header_))
scopes = scm_cons (header_, scopes);
-
+
String mod_nm = "scm framework-" + output_backend_global;
SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
dump_fields (),
SCM_UNDEFINED));
}
-
+
if (make_preview)
{
SCM func = scm_c_module_lookup (mod, "output-preview-framework");
/* Generate all stencils to trigger font loads. */
systems ();
- // ugh code dup
SCM scopes = SCM_EOL;
if (ly_c_module_p (header_))
scopes = scm_cons (header_, scopes);
- if (ly_c_module_p (score_systems_[0].header_))
- scopes = scm_cons (score_systems_[0].header_, scopes);
- //end ugh
+ if (ly_c_module_p (header_0_))
+ scopes = scm_cons (header_0_, scopes);
String format = output_backend_global;
String mod_nm = "scm framework-" + format;
-
+
SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
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 ()),
progress_indication ("\n");
}
-
/* TODO: resurrect more complex user-tweaks for titling? */
Stencil
Paper_book::book_title ()
if (ly_c_module_p (header_))
scopes = scm_cons (header_, scopes);
-
SCM tit = SCM_EOL;
if (ly_c_procedure_p (title_func))
tit = scm_call_2 (title_func,
- paper_->self_scm (),
- scopes);
+ paper_->self_scm (),
+ scopes);
if (unsmob_stencil (tit))
title = *unsmob_stencil (tit);
if (!title.is_empty ())
title.align_to (Y_AXIS, UP);
-
+
return title;
}
Stencil
-Paper_book::score_title (int i)
+Paper_book::score_title (SCM header)
{
SCM title_func = paper_->lookup_variable (ly_symbol2scm ("score-title"));
Stencil title;
- // ugh code dup
SCM scopes = SCM_EOL;
if (ly_c_module_p (header_))
scopes = scm_cons (header_, scopes);
- if (ly_c_module_p (score_systems_[i].header_))
- scopes = scm_cons (score_systems_[i].header_, scopes);
- //end ugh
+ if (ly_c_module_p (header))
+ scopes = scm_cons (header, scopes);
SCM tit = SCM_EOL;
if (ly_c_procedure_p (title_func))
tit = scm_call_2 (title_func,
- paper_->self_scm (),
- scopes);
+ paper_->self_scm (),
+ scopes);
if (unsmob_stencil (tit))
title = *unsmob_stencil (tit);
if (!title.is_empty ())
title.align_to (Y_AXIS, UP);
-
+
return title;
}
void
-set_system_penalty (Paper_system * ps, SCM header)
+set_system_penalty (Paper_system *ps, SCM header)
{
if (ly_c_module_p (header))
{
SCM force = ly_module_lookup (header, ly_symbol2scm ("breakbefore"));
- if (SCM_VARIABLEP(force)
- && scm_is_bool (SCM_VARIABLE_REF(force)))
+ if (SCM_VARIABLEP (force)
+ && scm_is_bool (SCM_VARIABLE_REF (force)))
{
- ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF(force))
+ ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF (force))
? -10000
: 10000;
}
}
}
-
+
SCM
Paper_book::systems ()
{
{
Paper_system *ps = new Paper_system (title, true);
set_system_penalty (ps, header_);
-
+
systems_ = scm_cons (ps->self_scm (), systems_);
scm_gc_unprotect_object (ps->self_scm ());
}
= scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"),
paper_->self_scm ());
- int score_count = score_systems_.size ();
- for (int i = 0; i < score_count; i++)
+ SCM header = SCM_EOL;
+ for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
{
- Stencil title = score_title (i);
- if (!title.is_empty ())
+ if (ly_c_module_p (scm_car (s)))
{
- Paper_system *ps = new Paper_system (title, true);
- systems_ = scm_cons (ps->self_scm (), systems_);
- scm_gc_unprotect_object (ps->self_scm ());
-
- set_system_penalty (ps, score_systems_[i].header_);
-
- }
-
- if (scm_vector_p (score_systems_[i].systems_) == SCM_BOOL_T)
+ header = scm_car (s);
+ if (header_0_ == SCM_EOL)
+ header_0_ = header;
+ }
+ else if (scm_is_vector (scm_car (s)))
{
- // guh.
- SCM system_list = scm_vector_to_list (score_systems_[i].systems_);
-
+ Stencil title = score_title (header);
+ if (title.is_empty ())
+ title = score_title (header_);
+ if (!title.is_empty ())
+ {
+ Paper_system *ps = new Paper_system (title, true);
+ systems_ = scm_cons (ps->self_scm (), systems_);
+ scm_gc_unprotect_object (ps->self_scm ());
+ set_system_penalty (ps, header);
+ }
+ header = SCM_EOL;
+
+ SCM system_list = scm_vector_to_list (scm_car (s));
system_list = scm_reverse (system_list);
systems_ = scm_append (scm_list_2 (system_list, systems_));
}
-
- for (SCM s = score_systems_[i].texts_; s != SCM_EOL; s = scm_cdr (s))
+ else if (Text_interface::markup_p (scm_car (s)))
{
SCM t = Text_interface::interpret_markup (paper_->self_scm (),
page_properties,
systems_ = scm_cons (ps->self_scm (), systems_);
scm_gc_unprotect_object (ps->self_scm ());
// FIXME: figure out penalty.
- //set_system_penalty (ps, score_systems_[i].header_);
+ //set_system_penalty (ps, scores_[i].header_);
}
+ else
+ assert (0);
}
-
+
systems_ = scm_reverse (systems_);
-
+
int i = 0;
Paper_system *last = 0;
for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s))
ps->break_before_penalty_ = 10000;
last = ps;
}
-
+
return systems_;
}
pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ()));
return pages_;
}
-
-
-/****************************************************************/
-
-Score_systems::Score_systems ()
-{
- systems_ = SCM_EOL;
- header_ = SCM_EOL;
- texts_ = SCM_EOL;
-}
-
-void
-Score_systems::gc_mark ()
-{
- scm_gc_mark (systems_);
- scm_gc_mark (header_);
- scm_gc_mark (texts_);
-}
-
projects / lilypond.git / blobdiff