X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=b91129b5d2c4fe5be3c032c079eaac2e50066781;hb=4b5d14fc3b5ea19d4cf71d2222ddb3964122eeb2;hp=0c0a0629fc86ba765d19fac5887abee61a76ee1f;hpb=8fc0b9a4a716de24d4764f9f7be386341f1d9768;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 0c0a0629fc..b91129b5d2 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,28 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Jan Nieuwenhuizen + (c) 2004--2006 Jan Nieuwenhuizen */ -#include "ly-module.hh" +#include "paper-book.hh" + #include "main.hh" #include "output-def.hh" -#include "paper-book.hh" -#include "paper-outputter.hh" #include "paper-score.hh" #include "paper-system.hh" -#include "stencil.hh" +#include "text-interface.hh" #include "warn.hh" #include "ly-smobs.icc" Paper_book::Paper_book () { - pages_ = SCM_BOOL_F; - lines_ = SCM_BOOL_F; 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 (); } @@ -33,309 +35,342 @@ Paper_book::~Paper_book () } 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 (); - - 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_); - return b->lines_; + 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; } -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, ','); + scores_ = scm_cons (s, scores_); +} - SCM lst = SCM_EOL; - int output_formats_count = output_formats.size (); - for (int i = 0; i < output_formats_count; i ++) - lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst); - - return lst; +void +Paper_book::add_performance (SCM s) +{ + performances_ = scm_cons (s, performances_); } void -Paper_book::output (String outname) +Paper_book::output (SCM output_channel) { - if (!score_lines_.size ()) + if (scm_is_pair (performances_)) + { + SCM proc = ly_lily_module_constant ("paper-book-write-midis"); + + scm_call_2 (proc, self_scm (), output_channel); + } + + if (scores_ == SCM_EOL) return; /* Generate all stencils to trigger font loads. */ pages (); - - SCM formats = ly_output_formats (); - for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s)) + + SCM scopes = SCM_EOL; + if (ly_is_module (header_)) + scopes = scm_cons (header_, scopes); + + string mod_nm = "scm framework-" + output_backend_global; + + SCM mod = scm_c_resolve_module (mod_nm.c_str ()); + if (make_print) { - 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 mod_nm = "scm framework-" + format; - - SCM mod = scm_c_resolve_module (mod_nm.to_str0 ()); SCM func = scm_c_module_lookup (mod, "output-framework"); func = scm_variable_ref (func); - scm_apply_0 (func, scm_list_n (out->self_scm (), + scm_apply_0 (func, scm_list_n (output_channel, self_scm (), scopes, dump_fields (), - scm_makfrom0str (outname.to_str0 ()), SCM_UNDEFINED)); + } - scm_gc_unprotect_object (out->self_scm ()); - progress_indication ("\n"); + 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)); } } void -Paper_book::classic_output (String outname) +Paper_book::classic_output (SCM output) { /* Generate all stencils to trigger font loads. */ - lines (); + systems (); - // 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 + if (ly_is_module (header_0_)) + scopes = scm_cons (header_0_, scopes); - Array output_formats = split_string (output_format_global, ','); + string format = output_backend_global; + string mod_nm = "scm framework-" + format; - for (int i = 0; i < output_formats.size (); i++) - { - String format = output_formats[i]; - String mod_nm = "scm framework-" + format; - - SCM mod = scm_c_resolve_module (mod_nm.to_str0 ()); - SCM func = scm_c_module_lookup (mod, "output-classic-framework"); + 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); - - Paper_outputter *out = get_paper_outputter (outname + "." + format, - format); - - scm_apply_0 (func, scm_list_5 (out->self_scm (), self_scm (), scopes, - dump_fields (), - scm_makfrom0str (outname.to_str0 ()))); - - scm_gc_unprotect_object (out->self_scm ()); - progress_indication ("\n"); - } -} - -LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages", - 1, 0, 0, (SCM pb), - "Return pages in book PB.") -{ - return unsmob_paper_book(pb)->pages (); -} - -LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes", - 1, 0, 0, (SCM book), - "Return pages in paper book @var{book}.") -{ - Paper_book *pb = unsmob_paper_book(book); - SCM_ASSERT_TYPE(pb, book, SCM_ARG1, __FUNCTION__, "Paper_book"); - - SCM scopes = SCM_EOL; - if (ly_c_module_p (pb->header_)) - scopes = scm_cons (pb->header_, scopes); - - return 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 (); -} + func = scm_variable_ref (func); + scm_apply_0 (func, scm_list_n (output, + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); -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 (); + 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)) + 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; } - -SCM -Paper_book::lines () + +void +set_system_penalty (Prob *ps, SCM header) { - if (lines_ != SCM_BOOL_F) - return lines_; + 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))) + { + ps->set_property ("penalty", + scm_from_int(to_boolean (SCM_VARIABLE_REF (force)) + ? -10000 + : 10000)); + } + } +} - lines_ = SCM_EOL; - Stencil title = book_title (); +SCM +Paper_book::get_score_title (SCM header) +{ + Stencil title = score_title (header); + if (title.is_empty ()) + title = score_title (header_); if (!title.is_empty ()) { - Paper_system *pl = new Paper_system (title, true); - lines_ = scm_cons (pl->self_scm (), lines_); - scm_gc_unprotect_object (pl->self_scm ()); + /* + 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(); } + + return SCM_BOOL_F; +} + + +SCM +Paper_book::get_system_specs () +{ + SCM system_specs = SCM_EOL; - int score_count = score_lines_.size (); - for (int i = 0; i < score_count; i++) + Stencil title = book_title (); + if (!title.is_empty ()) { - Stencil title = score_title (i); - 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_); + + system_specs = scm_cons (ps->self_scm (), system_specs); + ps->unprotect (); + } + + SCM page_properties + = scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"), + paper_->self_scm ()); + + 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))) { - Paper_system *pl = new Paper_system (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) + 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))) { - // guh. - SCM line_list = scm_vector_to_list (score_lines_[i].lines_); + 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_); + } + else + assert (0); + } + + system_specs = scm_reverse_x (system_specs, SCM_EOL); + return system_specs; +} - line_list = scm_reverse (line_list); - lines_ = scm_append (scm_list_2 (line_list, lines_)); +SCM +Paper_book::systems () +{ + if (systems_ != SCM_BOOL_F) + return systems_; + + systems_ = SCM_EOL; + 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_); } } - lines_ = scm_reverse (lines_); - + systems_ = scm_reverse (systems_); + int i = 0; - Paper_system *last = 0; - for (SCM s = lines_; s != SCM_EOL; s = ly_cdr (s)) + Prob *last = 0; + for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s)) { - Paper_system * p = unsmob_paper_line (ly_car (s)); - p->number_ = ++i; - - if (last && last->is_title ()) - // ugh, hardcoded. - p->penalty_ = 10000; - last = p; + 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 lines_; + + return systems_; } SCM @@ -345,25 +380,13 @@ Paper_book::pages () return pages_; pages_ = SCM_EOL; - Output_def *paper = bookpaper_; - SCM proc = paper->c_variable ("page-breaking"); - pages_ = scm_apply_0 (proc, scm_list_2 (lines (), self_scm ())); + SCM proc = paper_->c_variable ("page-breaking"); + pages_ = scm_apply_0 (proc, scm_list_1(self_scm ())); return pages_; } - -/****************************************************************/ - -Score_lines::Score_lines () -{ - lines_ = SCM_EOL; - header_ = SCM_EOL; -} - -void -Score_lines::gc_mark () +SCM +Paper_book::performances () const { - scm_gc_mark (lines_); - scm_gc_mark (header_); + return scm_reverse (performances_); } -