X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=bfe92de4b87c164803bf84f4f7d60d6d15053235;hb=9943c08d29026b5a582e15d661c9a0d0b5e37501;hp=fd53025c2c64b6e151d3e8e062fffc102ffac237;hpb=fd7e615444cf58b38283a59b56d3457c07778397;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index fd53025c2c..bfe92de4b8 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,15 +3,16 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2001 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" @@ -19,17 +20,49 @@ #include "array.hh" #include "string-convert.hh" #include "debug.hh" -#include "lookup.hh" +#include "font-metric.hh" #include "main.hh" #include "scope.hh" -#include "identifier.hh" + #include "lily-version.hh" -#include "atom.hh" +#include "paper-def.hh" +#include "file-results.hh" + + +/* + Ugh, this is messy. + */ -Paper_outputter::Paper_outputter () +Paper_outputter::Paper_outputter (String name) { - molecules_ = gh_cons (SCM_EOL, SCM_EOL); - last_cons_ = molecules_; + stream_p_ = new Paper_stream (name); + + /* + lilypond -f scm x.ly + guile -s x.scm + */ + verbatim_scheme_b_ = output_format_global == "scm"; + + if (verbatim_scheme_b_) + { + *stream_p_ << "" + ";;; Usage: guile -s x.scm > x.tex\n" + " (primitive-load-path 'standalone.scm)\n" + "; (scm-tex-output)\n" + " (scm-ps-output)\n" + " (map (lambda (x) (display (ly-eval x))) ' (\n" + ; + } + +} + +Paper_outputter::~Paper_outputter () +{ + if (verbatim_scheme_b_) + { + *stream_p_ << "))"; + } + delete stream_p_; } @@ -38,29 +71,27 @@ Paper_outputter::output_header () { if (safe_global_b) { - // ly_set_x ("security-paranoia", SCM_BOOL_T); gh_define ("security-paranoia", SCM_BOOL_T); } - String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))"; - ly_eval_str (s.ch_C ()); + + SCM exp = gh_list (ly_symbol2scm ((output_format_global + "-scm").ch_C ()), + ly_quote_scm (ly_symbol2scm ("all-definitions")), + SCM_UNDEFINED); + exp = scm_eval2 (exp, SCM_EOL); + scm_eval2 (exp, SCM_EOL); - String creator; - if (no_timestamps_global_b) - creator = gnu_lilypond_str (); - else - creator = gnu_lilypond_version_str (); + String creator = gnu_lilypond_version_str (); + + String generate = _ (", at "); + time_t t (time (0)); + generate += ctime (&t); + generate = generate.left_str (generate.length_i () - 1); + + /* + Make fixed length time stamps + */ + generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0) ; - String generate; - if (no_timestamps_global_b) - generate = ".\n"; - else - { - generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - //urg - } - SCM args_scm = gh_list (ly_str02scm (creator.ch_l ()), ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); @@ -70,52 +101,13 @@ Paper_outputter::output_header () output_scheme (scm); } -void -Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) -{ - if (flower_dstream) - { - output_comment (nm); - } - - for (Cons *ptr = m->atom_list_; ptr; ptr = ptr->next_) - { - Atom * i = ptr->car_; - - Offset a_off = i->off_; - a_off += o; - if (!i->func_) - continue; - - if (a_off.length () > 100 CM) - { - programming_error ("improbable offset for object"); - Axis a =X_AXIS; - while (a < NO_AXES) - { - if (abs(a_off[a]) > 30 CM) - a_off[a] = 30 CM; - incr (a); - } - } - - SCM box_scm - = gh_list (ly_symbol2scm ("placebox"), - gh_double2scm (a_off[X_AXIS]), - gh_double2scm (a_off[Y_AXIS]), - SCM(i->func_), - SCM_UNDEFINED); - - output_scheme (box_scm); - } -} void Paper_outputter::output_comment (String str) { output_scheme (gh_list (ly_symbol2scm ("comment"), - ly_str02scm ((char*)str.ch_C()), + ly_str02scm ((char*)str.ch_C ()), SCM_UNDEFINED) ); } @@ -124,110 +116,59 @@ Paper_outputter::output_comment (String str) 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; + /* + 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); } +/* + UGH. + + Should probably change interface to do less eval (symbol), and more + apply (procedure, args) + */ void -Paper_outputter::dump_onto (Paper_stream *ps) +Paper_outputter::dump_scheme (SCM s) { - if (String (output_global_ch) == "scm") -#if 1 // both are fine + if (verbatim_scheme_b_) { - /* - 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-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); + *stream_p_ << ly_scm2string (ly_write2scm (s)); } -#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 - 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); - } + SCM result = scm_eval2 (s, SCM_EOL); + char *c=gh_scm2newstr (result, NULL); + + *stream_p_ << c; + free (c); } } void Paper_outputter::output_scope (Scope *scope, String prefix) { - for (Scope_iter i (*scope); i.ok (); i++) + SCM al = scope->to_alist (); + for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s)) { - if (dynamic_cast (i.val ())) - { - String val = *i.val()->access_content_String (false); + SCM k = gh_caar (s); + SCM v = gh_cdar (s); + String s = ly_symbol2string (k); - output_String_def (prefix + i.key (), val); + + if (gh_string_p (v)) + { + output_String_def (prefix + s, ly_scm2string (v)); } - else if(dynamic_cast (i.val ())) + else if (scm_integer_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)); } } } @@ -236,39 +177,14 @@ void Paper_outputter::output_version () { String id_str = "Lily was here"; - if (no_timestamps_global_b) - id_str += "."; - else - id_str += String (", ") + version_str (); + id_str += String_convert::pad_to (String (", ") + version_str (), 40); - output_String_def ( "mudelatagline", id_str); - output_String_def ( "LilyPondVersion", version_str ()); + output_String_def ("lilypondtagline", id_str); + output_String_def ("LilyPondVersion", version_str ()); } -void -Paper_outputter::start_line (Real height) -{ - if (height > 50 CM) - { - programming_error ("Improbable system height"); - height = 50 CM; - } - SCM scm = gh_list (ly_symbol2scm ("start-line"), - gh_double2scm (height), - SCM_UNDEFINED); - output_scheme (scm); -} -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) @@ -276,11 +192,9 @@ 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 ()), + ly_str02scm (to_str (v).ch_l ()), SCM_UNDEFINED); output_scheme (scm); - - gh_define (k.ch_l (), gh_double2scm (v)); } void @@ -292,8 +206,6 @@ Paper_outputter::output_String_def (String k, String v) ly_str02scm (v.ch_l ()), SCM_UNDEFINED); output_scheme (scm); - - gh_define (k.ch_l (), ly_str02scm (v.ch_l ())); } void @@ -304,26 +216,47 @@ Paper_outputter::output_int_def (String k, int v) ly_str02scm (to_str (v).ch_l ()), SCM_UNDEFINED); output_scheme (scm); - - gh_define (k.ch_l (), gh_int2scm (v)); } - - void -Paper_outputter::stop_line () +Paper_outputter::output_string (SCM str) { - SCM scm = gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED); - output_scheme (scm); + *stream_p_ << ly_scm2string (str); } void -Paper_outputter::stop_last_line () +Paper_outputter::write_header_field_to_file (String filename, String key, String value) { - SCM scm = gh_list (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED); - output_scheme (scm); - scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED); - output_scheme (scm); + if (filename != "-") + filename += String (".") + key; + progress_indication (_f ("writing header field %s to %s...", + key, + filename == "-" ? String ("") : filename)); + + ostream *os = open_file_stream (filename); + *os << value; + close_file_stream (os); + progress_indication ("\n"); } - +void +Paper_outputter::write_header_fields_to_file (Scope * header) +{ + if (dump_header_fieldnames_global.size ()) + { + SCM fields = header->to_alist (); + 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.ch_C ()), fields); + String s; + /* Only write header field to file if it exists */ + if (gh_pair_p (val)) + { + s = ly_scm2string (gh_cdr (val)); + /* Always write header field file, even if string is empty ... */ + write_header_field_to_file (basename_, key, s); + } + } + } +}