X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=c2b4b34fdc661e25274e33a8fb84f8dae2fb1d54;hb=015bb3813eb4ac879df0561e5c6e28e9d1146792;hp=0fed5b78fb8b3c525da05c940dd53ce48f20f9a0;hpb=2d51c5db4b6405476a7c6ce560b5fff6e3eb2961;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 0fed5b78fb..c2b4b34fdc 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -3,390 +3,308 @@ 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 "warn.hh" + +#include "ly-smobs.icc" -static SCM -stencil2line (Stencil* stil) +Paper_book::Paper_book () { - 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 ()))); + pages_ = SCM_BOOL_F; + systems_ = SCM_BOOL_F; + header_ = SCM_EOL; + + paper_ = 0; + smobify_self (); } -static SCM -title2line (Stencil* stil) +Paper_book::~Paper_book () { - SCM s = stencil2line (stil); - /* whugh, add marker recognise titles. */ - return scm_cons (scm_cons (ly_symbol2scm ("title"), ly_car (s)), ly_cdr (s)); } -/* Simplistic page interface */ -class Page +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) { -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_); } + 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 (); + + if (b->paper_) + scm_gc_mark (b->paper_->self_scm ()); + scm_gc_mark (b->header_); + scm_gc_mark (b->pages_); + return b->systems_; +} - /* 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) +int +Paper_book::print_smob (SCM smob, SCM port, scm_print_state*) { - 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_->smobbed_copy (), - 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_->smobbed_copy (), - scm_int2num (number_)); - if (get_footer ()) - get_footer ()->align_to (Y_AXIS, UP); + Paper_book *b = (Paper_book*) SCM_CELL_WORD_1 (smob); + + scm_puts ("#<", port); + scm_puts (classname (b), port); + scm_puts (" ", 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 -Page::output (Paper_outputter *out, bool is_last) +Paper_book::output (String outname) { - 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; - if (get_header ()) + if (!score_systems_.size ()) + return; + + /* Generate all stencils to trigger font loads. */ + pages (); + + SCM scopes = SCM_EOL; + if (ly_c_module_p (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) { - out->output_line (stencil2line (get_header ()), &o, false); - o[Y_AXIS] += head_sep_; + 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)); } - for (SCM s = lines_; gh_pair_p (s); s = ly_cdr (s)) + + if (make_preview) { - SCM line = ly_car (s); - SCM offset = ly_car (line); - if (ly_car (offset) == ly_symbol2scm ("title")) - line = scm_cons (ly_cdr (offset), ly_cdr (line)); - out->output_line (line, &o, - is_last && gh_pair_p (ly_cdr (s)) && !get_copyright () - && !get_tagline () && !get_footer ()); - if (gh_pair_p (ly_cdr (s)) && ly_car (offset) != ly_symbol2scm ("title")) - o[Y_AXIS] += vfill; + 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)); } - if (get_copyright () || get_tagline () || get_footer ()) - o[Y_AXIS] += foot_sep_; - 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 ("]"); + progress_indication ("\n"); } -Real -Page::text_height () +void +Paper_book::classic_output (String outname) { - 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; -} - -/****************************************************************/ + /* Generate all stencils to trigger font loads. */ + systems (); -/* Current global paper book. Gives default_rendering access from - input-file-results. */ -Paper_book *paper_book; + // 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 + + 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)); -Paper_book::Paper_book () -{ - smobify_self (); + progress_indication ("\n"); } -Paper_book::~Paper_book () -{ -} -void -Paper_book::output (String outname) +/* TODO: resurrect more complex user-tweaks for titling? */ +Stencil +Paper_book::book_title () { - /* Generate all stencils to trigger font loads. */ - Link_array *pages = get_pages (); + 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); - Paper_def *paper = papers_[0]; - Paper_outputter *out = paper->get_paper_outputter (outname); - out->output_metadata (get_scopes (0), paper); - out->output_header (paper); + + SCM tit = SCM_EOL; + if (ly_c_procedure_p (title_func)) + tit = scm_call_2 (title_func, + paper_->self_scm (), + scopes); - int page_count = pages->size (); - for (int i = 0; i < page_count; i++) - (*pages)[i]->output (out, i + 1 == page_count); + if (unsmob_stencil (tit)) + title = *unsmob_stencil (tit); - out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); - progress_indication ("\n"); + if (!title.is_empty ()) + title.align_to (Y_AXIS, UP); + + return title; } -SCM -Paper_book::get_scopes (int i) +Stencil +Paper_book::score_title (int i) { + SCM title_func = paper_->lookup_variable (ly_symbol2scm ("score-title")); + + Stencil title; + + // ugh code dup 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); -Stencil* -Paper_book::get_title (int i) -{ - 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); + if (ly_c_module_p (score_systems_[i].header_)) + scopes = scm_cons (score_systems_[i].header_, scopes); + //end ugh + + 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; } -/* Ideas: - - real page breaking algorithm (Gourlay?) - - override: # pages, or pageBreakLines= #'(3 3 4), ? */ -Link_array* -Paper_book::get_pages () +void +set_system_penalty (Paper_system * ps, SCM header) { - Link_array *pages = new Link_array; - int score_count = scores_.size (); - - /* 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++) + if (ly_c_module_p (header)) { - Stencil *title = get_title (i); - if (title) - book_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 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; } } +} + +SCM +Paper_book::systems () +{ + if (systems_ != SCM_BOOL_F) + return systems_; - Paper_def *paper = papers_[0]; - SCM scopes = get_scopes (0); - - SCM make_tagline = scm_primitive_eval (ly_symbol2scm ("make-tagline")); - SCM tagline = scm_call_2 (make_tagline, paper->smobbed_copy (), scopes); - Real tag_height = 0; - if (Stencil *s = unsmob_stencil (tagline)) - tag_height = s->extent (Y_AXIS).length (); - book_height += tag_height; - - SCM make_copyright = scm_primitive_eval (ly_symbol2scm ("make-copyright")); - SCM copyright = scm_call_2 (make_copyright, paper->smobbed_copy (), scopes); - Real copy_height = 0; - if (Stencil *s = unsmob_stencil (copyright)) - copy_height = s->extent (Y_AXIS).length (); - book_height += copy_height; - - Page::page_count_ = 0; - int page_number = 0; - Page *page = new Page (paper, ++page_number); - int page_count = int (book_height / page->text_height () + 0.5); - if (unsmob_stencil (copyright)) - page->copyright_ = copyright; - if (unsmob_stencil (tagline) && page_number == page_count) - page->tagline_ = tagline; + 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 ()); + } -#if 0 - fprintf (stderr, "book_height: %f\n", book_height); - fprintf (stderr, "vsize: %f\n", page->vsize_); - fprintf (stderr, "pages: %d\n", page_count); -#endif - - /* Simplistic page breaking. */ - Real text_height = page->text_height (); + int score_count = score_systems_.size (); for (int i = 0; i < score_count; i++) { - Real h = 0; - Stencil *title = get_title (i); - 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++) + Stencil title = score_title (i); + 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, score_systems_[i].header_); + + } + + if (scm_vector_p (score_systems_[i].systems_) == SCM_BOOL_T) { - 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) - { - pages->push (page); - page = new Page (paper, ++page_number); - if (unsmob_stencil (tagline) && page_number == page_count) - page->tagline_ = tagline; - text_height = page->text_height (); - } - if (page->height_ + h <= text_height || page->height_ == 0) - { - if (j == 0 && title) - page->lines_ - = ly_snoc (title2line (title), page->lines_); - page->lines_ = ly_snoc (line, page->lines_); - page->line_count_++; - page->height_ += h; - h = 0; - } + // guh. + SCM system_list = scm_vector_to_list (score_systems_[i].systems_); + + system_list = scm_reverse (system_list); + systems_ = scm_append (scm_list_2 (system_list, systems_)); } } - pages->push (page); - return pages; + 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 systems_; } -void -Paper_book::classic_output (String outname) +SCM +Paper_book::pages () { - 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 ()); + if (SCM_BOOL_F != pages_) + return pages_; - 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"); + pages_ = SCM_EOL; + SCM proc = paper_->c_variable ("page-breaking"); + pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ())); + return pages_; } -#include "ly-smobs.icc" - -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) +Score_systems::Score_systems () { - 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; + systems_ = SCM_EOL; + header_ = SCM_EOL; } -int -Paper_book::print_smob (SCM smob, SCM port, scm_print_state*) +void +Score_systems::gc_mark () { - 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; + scm_gc_mark (systems_); + scm_gc_mark (header_); } +