X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=4307bb03eaa66880ac2fd9df18817978d43cc9ad;hb=e434a44b5d693cba78b5debb929a76da4c744981;hp=39c3f5f7aa8e9251f723014b3b98be442232b51b;hpb=b6b22a6efc6fe2f84c0b4f7cc4aa3550316bc89a;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 39c3f5f7aa..4307bb03ea 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,37 +3,36 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Jan Nieuwenhuizen + (c) 2004--2009 Jan Nieuwenhuizen */ -#include "ly-module.hh" -#include "main.hh" -#include "page.hh" #include "paper-book.hh" + +#include "grob.hh" +#include "main.hh" #include "output-def.hh" -#include "paper-outputter.hh" -#include "paper-line.hh" +#include "paper-column.hh" #include "paper-score.hh" -#include "stencil.hh" +#include "paper-system.hh" +#include "text-interface.hh" #include "warn.hh" +#include "program-option.hh" +#include "page-marker.hh" - -/* - Ugh. the Function of the Paper_book class is unclear. Trim this - file. - - */ - +#include "ly-smobs.icc" Paper_book::Paper_book () { - pages_ = SCM_BOOL_F; - lines_ = SCM_BOOL_F; - copyright_ = SCM_EOL; - tagline_ = SCM_EOL; header_ = SCM_EOL; - - bookpaper_ = 0; + header_0_ = SCM_EOL; + pages_ = SCM_BOOL_F; + scores_ = SCM_EOL; + bookparts_ = SCM_EOL; + performances_ = SCM_EOL; + systems_ = SCM_BOOL_F; + + paper_ = 0; + parent_ = 0; smobify_self (); } @@ -41,500 +40,573 @@ Paper_book::~Paper_book () { } -#include "ly-smobs.icc" - IMPLEMENT_DEFAULT_EQUAL_P (Paper_book); -IMPLEMENT_SMOBS (Paper_book) -IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?") +IMPLEMENT_SMOBS (Paper_book); +IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?"); SCM Paper_book::mark_smob (SCM smob) { - Paper_book *b = (Paper_book*) SCM_CELL_WORD_1 (smob); - for (int i = 0; i < b->score_lines_.size (); i++) - b->score_lines_[i].gc_mark (); - - scm_gc_mark (b->copyright_); - if (b->bookpaper_) - scm_gc_mark (b->bookpaper_->self_scm ()); + Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob); + if (b->paper_) + scm_gc_mark (b->paper_->self_scm ()); + if (b->parent_) + scm_gc_mark (b->parent_->self_scm ()); scm_gc_mark (b->header_); + scm_gc_mark (b->header_0_); scm_gc_mark (b->pages_); - scm_gc_mark (b->lines_); - return b->tagline_; + scm_gc_mark (b->performances_); + scm_gc_mark (b->scores_); + scm_gc_mark (b->bookparts_); + return b->systems_; } int Paper_book::print_smob (SCM smob, SCM port, scm_print_state*) { - Paper_book *b = (Paper_book*) ly_cdr (smob); - - scm_puts ("#<", port); - scm_puts (classname (b), port); - scm_puts (" ", port); - //scm_puts (b->, port); - scm_puts (">", port); + Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob); + (void)b; + scm_puts ("#", port); return 1; } -Array -split_string (String s, char c) +Output_def * +Paper_book::top_paper () { - Array rv; - while (s.length ()) - { - int i = s.index (c); - - if (i == 0) - { - s = s.nomid_string (0, 1); - continue; - } - - if (i < 0) - i = s.length () ; - - rv.push (s.cut_string (0, i)); - s = s.nomid_string (0, i); - } - - return rv; + Output_def *paper = paper_; + while (paper->parent_) + paper = paper->parent_; + return paper; } 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; } -LY_DEFINE (ly_output_formats, "ly:output-formats", - 0, 0, 0, (), - "Formats passed to --format as a list of strings, " - "used for the output.") +void +Paper_book::add_score (SCM s) { - Array output_formats = split_string (output_format_global, ','); - - SCM lst = SCM_EOL; - for (int i = 0; i < output_formats.size (); i ++) - lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst); - - return lst; + scores_ = scm_cons (s, scores_); } -/* - TODO: there is too much code dup, and the interface is not - clear. FIXME. - */ void -Paper_book::output (String outname) +Paper_book::add_bookpart (SCM p) { - if (!score_lines_.size ()) - return; + bookparts_ = scm_cons (p, bookparts_); +} - - /* Generate all stencils to trigger font loads. */ - pages (); +void +Paper_book::add_performance (SCM s) +{ + performances_ = scm_cons (s, performances_); +} - - SCM formats = ly_output_formats(); - for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s)) +int +Paper_book::output_aux (SCM output_channel, + bool is_last, + int *first_page_number, + int *first_performance_number) +{ + int page_nb = 0; + if (scm_is_pair (performances_)) { - String format = ly_scm2string (ly_car (s)); - - Paper_outputter *out = get_paper_outputter (outname + "." + format, format); - - SCM scopes = SCM_EOL; - if (ly_c_module_p (header_)) - scopes = scm_cons (header_, scopes); - - String func_nm = format; - func_nm = "output-framework-" + func_nm; - - SCM func = ly_scheme_function (func_nm.to_str0 ()); - scm_apply_0 (func, scm_list_n (out->self_scm (), - self_scm (), - scopes, - dump_fields (), - scm_makfrom0str (outname.to_str0 ()), - SCM_UNDEFINED - )) ; + SCM proc = ly_lily_module_constant ("write-performances-midis"); + + scm_call_3 (proc, + performances (), + output_channel, + scm_long2num (*first_performance_number)); + *first_performance_number += scm_ilength (performances_); + } - scm_gc_unprotect_object (out->self_scm ()); + if (scm_is_pair (bookparts_)) + { + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) + if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) + { + bool is_last_part = (is_last && !scm_is_pair (scm_cdr (p))); + page_nb += pbookpart->output_aux (output_channel, + is_last_part, + first_page_number, + first_performance_number); + } } + else + { + if (scores_ == SCM_EOL) + return 0; + paper_->set_variable (ly_symbol2scm ("first-page-number"), + scm_long2num (*first_page_number)); + paper_->set_variable (ly_symbol2scm ("is-last-bookpart"), + ly_bool2scm (is_last)); + /* Generate all stencils to trigger font loads. */ + page_nb = scm_ilength (pages ()); + *first_page_number += page_nb; + } + return page_nb; } - void -Paper_book::classic_output (String outname) +Paper_book::output (SCM output_channel) { - - /* Generate all stencils to trigger font loads. */ - lines (); - - - // ugh code dup + int first_page_number = robust_scm2int (paper_->c_variable ("first-page-number"), 1); + int first_performance_number = 0; + if (!output_aux (output_channel, + true, + &first_page_number, + &first_performance_number)) + return; + SCM scopes = SCM_EOL; - if (ly_c_module_p (header_)) + if (ly_is_module (header_)) scopes = scm_cons (header_, scopes); - if (ly_c_module_p (score_lines_[0].header_)) - scopes = scm_cons (score_lines_[0].header_, scopes); - //end ugh + string mod_nm = "scm framework-" + get_output_backend_name (); + SCM mod = scm_c_resolve_module (mod_nm.c_str ()); - Array output_formats = split_string (output_format_global, ','); - - for (int i = 0; i < output_formats.size (); i++) + if (get_program_option ("print-pages")) { - String format = output_formats[i]; - String func_nm = format; - func_nm = "output-classic-framework-" + func_nm; - - SCM func = ly_scheme_function (func_nm.to_str0 ()); + SCM func = scm_c_module_lookup (mod, "output-framework"); - Paper_outputter *out = get_paper_outputter (outname + "." + format, format); + func = scm_variable_ref (func); + scm_apply_0 (func, scm_list_n (output_channel, + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); + } - scm_apply_0 (func, scm_list_n (out->self_scm (), + if (get_program_option ("preview")) + { + SCM func = scm_c_module_lookup (mod, "output-preview-framework"); + func = scm_variable_ref (func); + scm_apply_0 (func, scm_list_n (output_channel, self_scm (), scopes, dump_fields (), - scm_makfrom0str (outname.to_str0 ()), - SCM_UNDEFINED - )) ; + SCM_UNDEFINED)); + } +} - scm_gc_unprotect_object (out->self_scm ()); +void +Paper_book::classic_output_aux (SCM output, + int *first_performance_number) +{ + if (scm_is_pair (performances_)) + { + SCM proc = ly_lily_module_constant ("write-performances-midis"); + scm_call_3 (proc, + performances (), + output, + scm_long2num (*first_performance_number)); + *first_performance_number += scm_ilength (performances_); } - progress_indication ("\n"); + /* Generate all stencils to trigger font loads. */ + systems (); } - - - -LY_DEFINE(ly_paper_book_pages, "ly:paper-book-pages", - 1,0,0, - (SCM pb), - "Return pages in book PB.") +void +Paper_book::classic_output (SCM output) { - return unsmob_paper_book(pb)->pages (); -} + int first_performance_number = 0; + classic_output_aux (output, &first_performance_number); + SCM scopes = SCM_EOL; + if (ly_is_module (header_)) + scopes = scm_cons (header_, scopes); -LY_DEFINE(ly_paper_book_lines, "ly:paper-book-lines", - 1,0,0, - (SCM pb), - "Return lines in book PB.") -{ - return unsmob_paper_book (pb)->lines (); -} + if (ly_is_module (header_0_)) + scopes = scm_cons (header_0_, scopes); + string format = get_output_backend_name (); + string mod_nm = "scm framework-" + format; -LY_DEFINE(ly_paper_book_book_paper, "ly:paper-book-book-paper", - 1,0,0, - (SCM pb), - "Return pages in book PB.") -{ - return unsmob_paper_book(pb)->bookpaper_->self_scm (); -} + 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); + scm_apply_0 (func, scm_list_n (output, + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); -TODO: resurrect more complex user-tweaks for titling . + progress_indication ("\n"); +} -*/ +/* TODO: resurrect more complex user-tweaks for titling? */ Stencil Paper_book::book_title () { - SCM title_func = bookpaper_->lookup_variable (ly_symbol2scm ("book-title")); + SCM title_func = paper_->lookup_variable (ly_symbol2scm ("book-title")); Stencil title; SCM scopes = SCM_EOL; - if (ly_c_module_p (header_)) + if (ly_is_module (header_)) scopes = scm_cons (header_, scopes); - SCM tit = SCM_EOL; - if (ly_c_procedure_p (title_func)) + if (ly_is_procedure (title_func)) tit = scm_call_2 (title_func, - bookpaper_->self_scm (), - scopes); + paper_->self_scm (), + scopes); if (unsmob_stencil (tit)) title = *unsmob_stencil (tit); if (!title.is_empty ()) title.align_to (Y_AXIS, UP); - + return title; } - - Stencil -Paper_book::score_title (int i) +Paper_book::score_title (SCM header) { - SCM title_func = bookpaper_->lookup_variable (ly_symbol2scm ("score-title")); + SCM title_func = paper_->lookup_variable (ly_symbol2scm ("score-title")); Stencil title; - // ugh code dup SCM scopes = SCM_EOL; - if (ly_c_module_p (header_)) + if (ly_is_module (header_)) scopes = scm_cons (header_, scopes); - if (ly_c_module_p (score_lines_[i].header_)) - scopes = scm_cons (score_lines_[i].header_, scopes); - //end ugh + if (ly_is_module (header)) + scopes = scm_cons (header, scopes); SCM tit = SCM_EOL; - if (ly_c_procedure_p (title_func)) - tit =scm_call_2 (title_func, - bookpaper_->self_scm (), - scopes); + if (ly_is_procedure (title_func)) + tit = scm_call_2 (title_func, + paper_->self_scm (), + scopes); if (unsmob_stencil (tit)) title = *unsmob_stencil (tit); - if (!title.is_empty ()) title.align_to (Y_AXIS, UP); - + return title; } - -SCM -Paper_book::lines () +void +set_page_permission (SCM sys, SCM symbol, SCM permission) { - if (SCM_BOOL_F != lines_) - return lines_; - - lines_ = SCM_EOL; - Stencil title = book_title (); - - if (!title.is_empty ()) - { - Paper_line *pl = new Paper_line (title, true); - - lines_ = scm_cons (pl->self_scm (), lines_); - scm_gc_unprotect_object (pl->self_scm ()); - } - - int score_count = score_lines_.size (); - for (int i = 0; i < score_count; i++) + if (Paper_score *ps = dynamic_cast (unsmob_music_output (sys))) { - Stencil title = score_title (i); - if (!title.is_empty ()) - { - Paper_line *pl = new Paper_line (title, true); - lines_ = scm_cons (pl->self_scm (), lines_); - scm_gc_unprotect_object (pl->self_scm ()); - } - - if (scm_vector_p (score_lines_[i].lines_) == SCM_BOOL_T) + vector cols = ps->get_columns (); + if (cols.size ()) { - SCM line_list = scm_vector_to_list (score_lines_[i].lines_); // guh. - - line_list = scm_reverse (line_list); - lines_ = scm_append (scm_list_2 (line_list, lines_)); + Paper_column *col = dynamic_cast (cols.back ()); + col->set_property (symbol, permission); + col->find_prebroken_piece (LEFT)->set_property (symbol, permission); } } - - lines_ = scm_reverse (lines_); - - int i = 0; - Paper_line * last = 0; - for (SCM s = lines_; s != SCM_EOL; s = ly_cdr (s)) - { - Paper_line * p = unsmob_paper_line (ly_car (s)); - p->number_ = ++i; + else if (Prob *pb = unsmob_prob (sys)) + pb->set_property (symbol, permission); +} - if (last && last->is_title ()) +/* 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)) + { + SCM force = ly_module_lookup (header, ly_symbol2scm ("breakbefore")); + if (SCM_VARIABLEP (force) + && scm_is_bool (SCM_VARIABLE_REF (force))) { - p->penalty_ = 10000; // ugh, hardcoded. + 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); } - last = p; } - - - return lines_; } - -SCM -make_tagline (Output_def*paper, SCM scopes) +void +set_labels (SCM sys, SCM labels) { - SCM make_tagline = paper->c_variable ("make-tagline"); - SCM tagline = scm_call_2 (make_tagline, paper->self_scm (), scopes); - return tagline; + 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 -make_copyright (Output_def *paper, SCM scopes) +Paper_book::get_score_title (SCM header) { - SCM make_copyright = paper->c_variable ("make-copyright"); - SCM copyright = scm_call_2 (make_copyright, paper->self_scm (), scopes); - return copyright; + Stencil title = score_title (header); + if (title.is_empty ()) + title = score_title (header_); + if (!title.is_empty ()) + { + /* + 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::pages () +Paper_book::get_system_specs () { - if (SCM_BOOL_F != pages_) - return pages_; - - pages_ = SCM_EOL; + SCM system_specs = SCM_EOL; - Output_def *paper = bookpaper_; - - - // dummy to extract dims - Page *page = new Page (SCM_EOL, paper, 1); // ugh - Real text_height = page->text_height (); - - Real copy_height = 0; - if (Stencil *s = unsmob_stencil (copyright_)) - copy_height = s->extent (Y_AXIS).length (); - - Real tag_height = 0; - if (Stencil *s = unsmob_stencil (tagline_)) - tag_height = s->extent (Y_AXIS).length (); - - scm_gc_unprotect_object (page->self_scm ()); - - /* - UGH - move this out of C++. - */ - SCM scopes = SCM_EOL; - if (ly_c_module_p (header_)) - scopes = scm_cons (header_, scopes); - - tagline_ = make_tagline (bookpaper_, scopes); - copyright_ = make_tagline (bookpaper_, scopes); - - - SCM all = lines (); - SCM proc = paper->c_variable ("page-breaking"); - SCM pages = scm_apply_0 (proc, scm_list_n (all, - self_scm (), - scm_make_real (text_height), - scm_make_real (-copy_height), - scm_make_real (-tag_height), - SCM_UNDEFINED)); - - - SCM *page_tail = &pages_; - int num = 0; - for (SCM s = pages; ly_c_pair_p (s); s = ly_cdr (s)) + Stencil title = book_title (); + if (!title.is_empty ()) { - Page * page = new Page (ly_car (s), paper, ++num); + SCM props = paper_->lookup_variable (ly_symbol2scm ("book-title-properties")); + Prob *ps = make_paper_system (props); + paper_system_set_stencil (ps, title); - *page_tail = scm_cons (page->self_scm () , SCM_EOL); - page_tail = SCM_CDRLOC(*page_tail); + system_specs = scm_cons (ps->self_scm (), system_specs); + ps->unprotect (); + } - scm_gc_unprotect_object (page->self_scm ()); + SCM page_properties + = scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"), + paper_->self_scm ()); - if (!ly_c_pair_p (ly_cdr (s))) - page->is_last_ = true; + 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))) + { + header = scm_car (s); + 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); + unsmob_prob (title)->unprotect (); + } + + 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 + { + /* + Ignore MIDI + */ + } + } + else if (Text_interface::is_markup_list (scm_car (s))) + { + 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); } - return pages_; + system_specs = scm_reverse_x (system_specs, SCM_EOL); + return system_specs; } - - -static SCM -c_ragged_page_breaks (SCM lines, - Paper_book *book, - Real text_height, - Real first, Real last) +SCM +Paper_book::systems () { - int page_number = 0; - - Real book_height =0.; - for (SCM s = lines ; ly_c_pair_p (s); s = ly_cdr (s)) - { - book_height += unsmob_paper_line (ly_car (s))->dim ()[Y_AXIS]; - } - - /* - UGH. following stuff should go out of C++. - */ - SCM scopes = SCM_EOL; - if (ly_c_module_p (book->header_)) - scopes = scm_cons (book->header_, scopes); - + if (systems_ != SCM_BOOL_F) + return systems_; - SCM tag = make_tagline (book->bookpaper_, scopes); - if (unsmob_stencil (tag)) + systems_ = SCM_EOL; + if (scm_is_pair (bookparts_)) { - book_height += unsmob_stencil (tag)->extent (Y_AXIS).length (); + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) + if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) + systems_ = scm_append_x (scm_list_2 (systems_, pbookpart->systems ())); } - - SCM cr = make_copyright (book->bookpaper_, scopes); - if (unsmob_stencil (cr)) + else { - book_height += unsmob_stencil (cr)->extent (Y_AXIS).length (); - } + 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_); - int page_count = int (book_height / text_height + 0.5); // ceil? - SCM breaks = SCM_EOL; - Real page_height = text_height + first; - Real h = 0; - int number = 0; - for (SCM s = lines; ly_c_pair_p (s); s = ly_cdr (s)) - { - Paper_line *pl = unsmob_paper_line (ly_car (s)); - if (!pl->is_title () && h < page_height) - number++; - h += pl->dim ()[Y_AXIS]; - if (!pl->is_title () && h > page_height) + /* 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)) { - breaks = ly_snoc (scm_int2num (number), breaks); - page_number++; - page_height = text_height + (page_number == page_count) * last; - h = 0; + Prob *ps = unsmob_prob (scm_car (s)); + ps->set_property ("number", scm_from_int (++i)); + + if (last + && 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)); + } } - if (ly_cdr (s) == SCM_EOL) - breaks = ly_snoc (scm_int2num (pl->number_), breaks); } - return scm_vector (breaks); + return systems_; } -LY_DEFINE (ly_ragged_page_breaks, "ly:ragged-page-breaks", - 5, 0, 0, (SCM lines, SCM book, SCM text, SCM first, SCM last), - "Return a vector with line numbers of page breaks.") +SCM +Paper_book::pages () { - Paper_book* b = unsmob_paper_book (book); - - SCM_ASSERT_TYPE (scm_pair_p (lines), lines, SCM_ARG1, __FUNCTION__, "list"); - SCM_ASSERT_TYPE (b, book, SCM_ARG2, __FUNCTION__, "Paper_book"); - SCM_ASSERT_TYPE (ly_c_number_p (text), text, SCM_ARG3, __FUNCTION__, "number"); - SCM_ASSERT_TYPE (ly_c_number_p (first), first, SCM_ARG4, __FUNCTION__, "number"); - SCM_ASSERT_TYPE (ly_c_number_p (last), last, SCM_ARG5, __FUNCTION__, "number"); - - return c_ragged_page_breaks (lines, b, - ly_scm2double (text), - ly_scm2double (first), ly_scm2double (last)); -} + if (SCM_BOOL_F != pages_) + return pages_; -/****************************************************************/ + pages_ = SCM_EOL; + if (scm_is_pair (bookparts_)) + { + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) + if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) + pages_ = scm_append_x (scm_list_2 (pages_, pbookpart->pages ())); + } + else if (scm_is_pair (scores_)) + { + SCM proc = paper_->c_variable ("page-breaking-wrapper"); + pages_ = scm_apply_0 (proc, scm_list_1 (self_scm ())); -Score_lines::Score_lines () -{ - lines_ = SCM_EOL; - header_ = SCM_EOL; + /* 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_; } -void -Score_lines::gc_mark () +SCM +Paper_book::performances () const { - scm_gc_mark (lines_); - scm_gc_mark (header_); + return scm_reverse (performances_); } -