X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=b91129b5d2c4fe5be3c032c079eaac2e50066781;hb=7dcae7597fae14ce5c4e2e7d50c2709d162b7332;hp=9683445fffd2fb028581b4cfdef21d59eea16b69;hpb=c2d7bd9507fb36d3f7da86653e3fb0b905ec2bc1;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 9683445fff..b91129b5d2 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,37 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Jan Nieuwenhuizen + (c) 2004--2006 Jan Nieuwenhuizen */ -#include "ly-module.hh" -#include "main.hh" -#include "page.hh" #include "paper-book.hh" + +#include "main.hh" #include "output-def.hh" -#include "paper-outputter.hh" -#include "paper-line.hh" #include "paper-score.hh" -#include "stencil.hh" +#include "paper-system.hh" +#include "text-interface.hh" #include "warn.hh" - -/* - Ugh. the Function of the Paper_book class is unclear. Trim this - file. - - */ - +#include "ly-smobs.icc" Paper_book::Paper_book () { - pages_ = SCM_EOL; - lines_ = SCM_EOL; - copyright_ = SCM_EOL; - tagline_ = SCM_EOL; header_ = SCM_EOL; - - bookpaper_ = 0; + header_0_ = SCM_EOL; + pages_ = SCM_BOOL_F; + scores_ = SCM_EOL; + performances_ = SCM_EOL; + systems_ = SCM_BOOL_F; + + paper_ = 0; smobify_self (); } @@ -41,476 +34,359 @@ 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 ()); 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_); + 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) -{ - 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; -} - 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; } -/* - TODO: there is too much code dup, and the interface is not - clear. FIXME. - */ void -Paper_book::output (String outname) +Paper_book::add_score (SCM s) { - if (!score_lines_.size ()) - return; - - /* Generate all stencils to trigger font loads. */ - pages (); + scores_ = scm_cons (s, scores_); +} - Array output_formats = split_string (output_format_global, ','); +void +Paper_book::add_performance (SCM s) +{ + performances_ = scm_cons (s, performances_); +} - for (int i = 0; i < output_formats.size (); i++) +void +Paper_book::output (SCM output_channel) +{ + if (scm_is_pair (performances_)) { - String format = output_formats[i]; - Paper_outputter *out = get_paper_outputter (outname + "." + output_formats[i], 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 ("paper-book-write-midis"); - scm_gc_unprotect_object (out->self_scm ()); + scm_call_2 (proc, self_scm (), output_channel); } -} - -void -Paper_book::classic_output (String outname) -{ + if (scores_ == SCM_EOL) + return; /* Generate all stencils to trigger font loads. */ - lines (); - + pages (); - // 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_[0].header_)) - scopes = scm_cons (score_lines_[0].header_, scopes); - //end ugh - + string mod_nm = "scm framework-" + output_backend_global; - Array output_formats = split_string (output_format_global, ','); - - for (int i = 0; i < output_formats.size (); i++) + SCM mod = scm_c_resolve_module (mod_nm.c_str ()); + if (make_print) { - 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 ()); - - Paper_outputter *out = get_paper_outputter (outname + "." + format, format); + SCM func = scm_c_module_lookup (mod, "output-framework"); - scm_apply_0 (func, scm_list_n (out->self_scm (), + 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 ()); + if (make_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_UNDEFINED)); } - - progress_indication ("\n"); } - - - -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 (); -} + /* Generate all stencils to trigger font loads. */ + systems (); + 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 = output_backend_global; + 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_system_penalty (Prob *ps, SCM header) { - if (ly_c_pair_p (lines_)) - return lines_; - - Stencil title = book_title (); - if (!title.is_empty ()) + if (ly_is_module (header)) { - Paper_line *pl = new Paper_line (title, -10001, 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++) - { - Stencil title = score_title (i); - if (!title.is_empty ()) - { - Paper_line *pl = new Paper_line (title, -10001, 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) + SCM force = ly_module_lookup (header, ly_symbol2scm ("breakbefore")); + if (SCM_VARIABLEP (force) + && scm_is_bool (SCM_VARIABLE_REF (force))) { - SCM line_list = scm_vector_to_list (score_lines_[i].lines_); // guh. - lines_ = scm_append (scm_list_2 (scm_reverse (line_list), lines_)); + ps->set_property ("penalty", + scm_from_int(to_boolean (SCM_VARIABLE_REF (force)) + ? -10000 + : 10000)); } } - - lines_ = scm_reverse (lines_); - - int i = 0; - for (SCM s = lines_; s != SCM_EOL; s = ly_cdr (s)) - unsmob_paper_line (ly_car (s))->number_ = ++i; - return lines_; } SCM -make_tagline (Output_def*paper, SCM scopes) +Paper_book::get_score_title (SCM header) { - SCM make_tagline = paper->c_variable ("make-tagline"); - SCM tagline = scm_call_2 (make_tagline, paper->self_scm (), scopes); - return tagline; -} + 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); + set_system_penalty (ps, header); + + return ps->self_scm(); + } -SCM -make_copyright (Output_def *paper, SCM scopes) -{ - SCM make_copyright = paper->c_variable ("make-copyright"); - SCM copyright = scm_call_2 (make_copyright, paper->self_scm (), scopes); - return copyright; + return SCM_BOOL_F; } + SCM -Paper_book::pages () +Paper_book::get_system_specs () { - if (ly_c_pair_p (pages_)) - return pages_; - - Output_def *paper = bookpaper_; - Page *page = new Page (paper, 1); - - 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 all = lines (); - SCM proc = paper->c_variable ("page-breaking"); - SCM breaks = 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)); - - - /* - UGH - move this out of C++. - */ - SCM scopes = SCM_EOL; - if (ly_c_module_p (header_)) - scopes = scm_cons (header_, scopes); + SCM system_specs = SCM_EOL; - tagline_ = make_tagline (bookpaper_, scopes); - copyright_ = make_tagline (bookpaper_, scopes); + Stencil title = book_title (); + if (!title.is_empty ()) + { + 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_); - int page_count = SCM_VECTOR_LENGTH ((SCM) breaks); - int line = 1; + system_specs = scm_cons (ps->self_scm (), system_specs); + ps->unprotect (); + } - for (int i = 0; i < page_count; i++) - { - if (i) - page = new Page (paper, i + 1); + SCM page_properties + = scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"), + paper_->self_scm ()); - int next = i + 1 < page_count - ? ly_scm2int (scm_vector_ref (breaks, scm_int2num (i))) : 0; - while ((!next && all != SCM_EOL) || line <= next) + SCM header = SCM_EOL; + for (SCM s = scm_reverse (scores_); s != SCM_EOL; 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 (Music_output *mop = unsmob_music_output (scm_car (s))) + { + if (Paper_score *pscore = dynamic_cast (mop)) + { + SCM title = get_score_title (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); + } + else + { + /* + Ignore MIDI + */ + } + } + else if (Text_interface::is_markup (scm_car (s))) { - SCM s = ly_car (all); - page->lines_ = ly_snoc (s, page->lines_); - page->height_ += unsmob_paper_line (s)->dim ()[Y_AXIS]; - page->line_count_++; - all = ly_cdr (all); - line++; + 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_); } - if (i == page_count-1) - page->is_last_ = true; - - pages_ = scm_cons (page->self_scm (), pages_); + else + assert (0); } - pages_ = scm_reverse (pages_); - 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; + if (systems_ != SCM_BOOL_F) + return systems_; - Real book_height =0.; - for (SCM s = lines ; ly_c_pair_p (s); s = ly_cdr (s)) + systems_ = SCM_EOL; + SCM specs = get_system_specs (); + for (SCM s = specs; scm_is_pair (s); s = scm_cdr (s)) { - book_height += unsmob_paper_line (ly_car (s))->dim ()[Y_AXIS]; + 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_); + } } - - /* - 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); + systems_ = scm_reverse (systems_); - SCM tag = make_tagline (book->bookpaper_, scopes); - if (unsmob_stencil (tag)) - { - book_height += unsmob_stencil (tag)->extent (Y_AXIS).length (); - } - - SCM cr = make_copyright (book->bookpaper_, scopes); - if (unsmob_stencil (cr)) - { - book_height += unsmob_stencil (cr)->extent (Y_AXIS).length (); - } - - 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)) + int i = 0; + Prob *last = 0; + for (SCM s = systems_; s != SCM_EOL; s = scm_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) - { - breaks = ly_snoc (scm_int2num (number), breaks); - page_number++; - page_height = text_height + (page_number == page_count) * last; - h = 0; - } - if (ly_cdr (s) == SCM_EOL) - breaks = ly_snoc (scm_int2num (pl->number_), breaks); + 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; } - 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_; -Score_lines::Score_lines () -{ - lines_ = SCM_EOL; - header_ = SCM_EOL; + pages_ = SCM_EOL; + SCM proc = paper_->c_variable ("page-breaking"); + pages_ = scm_apply_0 (proc, scm_list_1(self_scm ())); + return pages_; } -void -Score_lines::gc_mark () +SCM +Paper_book::performances () const { - scm_gc_mark (lines_); - scm_gc_mark (header_); + return scm_reverse (performances_); } -