X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=bfe92de4b87c164803bf84f4f7d60d6d15053235;hb=68a168bff1fec7f8011b2afa82d4fc89182c4bf7;hp=38f0c9d809e989f1a091ee2503899b52ce70208a;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 38f0c9d809..bfe92de4b8 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,14 +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 "dictionary-iter.hh" +#include "dimensions.hh" #include "virtual-methods.hh" #include "paper-outputter.hh" #include "paper-stream.hh" @@ -18,165 +20,129 @@ #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_stream *s) +Paper_outputter::Paper_outputter (String name) { - outstream_l_ = s; - output_header (); + 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 () { - SCM scm = gh_list (ly_symbol ("end-output"), SCM_UNDEFINED); - output_scheme (scm); + if (verbatim_scheme_b_) + { + *stream_p_ << "))"; + } + delete stream_p_; } + void Paper_outputter::output_header () { -#if 0 - int gobble = 10000; - {// alloc big chunk of memory. - SCM beg = SCM_EOL; - String bigstr = String_convert::char_str (' ', 50); - for (int i = gobble; i--; ) - { - beg = gh_cons (gh_str02scm (bigstr.ch_C()), beg); - } - } -#endif - if (safe_global_b) { - ly_set_scm ("security-paranoia", SCM_BOOL_T); - // gh_eval_str ("(set! security-paranoia #t)"); + gh_define ("security-paranoia", SCM_BOOL_T); } - String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))"; - gh_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 (gh_str02scm (creator.ch_l ()), - gh_str02scm (generate.ch_l ()), SCM_UNDEFINED); + gh_list (ly_str02scm (creator.ch_l ()), + ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); -#ifndef NPRINT - DOUT << "output_header\n"; - if (check_debug && !monitor->silent_b ("Guile")) - { - gh_display (args_scm); gh_newline (); - } -#endif - SCM scm = gh_cons (ly_symbol ("header"), args_scm); + SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm); output_scheme (scm); } -void -Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) -{ - if (check_debug) - *outstream_l_ << String ("\n%start: ") << nm << "\n"; - - - if (check_debug) - { - 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 (i->font_) - { - output_scheme (gh_list (ly_symbol ("select-font"), - gh_str02scm (symbol_to_string (i->font_).ch_C()), - SCM_UNDEFINED)); - } - - SCM box_scm - = gh_list (ly_symbol ("placebox"), - gh_double2scm (a_off.x ()), - gh_double2scm (a_off.y ()), - i->func_.to_SCM(), - SCM_UNDEFINED); - - output_scheme (box_scm); - } -} void Paper_outputter::output_comment (String str) { - if (String (output_global_ch) == "scm") - { - *outstream_l_ << "; " << str << '\n'; - } - else - { - *outstream_l_ << "% " << str << "\n"; - } + output_scheme (gh_list (ly_symbol2scm ("comment"), + ly_str02scm ((char*)str.ch_C ()), + SCM_UNDEFINED) + ); } void Paper_outputter::output_scheme (SCM scm) { - if (String (output_global_ch) == "scm") - { - static SCM port = 0; - - // urg - if (!port) - { - int fd = 1; - ofstream * of = dynamic_cast (outstream_l_->os); - if (of) - fd = of->rdbuf()->fd(); - FILE *file = fdopen (fd, "a"); - port = scm_standard_stream_to_port (file, "a", ""); - scm_display (gh_str02scm ("(load 'lily.scm)\n"), port); - } + /* + 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); +} + - scm_display (gh_str02scm ("("), port); - scm_write (scm, port); - scm_display (gh_str02scm (")\n"),port); - scm_fflush (port); +/* + UGH. + + Should probably change interface to do less eval (symbol), and more + apply (procedure, args) + */ +void +Paper_outputter::dump_scheme (SCM s) +{ + if (verbatim_scheme_b_) + { + *stream_p_ << ly_scm2string (ly_write2scm (s)); } else { - SCM result = scm_eval (scm); + SCM result = scm_eval2 (s, SCM_EOL); char *c=gh_scm2newstr (result, NULL); - - *outstream_l_ << c; + + *stream_p_ << c; free (c); } } @@ -184,25 +150,25 @@ Paper_outputter::output_scheme (SCM scm) 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)); } } } @@ -211,74 +177,86 @@ 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 ( "LilyIdString", id_str); -} + id_str += String_convert::pad_to (String (", ") + version_str (), 40); -void -Paper_outputter::start_line () -{ - SCM scm = gh_list (ly_symbol ("start-line"), SCM_UNDEFINED); - output_scheme (scm); + output_String_def ("lilypondtagline", id_str); + output_String_def ("LilyPondVersion", version_str ()); } -void -Paper_outputter::output_font_def (int i, String str) -{ - SCM scm = gh_list (ly_symbol ("font-def"), - gh_int2scm (i), - gh_str02scm (str.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); -} + void Paper_outputter::output_Real_def (String k, Real v) { - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str(v).ch_l ()), + SCM scm = gh_list (ly_symbol2scm ("lily-def"), + ly_str02scm (k.ch_l ()), + ly_str02scm (to_str (v).ch_l ()), 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_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (v.ch_l ()), + SCM scm = gh_list (ly_symbol2scm ("lily-def"), + ly_str02scm (k.ch_l ()), + ly_str02scm (v.ch_l ()), SCM_UNDEFINED); output_scheme (scm); - - gh_define (k.ch_l (), gh_str02scm (v.ch_l ())); } void Paper_outputter::output_int_def (String k, int v) { - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str (v).ch_l ()), + SCM scm = gh_list (ly_symbol2scm ("lily-def"), + ly_str02scm (k.ch_l ()), + ly_str02scm (to_str (v).ch_l ()), SCM_UNDEFINED); output_scheme (scm); - - gh_define (k.ch_l (), gh_int2scm (v)); } +void +Paper_outputter::output_string (SCM str) +{ + *stream_p_ << ly_scm2string (str); +} +void +Paper_outputter::write_header_field_to_file (String filename, String key, String value) +{ + 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::stop_line () +Paper_outputter::write_header_fields_to_file (Scope * header) { - SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED); - output_scheme (scm); + 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); + } + } + } }