X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=c66d1d6ae989cda7c6392a49a3096a9efea068f8;hb=af770f3440264c18ce01525dce1aa76b86ace0d5;hp=fa40e5ef582a1fcd7d82665dc02ab7d3bb114db5;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index fa40e5ef58..c66d1d6ae9 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,13 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2005 Jan Nieuwenhuizen + (c) 2004--2006 Jan Nieuwenhuizen */ #include "paper-book.hh" +#include "grob.hh" #include "main.hh" #include "output-def.hh" +#include "paper-column.hh" #include "paper-score.hh" #include "paper-system.hh" #include "text-interface.hh" @@ -56,11 +58,8 @@ int 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 ("#", port); return 1; } @@ -68,9 +67,9 @@ SCM 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; } @@ -90,6 +89,13 @@ Paper_book::add_performance (SCM s) void Paper_book::output (SCM output_channel) { + if (scm_is_pair (performances_)) + { + SCM proc = ly_lily_module_constant ("write-performances-midis"); + + scm_call_2 (proc, performances (), output_channel); + } + if (scores_ == SCM_EOL) return; @@ -100,9 +106,9 @@ Paper_book::output (SCM output_channel) 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"); @@ -140,10 +146,10 @@ Paper_book::classic_output (SCM output) 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); @@ -211,8 +217,12 @@ Paper_book::score_title (SCM header) return title; } +/* read the breakbefore property of a score block and set up the preceding + system-spec to honour it. That is, SYM should be the system spec that + immediately precedes the score (from which HEADER is taken) + in the get_system_specs() list */ void -set_system_penalty (Paper_system *ps, SCM header) +set_system_penalty (SCM sys, SCM header) { if (ly_is_module (header)) { @@ -220,43 +230,62 @@ set_system_penalty (Paper_system *ps, SCM header) if (SCM_VARIABLEP (force) && scm_is_bool (SCM_VARIABLE_REF (force))) { - ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF (force)) - ? -10000 - : 10000; + bool b = to_boolean (SCM_VARIABLE_REF (force)); + SCM sym = b ? ly_symbol2scm ("force") : SCM_EOL; + + if (Paper_score *ps = dynamic_cast (unsmob_music_output (sys))) + { + vector cols = ps->get_columns (); + if (cols.size ()) + { + Paper_column *col = dynamic_cast (cols.back ()); + col->set_property ("page-break-permission", sym); + col->find_prebroken_piece (LEFT)->set_property ("page-break-permission", sym); + } + } + else if (Prob *pb = unsmob_prob (sys)) + pb->set_property ("page-break-permission", sym); } } } -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 (); - set_system_penalty (ps, header); + /* + 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); + + 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); - set_system_penalty (ps, header_); + SCM props = paper_->lookup_variable (ly_symbol2scm ("book-title-properties")); + Prob *ps = make_paper_system (props); + paper_system_set_stencil (ps, title); - systems_ = scm_cons (ps->self_scm (), systems_); + system_specs = scm_cons (ps->self_scm (), system_specs); ps->unprotect (); } @@ -265,7 +294,7 @@ Paper_book::systems () paper_->self_scm ()); SCM header = SCM_EOL; - for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s)) + for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s)) { if (ly_is_module (scm_car (s))) { @@ -274,17 +303,22 @@ Paper_book::systems () header_0_ = header; } else if (Music_output *mop = unsmob_music_output (scm_car (s))) - { if (Paper_score *pscore = dynamic_cast (mop)) { - add_score_title (header); + SCM title = get_score_title (header); - header = SCM_EOL; + if (scm_is_pair (system_specs)) + set_system_penalty (scm_car (system_specs), header); - 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_)); + if (unsmob_prob (title)) + { + system_specs = scm_cons (title, system_specs); + unsmob_prob (title)->unprotect (); + } + + header = SCM_EOL; + system_specs = scm_cons (pscore->self_scm (), system_specs); } else { @@ -293,27 +327,19 @@ Paper_book::systems () */ } } - 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::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_); } @@ -321,20 +347,57 @@ Paper_book::systems () 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 (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_); + /* backwards compatibility for the old page breaker */ int i = 0; - Paper_system *last = 0; - for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s)) + Prob *last = 0; + for (SCM s = systems_; scm_is_pair (s); 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; + + if (scm_is_pair (scm_cdr (s))) + { + SCM perm = ps->get_property ("page-break-permission"); + Prob *next = unsmob_prob (scm_cadr (s)); + if (perm == SCM_EOL) + next->set_property ("penalty", scm_from_int (10001)); + else if (perm == ly_symbol2scm ("force")) + next->set_property ("penalty", scm_from_int (-10001)); + } } return systems_; @@ -347,8 +410,22 @@ Paper_book::pages () return pages_; pages_ = SCM_EOL; - SCM proc = paper_->c_variable ("page-breaking"); - pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ())); + SCM proc = paper_->c_variable ("page-breaking-wrapper"); + pages_ = scm_apply_0 (proc, scm_list_1 (self_scm ())); + + /* set systems_ from the pages */ + if (systems_ == SCM_BOOL_F) + { + systems_ = SCM_EOL; + for (SCM p = pages_; scm_is_pair (p); p = scm_cdr (p)) + { + Prob *page = unsmob_prob (scm_car (p)); + SCM systems = page->get_property ("lines"); + + systems_ = scm_append (scm_list_2 (systems_, systems)); + } + } + return pages_; }