X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=0a28aa242eceb5cbb1afca6ba81c8d463006999c;hb=4a964b10c411827584eb720c63cd0d6fc5b65d72;hp=157115741b1b174ee7c94e76fcfbecedc85abff8;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 157115741b..0a28aa242e 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,270 +3,148 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 1997--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -#include -#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 "dimensions.hh" +#include "file-name.hh" #include "font-metric.hh" -#include "main.hh" -#include "scope.hh" - +#include "input-smob.hh" +#include "lily-guile.hh" #include "lily-version.hh" -#include "paper-def.hh" -#include "file-results.hh" +#include "ly-module.hh" +#include "main.hh" +#include "output-def.hh" +#include "paper-book.hh" +#include "paper-outputter.hh" +#include "paper-system.hh" +#include "scm-hash.hh" +#include "stencil.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 (String filename, String format) { - 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" - ; - } - + file_ = SCM_EOL; + output_module_ = SCM_EOL; + smobify_self (); + + filename_ = filename; + String module_name = "scm output-" + format; + output_module_ = scm_c_resolve_module (module_name.to_str0 ()); } 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 = scm_list_n (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); - generate = generate.left_str (generate.length_i () - 1); - - /* - Make fixed length time stamps - */ - generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0) ; - - SCM args_scm = - scm_list_n (ly_str02scm (creator.ch_l ()), - ly_str02scm (generate.ch_l ()), 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*) { - /* - 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); + (void) x; + scm_puts ("#", p); + return 1; } -void flatten_write (SCM x, Paper_stream*ps) +SCM +Paper_outputter::file () { - if (ly_pair_p (x)) - { - flatten_write (ly_car (x),ps); - flatten_write (ly_cdr (x),ps); - } - else if (gh_string_p (x)) - { - *ps << String ( SCM_STRING_CHARS(x)) ; - } + if (file_ == SCM_EOL) + if (filename_ == "-") + file_ = scm_current_output_port(); + else + file_ = scm_open_file (scm_makfrom0str (filename_.to_str0 ()), + scm_makfrom0str ("w")); + return file_; } - -/* - UGH. - - Should probably change interface to do less eval (symbol), and more - apply (procedure, args) - */ -void -Paper_outputter::dump_scheme (SCM s) +SCM +Paper_outputter::dump_string (SCM scm) { - if (verbatim_scheme_b_) - { - *stream_p_ << ly_scm2string (ly_write2scm (s)); - } - else - { - SCM result = scm_primitive_eval (s); - flatten_write (result, stream_p_); - } + return scm_display (scm, file ()); } -void -Paper_outputter::output_scope (Scope *scope, String prefix) +SCM +Paper_outputter::scheme_to_string (SCM scm) { - 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_integer_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 scm_eval (scm, output_module_); } void -Paper_outputter::output_version () +Paper_outputter::output_scheme (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 ()); + dump_string (scheme_to_string (scm)); } - - - void -Paper_outputter::output_Real_def (String k, Real 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::output_String_def (String k, String v) +Paper_outputter::output_stencil (Stencil stil) { - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (v.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void*) this, Offset (0,0)); } -void -Paper_outputter::output_int_def (String k, int v) +Paper_outputter * +get_paper_outputter (String outname, String f) { - 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); + progress_indication (_f ("Layout output to `%s'...", + outname == "-" ? String ("") : outname)); + progress_indication ("\n"); + return new Paper_outputter (outname, f); } -void -Paper_outputter::output_string (SCM str) +/* FIXME: why is output_* wrapper called dump? */ +LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil", + 2, 0, 0, (SCM outputter, SCM stencil), + "Dump stencil @var{expr} onto @var{outputter}.") { - *stream_p_ << ly_scm2string (str); + Paper_outputter *po = unsmob_outputter (outputter); + Stencil *st = unsmob_stencil (stencil); + SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + SCM_ASSERT_TYPE (st, stencil, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + po->output_stencil (*st); + return SCM_UNSPECIFIED; } -void -Paper_outputter::write_header_field_to_file (String filename, String key, String value) +LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string", + 2, 0, 0, (SCM outputter, SCM str), + "Dump @var{str} onto @var{outputter}.") { - if (filename != "-") - filename += String (".") + key; - progress_indication (_f ("writing header field `%s' to `%s'...", - key, - filename == "-" ? String ("") : filename)); + Paper_outputter *po = unsmob_outputter (outputter); + SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - ostream *os = open_file_stream (filename); - *os << value; - close_file_stream (os); - progress_indication ("\n"); + return po->dump_string (str); } 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_, key, s); - } - } - } + scm_close_port (file_); }