X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-book.cc;h=da5b2453c3f9089a067597841b45a4507a279381;hb=9362af693c2e902d788067f9aff3654ad45d04ff;hp=048295b0a4c3689ef2c7ff3b684dc77b641e166e;hpb=14ca3493aab1a1f4f837f1b483ad9ea1d1e444ad;p=lilypond.git diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 048295b0a4..da5b2453c3 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -8,37 +8,23 @@ #include "ly-module.hh" #include "main.hh" -#include "page.hh" +#include "output-def.hh" #include "paper-book.hh" -#include "paper-def.hh" #include "paper-outputter.hh" -#include "paper-line.hh" #include "paper-score.hh" +#include "paper-system.hh" #include "stencil.hh" #include "warn.hh" -// JUNKME -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), - -10001 * is_title, is_title); - - return scm_gc_unprotect_object (pl->self_scm ()); -} - +#include "ly-smobs.icc" Paper_book::Paper_book () { - copyright_ = SCM_EOL; - tagline_ = SCM_EOL; + pages_ = SCM_BOOL_F; + systems_ = SCM_BOOL_F; + header_ = SCM_EOL; + bookpaper_ = 0; smobify_self (); } @@ -46,8 +32,6 @@ 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?") @@ -56,11 +40,14 @@ SCM Paper_book::mark_smob (SCM smob) { Paper_book *b = (Paper_book*) SCM_CELL_WORD_1 (smob); - for (int i = 0; i < b->score_lines_.size (); i++) - b->score_lines_[i].gc_mark (); - - scm_gc_mark (b->copyright_); - return b->tagline_; + for (int i = 0; i < b->score_systems_.size (); i++) + b->score_systems_[i].gc_mark (); + + if (b->bookpaper_) + scm_gc_mark (b->bookpaper_->self_scm ()); + scm_gc_mark (b->header_); + scm_gc_mark (b->pages_); + return b->systems_; } int @@ -76,296 +63,366 @@ Paper_book::print_smob (SCM smob, SCM port, scm_print_state*) return 1; } -void -Paper_book::output (String outname) +Array +split_string (String s, char c) { - if (!score_lines_.size ()) - // FIXME: no end-output? - return; - - /* Generate all stencils to trigger font loads. */ - SCM pages = this->pages (); - - Paper_def *paper = score_lines_[0].paper_; - Paper_outputter *out = paper->get_paper_outputter (outname); - int page_count = scm_ilength (pages); - out->output_header (paper, scopes (0), page_count, false); - - for (SCM s = pages; s != SCM_EOL; s = ly_cdr (s)) + Array rv; + while (s.length ()) { - Page *p = unsmob_page (ly_car (s)); - progress_indication ("[" + to_string (p->number_)); - out->output_page (p, ly_cdr (s) == SCM_EOL); - progress_indication ("]"); + 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); } - out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); - progress_indication ("\n"); + return rv; } SCM -Paper_book::scopes (int i) +dump_fields () { - return score_lines_[i].scopes (); + 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; } - -Stencil -Paper_book::title (int i) +LY_DEFINE (ly_output_formats, "ly:output-formats", + 0, 0, 0, (), + "Formats passed to --format as a list of strings, " + "used for the output.") { - /* - TODO: get from book-paper definition. - */ - SCM user_title = ly_scheme_function ("user-title"); - SCM book_title = ly_scheme_function ("book-title"); - SCM score_title = ly_scheme_function ("score-title"); - SCM field = (i == 0 ? ly_symbol2scm ("bookTitle") - : ly_symbol2scm ("scoreTitle")); + Array output_formats = split_string (output_format_global, ','); - Stencil title; - 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, - score_lines_[0].paper_->self_scm (), - scm_variable_ref (s))); - else - title = *unsmob_stencil (scm_call_2 (i == 0 ? book_title : score_title, - score_lines_[0].paper_->self_scm (), - scopes)); - if (!title.is_empty ()) - title.align_to (Y_AXIS, UP); + 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 title; + return lst; } void -Paper_book::classic_output (String outname) +Paper_book::post_processing (SCM module, + SCM file_name) { - int count = score_lines_.size (); - Paper_def * p = score_lines_.top ().paper_; - Paper_outputter *out = p->get_paper_outputter (outname); - out->output_header (p, scopes (count - 1), 0, true); - - SCM top_lines = score_lines_.top ().lines_; - Paper_line *first = unsmob_paper_line (scm_vector_ref (top_lines, - scm_int2num (0))); - Offset o (0, -0.5 * first->dim ()[Y_AXIS]); - int line_count = SCM_VECTOR_LENGTH (top_lines); - for (int i = 0; i < line_count; i++) + 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++) { - /* In classic compatibility TeX tracks how large things are, and - advances the Y pos for us. If we advance it too, we get too - much space. - - FIXME: vague... why is TeX is different from other ouput - backends, why not fix the TeX backend? -- jcn */ - if (output_format_global == "tex") - o = Offset (0, 0); - - out->output_line (scm_vector_ref (top_lines, scm_int2num (i)), - &o, i == line_count - 1); + 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); + } + } } - - out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); - progress_indication ("\n"); } -/* calculate book height, #lines, stencils. */ void -Paper_book::init () +Paper_book::output (String outname) { - int score_count = score_lines_.size (); + if (!score_systems_.size ()) + return; - /* 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++) + /* Generate all stencils to trigger font loads. */ + pages (); + + SCM formats = ly_output_formats (); + for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s)) { - Stencil title = this->title (i); - if (!title.is_empty ()) - height_ += title.extent (Y_AXIS).length (); - - int line_count = SCM_VECTOR_LENGTH (score_lines_[i].lines_); - for (int j = 0; j < line_count; j++) + String format = ly_scm2string (ly_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 ()); + 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) { - SCM s = scm_vector_ref ((SCM) score_lines_[i].lines_, scm_int2num (j)); - height_ += unsmob_paper_line (s)->dim ()[Y_AXIS]; - } + 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"); } - - Paper_def *paper = score_lines_[0].paper_; - SCM scopes = this->scopes (0); - - SCM make_tagline = paper->c_variable ("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 = paper->c_variable ("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::classic_output (String outname) { - int score_count = score_lines_.size (); - SCM lines = SCM_EOL; - for (int i = 0; i < score_count; i++) + /* 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, ','); + + for (int i = 0; i < output_formats.size (); i++) { - Stencil title = this->title (i); - if (!title.is_empty ()) - lines = ly_snoc (stencil2line (title, true), lines); - lines = scm_append (scm_list_2 (lines, scm_vector_to_list (score_lines_[i].lines_))); + 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"); + + 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, + dump_fields (), + scm_makfrom0str (outname.to_str0 ()), + SCM_UNDEFINED)); + + scm_gc_unprotect_object (out->self_scm ()); + 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 paper book @var{book}.") +{ + Paper_book *pb = unsmob_paper_book(book); + SCM_ASSERT_TYPE(pb, book, SCM_ARG1, __FUNCTION__, "Paper_book"); - //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; + SCM scopes = SCM_EOL; + if (ly_c_module_p (pb->header_)) + scopes = scm_cons (pb->header_, scopes); + + return scopes; } -SCM -Paper_book::pages () +LY_DEFINE (ly_paper_book_systems, "ly:paper-book-systems", + 1, 0, 0, (SCM pb), + "Return systems in book PB.") { - init (); - Page::page_count_ = 0; - Paper_def *paper = score_lines_[0].paper_; - 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->c_variable ("page-breaking"); - SCM breaks = scm_apply_0 (proc, scm_list_n (all, scm_make_real (height_), - scm_make_real (text_height), - scm_make_real (-copy_height), - scm_make_real (-tag_height), - SCM_UNDEFINED)); - - /* Copyright on first page. */ - if (unsmob_stencil (copyright_)) - page->copyright_ = copyright_; - - SCM pages = SCM_EOL; - int page_count = SCM_VECTOR_LENGTH ((SCM) breaks); - int line = 1; - for (int i = 0; i < page_count; i++) - { - if (i) - page = new Page (paper, i + 1); + return unsmob_paper_book (pb)->systems (); +} - int next = i + 1 < page_count - ? ly_scm2int (scm_vector_ref (breaks, scm_int2num (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 = scm_cons (page->self_scm (), pages); - } +LY_DEFINE (ly_paper_book_book_paper, "ly:paper-book-book-paper", + 1, 0, 0, (SCM pb), + "Return pages in book PB.") +{ + return unsmob_paper_book (pb)->bookpaper_->self_scm (); +} - /* Tagline on last page. */ - if (unsmob_stencil (tagline_)) - page->tagline_ = tagline_; +/* TODO: resurrect more complex user-tweaks for titling? */ +Stencil +Paper_book::book_title () +{ + SCM title_func = bookpaper_->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, + bookpaper_->self_scm (), + scopes); - return scm_reverse (pages); + if (unsmob_stencil (tit)) + title = *unsmob_stencil (tit); + + if (!title.is_empty ()) + title.align_to (Y_AXIS, UP); + + return title; } -static SCM -c_ragged_page_breaks (SCM lines, Real book_height, Real text_height, - Real first, Real last) +Stencil +Paper_book::score_title (int i) { - 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 title_func = bookpaper_->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 + + SCM tit = SCM_EOL; + if (ly_c_procedure_p (title_func)) + tit = scm_call_2 (title_func, + bookpaper_->self_scm (), + scopes); + + if (unsmob_stencil (tit)) + title = *unsmob_stencil (tit); + + if (!title.is_empty ()) + title.align_to (Y_AXIS, UP); + + return title; +} + +SCM +Paper_book::systems () +{ + if (systems_ != SCM_BOOL_F) + return systems_; + + systems_ = SCM_EOL; + Stencil title = book_title (); + + if (!title.is_empty ()) { - 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) + Paper_system *ps = new Paper_system (title, true); + 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++) + { + 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 ()); + } + + if (scm_vector_p (score_systems_[i].systems_) == SCM_BOOL_T) { - breaks = ly_snoc (scm_int2num (number), breaks); - page_number++; - page_height = text_height + (page_number == page_count) * last; - 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_)); } - if (ly_cdr (s) == SCM_EOL) - breaks = ly_snoc (scm_int2num (pl->number_), breaks); } + + systems_ = scm_reverse (systems_); + + int i = 0; + Paper_system *last = 0; + for (SCM s = systems_; s != SCM_EOL; s = ly_cdr (s)) + { + Paper_system *ps = unsmob_paper_system (ly_car (s)); + ps->number_ = ++i; - return scm_vector (breaks); + if (last && last->is_title ()) + // ugh, hardcoded. + ps->penalty_ = 10000; + last = ps; + } + + 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 () { - SCM_ASSERT_TYPE (scm_pair_p (lines), lines, SCM_ARG1, __FUNCTION__, "list"); - SCM_ASSERT_TYPE (ly_c_number_p (book), book, SCM_ARG2, __FUNCTION__, "real"); - SCM_ASSERT_TYPE (ly_c_number_p (text), text, SCM_ARG2, __FUNCTION__, "real"); - SCM_ASSERT_TYPE (ly_c_number_p (first), first, SCM_ARG2, __FUNCTION__, "real"); - SCM_ASSERT_TYPE (ly_c_number_p (last), last, SCM_ARG2, __FUNCTION__, "real"); - - return c_ragged_page_breaks (lines, - ly_scm2double (book), ly_scm2double (text), - ly_scm2double (first), ly_scm2double (last)); + if (SCM_BOOL_F != pages_) + return pages_; + + pages_ = SCM_EOL; + SCM proc = bookpaper_->c_variable ("page-breaking"); + pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ())); + return pages_; } + /****************************************************************/ -Score_lines::Score_lines () +Score_systems::Score_systems () { - lines_ = SCM_EOL; - global_header_ = SCM_EOL; + systems_ = SCM_EOL; header_ = SCM_EOL; - paper_ = 0; } void -Score_lines::gc_mark () +Score_systems::gc_mark () { - scm_gc_mark (lines_); - scm_gc_mark (global_header_); + scm_gc_mark (systems_); scm_gc_mark (header_); - if (paper_) - scm_gc_mark (paper_->self_scm ()); } - -SCM -Score_lines::scopes () -{ - SCM scopes = SCM_EOL; - if (header_) - scopes = scm_cons (header_, scopes); - if (SCM_MODULEP(global_header_) - && global_header_ != header_) - scopes = scm_cons (global_header_, scopes); - - return scopes; -}