X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=a424b66cf4602ab960155d1981cf9a992173774a;hb=c37888fe2f06304914ae980b26cb82de2b1deccf;hp=f9c13d404369a4fa38adde19f99ba854c497cdb7;hpb=abd05b0ad0ccc4b63bb77ed128a8f28d5d48f330;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index f9c13d4043..a424b66cf4 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,329 +3,343 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Jan Nieuwenhuizen + (c) 2004--2005 Jan Nieuwenhuizen */ -#include +#include "paper-book.hh" -#include "ly-module.hh" #include "main.hh" -#include "paper-book.hh" -#include "paper-def.hh" -#include "paper-outputter.hh" +#include "output-def.hh" #include "paper-score.hh" -#include "stencil.hh" +#include "paper-system.hh" +#include "text-item.hh" +#include "warn.hh" -static SCM -stencil2line (Stencil* stil) -{ - static SCM z = ly_offset2scm (Offset (0, 0)); - Offset dim = Offset (stil->extent (X_AXIS).length (), - stil->extent (Y_AXIS).length ()); - return scm_cons (ly_offset2scm (dim), - scm_list_1 (scm_cons (z, stil->smobbed_copy ()))); -} +#include "ly-smobs.icc" -// WIP -- simplistic page interface -// Do we need this at all? SCM, smob? -class Page -{ -public: - Paper_def *paper_; - static int page_count_; - int number_; - int line_count_; - - Protected_scm lines_; - Protected_scm header_; - Protected_scm footer_; - - Stencil *get_header () { return unsmob_stencil (header_); } - Stencil *get_footer () { return unsmob_stencil (footer_); } - - /* actual height filled with text. */ - Real height_; - - // HMMM all this size stuff to paper/paper-outputter? - Real hsize_; - Real vsize_; - Real left_margin_; - Real top_margin_; - Real bottom_margin_; - Real foot_sep_; - Real head_sep_; - Real text_width_; - - /* available area for text. */ - Real text_height (); - - Page (Paper_def*, int); - void output (Paper_outputter*, bool); -}; - -int Page::page_count_ = 0; - -Page::Page (Paper_def *paper, int number) +Paper_book::Paper_book () { - paper_ = paper; - number_ = number; - page_count_++; - - height_ = 0; - lines_ = SCM_EOL; - line_count_ = 0; - - hsize_ = paper->get_realvar (ly_symbol2scm ("hsize")); - vsize_ = paper->get_realvar (ly_symbol2scm ("vsize")); - top_margin_ = paper->get_realvar (ly_symbol2scm ("top-margin")); - bottom_margin_ = paper->get_realvar (ly_symbol2scm ("bottom-margin")); - head_sep_ = paper->get_realvar (ly_symbol2scm ("head-sep")); - foot_sep_ = paper->get_realvar (ly_symbol2scm ("foot-sep")); - text_width_ = paper->get_realvar (ly_symbol2scm ("linewidth")); - left_margin_ = (hsize_ - text_width_) / 2; - - SCM make_header = scm_primitive_eval (ly_symbol2scm ("make-header")); - SCM make_footer = scm_primitive_eval (ly_symbol2scm ("make-footer")); - - header_ = scm_call_2 (make_header, paper_->smobbed_copy (), - scm_int2num (number_)); - if (get_header ()) - get_header ()->align_to (Y_AXIS, UP); - - // FIXME: tagline/copyright - footer_ = scm_call_2 (make_footer, paper_->smobbed_copy (), - scm_int2num (number_)); - - if (get_footer ()) - get_footer ()->align_to (Y_AXIS, UP); + header_ = SCM_EOL; + header_0_ = SCM_EOL; + pages_ = SCM_BOOL_F; + scores_ = SCM_EOL; + systems_ = SCM_BOOL_F; + + paper_ = 0; + smobify_self (); } -void -Page::output (Paper_outputter *out, bool is_last) +Paper_book::~Paper_book () { - Offset o (left_margin_, top_margin_); - Real vfill = line_count_ > 1 ? (text_height () - height_) / (line_count_ - 1) - : 0; - out->output_scheme (scm_list_1 (ly_symbol2scm ("start-page"))); - if (get_header ()) - out->output_line (stencil2line (get_header ()), &o, false); - for (SCM s = lines_; gh_pair_p (s); s = ly_cdr (s)) - { - out->output_line (ly_car (s), &o, is_last && gh_pair_p (ly_cdr (s))); - if (gh_pair_p (ly_cdr (s))) - o[Y_AXIS] += vfill; - } - if (get_footer ()) - out->output_line (stencil2line (get_footer ()), &o, is_last); - out->output_scheme (scm_list_2 (ly_symbol2scm ("stop-page"), - gh_bool2scm (is_last && !get_footer ()))); } -Real -Page::text_height () +IMPLEMENT_DEFAULT_EQUAL_P (Paper_book); +IMPLEMENT_SMOBS (Paper_book) + IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?") + + SCM +Paper_book::mark_smob (SCM smob) { - Real h = vsize_ - top_margin_ - bottom_margin_; - if (get_header ()) - h -= get_header ()->extent (Y_AXIS).length () + head_sep_; - if (get_footer ()) - h -= get_footer ()->extent (Y_AXIS).length () + foot_sep_; - return h; + 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); -/* Current global paper book. Gives default_rendering access from - input-file-results. */ -Paper_book *paper_book; + scm_puts ("#<", port); + scm_puts (classname (b), port); + scm_puts (" ", port); + scm_puts (">", port); + return 1; +} -Paper_book::Paper_book () +SCM +dump_fields () { - smobify_self (); + SCM fields = SCM_EOL; + for (int i = dump_header_fieldnames_global.size (); i--;) + fields + = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()), + fields); + return fields; } -Paper_book::~Paper_book () +void +Paper_book::add_score (SCM s) { + scores_ = scm_cons (s, scores_); } void Paper_book::output (String outname) { + if (scores_ == SCM_EOL) + return; + /* Generate all stencils to trigger font loads. */ - Link_array *pages = get_pages (); + pages (); + + SCM scopes = SCM_EOL; + if (ly_c_module_p (header_)) + scopes = scm_cons (header_, scopes); - Paper_def *paper = papers_[0]; - Paper_outputter *out = paper->get_paper_outputter (outname); - out->output_metadata (get_scopes (0), paper); - out->output_header (paper); + String mod_nm = "scm framework-" + output_backend_global; - int page_count = pages->size (); - for (int i = 0; i < page_count; i++) - (*pages)[i]->output (out, i + 1 == page_count); + SCM mod = scm_c_resolve_module (mod_nm.to_str0 ()); + 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 ()), + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); + } - out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); - 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)); + } } -SCM -Paper_book::get_scopes (int i) +void +Paper_book::classic_output (String outname) { + /* Generate all stencils to trigger font loads. */ + systems (); + SCM scopes = SCM_EOL; - if (headers_[i]) - scopes = scm_cons (headers_[i], scopes); - if (global_headers_[i] && global_headers_[i] != headers_[i]) - scopes = scm_cons (global_headers_[i], scopes); - return scopes; + if (ly_c_module_p (header_)) + scopes = scm_cons (header_, scopes); + + if (ly_c_module_p (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 ()), + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); + + progress_indication ("\n"); } -Stencil* -Paper_book::get_title (int i) +/* TODO: resurrect more complex user-tweaks for titling? */ +Stencil +Paper_book::book_title () { - SCM user_title = scm_primitive_eval (ly_symbol2scm ("user-title")); - SCM book_title = scm_primitive_eval (ly_symbol2scm ("book-title")); - SCM score_title = scm_primitive_eval (ly_symbol2scm ("score-title")); - SCM field = (i == 0 ? ly_symbol2scm ("bookTitle") - : ly_symbol2scm ("scoreTitle")); - - Stencil *title = 0; - SCM scopes = get_scopes (i); - SCM s = ly_modules_lookup (scopes, field); - if (s != SCM_UNDEFINED && scm_variable_bound_p (s) == SCM_BOOL_T) - title = unsmob_stencil (scm_call_2 (user_title, - papers_[0]->self_scm (), - scm_variable_ref (s))); - else - title = unsmob_stencil (scm_call_2 (i == 0 ? book_title : score_title, - papers_[0]->self_scm (), - scopes)); - if (title) - title->align_to (Y_AXIS, UP); - + SCM title_func = paper_->lookup_variable (ly_symbol2scm ("book-title")); + Stencil title; + + SCM scopes = SCM_EOL; + 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); + + if (unsmob_stencil (tit)) + title = *unsmob_stencil (tit); + + if (!title.is_empty ()) + title.align_to (Y_AXIS, UP); + return title; } -/* TODO: - - decent page breaking algorithm - - top/bottom & inter-line filling - - footer: tagline/copyright - - override: # pages, or pageBreakLines= #'(3 3 4), ? */ -Link_array* -Paper_book::get_pages () +Stencil +Paper_book::score_title (SCM header) { - Link_array *pages = new Link_array; - int score_count = scores_.size (); + SCM title_func = paper_->lookup_variable (ly_symbol2scm ("score-title")); - /* Calculate the full book height. Hmm, can't we cache system - heights while making stencils? */ - Real book_height = 0; - for (int i = 0; i < score_count; i++) - { - Stencil *title = get_title (i); - if (title) - book_height += title->extent (Y_AXIS).length (); + Stencil title; - int line_count = SCM_VECTOR_LENGTH ((SCM) scores_[i]); - for (int j = 0; j < line_count; j++) + SCM scopes = SCM_EOL; + if (ly_c_module_p (header_)) + scopes = scm_cons (header_, scopes); + + 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); + + 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))) { - SCM line = scm_vector_ref ((SCM) scores_[i], scm_int2num (j)); - book_height += ly_scm2offset (ly_car (line))[Y_AXIS]; + ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF (force)) + ? -10000 + : 10000; } } +} - Paper_def *paper = papers_[0]; - Page::page_count_ = 0; - int page_number = 1; - Page *page = new Page (paper, page_number++); - fprintf (stderr, "book_height: %f\n", book_height); - fprintf (stderr, "vsize: %f\n", page->vsize_); - fprintf (stderr, "pages: %f\n", book_height / page->text_height ()); - - /* Simplistic page breaking. */ - Real text_height = page->text_height (); - for (int i = 0; i < score_count; i++) +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 ()) { - Stencil *title = get_title (i); - if (title) - book_height += title->extent (Y_AXIS).length (); - Real h = 0; - if (title) - h = title->extent (Y_AXIS).length (); - - int line_count = SCM_VECTOR_LENGTH ((SCM) scores_[i]); - for (int j = 0; j < line_count; j++) + 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 () +{ + if (systems_ != SCM_BOOL_F) + return systems_; + + systems_ = SCM_EOL; + Stencil title = book_title (); + + 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 ()); + } + + 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_c_module_p (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))) + { - SCM line = scm_vector_ref ((SCM) scores_[i], scm_int2num (j)); - h += ly_scm2offset (ly_car (line))[Y_AXIS]; - if (page->height_ + h > text_height) + if (Paper_score *pscore = dynamic_cast (mop)) { - pages->push (page); - page = new Page (paper, page_number++); + add_score_title (header); + + header = SCM_EOL; + + 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_)); } - if (page->height_ + h <= text_height || page->height_ == 0) + else { - if (j == 0 && title) - page->lines_ = ly_snoc (stencil2line (title), page->lines_); - page->lines_ = ly_snoc (line, page->lines_); - page->line_count_++; - page->height_ += h; - h = 0; + /* + Ignore MIDI + */ } } + else if (scm_is_vector (scm_car (s))) + { + /* + 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); } - - pages->push (page); - return pages; -} - -void -Paper_book::classic_output (String outname) -{ - Paper_outputter *out = papers_.top ()->get_paper_outputter (outname); - int count = scores_.size (); - - out->output_metadata (get_scopes (count - 1), papers_.top ()); - out->output_header (papers_.top ()); - - int line_count = SCM_VECTOR_LENGTH ((SCM) scores_.top ()); - for (int i = 0; i < line_count; i++) - out->output_line (scm_vector_ref ((SCM) scores_.top (), scm_int2num (i)), - 0, i == line_count - 1); - - out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); - progress_indication ("\n"); -} + systems_ = scm_reverse (systems_); -#include "ly-smobs.icc" + int i = 0; + Paper_system *last = 0; + for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s)) + { + Paper_system *ps = unsmob_paper_system (scm_car (s)); + ps->number_ = ++i; + + if (last + && last->is_title () + && !ps->break_before_penalty_) + ps->break_before_penalty_ = 10000; + last = ps; + } -IMPLEMENT_DEFAULT_EQUAL_P (Paper_book); -IMPLEMENT_SMOBS (Paper_book) -IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?") + return systems_; +} SCM -Paper_book::mark_smob (SCM smob) +Paper_book::pages () { - Paper_book *pb = (Paper_book*) SCM_CELL_WORD_1 (smob); - for (int i = 0; i < pb->headers_.size (); i++) - scm_gc_mark (pb->headers_[i]); - for (int i = 0; i < pb->global_headers_.size (); i++) - scm_gc_mark (pb->global_headers_[i]); - for (int i = 0; i < pb->papers_.size (); i++) - scm_gc_mark (pb->papers_[i]->self_scm ()); - for (int i = 0; i < pb->scores_.size (); i++) - scm_gc_mark (pb->scores_[i]); - return SCM_EOL; -} + if (SCM_BOOL_F != pages_) + return pages_; -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); - return 1; + pages_ = SCM_EOL; + SCM proc = paper_->c_variable ("page-breaking"); + pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ())); + return pages_; } -