X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=ea7c044417063db43700a3c80acbaa816b56cd77;hb=9602a6de93da3d612b7833fdd56168c3c8d19df1;hp=08367608b38d7db94fe53e12506d873a200504ee;hpb=87c76f9661ab6c7c24be704336fd207597ce5b3d;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 08367608b3..ea7c044417 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,27 +3,28 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Jan Nieuwenhuizen + (c) 2004--2005 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-item.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; systems_ = SCM_BOOL_F; - header_ = SCM_EOL; - + paper_ = 0; smobify_self (); } @@ -34,256 +35,118 @@ Paper_book::~Paper_book () IMPLEMENT_DEFAULT_EQUAL_P (Paper_book); IMPLEMENT_SMOBS (Paper_book) -IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?") + IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?") -SCM + 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->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; } -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 (int i = dump_header_fieldnames_global.size (); i--;) fields = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()), 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.") -{ - Array output_formats = split_string (output_format_global, ','); - - 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::post_processing (SCM module, - SCM file_name) +Paper_book::add_score (SCM s) { - struct - { - bool do_it_; - char const *func_name_; - } settings[] = { - {make_tex, "convert-to-tex"}, - {make_dvi, "convert-to-dvi"}, - {make_ps, "convert-to-ps"}, - {make_pdf, "convert-to-pdf"}, - {make_png, "convert-to-png"}, - {0, 0}, - }; - - for (int i = 0; settings[i].func_name_; i++) - { - if (settings[i].do_it_) - { - SCM func = scm_c_module_lookup (module, settings[i].func_name_); - if (scm_variable_p (func) == SCM_BOOL_T) - { - func = scm_variable_ref (func); - if (ly_c_procedure_p (func)) - scm_call_2 (func, self_scm (), file_name); - } - } - } + scores_ = scm_cons (s, scores_); } void Paper_book::output (String outname) { - if (!score_systems_.size ()) + if (scores_ == SCM_EOL) return; /* Generate all stencils to trigger font loads. */ pages (); - - SCM formats = ly_output_formats (); - for (SCM s = formats; scm_is_pair (s); s = scm_cdr (s)) - { - String format = ly_scm2string (scm_car (s)); - String file_name = outname; - - if (file_name != "-") - file_name += "." + format; - - Paper_outputter *out = get_paper_outputter (file_name, 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 ()); - if (make_pages) - { - SCM func = scm_c_module_lookup (mod, "output-framework"); - - func = scm_variable_ref (func); - scm_apply_0 (func, scm_list_n (out->self_scm (), - self_scm (), - scopes, - dump_fields (), - scm_makfrom0str (outname.to_str0 ()), - SCM_UNDEFINED)); - out->close (); - scm_gc_unprotect_object (out->self_scm ()); - post_processing (mod, scm_makfrom0str (file_name.to_str0 ())); - } - - if (make_preview) - { - String file_name = outname + ".preview." + format; - Paper_outputter *out = get_paper_outputter (file_name, format); - - SCM func = scm_c_module_lookup (mod, "output-preview-framework"); - func = scm_variable_ref (func); - scm_apply_0 (func, scm_list_n (out->self_scm (), - self_scm (), - scopes, - dump_fields (), - scm_makfrom0str (outname.to_str0 ()), - SCM_UNDEFINED)); - - out->close (); - scm_gc_unprotect_object (out->self_scm ()); - - post_processing (mod, scm_makfrom0str (file_name.to_str0 ())); - } - } - progress_indication ("\n"); -} -void -Paper_book::classic_output (String outname) -{ - /* Generate all stencils to trigger font loads. */ - systems (); - - // ugh code dup SCM scopes = SCM_EOL; if (ly_c_module_p (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 - - Array output_formats = split_string (output_format_global, ','); + String mod_nm = "scm framework-" + output_backend_global; - for (int i = 0; i < output_formats.size (); i++) + SCM mod = scm_c_resolve_module (mod_nm.to_str0 ()); + if (make_pages) { - 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 func = scm_c_module_lookup (mod, "output-framework"); func = scm_variable_ref (func); - - Paper_outputter *out = get_paper_outputter (outname + "." + format, - format); - - scm_apply_0 (func, scm_list_n (out->self_scm (), self_scm (), scopes, + scm_apply_0 (func, scm_list_n (scm_makfrom0str (outname.to_str0 ()), + 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 (scm_makfrom0str (outname.to_str0 ()), + 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 (String outname) { - return unsmob_paper_book(pb)->pages (); -} + /* Generate all stencils to trigger font loads. */ + systems (); -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; -} + if (ly_c_module_p (header_)) + scopes = scm_cons (header_, 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 (); -} + if (ly_c_module_p (header_0_)) + scopes = scm_cons (header_0_, scopes); -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 (); + 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 ()), + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); + + progress_indication ("\n"); } /* TODO: resurrect more complex user-tweaks for titling? */ @@ -297,53 +160,66 @@ Paper_book::book_title () if (ly_c_module_p (header_)) scopes = scm_cons (header_, scopes); - SCM tit = SCM_EOL; if (ly_c_procedure_p (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_)) 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_c_module_p (header)) + scopes = scm_cons (header, scopes); SCM tit = SCM_EOL; if (ly_c_procedure_p (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) +{ + if (ly_c_module_p (header)) + { + SCM force = ly_module_lookup (header, ly_symbol2scm ("breakbefore")); + if (SCM_VARIABLEP (force) + && scm_is_bool (SCM_VARIABLE_REF (force))) + { + ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF (force)) + ? -10000 + : 10000; + } + } +} + SCM Paper_book::systems () { @@ -356,33 +232,61 @@ Paper_book::systems () if (!title.is_empty ()) { 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_c_module_p (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 ()); - } - - if (scm_vector_p (score_systems_[i].systems_) == SCM_BOOL_T) + header = scm_car (s); + if (header_0_ == SCM_EOL) + header_0_ = header; + } + else if (scm_is_vector (scm_car (s))) { - // guh. - SCM system_list = scm_vector_to_list (score_systems_[i].systems_); + 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); + } + 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)) @@ -390,12 +294,13 @@ Paper_book::systems () Paper_system *ps = unsmob_paper_system (scm_car (s)); ps->number_ = ++i; - if (last && last->is_title ()) - // ugh, hardcoded. - ps->penalty_ = 10000; + if (last + && last->is_title () + && !ps->break_before_penalty_) + ps->break_before_penalty_ = 10000; last = ps; } - + return systems_; } @@ -410,20 +315,3 @@ Paper_book::pages () pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ())); return pages_; } - - -/****************************************************************/ - -Score_systems::Score_systems () -{ - systems_ = SCM_EOL; - header_ = SCM_EOL; -} - -void -Score_systems::gc_mark () -{ - scm_gc_mark (systems_); - scm_gc_mark (header_); -} -