X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=44b9b671156db9794d8a4f4041b32ef2dbe67352;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=39d1b49c0edccbce6fa06c66991e3417e3745de7;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 39d1b49c0e..44b9b67115 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,103 +3,85 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include -#include #include -#include #include "dimensions.hh" #include "virtual-methods.hh" #include "paper-outputter.hh" -#include "paper-stream.hh" #include "molecule.hh" #include "array.hh" #include "string-convert.hh" -#include "debug.hh" -#include "lookup.hh" +#include "warn.hh" +#include "font-metric.hh" #include "main.hh" -#include "scope.hh" -#include "identifier.hh" +#include "scm-hash.hh" #include "lily-version.hh" +#include "paper-def.hh" +#include "input-file-results.hh" +#include "ly-modules.hh" + /* - Ugh, this is messy. - */ + TODO: this entire class should be implemented at Scheme level. -Paper_outputter::Paper_outputter (Paper_stream * ps ) -{ - /* - lilypond -f scm x.ly - guile -s x.scm - */ - verbatim_scheme_b_ = output_global_ch == String ("scm"); - if (verbatim_scheme_b_) + + */ +Paper_outputter::Paper_outputter (String name) +{ + if (safe_global_b) { - *ps << "" - ";;; Usage: guile -s x.scm > x.tex\n" - "(primitive-load-path 'lily.scm)\n" - "(scm-tex-output)\n" - ";(scm-ps-output)\n" - "(map (lambda (x) (display (eval x))) '(\n" - ; + gh_define ("security-paranoia", SCM_BOOL_T); } + + file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), + scm_makfrom0str ("w")); + + /* + ugh. + */ + SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"), + scm_makfrom0str (output_format_global.to_str0 ()), + SCM_UNDEFINED); - stream_p_ = ps; + output_func_ = scm_primitive_eval (exp); } Paper_outputter::~Paper_outputter () { - if (verbatim_scheme_b_) - { - *stream_p_ << "))"; - } - delete stream_p_; + scm_close_port (file_); + file_ = SCM_EOL; } void Paper_outputter::output_header () { - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } - - SCM exp = gh_list (ly_symbol2scm ((String (output_global_ch) + "-scm").ch_C()), - ly_quote_scm (ly_symbol2scm ("all-definitions")), - SCM_UNDEFINED); - exp = scm_eval (exp); - scm_eval (exp); + time_t t (time (0)); + String generate = ctime (&t); + generate = generate.left_string (generate.length () - 1) + " " + *tzname; - String creator; - if (no_timestamps_global_b) - creator = gnu_lilypond_str (); - else - creator = gnu_lilypond_version_str (); + /* Fixed length time stamp */ + generate = generate + to_string (' ', (50 - generate.length ()) >? 0); - String generate; - if (no_timestamps_global_b) - generate = "."; - else - { - generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - generate = generate.left_str (generate.length_i () - 1); - } - - SCM args_scm = - gh_list (ly_str02scm (creator.ch_l ()), - ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); + /* Fixed length creator string */ + String creator = gnu_lilypond_version_string (); + creator += " (http://lilypond.org)"; + creator = creator + to_string (' ', (50 - creator.length ()) >? 0); + + 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); } @@ -108,71 +90,42 @@ Paper_outputter::output_header () void Paper_outputter::output_comment (String str) { - output_scheme (gh_list (ly_symbol2scm ("comment"), - ly_str02scm ((char*)str.ch_C()), + output_scheme (scm_list_n (ly_symbol2scm ("comment"), + scm_makfrom0str ((char*)str.to_str0 ()), SCM_UNDEFINED) ); } - void Paper_outputter::output_scheme (SCM scm) { - /* - we don't rename dump_scheme, because we might in the future want - to remember Scheme. We don't now, because it sucks up a lot of memory. - */ - dump_scheme (scm); + gh_call2 (output_func_, scm, file_); } - -/* - UGH. - - Should probably change interface to do less eval ( symbol ), and more - apply (procedure, args) - */ void -Paper_outputter::dump_scheme (SCM s) +Paper_outputter::output_scope (SCM mod, String prefix) { - if (verbatim_scheme_b_) - { - SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"), - ly_quote_scm (gh_car (s)), SCM_UNDEFINED)); - - *stream_p_ << ly_scm2string (result); - } - else - { - SCM result = scm_eval (s); - char *c=gh_scm2newstr (result, NULL); + if (!SCM_MODULEP (mod)) + return ; - *stream_p_ << c; - free (c); - } -} -void -Paper_outputter::output_scope (Scope *scope, String prefix) -{ - SCM al = scope->to_alist (); - for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s)) + SCM al = ly_module_to_alist (mod); + for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) { - SCM k = gh_caar (s); - SCM v = gh_cdar (s); + 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_integer_p (v) == SCM_BOOL_T) + 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)); + output_Real_def (prefix + s, gh_scm2double (v)); } } } @@ -180,37 +133,23 @@ Paper_outputter::output_scope (Scope *scope, String prefix) void Paper_outputter::output_version () { - String id_str = "Lily was here"; - if (no_timestamps_global_b) - id_str += "."; - else - id_str += String (", ") + version_str (); - - output_String_def ( "mudelatagline", id_str); - output_String_def ( "LilyPondVersion", version_str ()); -} - - - -void -Paper_outputter::output_font_def (int i, String str) -{ - SCM scm = gh_list (ly_symbol2scm ("font-def"), - gh_int2scm (i), - ly_str02scm (str.ch_l ()), - SCM_UNDEFINED); + String id_string = "Engraved by LilyPond"; + id_string += String_convert::pad_to (String (", ") + version_string (), 40); - output_scheme (scm); + output_String_def ("lilypondtagline", id_string); + output_String_def ("LilyPondVersion", version_string ()); + output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT)); } + void Paper_outputter::output_Real_def (String k, Real v) { - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (to_str(v).ch_l ()), - SCM_UNDEFINED); + 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); } @@ -218,9 +157,9 @@ void Paper_outputter::output_String_def (String k, String v) { - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (v.ch_l ()), + SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), + scm_makfrom0str (k.get_str0 ()), + scm_makfrom0str (v.get_str0 ()), SCM_UNDEFINED); output_scheme (scm); } @@ -228,17 +167,41 @@ Paper_outputter::output_String_def (String k, String v) void Paper_outputter::output_int_def (String k, int v) { - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (to_str (v).ch_l ()), + 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); } - +void +Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) +{ + output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), + scm_makfrom0str (filename.to_str0 ()), + ly_quote_scm (key), value, + SCM_UNDEFINED)); +} void -Paper_outputter::output_string (SCM str) +Paper_outputter::write_header_fields_to_file (SCM mod) { - *stream_p_ << ly_scm2string (str); + if (ly_module_p (mod)&& + dump_header_fieldnames_global.size ()) + { + SCM fields = ly_module_to_alist (mod); + for (int i = 0; i < dump_header_fieldnames_global.size (); i++) + { + 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) && gh_string_p (ly_cdr (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)); + } + } + } }