X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=020c2e7b21248722977acd93f0885a4ac5ef876e;hb=a40e959dba858a468bede003e1f07438c6700fad;hp=81376da0a4b2e1bb2519cb83df14ff883442b9bb;hpb=837a30f66f73ed048a82bef3a3ff1551d06a96da;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 81376da0a4..020c2e7b21 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,17 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2006 Jan Nieuwenhuizen + (c) 2004--2007 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" #include "warn.hh" +#include "program-option.hh" +#include "page-marker.hh" #include "ly-smobs.icc" @@ -89,9 +93,9 @@ 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); + SCM proc = ly_lily_module_constant ("write-performances-midis"); + + scm_call_2 (proc, performances (), output_channel); } if (scores_ == SCM_EOL) @@ -104,10 +108,11 @@ 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-" + get_output_backend_name (); SCM mod = scm_c_resolve_module (mod_nm.c_str ()); - if (make_print) + + if (get_program_option ("print-pages")) { SCM func = scm_c_module_lookup (mod, "output-framework"); @@ -119,7 +124,7 @@ Paper_book::output (SCM output_channel) SCM_UNDEFINED)); } - if (make_preview) + if (get_program_option ("preview")) { SCM func = scm_c_module_lookup (mod, "output-preview-framework"); func = scm_variable_ref (func); @@ -134,6 +139,13 @@ Paper_book::output (SCM output_channel) void Paper_book::classic_output (SCM output) { + if (scm_is_pair (performances_)) + { + SCM proc = ly_lily_module_constant ("write-performances-midis"); + + scm_call_2 (proc, performances (), output); + } + /* Generate all stencils to trigger font loads. */ systems (); @@ -144,7 +156,7 @@ Paper_book::classic_output (SCM output) if (ly_is_module (header_0_)) scopes = scm_cons (header_0_, scopes); - string format = output_backend_global; + string format = get_output_backend_name (); string mod_nm = "scm framework-" + format; SCM mod = scm_c_resolve_module (mod_nm.c_str ()); @@ -216,7 +228,28 @@ Paper_book::score_title (SCM header) } void -set_system_penalty (Prob *ps, SCM header) +set_page_permission (SCM sys, SCM symbol, SCM permission) +{ + 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 (symbol, permission); + col->find_prebroken_piece (LEFT)->set_property (symbol, permission); + } + } + else if (Prob *pb = unsmob_prob (sys)) + pb->set_property (symbol, permission); +} + +/* read the breakbefore property of a score block and set up the preceding + system-spec to honour it. That is, SYS 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 (SCM sys, SCM header) { if (ly_is_module (header)) { @@ -224,14 +257,42 @@ set_system_penalty (Prob *ps, SCM header) if (SCM_VARIABLEP (force) && scm_is_bool (SCM_VARIABLE_REF (force))) { - ps->set_property ("penalty", - scm_from_int(to_boolean (SCM_VARIABLE_REF (force)) - ? -10000 - : 10000)); + if (to_boolean (SCM_VARIABLE_REF (force))) + { + set_page_permission (sys, ly_symbol2scm ("page-break-permission"), + ly_symbol2scm ("force")); + set_page_permission (sys, ly_symbol2scm ("line-break-permission"), + ly_symbol2scm ("force")); + } + else + set_page_permission (sys, ly_symbol2scm ("page-break-permission"), SCM_EOL); } } } +void +set_labels (SCM sys, SCM labels) +{ + if (Paper_score *ps = dynamic_cast (unsmob_music_output (sys))) + { + vector cols = ps->get_columns (); + if (cols.size ()) + { + Paper_column *col = dynamic_cast (cols[0]); + col->set_property ("labels", + scm_append_x (scm_list_2 (col->get_property ("labels"), + labels))); + Paper_column *col_right = dynamic_cast (col->find_prebroken_piece (RIGHT)); + col_right->set_property ("labels", + scm_append_x (scm_list_2 (col_right->get_property ("labels"), + labels))); + } + } + else if (Prob *pb = unsmob_prob (sys)) + pb->set_property ("labels", + scm_append_x (scm_list_2 (pb->get_property ("labels"), + labels))); +} SCM Paper_book::get_score_title (SCM header) @@ -248,9 +309,8 @@ Paper_book::get_score_title (SCM header) 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 ps->self_scm (); } return SCM_BOOL_F; @@ -268,7 +328,6 @@ Paper_book::get_system_specs () 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_); system_specs = scm_cons (ps->self_scm (), system_specs); ps->unprotect (); @@ -278,8 +337,10 @@ Paper_book::get_system_specs () = scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"), paper_->self_scm ()); + SCM interpret_markup_list = ly_lily_module_constant ("interpret-markup-list"); SCM header = SCM_EOL; - for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s)) + SCM labels = SCM_EOL; + for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s)) { if (ly_is_module (scm_car (s))) { @@ -287,11 +348,33 @@ Paper_book::get_system_specs () if (header_0_ == SCM_EOL) header_0_ = header; } + else if (Page_marker *page_marker = unsmob_page_marker (scm_car (s))) + { + /* page markers are used to set page breaking/turning permission, + or to place bookmarking labels */ + if (scm_is_symbol (page_marker->permission_symbol ())) + { + /* set previous element page break or turn permission */ + if (scm_is_pair (system_specs)) + set_page_permission (scm_car (system_specs), + page_marker->permission_symbol (), + page_marker->permission_value ()); + } + if (scm_is_symbol (page_marker->label ())) + { + /* The next element label is to be set */ + labels = scm_cons (page_marker->label (), labels); + } + } else if (Music_output *mop = unsmob_music_output (scm_car (s))) { if (Paper_score *pscore = dynamic_cast (mop)) { SCM title = get_score_title (header); + + if (scm_is_pair (system_specs)) + set_system_penalty (scm_car (system_specs), header); + if (unsmob_prob (title)) { system_specs = scm_cons (title, system_specs); @@ -300,6 +383,11 @@ Paper_book::get_system_specs () header = SCM_EOL; system_specs = scm_cons (pscore->self_scm (), system_specs); + if (scm_is_pair (labels)) + { + set_labels (scm_car (system_specs), labels); + labels = SCM_EOL; + } } else { @@ -308,21 +396,42 @@ Paper_book::get_system_specs () */ } } - else if (Text_interface::is_markup (scm_car (s))) + else if (Text_interface::is_markup_list (scm_car (s))) { - SCM t = Text_interface::interpret_markup (paper_->self_scm (), - page_properties, - scm_car (s)); - - // 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_); + SCM texts = scm_call_3 (interpret_markup_list, + paper_->self_scm (), + page_properties, + scm_car (s)); + for (SCM list = texts ; scm_is_pair (list) ; list = scm_cdr (list)) + { + SCM t = scm_car (list); + // TODO: init props + Prob *ps = make_paper_system (SCM_EOL); + ps->set_property ("page-break-permission", ly_symbol2scm ("allow")); + ps->set_property ("page-turn-permission", ly_symbol2scm ("allow")); + + paper_system_set_stencil (ps, *unsmob_stencil (t)); + ps->set_property ("is-title", SCM_BOOL_T); + if (scm_is_pair (scm_cdr (list))) + { + /* If an other markup is following, set this markup + * next padding and next space to 0, so that baseline-skip + * only should be taken into account for lines vertical + * spacing. */ + ps->set_property ("next-padding", scm_double2num (0.0)); + ps->set_property ("next-space", scm_double2num (0.0)); + } + system_specs = scm_cons (ps->self_scm (), system_specs); + ps->unprotect (); + + if (scm_is_pair (labels)) + { + set_labels (scm_car (system_specs), labels); + labels = SCM_EOL; + } + // FIXME: figure out penalty. + //set_system_penalty (ps, scores_[i].header_); + } } else assert (0); @@ -356,9 +465,10 @@ Paper_book::systems () systems_ = scm_reverse (systems_); + /* backwards compatibility for the old page breaker */ int i = 0; Prob *last = 0; - for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s)) + for (SCM s = systems_; scm_is_pair (s); s = scm_cdr (s)) { Prob *ps = unsmob_prob (scm_car (s)); ps->set_property ("number", scm_from_int (++i)); @@ -368,6 +478,16 @@ Paper_book::systems () && !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_; @@ -380,14 +500,14 @@ Paper_book::pages () return pages_; pages_ = SCM_EOL; - SCM proc = paper_->c_variable ("page-breaking"); - pages_ = scm_apply_0 (proc, scm_list_1(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_; p != SCM_EOL; p = scm_cdr (p)) + 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");