X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=5e8c509807f53d6881d1ab2d411858cca763fd65;hb=12b33a8040a80d5b4a1217faf0d4cc7529483cc0;hp=59d4fb4ba5b3044f5b22b7799743286495645c39;hpb=a78c70be8951804126d19eb74b344ae1858023e5;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 59d4fb4ba5..5e8c509807 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,27 +3,23 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 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 "font-metric.hh" #include "main.hh" -#include "scope.hh" - +#include "scm-hash.hh" #include "lily-version.hh" #include "paper-def.hh" #include "file-results.hh" @@ -32,56 +28,32 @@ /* Ugh, this is messy. */ - Paper_outputter::Paper_outputter (String name) { - 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_) + if (safe_global_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" - ; + gh_define ("security-paranoia", SCM_BOOL_T); } + + file_ = scm_open_file (ly_str02scm (name.ch_C()), + ly_str02scm ("w")); + + SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"), + ly_str02scm (output_format_global.ch_C()), + SCM_UNDEFINED); + output_func_ = scm_primitive_eval (exp); } Paper_outputter::~Paper_outputter () { - if (verbatim_scheme_b_) - { - *stream_p_ << "))"; - } - delete stream_p_; + } void Paper_outputter::output_header () { - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } - - SCM exp = gh_list (ly_symbol2scm ((output_format_global + "-scm").ch_C ()), - ly_quote_scm (ly_symbol2scm ("all-definitions")), - SCM_UNDEFINED); - exp = scm_primitive_eval (exp); - scm_primitive_eval (exp); - - String creator = gnu_lilypond_version_str (); - String generate = _ (", at "); time_t t (time (0)); generate += ctime (&t); @@ -91,13 +63,14 @@ Paper_outputter::output_header () Make fixed length time stamps */ generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0) ; + String creator = "lelie"; - SCM args_scm = - gh_list (ly_str02scm (creator.ch_l ()), - ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); + SCM args_scm = scm_list_n (ly_str02scm (creator.ch_C ()), + ly_str02scm (generate.ch_C ()), SCM_UNDEFINED); SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm); + output_scheme (scm); } @@ -106,69 +79,39 @@ Paper_outputter::output_header () void Paper_outputter::output_comment (String str) { - output_scheme (gh_list (ly_symbol2scm ("comment"), + output_scheme (scm_list_n (ly_symbol2scm ("comment"), ly_str02scm ((char*)str.ch_C ()), 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); -} - - -/* - 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_primitive_eval (s); - char *c=gh_scm2newstr (result, NULL); - - *stream_p_ << c; - free (c); - } + gh_call2 (output_func_, scm, file_); } void -Paper_outputter::output_scope (Scope *scope, String prefix) +Paper_outputter::output_scope (Scheme_hash_table *scope, String prefix) { SCM al = scope->to_alist (); - for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s)) + 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)); } } } @@ -181,19 +124,18 @@ Paper_outputter::output_version () output_String_def ("lilypondtagline", id_str); output_String_def ("LilyPondVersion", version_str ()); + 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"), + ly_str02scm (k.ch_l ()), + ly_str02scm (to_str (v).ch_l ()), + SCM_UNDEFINED); output_scheme (scm); } @@ -201,7 +143,7 @@ void Paper_outputter::output_String_def (String k, String v) { - SCM scm = gh_list (ly_symbol2scm ("lily-def"), + SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), ly_str02scm (k.ch_l ()), ly_str02scm (v.ch_l ()), SCM_UNDEFINED); @@ -211,7 +153,7 @@ 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"), + SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), ly_str02scm (k.ch_l ()), ly_str02scm (to_str (v).ch_l ()), SCM_UNDEFINED); @@ -219,28 +161,16 @@ Paper_outputter::output_int_def (String k, int v) } void -Paper_outputter::output_string (SCM str) +Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) { - *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"); + output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), + ly_str02scm (filename.ch_C()), + ly_quote_scm (key), value, + SCM_UNDEFINED)); } void -Paper_outputter::write_header_fields_to_file (Scope * header) +Paper_outputter::write_header_fields_to_file (Scheme_hash_table * header) { if (dump_header_fieldnames_global.size ()) { @@ -253,9 +183,9 @@ Paper_outputter::write_header_fields_to_file (Scope * header) /* Only write header field to file if it exists */ if (gh_pair_p (val)) { - s = ly_scm2string (gh_cdr (val)); + s = ly_scm2string (ly_cdr (val)); /* Always write header field file, even if string is empty ... */ - write_header_field_to_file (basename_, key, s); + write_header_field_to_file (basename_ , ly_car (val), ly_cdr (val)); } } }