X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=dea59e6cf18ba29746f85b57368c5696431f4742;hb=9bc467a994787949def91708bf3bd50d088db982;hp=487b3d2b9ae3d6a6d9f1118e73812c5685bf5980;hpb=96c20e0d65d98ac10fb2ed72c14f478bdaa33e81;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 487b3d2b9a..dea59e6cf1 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,48 +3,56 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1999 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include #include + +#include "dimensions.hh" +#include "dictionary-iter.hh" +#include "virtual-methods.hh" #include "paper-outputter.hh" #include "paper-stream.hh" #include "molecule.hh" -#include "atom.hh" #include "array.hh" #include "string-convert.hh" #include "debug.hh" #include "lookup.hh" #include "main.hh" +#include "scope.hh" +#include "identifier.hh" +#include "lily-version.hh" +#include "atom.hh" -Paper_outputter::Paper_outputter (Paper_stream *s) +Paper_outputter::Paper_outputter () { - outstream_l_ = s; - output_header (); + molecules_ = gh_cons (SCM_EOL, SCM_EOL); + last_cons_ = molecules_; } -Paper_outputter::~Paper_outputter () -{ - SCM scm = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("end-output"), SCM_EOL))); - - output_scheme (scm); -} void Paper_outputter::output_header () { + if (safe_global_b) + { + // 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_eval_str (s.ch_C ()); + String creator; if (no_timestamps_global_b) - creator = "GNU LilyPond\n"; + creator = gnu_lilypond_str (); else - creator = get_version_str (); + creator = gnu_lilypond_version_str (); + String generate; if (no_timestamps_global_b) - generate = "."; + generate = ".\n"; else { generate = _ (", at "); @@ -54,67 +62,50 @@ Paper_outputter::output_header () } SCM args_scm = - gh_cons (gh_str02scm (creator.ch_l ()), - gh_cons (gh_str02scm (generate.ch_l ()), SCM_EOL)); - -#ifndef NPRINT - DOUT << "output_header\n"; - if (check_debug && !monitor->silent_b ("Guile")) - { - gh_display (args_scm); gh_newline (); - } -#endif + gh_list (ly_str02scm (creator.ch_l ()), + ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); - SCM scm = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("header"), 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"; - - for (PCursor i (m->atoms_); i.ok (); i++) + if (flower_dstream) { - Offset a_off = i->offset (); - a_off += o; - - if (!i->lambda_) - { - // urg - i->lambda_ = ly_append (ly_lambda_o (), - ly_list1 (ly_func_o ("empty"))); - } - - switch_to_font (i->font_); + output_comment (nm); + } + + for (Cons *ptr = m->atom_list_; ptr; ptr = ptr->next_) + { + Atom * i = ptr->car_; -#ifndef NPRINT - if (check_debug && !monitor->silent_b ("Guile")) - { - DOUT << i->str_ << "\n"; - gh_display (i->lambda_); gh_newline (); - } -#endif + Offset a_off = i->off_; + a_off += o; - SCM args_scm = - gh_cons (gh_double2scm (a_off.x ()), - gh_cons (gh_double2scm (a_off.y ()), - gh_cons (i->lambda_, SCM_EOL))); + if (!i->func_) + continue; -#ifndef NPRINT - if (check_debug && !monitor->silent_b ("Guile")) + if (a_off.length () > 100 CM) { - gh_display (args_scm); gh_newline (); + programming_error ("improbable offset for object"); + Axis a =X_AXIS; + while (a < NO_AXES) + { + if (abs(a_off[a]) > 30 CM) + a_off[a] = 30 CM; + incr (a); + } } -#endif - - SCM box_scm = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("placebox"), args_scm))); + + SCM box_scm + = gh_list (ly_symbol2scm ("placebox"), + gh_double2scm (a_off.x ()), + gh_double2scm (a_off.y ()), + SCM(i->func_), + SCM_UNDEFINED); output_scheme (box_scm); } @@ -123,141 +114,216 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) void Paper_outputter::output_comment (String str) { - // urg - *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) { - String o = String ("\'") + output_global_ch; -#ifndef NPRINT - if (check_debug && !monitor->silent_b ("Guile")) - { - gh_display (scm); gh_newline (); - } -#endif - // urg; temporary hack to debug scheme error #unknown + 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-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); } -#if 0 - *outstream_l_ << "(display ((eval "; - scm_write (scm, port); - *outstream_l_ << ") 'tex))\n"; + scm_display (gh_str02scm (")))"), port); + scm_display (newline, port); + scm_flush (port); + scm_close_port (port); + } #else - scm_display (gh_str02scm ("(display ((eval "), port); - scm_write (scm, port); - scm_display (gh_str02scm (") 'tex))\n"), port); - scm_newline (port); - scm_fflush (port); + { + /* + 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 - return; + + 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); + } } - SCM str_scm = gh_call1 (ly_eval (scm), gh_eval_str (o.ch_l ())); - char* c = gh_scm2newstr (str_scm, NULL); -#ifndef NPRINT - if (check_debug && !monitor->silent_b ("Guile")) +} + +void +Paper_outputter::output_scope (Scope *scope, String prefix) +{ + for (Scope_iter i (*scope); i.ok (); i++) { - gh_display (str_scm); gh_newline (); + if (dynamic_cast (i.val ())) + { + String val = *i.val()->access_content_String (false); + + output_String_def (prefix + i.key (), val); + } + else if(dynamic_cast (i.val ())) + { + Real val = *i.val ()->access_content_Real (false); + + output_Real_def (prefix + i.key (), val); + } + else if (dynamic_cast (i.val ())) + { + int val = *i.val ()->access_content_int (false); + + output_int_def (prefix + i.key (), val); + } } -#endif - *outstream_l_ << c; - free (c); } void -Paper_outputter::output_string (String str) +Paper_outputter::output_version () { - // urg - *outstream_l_ << str; + String id_str = "Lily was here"; + if (no_timestamps_global_b) + id_str += "."; + else + id_str += String (", ") + version_str (); + + output_String_def ( "mudelatagline", id_str); + output_String_def ( "LilyPondVersion", version_str ()); } void -Paper_outputter::switch_to_font (String fontname) +Paper_outputter::start_line (Real height) { - if (fontname.length_i () && (fontname != current_font_)) + if (height > 50 CM) { - current_font_ = fontname; - int i=0; - bool new_b = false; - for (; i< font_arr_.size (); i++) - if (font_arr_[i] == fontname) - { - new_b = true; - break; - } - - if (new_b) - { - font_arr_.push (fontname); - output_font_def (i, fontname); - } - output_font_switch (i); + programming_error ("Improbable system height"); + height = 50 CM; } - return; + SCM scm = gh_list (ly_symbol2scm ("start-line"), + gh_double2scm (height), + SCM_UNDEFINED); + output_scheme (scm); } void -Paper_outputter::start_line () +Paper_outputter::output_font_def (int i, String str) { - SCM scm = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("start-line"), SCM_EOL))); + SCM scm = gh_list (ly_symbol2scm ("font-def"), + gh_int2scm (i), + ly_str02scm (str.ch_l ()), + SCM_UNDEFINED); output_scheme (scm); } -/* - 26 fonts ought to be enough for anyone. -*/ void -Paper_outputter::output_font_def (int i, String str) +Paper_outputter::output_Real_def (String k, Real v) { - //urg, broken with guile-1.3 - //return; - SCM scm = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("font-def"), - gh_cons (gh_int2scm (i), gh_cons (gh_str02scm (str.ch_l ()), SCM_EOL))))); - + + 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)); } void -Paper_outputter::output_font_switch (int i) +Paper_outputter::output_String_def (String k, String v) { - //urg, broken with guile-1.2, 1.3 - //return; - SCM scm = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("font-switch"), - gh_cons (gh_int2scm (i), SCM_EOL)))); + + 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_str02scm (v.ch_l ())); +} + +void +Paper_outputter::output_int_def (String k, int v) +{ + 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)); } + + void Paper_outputter::stop_line () { - SCM scm = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("stop-line"), SCM_EOL))); - + SCM scm = gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED); output_scheme (scm); +} - current_font_ = ""; - font_arr_.clear (); +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); } + +