X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=b624b8ea8f2643308c9cc5109c07f2c3eed833cb;hb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;hp=5a46415e69018d5da60ea74030c430c2d34fbb3d;hpb=41c075bc0a4419c0e3646b7d554b1677b71f5a43;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 5a46415e69..b624b8ea8f 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,12 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include #include +#include +#include #include "dimensions.hh" #include "dictionary-iter.hh" @@ -24,30 +26,25 @@ #include "scope.hh" #include "identifier.hh" #include "lily-version.hh" -#include "atom.hh" -Paper_outputter::Paper_outputter (Paper_stream *s) -{ - outstream_l_ = s; - output_header (); -} -Paper_outputter::~Paper_outputter () +Paper_outputter::Paper_outputter () { - SCM scm = gh_list (ly_symbol ("end-output"), SCM_UNDEFINED); - output_scheme (scm); + molecules_ = gh_cons (SCM_EOL, SCM_EOL); + last_cons_ = molecules_; } + void Paper_outputter::output_header () { if (safe_global_b) { - ly_set_scm ("security-paranoia", SCM_BOOL_T); - // gh_eval_str ("(set! security-paranoia #t)"); + + gh_define ("security-paranoia", SCM_BOOL_T); } String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))"; - gh_eval_str (s.ch_C()); + ly_eval_str (s.ch_C ()); String creator; if (no_timestamps_global_b) @@ -57,134 +54,159 @@ Paper_outputter::output_header () String generate; if (no_timestamps_global_b) - generate = ".\n"; + generate = "."; else { generate = _ (", at "); time_t t (time (0)); generate += ctime (&t); - //urg + generate = generate.left_str (generate.length_i () - 1); } SCM args_scm = - gh_list (gh_str02scm (creator.ch_l ()), - gh_str02scm (generate.ch_l ()), SCM_UNDEFINED); + gh_list (ly_str02scm (creator.ch_l ()), + ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); -#ifndef NPRINT - DOUT << "output_header\n"; - if (check_debug && !monitor->silent_b ("Guile")) - { - gh_display (args_scm); gh_newline (); - } -#endif - SCM scm = gh_cons (header_scm_sym, args_scm); + 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) +Paper_outputter::output_molecule (SCM expr, Offset o, char const *nm) { - if (check_debug) - *outstream_l_ << String ("\n%start: ") << nm << "\n"; - - - if (check_debug) +#if 0 + if (flower_dstream) { output_comment (nm); } - -#ifdef ATOM_SMOB - for (SCM ptr = m->atom_list_; ptr != SCM_EOL; ptr = SCM_CDR(ptr)) - { - Atom *i = Atom::atom_l (SCM_CAR(ptr)); -#else - for (Cons *ptr = m->atom_list_; ptr; ptr = ptr->next_cons_p_) - { - Atom * i = ptr->car_p_; #endif - Offset a_off = i->off_; - a_off += o; - - if (!i->func_) - continue; + + SCM offset_sym = ly_symbol2scm ("translate-molecule"); + SCM combine_sym = ly_symbol2scm ("combine-molecule"); +enter: - if (a_off.length () > 100 CM) - { - warning (_f("Improbable dimension for object type `%s\'", nm)); - Axis a =X_AXIS; - while (a < NO_AXES) - { - if (abs(a_off[a]) > 50 CM) - a_off[a] = 50 CM; - incr (a); - } - } - - if (i->font_) - { - output_scheme (gh_list (ly_symbol ("select-font"), - gh_str02scm (symbol_to_string (i->font_).ch_C()), - SCM_UNDEFINED)); - } + if (!gh_pair_p (expr)) + return; + + SCM head =gh_car (expr); + if (head == offset_sym) + { + o += scm_to (gh_cadr (expr), &o); + expr = gh_caddr (expr); + goto enter; + } + else if (head == combine_sym) + { + output_molecule (gh_cadr (expr), o, nm); + expr = gh_caddr (expr); + goto enter; // tail recursion + } + else + { + output_scheme (gh_list (ly_symbol2scm ("placebox"), + gh_double2scm (o[X_AXIS]), + gh_double2scm (o[Y_AXIS]), + expr, + SCM_UNDEFINED)); - SCM box_scm - = gh_list (placebox_scm_sym, - gh_double2scm (a_off.x ()), - gh_double2scm (a_off.y ()), - SCM(i->func_), - SCM_UNDEFINED); - - output_scheme (box_scm); } } void Paper_outputter::output_comment (String str) { - if (String (output_global_ch) == "scm") - { - *outstream_l_ << "; " << str << '\n'; - } - else - { - *outstream_l_ << "% " << str << "\n"; - } + output_scheme (gh_list (ly_symbol2scm ("comment"), + ly_str02scm ((char*)str.ch_C()), + SCM_UNDEFINED) + ); } void Paper_outputter::output_scheme (SCM scm) +{ + SCM c = gh_cons (scm,gh_cdr (last_cons_)); + gh_set_cdr_x(last_cons_, c); + last_cons_ = c; +} + + +void +Paper_outputter::dump_onto (Paper_stream *ps) { if (String (output_global_ch) == "scm") +#if 1 // both are fine { - static SCM port = 0; - - // urg - if (!port) + /* + default to stdin + */ + int fd = 1; + if (ofstream* of = dynamic_cast (ps->os)) + fd = of->rdbuf ()->fd (); + SCM port = scm_fdes_to_port (fd, "a", SCM_EOL); + + /* + lilypond -f scm x.ly + guile -s x.scm + */ + scm_display (gh_str02scm ( + ";;; Usage: guile -s x.scm > x.tex\n" + "(primitive-load-path 'lily.scm)\n" + "(scm-as-output)\n" + ";(scm-tex-output)\n" + ";(scm-ps-output)\n" + "(map (lambda (x) (display (eval x))) '(\n" + ), port); + + SCM newline = gh_str02scm ("\n"); + for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) { - 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_write (gh_car (s), port); + scm_display (newline, port); + scm_flush (port); } - - scm_display (gh_str02scm ("("), port); - scm_write (scm, port); - scm_display (gh_str02scm (")\n"),port); - scm_fflush (port); + scm_display (gh_str02scm ("))"), port); + scm_display (newline, port); + scm_flush (port); + scm_close_port (port); } - else +#else { - SCM result = scm_eval (scm); - char *c=gh_scm2newstr (result, NULL); - - *outstream_l_ << c; - free (c); + /* + lilypond -f scm x.ly + guile -s x.scm + */ + if (output_global_ch == String ("scm")) + *ps << "" + ";;; Usage: guile -s x.scm > x.tex\n" + "(primitive-load-path 'lily.scm)\n" + "(scm-tex-output)\n" + ";(scm-ps-output)\n" + "(map (lambda (x) (display (eval x))) '(\n" + ; + for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) + { + SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"), + ly_quote_scm (gh_car (s)), SCM_UNDEFINED)); + + *ps << ly_scm2string (result); + } + *ps << "))"; } +#endif + + else + { + for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) + { + SCM result = scm_eval (gh_car (s)); + char *c=gh_scm2newstr (result, NULL); + + *ps << c; + free (c); + } + } } void @@ -229,7 +251,12 @@ Paper_outputter::output_version () void Paper_outputter::start_line (Real height) { - SCM scm = gh_list (ly_symbol ("start-line"), + if (height > 50 CM) + { + programming_error ("Improbable system height"); + height = 50 CM; + } + SCM scm = gh_list (ly_symbol2scm ("start-line"), gh_double2scm (height), SCM_UNDEFINED); output_scheme (scm); @@ -238,9 +265,9 @@ Paper_outputter::start_line (Real height) void Paper_outputter::output_font_def (int i, String str) { - SCM scm = gh_list (ly_symbol ("font-def"), + SCM scm = gh_list (ly_symbol2scm ("font-def"), gh_int2scm (i), - gh_str02scm (str.ch_l ()), + ly_str02scm (str.ch_l ()), SCM_UNDEFINED); output_scheme (scm); @@ -250,38 +277,38 @@ void Paper_outputter::output_Real_def (String k, Real v) { - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str(v).ch_l ()), + SCM scm = gh_list (ly_symbol2scm ("lily-def"), + ly_str02scm (k.ch_l ()), + ly_str02scm (to_str(v).ch_l ()), SCM_UNDEFINED); output_scheme (scm); - gh_define (k.ch_l (), gh_double2scm (v)); + // gh_define (k.ch_l (), gh_double2scm (v)); } void Paper_outputter::output_String_def (String k, String v) { - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (v.ch_l ()), + SCM scm = gh_list (ly_symbol2scm ("lily-def"), + ly_str02scm (k.ch_l ()), + ly_str02scm (v.ch_l ()), SCM_UNDEFINED); output_scheme (scm); - gh_define (k.ch_l (), gh_str02scm (v.ch_l ())); + // gh_define (k.ch_l (), ly_str02scm (v.ch_l ())); } void Paper_outputter::output_int_def (String k, int v) { - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str (v).ch_l ()), + SCM scm = gh_list (ly_symbol2scm ("lily-def"), + ly_str02scm (k.ch_l ()), + ly_str02scm (to_str (v).ch_l ()), SCM_UNDEFINED); output_scheme (scm); - gh_define (k.ch_l (), gh_int2scm (v)); + // gh_define (k.ch_l (), gh_int2scm (v)); } @@ -289,6 +316,17 @@ Paper_outputter::output_int_def (String k, int v) void Paper_outputter::stop_line () { - SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED); + SCM scm = gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED); output_scheme (scm); } + +void +Paper_outputter::stop_last_line () +{ + SCM scm = gh_list (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED); + output_scheme (scm); + scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED); + output_scheme (scm); +} + +