X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=74cd96acc5ef763f00b2d6cf154006c188c9dedb;hb=f296c9b7aa080acf9edccdb984d058f9a7a92ae1;hp=3f31fb306f8012a217af9b9d1af953324ce0c084;hpb=bd0a24bfd5968f97b8817f6e1442403a35ebcdf6;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 3f31fb306f..74cd96acc5 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,246 +3,190 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include -#include +#include + +#include "dimensions.hh" +#include "virtual-methods.hh" #include "paper-outputter.hh" -#include "paper-stream.hh" #include "molecule.hh" -#include "atom.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 "scm-hash.hh" +#include "lily-version.hh" +#include "paper-def.hh" +#include "file-results.hh" + -Paper_outputter::Paper_outputter (Paper_stream *s) +/* + Ugh, this is messy. + */ +Paper_outputter::Paper_outputter (String name) { - outstream_l_ = s; - output_header (); + if (safe_global_b) + { + gh_define ("security-paranoia", SCM_BOOL_T); + } + + file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), + scm_makfrom0str ("w")); + + 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 () { - SCM scm = - gh_append2 (ly_lambda_o (), - ly_list1 (gh_append2 (ly_func_o ("end-output"), SCM_EOL))); - - output_scheme (scm); + } + void Paper_outputter::output_header () { - String creator; - if (no_timestamps_global_b) - creator = "GNU LilyPond\n"; - else - creator = get_version_str (); - String generate; - if (no_timestamps_global_b) - generate = "."; - else - { - generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - //urg - } - - SCM args_scm = - gh_cons (gh_str02scm (creator.ch_l ()), - gh_cons (gh_str02scm (generate.ch_l ()), SCM_EOL)); - -#ifndef NPRINT - DOUT << "output_header\n"; - if (check_debug && !monitor->silent_b ("Guile")) - { - gh_display (args_scm); gh_newline (); - } -#endif - - SCM scm = - gh_append2 (ly_lambda_o (), - ly_list1 (gh_append2 (ly_func_o ("header"), args_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); } -void -Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) -{ - if (check_debug) - *outstream_l_ << String ("\n%start: ") << nm << "\n"; - - for (PCursor i (m->atoms_); i.ok (); i++) - { - Offset a_off = i->offset (); - a_off += o; - - if (!i->lambda_) - { - // urg - i->lambda_ = gh_append2 (ly_lambda_o (), - ly_list1 (ly_func_o ("empty"))); - } - switch_to_font (i->font_); - -#ifndef NPRINT - if (check_debug && !monitor->silent_b ("Guile")) - { - DOUT << i->str_ << "\n"; - gh_display (i->lambda_); gh_newline (); - } -#endif - - SCM args_scm = - gh_cons (gh_double2scm (a_off.x ()), - gh_cons (gh_double2scm (a_off.y ()), - gh_cons (i->lambda_, SCM_EOL))); - -#ifndef NPRINT - if (check_debug && !monitor->silent_b ("Guile")) - { - gh_display (args_scm); gh_newline (); - } -#endif - - SCM box_scm = - gh_append2 (ly_lambda_o (), - ly_list1 (gh_append2 (ly_func_o ("placebox"), args_scm))); - - output_scheme (box_scm); - } -} void Paper_outputter::output_comment (String str) { - // urg - *outstream_l_ << "% " << str << "\n"; + output_scheme (scm_list_n (ly_symbol2scm ("comment"), + scm_makfrom0str ((char*)str.to_str0 ()), + SCM_UNDEFINED) + ); } - void Paper_outputter::output_scheme (SCM scm) { - String o = String ("\'") + output_global_ch; - - 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); - scm_display (gh_str02scm ("(define (of) 'ps)\n"), port); - scm_display (gh_str02scm ("(define (of) 'tex)\n"), port); - } - - scm_display (gh_str02scm ("(display ((eval "), port); - scm_write (scm, port); - scm_display (gh_str02scm (") (of)))\n"), port); - scm_newline (port); - scm_fflush (port); - - return; - } - else - { - SCM str_scm = gh_call1 (ly_eval (scm), gh_eval_str (o.ch_l ())); - char* c = gh_scm2newstr (str_scm, NULL); - *outstream_l_ << c; - free (c); - } -} -void -Paper_outputter::output_string (String str) -{ - // urg - *outstream_l_ << str; + gh_call2 (output_func_, scm, file_); } void -Paper_outputter::switch_to_font (String fontname) +Paper_outputter::output_scope (Scheme_hash_table *scope, String prefix) { - if (fontname.length_i () && fontname != current_font_) + SCM al = scope->to_alist (); + for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) { - current_font_ = fontname; - int i=0; - - for (; i< font_arr_.size (); i++) - if (font_arr_[i] == fontname) - break; - - if (i == font_arr_.size ()) + 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) { - font_arr_.push (fontname); - output_font_def (i, fontname); + output_int_def (prefix + s, gh_scm2int (v)); + } + else if (gh_number_p (v)) + { + output_Real_def (prefix + s, gh_scm2double (v)); } - output_font_switch (i); } - return; } void -Paper_outputter::start_line () +Paper_outputter::output_version () { - SCM scm = - gh_append2 (ly_lambda_o (), - gh_list (ly_func_o ("start-line"), SCM_UNDEFINED));; + String id_string = "Lily was here"; + 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)); } -/* - 26 fonts ought to be enough for anyone. -*/ + void -Paper_outputter::output_font_def (int i, String str) +Paper_outputter::output_Real_def (String k, Real v) { - //urg, broken with guile-1.3 - //return; - SCM scm = - gh_append2 (ly_lambda_o (), - ly_list1 (gh_append2 (ly_func_o ("font-def"), - gh_cons (gh_int2scm (i), gh_cons (gh_str02scm (str.ch_l ()), SCM_EOL))))); - + + 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::output_font_switch (int i) +Paper_outputter::output_String_def (String k, String v) { - //urg, broken with guile-1.2, 1.3 - //return; - SCM scm = - gh_append2 (ly_lambda_o (), - ly_list1 (gh_append2 (ly_func_o ("font-switch"), - gh_cons (gh_int2scm (i), SCM_EOL)))); - + + SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), + scm_makfrom0str (k.get_str0 ()), + scm_makfrom0str (v.get_str0 ()), + SCM_UNDEFINED); output_scheme (scm); } void -Paper_outputter::stop_line () +Paper_outputter::output_int_def (String k, int v) { - SCM scm = - gh_append2 (ly_lambda_o (), - ly_list1 (gh_append2 (ly_func_o ("stop-line"), SCM_EOL))); - + 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)); +} - current_font_ = ""; - font_arr_.clear (); +void +Paper_outputter::write_header_fields_to_file (Scheme_hash_table * 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.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)); + } + } + } }