X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=dea59e6cf18ba29746f85b57368c5696431f4742;hb=refs%2Ftags%2Frelease%2F1.3.10;hp=e0565ab7b0d680951e494b8e7074d0f909b3e614;hpb=76014fe170f4217374f4726d54c2a46c60f73e67;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index e0565ab7b0..dea59e6cf1 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -26,41 +26,23 @@ #include "lily-version.hh" #include "atom.hh" -Paper_outputter::Paper_outputter (Paper_stream *s) +Paper_outputter::Paper_outputter () { - outstream_l_ = s; - output_header (); - - if (output_global_ch == String ("scm")) - *outstream_l_->os << "" - "(primitive-load-path 'lily.scm)\n" - "(eval (tex-scm 'all-definitions))\n" - ";(eval (ps-scm 'all-definitions))\n" - "(display (map (lambda (x) (string-append (eval x) \"\\n\")) '(\n" - ; + molecules_ = gh_cons (SCM_EOL, SCM_EOL); + last_cons_ = molecules_; } -Paper_outputter::~Paper_outputter () -{ - SCM scm = gh_list (ly_symbol ("end-output"), SCM_UNDEFINED); - output_scheme (scm); - - if (String (output_global_ch) == "scm") - { - *outstream_l_->os << ")))"; - } -} void Paper_outputter::output_header () { if (safe_global_b) { - ly_set_scm ("security-paranoia", SCM_BOOL_T); - // ly_ch_C_eval_scm ("(set! security-paranoia #t)"); + // ly_set_x ("security-paranoia", SCM_BOOL_T); + gh_define ("security-paranoia", SCM_BOOL_T); } String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))"; - ly_ch_C_eval_scm (s.ch_C ()); + ly_eval_str (s.ch_C ()); String creator; if (no_timestamps_global_b) @@ -80,45 +62,26 @@ Paper_outputter::output_header () } SCM args_scm = - gh_list (ly_ch_C_to_scm (creator.ch_l ()), - ly_ch_C_to_scm (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 && !lily_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) { - if (check_debug) - *outstream_l_ << String ("\n%start: ") << nm << "\n"; - - - if (check_debug) + 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_) { Atom * i = ptr->car_; -#endif -#if 0 - } -#endif + Offset a_off = i->off_; a_off += o; @@ -127,31 +90,23 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) if (a_off.length () > 100 CM) { - warning (_f("Improbable offset for object type `%s\'", nm)); + programming_error ("improbable offset for object"); Axis a =X_AXIS; while (a < NO_AXES) { - if (abs(a_off[a]) > 50 CM) - a_off[a] = 50 CM; + if (abs(a_off[a]) > 30 CM) + a_off[a] = 30 CM; incr (a); } } - if (i->font_) - { - output_scheme (gh_list (ly_symbol ("select-font"), - ly_ch_C_to_scm (symbol_to_string (i->font_).ch_C()), - SCM (i->magn_), - SCM_UNDEFINED)); - } - SCM box_scm - = gh_list (placebox_scm_sym, + = gh_list (ly_symbol2scm ("placebox"), gh_double2scm (a_off.x ()), gh_double2scm (a_off.y ()), SCM(i->func_), SCM_UNDEFINED); - + output_scheme (box_scm); } } @@ -159,32 +114,95 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) 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 { - SCM result = scm_eval (scm_listify (ly_symbol ("scm->string"), ly_quote_scm (scm), SCM_UNDEFINED)); - *outstream_l_->os << ly_scm2string (result) << endl; + /* + 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-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)) + { + scm_write (gh_car (s), port); + scm_display (newline, port); + scm_flush (port); + } + scm_display (gh_str02scm (")))"), port); + scm_display (newline, port); + scm_flush (port); + scm_close_port (port); } +#else + { + /* + 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 { - SCM result = scm_eval (scm); - char *c=gh_scm2newstr (result, NULL); - - *outstream_l_ << c; - free (c); + 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); + } } } @@ -230,7 +248,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); @@ -239,9 +262,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), - ly_ch_C_to_scm (str.ch_l ()), + ly_str02scm (str.ch_l ()), SCM_UNDEFINED); output_scheme (scm); @@ -251,9 +274,9 @@ void Paper_outputter::output_Real_def (String k, Real v) { - SCM scm = gh_list (ly_symbol ("lily-def"), - ly_ch_C_to_scm (k.ch_l ()), - ly_ch_C_to_scm (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); @@ -264,21 +287,21 @@ void Paper_outputter::output_String_def (String k, String v) { - SCM scm = gh_list (ly_symbol ("lily-def"), - ly_ch_C_to_scm (k.ch_l ()), - ly_ch_C_to_scm (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 (), ly_ch_C_to_scm (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"), - ly_ch_C_to_scm (k.ch_l ()), - ly_ch_C_to_scm (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); @@ -290,13 +313,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_symbol ("stop-last-line"), SCM_UNDEFINED); + 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); } + +