source file of the GNU LilyPond music typesetter
- (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "paper-book.hh"
Paper_book::print_smob (SCM smob, SCM port, scm_print_state*)
{
Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
-
- scm_puts ("#<", port);
- scm_puts (classname (b), port);
- scm_puts (" ", port);
- scm_puts (">", port);
+ (void)b;
+ scm_puts ("#<Paper_book>", port);
return 1;
}
dump_fields ()
{
SCM fields = SCM_EOL;
- for (int i = dump_header_fieldnames_global.size (); i--;)
+ for (vsize i = dump_header_fieldnames_global.size (); i--;)
fields
- = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
+ = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].c_str ()),
fields);
return fields;
}
scores_ = scm_cons (s, scores_);
}
-
void
Paper_book::add_performance (SCM s)
{
performances_ = scm_cons (s, performances_);
}
-
void
Paper_book::output (SCM output_channel)
{
+ if (scm_is_pair (performances_))
+ {
+ SCM proc = ly_lily_module_constant ("paper-book-write-midis");
+
+ scm_call_2 (proc, self_scm (), output_channel);
+ }
+
if (scores_ == SCM_EOL)
return;
if (ly_is_module (header_))
scopes = scm_cons (header_, scopes);
- String mod_nm = "scm framework-" + output_backend_global;
+ string mod_nm = "scm framework-" + output_backend_global;
- SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+ SCM mod = scm_c_resolve_module (mod_nm.c_str ());
if (make_print)
{
SCM func = scm_c_module_lookup (mod, "output-framework");
if (ly_is_module (header_0_))
scopes = scm_cons (header_0_, scopes);
- String format = output_backend_global;
- String mod_nm = "scm framework-" + format;
+ string format = output_backend_global;
+ string mod_nm = "scm framework-" + format;
- SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+ SCM mod = scm_c_resolve_module (mod_nm.c_str ());
SCM func = scm_c_module_lookup (mod, "output-classic-framework");
func = scm_variable_ref (func);
}
void
-set_system_penalty (Paper_system *ps, SCM header)
+set_system_penalty (Prob *ps, SCM header)
{
if (ly_is_module (header))
{
if (SCM_VARIABLEP (force)
&& scm_is_bool (SCM_VARIABLE_REF (force)))
{
- ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF (force))
- ? -10000
- : 10000;
+ ps->set_property ("penalty",
+ scm_from_int(to_boolean (SCM_VARIABLE_REF (force))
+ ? -10000
+ : 10000));
}
}
}
-void
-Paper_book::add_score_title (SCM header)
+
+SCM
+Paper_book::get_score_title (SCM header)
{
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_);
- ps->unprotect ();
+ /*
+ TODO: this should come from the \layout {} block, which should
+ override settings from \paper {}
+ */
+ SCM props = paper_->lookup_variable (ly_symbol2scm ("score-title-properties"));
+ Prob *ps = make_paper_system (props);
+ paper_system_set_stencil (ps, title);
set_system_penalty (ps, header);
+
+ return ps->self_scm();
}
+
+ return SCM_BOOL_F;
}
+
SCM
-Paper_book::systems ()
+Paper_book::get_system_specs ()
{
- if (systems_ != SCM_BOOL_F)
- return systems_;
-
- systems_ = SCM_EOL;
+ SCM system_specs = SCM_EOL;
+
Stencil title = book_title ();
-
if (!title.is_empty ())
{
- Paper_system *ps = new Paper_system (title, true);
+ SCM props = paper_->lookup_variable (ly_symbol2scm ("book-title-properties"));
+ Prob *ps = make_paper_system (props);
+ paper_system_set_stencil (ps, title);
set_system_penalty (ps, header_);
- systems_ = scm_cons (ps->self_scm (), systems_);
+ system_specs = scm_cons (ps->self_scm (), system_specs);
ps->unprotect ();
}
header_0_ = header;
}
else if (Music_output *mop = unsmob_music_output (scm_car (s)))
-
{
if (Paper_score *pscore = dynamic_cast<Paper_score *> (mop))
{
- add_score_title (header);
-
+ SCM title = get_score_title (header);
+ if (unsmob_prob (title))
+ {
+ system_specs = scm_cons (title, system_specs);
+ unsmob_prob (title)->unprotect ();
+ }
+
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_));
+ system_specs = scm_cons (pscore->self_scm (), system_specs);
}
else
{
*/
}
}
- else if (scm_is_vector (scm_car (s)))
- {
- /*
- UGH. code dup.
- */
- add_score_title (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_));
- }
- else if (Text_interface::markup_p (scm_car (s)))
+ else if (Text_interface::is_markup (scm_car (s)))
{
SCM t = Text_interface::interpret_markup (paper_->self_scm (),
page_properties,
scm_car (s));
- // FIXME: title=true?
- Paper_system *ps = new Paper_system (*unsmob_stencil (t), true);
- systems_ = scm_cons (ps->self_scm (), systems_);
+
+ // TODO: init props
+ Prob *ps = make_paper_system (SCM_EOL);
+ paper_system_set_stencil (ps, *unsmob_stencil (t));
+ ps->set_property ("is-title", SCM_BOOL_T);
+ system_specs = scm_cons (ps->self_scm (), system_specs);
ps->unprotect ();
+
// FIXME: figure out penalty.
//set_system_penalty (ps, scores_[i].header_);
}
assert (0);
}
+ system_specs = scm_reverse_x (system_specs, SCM_EOL);
+ return system_specs;
+}
+
+SCM
+Paper_book::systems ()
+{
+ if (systems_ != SCM_BOOL_F)
+ return systems_;
+
+ systems_ = SCM_EOL;
+ SCM specs = get_system_specs ();
+ for (SCM s = specs; scm_is_pair (s); s = scm_cdr (s))
+ {
+ if (Paper_score *pscore = dynamic_cast<Paper_score*> (unsmob_music_output (scm_car (s))))
+ {
+ 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
+ {
+ systems_ = scm_cons (scm_car (s), systems_);
+ }
+ }
+
systems_ = scm_reverse (systems_);
int i = 0;
- Paper_system *last = 0;
+ Prob *last = 0;
for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s))
{
- Paper_system *ps = unsmob_paper_system (scm_car (s));
- ps->number_ = ++i;
+ Prob *ps = unsmob_prob (scm_car (s));
+ ps->set_property ("number", scm_from_int (++i));
if (last
- && last->is_title ()
- && !ps->break_before_penalty_)
- ps->break_before_penalty_ = 10000;
+ && to_boolean (last->get_property ("is-title"))
+ && !scm_is_number (ps->get_property ("penalty")))
+ ps->set_property ("penalty", scm_from_int (10000));
last = ps;
}
projects / lilypond.git / blobdiff