X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=4797a837ec0e18150151828e6840d85f9206ea8a;hb=abd05b0ad0ccc4b63bb77ed128a8f28d5d48f330;hp=1ecba007553c43b3e79a25519cdc8f7d2b16d8a4;hpb=380a3c6e2c3e155f74c95507aed3a25ce796bd6e;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 1ecba00755..4797a837ec 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -13,7 +13,7 @@ #include "dimensions.hh" #include "virtual-methods.hh" #include "paper-outputter.hh" -#include "molecule.hh" +#include "stencil.hh" #include "array.hh" #include "string-convert.hh" #include "warn.hh" @@ -23,179 +23,177 @@ #include "lily-version.hh" #include "paper-def.hh" #include "input-file-results.hh" -#include "ly-modules.hh" +#include "ly-module.hh" +#include "paper-book.hh" +#include "input-smob.hh" // output_expr - -/* - Ugh, this is messy. - */ Paper_outputter::Paper_outputter (String name) { if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } + scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T); file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), - scm_makfrom0str ("w")); + scm_makfrom0str ("w")); + + static SCM find_dumper; + if (!find_dumper) + find_dumper = scm_c_eval_string ("find-dumper"); - /* - ugh. - */ - SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"), - scm_makfrom0str (output_format_global.to_str0 ()), - SCM_UNDEFINED); + output_func_ + = scm_call_1 (find_dumper, + scm_makfrom0str (output_format_global.to_str0 ())); - output_func_ = scm_primitive_eval (exp); + 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_3 (ly_symbol2scm ("header"), + scm_makfrom0str (creator.to_str0 ()), + scm_makfrom0str (time_stamp.to_str0 ()))); } Paper_outputter::~Paper_outputter () { - + scm_close_port (file_); + file_ = SCM_EOL; } - void -Paper_outputter::output_header () +Paper_outputter::output_scheme (SCM scm) { - String generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - generate = generate.left_string (generate.length () - 1); - - /* - Make fixed length time stamps - */ - generate = generate + to_string (' ' * (120 - generate.length ())>? 0) ; - String creator = "lelie"; - - SCM args_scm = scm_list_n (scm_makfrom0str (creator.to_str0 ()), - scm_makfrom0str (generate.to_str0 ()), SCM_UNDEFINED); - - - SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm); - - output_scheme (scm); + gh_call2 (output_func_, scm, file_); } - - void -Paper_outputter::output_comment (String str) +Paper_outputter::output_metadata (SCM scopes, Paper_def *paper) { - output_scheme (scm_list_n (ly_symbol2scm ("comment"), - scm_makfrom0str ((char*)str.to_str0 ()), - SCM_UNDEFINED) - ); + SCM fields = SCM_EOL; + for (int i = dump_header_fieldnames_global.size (); i--; ) + fields + = gh_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()), + fields); + output_scheme (scm_list_n (ly_symbol2scm ("output-scopes"), + paper->self_scm (), + scm_list_n (ly_symbol2scm ("quote"), + scopes, SCM_UNDEFINED), + scm_list_n (ly_symbol2scm ("quote"), + fields, SCM_UNDEFINED), + scm_makfrom0str (basename_.to_str0 ()), + SCM_UNDEFINED)); } void -Paper_outputter::output_scheme (SCM scm) +Paper_outputter::output_header (Paper_def *paper) { - gh_call2 (output_func_, scm, file_); + output_music_output_def (paper); + output_scheme (scm_list_1 (ly_symbol2scm ("header-end"))); + output_scheme (scm_list_2 (ly_symbol2scm ("define-fonts"), + ly_quote_scm (paper->font_descriptions ()))); } void -Paper_outputter::output_scope (SCM mod, String prefix) +Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) { - if (!SCM_MODULEP (mod)) - return ; - - SCM al = ly_module_to_alist (mod); - for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) + Offset dim = ly_scm2offset (ly_car (line)); + if (dim[Y_AXIS] > 50 CM) { - SCM k = ly_caar (s); - SCM v = ly_cdar (s); - String s = ly_symbol2string (k); - - if (gh_string_p (v)) - { - output_String_def (prefix + s, ly_scm2string (v)); - } - else if (scm_exact_p (v) == SCM_BOOL_T) - { - output_int_def (prefix + s, gh_scm2int (v)); - } - else if (gh_number_p (v)) - { - output_Real_def (prefix + s, gh_scm2double (v)); - } + programming_error ("Improbable system height."); + dim[Y_AXIS] = 50 CM; } -} - -void -Paper_outputter::output_version () -{ - String id_string = "Lily was here"; - id_string += String_convert::pad_to (String (", ") + version_string (), 40); - - output_String_def ("lilypondtagline", id_string); - output_String_def ("LilyPondVersion", version_string ()); - output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT)); -} + if (output_format_global != PAGE_LAYOUT) + output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), + gh_double2scm (dim[X_AXIS]), + gh_double2scm (dim[Y_AXIS]))); + else + { + output_scheme (scm_list_3 (ly_symbol2scm ("new-start-system"), + ly_quote_scm (ly_offset2scm (*origin)), + ly_quote_scm (ly_offset2scm (dim)))); + (*origin)[Y_AXIS] += dim[Y_AXIS]; + } -void -Paper_outputter::output_Real_def (String k, Real v) -{ - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); -} + SCM between = SCM_EOL; + for (SCM s = ly_cdr (line); gh_pair_p (s); s = ly_cdr (s)) + { + Stencil *stil = unsmob_stencil (ly_cdar (s)); + SCM head = ly_caar (s); + + if (head == ly_symbol2scm ("between-system-string")) + { + between = stil->get_expr (); + continue; + } -void -Paper_outputter::output_String_def (String k, String v) -{ - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (v.get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); -} + if (stil) + output_expr (stil->get_expr (), ly_scm2offset (head)); + } -void -Paper_outputter::output_int_def (String k, int v) -{ - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); + if (is_last) + output_scheme (scm_list_1 (ly_symbol2scm ("stop-last-system"))); + else + { + output_scheme (scm_list_1 (ly_symbol2scm ("stop-system"))); + if (output_format_global != PAGE_LAYOUT && between != SCM_EOL) + output_scheme (between); + } } void -Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) +Paper_outputter::output_music_output_def (Music_output_def* odef) { - output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), - scm_makfrom0str (filename.to_str0 ()), - ly_quote_scm (key), value, - SCM_UNDEFINED)); + output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"), + odef->self_scm (), SCM_UNDEFINED)); } +/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil */ void -Paper_outputter::write_header_fields_to_file (SCM mod) +Paper_outputter::output_expr (SCM expr, Offset o) { - if (ly_module_p (mod)&& - dump_header_fieldnames_global.size ()) + while (1) { - SCM fields = ly_module_to_alist (mod); - for (int i = 0; i < dump_header_fieldnames_global.size (); i++) + if (!gh_pair_p (expr)) + return; + + SCM head =ly_car (expr); + if (unsmob_input (head)) + { + Input * ip = unsmob_input (head); + + output_scheme (scm_list_n (ly_symbol2scm ("define-origin"), + scm_makfrom0str (ip->file_string ().to_str0 ()), + gh_int2scm (ip->line_number ()), + gh_int2scm (ip->column_number ()), + SCM_UNDEFINED)); + expr = ly_cadr (expr); + } + else if (head == ly_symbol2scm ("no-origin")) + { + output_scheme (scm_list_n (head, SCM_UNDEFINED)); + 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 { - String key = dump_header_fieldnames_global[i]; - SCM val = gh_assoc (ly_symbol2scm (key.to_str0 ()), fields); - String s; - /* Only write header field to file if it exists */ - if (gh_pair_p (val)) - { - s = ly_scm2string (ly_cdr (val)); - /* Always write header field file, even if string is empty ... */ - write_header_field_to_file (basename_ , ly_car (val), ly_cdr (val)); - } + output_scheme (scm_list_n (ly_symbol2scm ("placebox"), + gh_double2scm (o[X_AXIS]), + gh_double2scm (o[Y_AXIS]), + expr, + SCM_UNDEFINED)); + return; } } } +