X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=020c2e7b21248722977acd93f0885a4ac5ef876e;hb=4063c4f664e044181e416857e999cb07391c3e33;hp=195e978f65a1581e84d1f4913e6d45c104ae76d2;hpb=a3765e1d290e5e49093e7ca7791bf3fe20be1726;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 195e978f65..020c2e7b21 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -17,6 +17,7 @@ #include "text-interface.hh" #include "warn.hh" #include "program-option.hh" +#include "page-marker.hh" #include "ly-smobs.icc" @@ -110,7 +111,8 @@ Paper_book::output (SCM output_channel) 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"); @@ -122,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); @@ -225,8 +227,25 @@ Paper_book::score_title (SCM header) return title; } +void +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, SYM should be the system spec that + 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 @@ -238,25 +257,42 @@ set_system_penalty (SCM sys, SCM header) if (SCM_VARIABLEP (force) && scm_is_bool (SCM_VARIABLE_REF (force))) { - 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))) + if (to_boolean (SCM_VARIABLE_REF (force))) { - 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); - } + 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 if (Prob *pb = unsmob_prob (sys)) - pb->set_property ("page-break-permission", sym); + 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) @@ -301,7 +337,9 @@ 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; + 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))) @@ -310,6 +348,24 @@ 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)) @@ -327,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 { @@ -335,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);