X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=84191b7da8b94bf17f4a67cd488591c4bdbc5e73;hb=a807055089b5d2e51b9eda08d105b9390c63ec21;hp=168d19b92e899eb85faacb2caf997be69948712d;hpb=928398cf62c41729bf75e957a8f7a5b145b7d5ff;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 168d19b92e..84191b7da8 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2006 Jan Nieuwenhuizen + (c) 2004--2007 Jan Nieuwenhuizen */ #include "paper-book.hh" @@ -11,10 +11,13 @@ #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" @@ -90,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) @@ -105,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"); @@ -120,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); @@ -135,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 (); @@ -145,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,10 +227,27 @@ 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 */ + in the get_system_specs () list */ void set_system_penalty (SCM sys, SCM header) { @@ -229,21 +257,36 @@ 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 ()) - cols.back ()->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_label (SCM sys, SCM label) +{ + 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_cons (label, col->get_property ("labels"))); + Paper_column *col_right = dynamic_cast (col->find_prebroken_piece (RIGHT)); + col_right->set_property ("labels", scm_cons (label, col_right->get_property ("labels"))); + } + } + else if (Prob *pb = unsmob_prob (sys)) + pb->set_property ("labels", scm_cons (label, pb->get_property ("labels"))); +} SCM Paper_book::get_score_title (SCM header) @@ -261,7 +304,7 @@ Paper_book::get_score_title (SCM header) Prob *ps = make_paper_system (props); paper_system_set_stencil (ps, title); - return ps->self_scm(); + return ps->self_scm (); } return SCM_BOOL_F; @@ -297,6 +340,25 @@ 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 ())) + { + /* set previous element label */ + if (scm_is_pair (system_specs)) + set_label (scm_car (system_specs), page_marker->label ()); + } + } else if (Music_output *mop = unsmob_music_output (scm_car (s))) { if (Paper_score *pscore = dynamic_cast (mop)) @@ -330,6 +392,9 @@ Paper_book::get_system_specs () // 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); system_specs = scm_cons (ps->self_scm (), system_specs); @@ -370,6 +435,7 @@ Paper_book::systems () systems_ = scm_reverse (systems_); + /* backwards compatibility for the old page breaker */ int i = 0; Prob *last = 0; for (SCM s = systems_; scm_is_pair (s); s = scm_cdr (s)) @@ -382,6 +448,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_; @@ -394,8 +470,8 @@ 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)