X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=08e378b41eb911542203fde1766fd970240f081f;hb=26cd516049c72cf63375979fd4a0fbe2f11a9395;hp=e6d63aa0cb41e2681cea94be0f74a60a3cd6559e;hpb=a0c5f43a69fc72f878d7b3f635030f67f1a535db;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index e6d63aa0cb..08e378b41e 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,27 +3,29 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Jan Nieuwenhuizen + (c) 2004--2005 Jan Nieuwenhuizen */ #include "paper-book.hh" -#include "ly-module.hh" #include "main.hh" #include "output-def.hh" -#include "paper-outputter.hh" #include "paper-score.hh" #include "paper-system.hh" +#include "text-interface.hh" #include "warn.hh" #include "ly-smobs.icc" Paper_book::Paper_book () { + header_ = SCM_EOL; + header_0_ = SCM_EOL; pages_ = SCM_BOOL_F; + scores_ = SCM_EOL; + performances_ = SCM_EOL; systems_ = SCM_BOOL_F; - header_ = SCM_EOL; - + paper_ = 0; smobify_self (); } @@ -33,32 +35,31 @@ 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_systems_.size (); i++) - b->score_systems_[i].gc_mark (); - + 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->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*) SCM_CELL_WORD_1 (smob); - + Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob); + scm_puts ("#<", port); scm_puts (classname (b), port); scm_puts (" ", port); - //scm_puts (b->, port); scm_puts (">", port); return 1; } @@ -67,7 +68,7 @@ SCM dump_fields () { SCM fields = SCM_EOL; - for (int i = dump_header_fieldnames_global.size (); i--; ) + for (int i = dump_header_fieldnames_global.size (); i--;) fields = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()), fields); @@ -75,70 +76,80 @@ dump_fields () } void -Paper_book::output (String outname) +Paper_book::add_score (SCM s) +{ + scores_ = scm_cons (s, scores_); +} + + +void +Paper_book::add_performance (SCM s) { - if (!score_systems_.size ()) + performances_ = scm_cons (s, performances_); +} + + +void +Paper_book::output (SCM output_channel) +{ + if (scores_ == SCM_EOL) return; /* Generate all stencils to trigger font loads. */ pages (); - + SCM scopes = SCM_EOL; - if (ly_c_module_p (header_)) + 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.to_str0 ()); - if (make_pages) + if (make_print) { SCM func = scm_c_module_lookup (mod, "output-framework"); func = scm_variable_ref (func); - scm_apply_0 (func, scm_list_n (scm_makfrom0str (outname.to_str0 ()), + scm_apply_0 (func, scm_list_n (output_channel, self_scm (), scopes, dump_fields (), SCM_UNDEFINED)); } - + 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 (scm_makfrom0str (outname.to_str0 ()), + scm_apply_0 (func, scm_list_n (output_channel, self_scm (), scopes, dump_fields (), SCM_UNDEFINED)); } - progress_indication ("\n"); } void -Paper_book::classic_output (String outname) +Paper_book::classic_output (SCM output) { /* Generate all stencils to trigger font loads. */ 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_systems_[0].header_)) - scopes = scm_cons (score_systems_[0].header_, scopes); - //end ugh + if (ly_is_module (header_0_)) + scopes = scm_cons (header_0_, scopes); String format = output_backend_global; 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"); func = scm_variable_ref (func); - - scm_apply_0 (func, scm_list_n (scm_makfrom0str (outname.to_str0 ()), + scm_apply_0 (func, scm_list_n (output, self_scm (), scopes, dump_fields (), @@ -147,41 +158,6 @@ Paper_book::classic_output (String outname) 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 layout 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_systems, "ly:paper-book-systems", - 1, 0, 0, (SCM pb), - "Return systems in book PB.") -{ - return unsmob_paper_book (pb)->systems (); -} - -LY_DEFINE (ly_paper_book_paper, "ly:paper-book-paper", - 1, 0, 0, (SCM pb), - "Return pages in book PB.") -{ - return unsmob_paper_book (pb)->paper_->self_scm (); -} - /* TODO: resurrect more complex user-tweaks for titling? */ Stencil Paper_book::book_title () @@ -190,72 +166,84 @@ Paper_book::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, - paper_->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 = 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_systems_[i].header_)) - scopes = scm_cons (score_systems_[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, - paper_->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; } void -set_system_penalty (Paper_system * ps, SCM header) +set_system_penalty (Paper_system *ps, SCM header) { - if (ly_c_module_p (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))) + if (SCM_VARIABLEP (force) + && scm_is_bool (SCM_VARIABLE_REF (force))) { - ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF(force)) + ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF (force)) ? -10000 : 10000; } } } - + +void +Paper_book::add_score_title (SCM header) +{ + Stencil title = score_title (header); + if (title.is_empty ()) + title = score_title (header_); + if (!title.is_empty ()) + { + Paper_system *ps = new Paper_system (title, true); + systems_ = scm_cons (ps->self_scm (), systems_); + scm_gc_unprotect_object (ps->self_scm ()); + set_system_penalty (ps, header); + } +} + SCM Paper_book::systems () { @@ -269,37 +257,74 @@ Paper_book::systems () { Paper_system *ps = new Paper_system (title, true); set_system_penalty (ps, header_); - + systems_ = scm_cons (ps->self_scm (), systems_); scm_gc_unprotect_object (ps->self_scm ()); } - - int score_count = score_systems_.size (); - for (int i = 0; i < score_count; i++) + + 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)) { - Stencil title = score_title (i); - if (!title.is_empty ()) + if (ly_is_module (scm_car (s))) { - Paper_system *ps = new Paper_system (title, true); - systems_ = scm_cons (ps->self_scm (), systems_); - scm_gc_unprotect_object (ps->self_scm ()); - - set_system_penalty (ps, score_systems_[i].header_); + 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)) + { + add_score_title (header); + + header = SCM_EOL; - } - - if (scm_vector_p (score_systems_[i].systems_) == SCM_BOOL_T) + 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 + { + /* + Ignore MIDI + */ + } + } + else if (scm_is_vector (scm_car (s))) { - // guh. - SCM system_list = scm_vector_to_list (score_systems_[i].systems_); - + /* + UGH. code dup. + */ + add_score_title (header); + header = SCM_EOL; + + SCM system_list = scm_vector_to_list (scm_car (s)); system_list = scm_reverse (system_list); systems_ = scm_append (scm_list_2 (system_list, systems_)); } + else if (Text_interface::markup_p (scm_car (s))) + { + SCM t = Text_interface::interpret_markup (paper_->self_scm (), + page_properties, + scm_car (s)); + // FIXME: title=true? + Paper_system *ps = new Paper_system (*unsmob_stencil (t), true); + systems_ = scm_cons (ps->self_scm (), systems_); + scm_gc_unprotect_object (ps->self_scm ()); + // FIXME: figure out penalty. + //set_system_penalty (ps, scores_[i].header_); + } + else + assert (0); } - + systems_ = scm_reverse (systems_); - + int i = 0; Paper_system *last = 0; for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s)) @@ -313,7 +338,7 @@ Paper_book::systems () ps->break_before_penalty_ = 10000; last = ps; } - + return systems_; } @@ -329,19 +354,8 @@ Paper_book::pages () return pages_; } - -/****************************************************************/ - -Score_systems::Score_systems () -{ - systems_ = SCM_EOL; - header_ = SCM_EOL; -} - -void -Score_systems::gc_mark () +SCM +Paper_book::performances () const { - scm_gc_mark (systems_); - scm_gc_mark (header_); + return scm_reverse (performances_); } -