X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=77ac4fff8a07e145a870916a412113dd268518d3;hb=c98b4dc03abd0e96c0303f7e3b250c5f244a1208;hp=850425915d5e7acaa39ea3636a3c5db36ca6a6e8;hpb=ed001376ecd8e7bdf07b1d5c340a56181fdece77;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 850425915d..77ac4fff8a 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,201 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Jan Nieuwenhuizen + (c) 2004--2005 Jan Nieuwenhuizen */ -#include -#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 "paper-line.hh" +#include "output-def.hh" #include "paper-score.hh" -#include "stencil.hh" - -static Real const MIN_COVERAGE = 0.66; - -static SCM -stencil2line (Stencil* stil, bool is_title = false) -{ - static SCM z; - if (!z) - z = scm_permanent_object (ly_offset2scm (Offset (0, 0))); - Offset dim = Offset (stil->extent (X_AXIS).length (), - stil->extent (Y_AXIS).length ()); - Paper_line *pl = new Paper_line (dim, scm_cons (stil->smobbed_copy (), - SCM_EOL), is_title); - return pl->self_scm (); -} +#include "paper-system.hh" +#include "text-interface.hh" +#include "warn.hh" -/* Simplistic page interface */ -class Page -{ -public: - Paper_def *paper_; - static int page_count_; - int number_; - int line_count_; - - Protected_scm lines_; - Protected_scm header_; - Protected_scm footer_; - Protected_scm copyright_; - Protected_scm tagline_; - - Stencil *get_header () { return unsmob_stencil (header_); } - Stencil *get_copyright () { return unsmob_stencil (copyright_); } - Stencil *get_tagline () { return unsmob_stencil (tagline_); } - 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_ = 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; - - copyright_ = SCM_EOL; - tagline_ = SCM_EOL; - - 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_->self_scm (), - scm_int2num (number_)); - // FIXME: why does this (generates Stencil) not trigger font load? - if (get_header ()) - get_header ()->align_to (Y_AXIS, UP); - - footer_ = scm_call_2 (make_footer, paper_->self_scm (), - scm_int2num (number_)); - if (get_footer ()) - get_footer ()->align_to (Y_AXIS, UP); -} - -void -Page::output (Paper_outputter *out, bool is_last) -{ - progress_indication ("[" + to_string (number_)); - out->output_scheme (scm_list_1 (ly_symbol2scm ("start-page"))); - Offset o (left_margin_, top_margin_); - Real vfill = line_count_ > 1 ? (text_height () - height_) / (line_count_ - 1) - : 0; - - Real coverage = height_ / text_height (); - if (coverage < MIN_COVERAGE) - /* Do not space out a badly filled page. This is too simplistic - (ie broken), because this should not vary too much between - (subsequent?) pages in a book. */ - vfill = 0; - - if (get_header ()) - { - out->output_line (stencil2line (get_header ()), &o, false); - o[Y_AXIS] += head_sep_; - } - for (SCM s = lines_; s != SCM_EOL; s = ly_cdr (s)) - { - SCM line = ly_car (s); - out->output_line (line, &o, - is_last && ly_cdr (s) != SCM_EOL && !get_copyright () - && !get_tagline () && !get_footer ()); - - /* Do not put vfill between title and its music, */ - if (scm_pair_p (ly_cdr (s)) && !unsmob_paper_line (line)->is_title ()) - o[Y_AXIS] += vfill; - /* rather put extra just before the title. */ - if (ly_cdr (s) != SCM_EOL - && unsmob_paper_line (ly_cadr (s))->is_title ()) - o[Y_AXIS] += vfill; - } - - o[Y_AXIS] = vsize_ - bottom_margin_; - if (get_copyright ()) - o[Y_AXIS] -= get_copyright ()->extent (Y_AXIS).length (); - if (get_tagline ()) - o[Y_AXIS] -= get_tagline ()->extent (Y_AXIS).length (); - if (get_footer ()) - o[Y_AXIS] -= get_footer ()->extent (Y_AXIS).length (); - - if (get_copyright ()) - out->output_line (stencil2line (get_copyright ()), &o, - is_last && !get_tagline () && !get_footer ()); - if (get_tagline ()) - out->output_line (stencil2line (get_tagline ()), &o, - is_last && !get_footer ()); - 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 ()))); - progress_indication ("]"); -} - -Real -Page::text_height () -{ - Real h = vsize_ - top_margin_ - bottom_margin_; - if (get_header ()) - h -= get_header ()->extent (Y_AXIS).length () + head_sep_; - if (get_copyright () || get_tagline () || get_footer ()) - h -= foot_sep_; - if (get_copyright ()) - h -= get_copyright ()->extent (Y_AXIS).length (); - if (get_tagline ()) - h -= get_tagline ()->extent (Y_AXIS).length (); - if (get_footer ()) - h -= get_footer ()->extent (Y_AXIS).length (); - return h; -} - -/****************************************************************/ - -/* Current global paper book. Gives default_rendering access from - input-file-results. */ -Paper_book *paper_book; +#include "ly-smobs.icc" Paper_book::Paper_book () { - copyright_ = SCM_EOL; - tagline_ = SCM_EOL; - + header_ = SCM_EOL; + header_0_ = SCM_EOL; + pages_ = SCM_BOOL_F; + scores_ = SCM_EOL; + performances_ = SCM_EOL; + systems_ = SCM_BOOL_F; + + paper_ = 0; smobify_self (); } @@ -205,276 +34,333 @@ 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 *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]); - - scm_gc_mark (pb->copyright_); - - return pb->tagline_; + 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*) ly_cdr (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; } +SCM +dump_fields () +{ + 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; +} + +void +Paper_book::add_score (SCM s) +{ + scores_ = scm_cons (s, scores_); +} + +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 (!papers_.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. */ - Link_array *pages = this->pages (); + pages (); - Paper_def *paper = papers_[0]; - Paper_outputter *out = paper->get_paper_outputter (outname); - out->output_header (paper, scopes (0), pages->size ()); + SCM scopes = SCM_EOL; + if (ly_is_module (header_)) + scopes = scm_cons (header_, scopes); - int page_count = pages->size (); - for (int i = 0; i < page_count; i++) - (*pages)[i]->output (out, i + 1 == page_count); + String mod_nm = "scm framework-" + output_backend_global; - out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); - progress_indication ("\n"); + 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 (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 (output_channel, + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); + } } -SCM -Paper_book::scopes (int i) +void +Paper_book::classic_output (SCM output) { + /* 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_is_module (header_)) + scopes = scm_cons (header_, scopes); + + 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 (output, + self_scm (), + scopes, + dump_fields (), + SCM_UNDEFINED)); + + progress_indication ("\n"); } -Stencil* -Paper_book::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 = this->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_is_module (header_)) + scopes = scm_cons (header_, scopes); + + SCM tit = SCM_EOL; + 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; } -void -Paper_book::classic_output (String outname) +Stencil +Paper_book::score_title (SCM header) { - int count = scores_.size (); - Paper_outputter *out = papers_.top ()->get_paper_outputter (outname); - out->output_header (papers_.top (), scopes (count - 1), 0); - - 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"); -} + SCM title_func = paper_->lookup_variable (ly_symbol2scm ("score-title")); + + Stencil title; + SCM scopes = SCM_EOL; + if (ly_is_module (header_)) + scopes = scm_cons (header_, scopes); + + if (ly_is_module (header)) + scopes = scm_cons (header, scopes); + + SCM tit = SCM_EOL; + 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; +} -/* calculate book height, #lines, stencils. */ void -Paper_book::init () +set_system_penalty (Paper_system *ps, SCM header) { - int score_count = scores_.size (); - - /* Calculate the full book height. Hmm, can't we cache system - heights while making stencils? */ - height_ = 0; - for (int i = 0; i < score_count; i++) + if (ly_is_module (header)) { - Stencil *title = this->title (i); - if (title) - height_ += title->extent (Y_AXIS).length (); - - int line_count = SCM_VECTOR_LENGTH ((SCM) scores_[i]); - for (int j = 0; j < line_count; j++) + SCM force = ly_module_lookup (header, ly_symbol2scm ("breakbefore")); + if (SCM_VARIABLEP (force) + && scm_is_bool (SCM_VARIABLE_REF (force))) { - SCM s = scm_vector_ref ((SCM) scores_[i], scm_int2num (j)); - height_ += unsmob_paper_line (s)->dim ()[Y_AXIS]; + ps->break_before_penalty_ = to_boolean (SCM_VARIABLE_REF (force)) + ? -10000 + : 10000; } } - - Paper_def *paper = papers_[0]; - SCM scopes = this->scopes (0); - - SCM make_tagline = scm_primitive_eval (ly_symbol2scm ("make-tagline")); - tagline_ = scm_call_2 (make_tagline, paper->self_scm (), scopes); - Real tag_height = 0; - if (Stencil *s = unsmob_stencil (tagline_)) - tag_height = s->extent (Y_AXIS).length (); - height_ += tag_height; - - SCM make_copyright = scm_primitive_eval (ly_symbol2scm ("make-copyright")); - copyright_ = scm_call_2 (make_copyright, paper->self_scm (), scopes); - Real copy_height = 0; - if (Stencil *s = unsmob_stencil (copyright_)) - copy_height = s->extent (Y_AXIS).length (); - height_ += copy_height; } -SCM -Paper_book::lines () +void +Paper_book::add_score_title (SCM header) { - int score_count = scores_.size (); - SCM lines = SCM_EOL; - for (int i = 0; i < score_count; i++) + Stencil title = score_title (header); + if (title.is_empty ()) + title = score_title (header_); + if (!title.is_empty ()) { - if (Stencil *title = this->title (i)) - lines = ly_snoc (stencil2line (title, true), lines); - lines = scm_append (scm_list_2 (lines, scm_vector_to_list (scores_[i]))); + Paper_system *ps = new Paper_system (title, true); + systems_ = scm_cons (ps->self_scm (), systems_); + ps->unprotect (); + set_system_penalty (ps, header); } - //debug helper; ughr - int i = 0; - for (SCM s = lines; s != SCM_EOL; s = ly_cdr (s)) - unsmob_paper_line (ly_car (s))->number_ = ++i; - return lines; } -Link_array* -Paper_book::pages () +SCM +Paper_book::systems () { - init (); - Page::page_count_ = 0; - Paper_def *paper = papers_[0]; - 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->get_scmvar ("page-breaking"); - SCM breaks = scm_apply_0 (proc, scm_list_n (all, - gh_double2scm (height_), - gh_double2scm (text_height), - gh_double2scm (copy_height), - gh_double2scm (tag_height), - SCM_UNDEFINED)); - - /* Copyright on first page. */ - if (unsmob_stencil (copyright_)) - page->copyright_ = copyright_; - - Link_array *pages = new Link_array; - int page_count = SCM_VECTOR_LENGTH ((SCM) breaks); - int line = 1; - for (int i = 0; i < page_count; i++) + if (systems_ != SCM_BOOL_F) + return systems_; + + systems_ = SCM_EOL; + Stencil title = book_title (); + + if (!title.is_empty ()) { - if (i) - page = new Page (paper, i+1); - int next = i + 1 < page_count - ? gh_scm2int (scm_vector_ref (breaks, gh_int2scm (i))) : 0; - while ((!next && all != SCM_EOL) || line <= next) - { - 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++; - } - pages->push (page); + Paper_system *ps = new Paper_system (title, true); + set_system_penalty (ps, header_); + + systems_ = scm_cons (ps->self_scm (), systems_); + ps->unprotect (); } - /* Tagline on last page. */ - if (unsmob_stencil (tagline_)) - page->tagline_ = tagline_; - return pages; -} + SCM page_properties + = scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"), + paper_->self_scm ()); -static SCM -c_ragged_page_breaks (SCM lines, Real book_height, Real text_height, - Real first, Real last) -{ - int page_number = 0; - int page_count = int (book_height / text_height + 0.5); - SCM breaks = SCM_EOL; - Real page_height = text_height + first; - Real h = 0; - int number = 0; - for (SCM s = lines; s != SCM_EOL; s = ly_cdr (s)) + SCM header = SCM_EOL; + for (SCM s = scm_reverse (scores_); 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) + 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)) + { + 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_)); + } + else + { + /* + Ignore MIDI + */ + } + } + else if (scm_is_vector (scm_car (s))) { - breaks = ly_snoc (gh_int2scm (number), breaks); - page_number++; - page_height = text_height + (page_number == page_count) * last; - h = 0; + /* + 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_)); } - if (ly_cdr (s) == SCM_EOL) - breaks = ly_snoc (gh_int2scm (pl->number_), breaks); + else if (Text_interface::is_markup (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_); + ps->unprotect (); + // 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)) + { + 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; } - 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 () +{ + if (SCM_BOOL_F != pages_) + return pages_; + + pages_ = SCM_EOL; + SCM proc = paper_->c_variable ("page-breaking"); + pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ())); + return pages_; +} + +SCM +Paper_book::performances () const { - SCM_ASSERT_TYPE (scm_pair_p (lines), lines, SCM_ARG1, __FUNCTION__, "list"); - SCM_ASSERT_TYPE (gh_number_p (book), book, SCM_ARG2, __FUNCTION__, "real"); - SCM_ASSERT_TYPE (gh_number_p (text), text, SCM_ARG2, __FUNCTION__, "real"); - SCM_ASSERT_TYPE (gh_number_p (first), first, SCM_ARG2, __FUNCTION__, "real"); - SCM_ASSERT_TYPE (gh_number_p (last), last, SCM_ARG2, __FUNCTION__, "real"); - - return c_ragged_page_breaks (lines, - gh_scm2double (book), gh_scm2double (text), - gh_scm2double (first), gh_scm2double (last)); + return scm_reverse (performances_); }