X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=1f91ffd51c3d6a08847d0a0b3f1bad5f0b31fcf9;hb=6e8c2c2bbc0526de8a677a18b5b76e6096b59ef6;hp=2177afffcd08813f0be0441a2d65cbc61930475c;hpb=a517dce054511941847288622f7840ff9d2bd353;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 2177afffcd..1f91ffd51c 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,190 +3,136 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 1997--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -#include #include +#include -#include "dimensions.hh" -#include "virtual-methods.hh" -#include "paper-outputter.hh" -#include "molecule.hh" #include "array.hh" -#include "string-convert.hh" -#include "warn.hh" +#include "dimensions.hh" #include "font-metric.hh" +#include "input-smob.hh" +#include "lily-guile.hh" +#include "lily-version.hh" +#include "ly-module.hh" #include "main.hh" +#include "paper-book.hh" +#include "output-def.hh" +#include "paper-line.hh" +#include "paper-outputter.hh" +#include "file-name.hh" #include "scm-hash.hh" -#include "lily-version.hh" -#include "paper-def.hh" -#include "input-file-results.hh" +#include "stencil.hh" +#include "string-convert.hh" +#include "warn.hh" +// JUNKME +extern SCM stencil2line (Stencil *stil, bool is_title = false); -/* - Ugh, this is messy. - */ -Paper_outputter::Paper_outputter (String name) +Paper_outputter::Paper_outputter (String filename, String format) { - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } - - file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), - scm_makfrom0str ("w")); + file_ = SCM_EOL; + output_module_ = SCM_EOL; + smobify_self (); - SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"), - scm_makfrom0str (output_format_global.to_str0 ()), - SCM_UNDEFINED); + filename_ = filename; + file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()), + scm_makfrom0str ("w")); - output_func_ = scm_primitive_eval (exp); + String module_name = "scm output-" + format; + output_module_ = scm_c_resolve_module (module_name.to_str0 ()); } Paper_outputter::~Paper_outputter () { - } +#include "ly-smobs.icc" -void -Paper_outputter::output_header () -{ - 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); +IMPLEMENT_SMOBS (Paper_outputter); +IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); - output_scheme (scm); +SCM +Paper_outputter::mark_smob (SCM x) +{ + Paper_outputter *p = (Paper_outputter*) SCM_CELL_WORD_1(x); + scm_gc_mark (p->output_module_); + return p->file_; } - - -void -Paper_outputter::output_comment (String str) +int +Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) { - output_scheme (scm_list_n (ly_symbol2scm ("comment"), - scm_makfrom0str ((char*)str.to_str0 ()), - SCM_UNDEFINED) - ); + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_scheme (SCM scm) +SCM +Paper_outputter::dump_string (SCM scm) { - gh_call2 (output_func_, scm, file_); + return scm_display (scm, file_); } -void -Paper_outputter::output_scope (Scheme_hash_table *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_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 scm_eval (scm, output_module_); } void -Paper_outputter::output_version () +Paper_outputter::output_scheme (SCM scm) { - String id_string = "Lily was here"; - id_string += String_convert::pad_to (String (", ") + version_string (), 40); - - output_String_def ("lilypondtagline", id_string); - output_String_def ("LilyPondVersion", version_string ()); - output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT)); + 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"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - 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"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (v.get_str0 ()), - 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"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); + progress_indication (_f ("paper output to `%s'...", + outname == "-" ? String ("") : outname)); + return new Paper_outputter (outname, f); + } -void -Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) +/* 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}.") { - output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), - scm_makfrom0str (filename.to_str0 ()), - ly_quote_scm (key), value, - SCM_UNDEFINED)); + 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_fields_to_file (Scheme_hash_table * header) +LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string", + 2, 0, 0, (SCM outputter, SCM str), + "Dump @var{str} onto @var{outputter}.") { - 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)); - } - } - } + Paper_outputter *po = unsmob_outputter (outputter); + SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + + return po->dump_string (str); }