X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=41a941884dc5ef7c763899da48f544195c1ebc3b;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=24ed811878b28200c5cc8576c4ee5f8d860187bc;hpb=736bfdaea194aade5d20d9f749f009c96d41b953;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 24ed811878..41a941884d 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,194 +3,105 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ -#include - -#include +#include "paper-outputter.hh" +#include +#include +using namespace std; #include "dimensions.hh" -#include "virtual-methods.hh" -#include "paper-outputter.hh" -#include "molecule.hh" -#include "array.hh" -#include "string-convert.hh" -#include "debug.hh" +#include "file-name.hh" #include "font-metric.hh" -#include "main.hh" -#include "scope.hh" - +#include "input-smob.hh" #include "lily-version.hh" -#include "paper-def.hh" -#include "file-results.hh" +#include "main.hh" +#include "output-def.hh" +#include "paper-book.hh" +#include "paper-system.hh" +#include "scm-hash.hh" +#include "string-convert.hh" +#include "warn.hh" +#include "ly-smobs.icc" -/* - Ugh, this is messy. - */ -Paper_outputter::Paper_outputter (String name) +Paper_outputter::Paper_outputter (SCM port, String format) { - if (safe_global_b) - { - 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); -} + file_ = port; + output_module_ = SCM_EOL; + smobify_self (); -Paper_outputter::~Paper_outputter () -{ - + String module_name = "scm output-" + format; + output_module_ = scm_c_resolve_module (module_name.to_str0 ()); } - -void -Paper_outputter::output_header () +Paper_outputter::~Paper_outputter () { - 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 creator = "lelie"; - - 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); } +IMPLEMENT_SMOBS (Paper_outputter); +IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); - -void -Paper_outputter::output_comment (String str) +SCM +Paper_outputter::mark_smob (SCM x) { - output_scheme (scm_list_n (ly_symbol2scm ("comment"), - ly_str02scm ((char*)str.ch_C ()), - SCM_UNDEFINED) - ); + Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x); + scm_gc_mark (p->output_module_); + return p->file_; } -void -Paper_outputter::output_scheme (SCM scm) +int +Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) { - gh_call2 (output_func_, scm, file_); + (void) x; + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_scope (Scope *scope, String prefix) +SCM +Paper_outputter::file () const { - SCM al = scope->to_alist (); - for (SCM s = al ; gh_pair_p (s); s = ly_cdr (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_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)); - } - } + return file_; } -void -Paper_outputter::output_version () +SCM +Paper_outputter::dump_string (SCM scm) { - String id_str = "Lily was here"; - id_str += String_convert::pad_to (String (", ") + version_str (), 40); - - output_String_def ("lilypondtagline", id_str); - output_String_def ("LilyPondVersion", version_str ()); + return scm_display (scm, file ()); } - - - -void -Paper_outputter::output_Real_def (String k, Real v) +SCM +Paper_outputter::scheme_to_string (SCM scm) { - - 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); + return scm_eval (scm, output_module_); } void -Paper_outputter::output_String_def (String k, String v) +Paper_outputter::output_scheme (SCM scm) { - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (v.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); + dump_string (scheme_to_string (scm)); } void -Paper_outputter::output_int_def (String k, int v) +paper_outputter_dump (void *po, SCM x) { - 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); + Paper_outputter *me = (Paper_outputter *) po; + me->output_scheme (x); } void -Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) +Paper_outputter::output_stencil (Stencil stil) { - output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), - ly_str02scm (filename.ch_C()), - ly_quote_scm (key), value, - SCM_UNDEFINED)); + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void *) this, Offset (0, 0)); } void -Paper_outputter::write_header_fields_to_file (Scope * header) +Paper_outputter::close () { - 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 (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)); - } - } - } + if (scm_port_p (file_) == SCM_BOOL_T) + scm_close_port (file_); }