X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=72135b91389ca4cddd41892198861df5bff93b26;hb=55a36d7beef61098884e49d6b853ce3d7a79811a;hp=94bff9eaed983cad658f963f4cbaaf9d72188bcc;hpb=d3b59ed445baf28ffd933df4620d5bc143f862ec;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 94bff9eaed..72135b9138 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -7,202 +7,142 @@ Jan Nieuwenhuizen */ +#include "paper-outputter.hh" + #include -#include +#include -#include "array.hh" #include "dimensions.hh" +#include "file-name.hh" #include "font-metric.hh" #include "input-smob.hh" -#include "lily-guile.hh" #include "lily-version.hh" #include "ly-module.hh" #include "main.hh" -#include "page.hh" +#include "output-def.hh" #include "paper-book.hh" -#include "paper-def.hh" -#include "paper-line.hh" -#include "paper-outputter.hh" -#include "file-name.hh" +#include "paper-system.hh" #include "scm-hash.hh" -#include "stencil.hh" #include "string-convert.hh" #include "warn.hh" -// JUNKME -extern SCM stencil2line (Stencil* stil, bool is_title = false); +#include "ly-smobs.icc" -Paper_outputter::Paper_outputter (String filename) +Paper_outputter::Paper_outputter (String file_name, String format) { - filename_ = filename; - file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()), - scm_makfrom0str ("w")); - - String module_name = "scm output-" + output_format_global; + file_ = SCM_EOL; + output_module_ = SCM_EOL; + smobify_self (); + + file_name_ = file_name; + String module_name = "scm output-" + format; output_module_ = scm_c_resolve_module (module_name.to_str0 ()); } Paper_outputter::~Paper_outputter () { - scm_close_port (file_); - file_ = SCM_EOL; } -void -Paper_outputter::output_scheme (SCM scm) + +IMPLEMENT_SMOBS (Paper_outputter); +IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); + +SCM +Paper_outputter::mark_smob (SCM x) { - scm_display (scm_eval (scm, output_module_), file_); + Paper_outputter *p = (Paper_outputter*) SCM_CELL_WORD_1(x); + scm_gc_mark (p->output_module_); + return p->file_; } -void -Paper_outputter::output_metadata (Paper_def *paper, SCM scopes) +int +Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) { - 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); - - File_name file_name (filename_); - file_name.ext_ = ""; - String basename = file_name.to_string (); - output_scheme (scm_list_n (ly_symbol2scm ("output-scopes"), - paper->self_scm (), - ly_quote_scm (scopes), - ly_quote_scm (fields), - scm_makfrom0str (basename.to_str0 ()), - SCM_UNDEFINED)); + (void) x; + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count, - bool is_classic) +SCM +Paper_outputter::file () { - String creator = gnu_lilypond_version_string (); - creator += " (http://lilypond.org)"; - time_t t (time (0)); - String time_stamp = ctime (&t); - time_stamp = time_stamp.left_string (time_stamp.length () - 1) - + " " + *tzname; - output_scheme (scm_list_n (ly_symbol2scm ("header"), - scm_makfrom0str (creator.to_str0 ()), - scm_makfrom0str (time_stamp.to_str0 ()), - paper->self_scm (), - scm_int2num (page_count), - ly_bool2scm (is_classic), - SCM_UNDEFINED)); - - output_metadata (paper, scopes); - output_music_output_def (paper); - - output_scheme (scm_list_1 (ly_symbol2scm ("header-end"))); - - /* TODO: maybe have Scheme extract the fonts directly from \paper ? - - Alternatively, we could simply load the fonts on demand in the - output, and do away with this define-fonts step. */ - SCM fonts = paper->font_descriptions (); - output_scheme (scm_list_3 (ly_symbol2scm ("define-fonts"), - paper->self_scm (), - //FIXME: - ly_quote_scm (ly_list_qsort_uniq_x (fonts)))); + if (file_ == SCM_EOL) + if (file_name_ == "-") + file_ = scm_current_output_port(); + else + file_ = scm_open_file (scm_makfrom0str (file_name_.to_str0 ()), + scm_makfrom0str ("w")); + return file_; } -void -Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) +SCM +Paper_outputter::dump_string (SCM scm) { - Paper_line *p = unsmob_paper_line (line); - Offset dim = p->dim (); - if (dim[Y_AXIS] > 50 CM) - { - programming_error (to_string ("Improbable line height: %f", - dim[Y_AXIS])); - dim[Y_AXIS] = 50 CM; - } - - output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), - ly_quote_scm (ly_offset2scm (*origin)), - ly_quote_scm (ly_offset2scm (dim)))); - - output_stencil (unsmob_stencil (p->to_stencil ())); - - (*origin)[Y_AXIS] += dim[Y_AXIS]; - output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), - ly_bool2scm (is_last))); + return scm_display (scm, file ()); +} + +SCM +Paper_outputter::scheme_to_string (SCM scm) +{ + return scm_eval (scm, output_module_); } void -Paper_outputter::output_page (Page *p, bool is_last) +Paper_outputter::output_scheme (SCM scm) { - output_scheme (scm_list_1 (ly_symbol2scm ("start-page"))); + dump_string (scheme_to_string (scm)); +} - output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), - ly_quote_scm (ly_offset2scm (Offset (0, 0))), - ly_quote_scm (ly_offset2scm (Offset (0, 0))))); +void +paper_outputter_dump (void *po, SCM x) +{ + Paper_outputter *me = (Paper_outputter*) po; + me->output_scheme (x); +} - output_stencil (unsmob_stencil (p->to_stencil ())); +void +Paper_outputter::output_stencil (Stencil stil) +{ + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void*) this, Offset (0,0)); +} - output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), SCM_BOOL_T)); - output_scheme (scm_list_2 (ly_symbol2scm ("stop-page"), - ly_bool2scm (is_last - && !unsmob_stencil (p->footer_)))); +Paper_outputter * +get_paper_outputter (String outname, String f) +{ + progress_indication (_f ("Layout output to `%s'...", + outname == "-" ? String ("") : outname)); + progress_indication ("\n"); + return new Paper_outputter (outname, f); } -void -Paper_outputter::output_music_output_def (Music_output_def *odef) +/* FIXME: why is output_* wrapper called dump? */ +LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil", + 2, 0, 0, (SCM outputter, SCM stencil), + "Dump stencil @var{expr} onto @var{outputter}.") { - output_scheme (scm_list_2 (ly_symbol2scm ("output-paper-def"), - odef->self_scm ())); + Paper_outputter *po = unsmob_outputter (outputter); + Stencil *st = unsmob_stencil (stencil); + SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + SCM_ASSERT_TYPE (st, stencil, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + po->output_stencil (*st); + return SCM_UNSPECIFIED; } -void -Paper_outputter::output_stencil (Stencil *stil) +LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string", + 2, 0, 0, (SCM outputter, SCM str), + "Dump @var{str} onto @var{outputter}.") { - output_expr (stil->expr (), stil->origin ()); + Paper_outputter *po = unsmob_outputter (outputter); + SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + + return po->dump_string (str); } -/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil */ void -Paper_outputter::output_expr (SCM expr, Offset o) +Paper_outputter::close () { - while (1) - { - if (!ly_c_pair_p (expr)) - return; - - SCM head =ly_car (expr); - if (unsmob_input (head)) - { - Input *ip = unsmob_input (head); - output_scheme (scm_list_4 (ly_symbol2scm ("define-origin"), - scm_makfrom0str (ip->file_string () - .to_str0 ()), - scm_int2num (ip->line_number ()), - scm_int2num (ip->column_number ()))); - expr = ly_cadr (expr); - } - else if (head == ly_symbol2scm ("no-origin")) - { - output_scheme (scm_list_1 (head)); - expr = ly_cadr (expr); - } - else if (head == ly_symbol2scm ("translate-stencil")) - { - o += ly_scm2offset (ly_cadr (expr)); - expr = ly_caddr (expr); - } - else if (head == ly_symbol2scm ("combine-stencil")) - { - output_expr (ly_cadr (expr), o); - expr = ly_caddr (expr); - } - else - { - output_scheme (scm_list_4 (ly_symbol2scm ("placebox"), - scm_make_real (o[X_AXIS]), - scm_make_real (o[Y_AXIS]), - expr)); - return; - } - } + if (scm_port_p (file_) == SCM_BOOL_T) + scm_close_port (file_); }