X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=ce4bc59a0bd19346156606c54d60e1ca8629a63d;hb=722c6964353630deed172f199b674280ebc24061;hp=1d5ee856a146145126139434ce169658dac2ba5f;hpb=28d97df78de5e56962730b42119c2d9b73401fa7;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 1d5ee856a1..ce4bc59a0b 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,79 +3,82 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include -#include #include -#include #include "dimensions.hh" -#include "dictionary-iter.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. */ +Paper_outputter::Paper_outputter (String name) +{ + if (safe_global_b) + { + gh_define ("security-paranoia", SCM_BOOL_T); + } + + file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), + scm_makfrom0str ("w")); -Paper_outputter::Paper_outputter () + /* + ugh. + */ + SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"), + scm_makfrom0str (output_format_global.to_str0 ()), + SCM_UNDEFINED); + + output_func_ = scm_primitive_eval (exp); +} + +Paper_outputter::~Paper_outputter () { - molecules_ = gh_cons (SCM_EOL, SCM_EOL); - last_cons_ = molecules_; + 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); } @@ -84,121 +87,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) { - SCM c = gh_cons (scm,gh_cdr (last_cons_)); - gh_set_cdr_x(last_cons_, c); - last_cons_ = c; + gh_call2 (output_func_, scm, file_); } - void -Paper_outputter::dump_onto (Paper_stream *ps) +Paper_outputter::output_scope (SCM mod, String prefix) { - if (String (output_global_ch) == "scm") -#if 1 // both are fine - { - /* - default to stdin - */ - int fd = 1; - if (ofstream* of = dynamic_cast (ps->os)) - fd = of->rdbuf ()->fd (); - SCM port = scm_fdes_to_port (fd, "a", SCM_EOL); - - /* - lilypond -f scm x.ly - guile -s x.scm - */ - scm_display (gh_str02scm ( - ";;; Usage: guile -s x.scm > x.tex\n" - "(primitive-load-path 'lily.scm)\n" - "(scm-as-output)\n" - ";(scm-tex-output)\n" - ";(scm-ps-output)\n" - "(map (lambda (x) (display (eval x))) '(\n" - ), port); - - SCM newline = gh_str02scm ("\n"); - for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) - { - scm_write (gh_car (s), port); - scm_display (newline, port); - scm_flush (port); - } - scm_display (gh_str02scm ("))"), port); - scm_display (newline, port); - scm_flush (port); - scm_close_port (port); - } -#else - { - /* - lilypond -f scm x.ly - guile -s x.scm - */ - if (output_global_ch == String ("scm")) - *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" - ; - for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) - { - SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"), - ly_quote_scm (gh_car (s)), SCM_UNDEFINED)); - - *ps << ly_scm2string (result); - } - *ps << "))"; - } -#endif + if (!SCM_MODULEP (mod)) + return ; - else - { - for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) - { - SCM result = scm_eval (gh_car (s)); - char *c=gh_scm2newstr (result, NULL); - - *ps << c; - free (c); - } - } -} - -void -Paper_outputter::output_scope (Scope *scope, String prefix) -{ - for (Scope_iter i (*scope); i.ok (); i++) + SCM al = ly_module_to_alist (mod); + for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) { - if (dynamic_cast (i.val ())) + SCM k = ly_caar (s); + SCM v = ly_cdar (s); + String s = ly_symbol2string (k); + + if (gh_string_p (v)) { - String val = *i.val()->access_content_String (false); - - output_String_def (prefix + i.key (), val); + output_String_def (prefix + s, ly_scm2string (v)); } - else if(dynamic_cast (i.val ())) + else if (scm_exact_p (v) == SCM_BOOL_T) { - Real val = *i.val ()->access_content_Real (false); - - output_Real_def (prefix + i.key (), val); + output_int_def (prefix + s, gh_scm2int (v)); } - else if (dynamic_cast (i.val ())) + else if (gh_number_p (v)) { - int val = *i.val ()->access_content_int (false); - - output_int_def (prefix + i.key (), val); + output_Real_def (prefix + s, gh_scm2double (v)); } } } @@ -206,68 +130,75 @@ 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 (); + String id_string = "Lily was here"; + id_string += String_convert::pad_to (String (", ") + version_string (), 40); - output_String_def ( "mudelatagline", id_str); - output_String_def ( "LilyPondVersion", version_str ()); + output_String_def ("lilypondtagline", id_string); + output_String_def ("LilyPondVersion", version_string ()); + output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT)); } - -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); - - output_scheme (scm); -} - 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); - - // gh_define (k.ch_l (), gh_double2scm (v)); } 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); - - // gh_define (k.ch_l (), ly_str02scm (v.ch_l ())); } 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); - - // gh_define (k.ch_l (), gh_int2scm (v)); } +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::write_header_fields_to_file (SCM mod) +{ + 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)) + { + 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)); + } + } + } +}