X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=8de4a29e167e20525238a5edc7ae5abfa3ceb3bf;hb=e2a4be3b72b1c473658436e4f82234b401dd7b60;hp=c8dbed177dcba4a0d42a4697f83ed2e736c981b6;hpb=cc288cebe296287d2f99c517869f96c646677f37;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index c8dbed177d..8de4a29e16 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,346 +3,265 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 1997--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -#include -#include #include -#include +#include +#include "array.hh" #include "dimensions.hh" -#include "dictionary-iter.hh" -#include "virtual-methods.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 "page.hh" +#include "paper-book.hh" +#include "paper-def.hh" +#include "paper-line.hh" #include "paper-outputter.hh" -#include "paper-stream.hh" -#include "molecule.hh" -#include "array.hh" +#include "file-name.hh" +#include "scm-hash.hh" +#include "stencil.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" +#include "warn.hh" + +// JUNKME +extern SCM stencil2line (Stencil* stil, bool is_title = false); -Paper_outputter::Paper_outputter () +Paper_outputter::Paper_outputter (String filename) { - molecules_ = gh_cons (SCM_EOL, SCM_EOL); - last_cons_ = molecules_; -} + filename_ = filename; + file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()), + scm_makfrom0str ("w")); + if (safe_global_b) + scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T); -void -Paper_outputter::output_header () -{ + String module_name = "scm output-" + output_format_global; if (safe_global_b) { - - gh_define ("security-paranoia", SCM_BOOL_T); + /* In safe mode, start from a GUILE safe-module and import + all symbols from the output module. */ + scm_c_use_module ("ice-9 safe"); + SCM msm = scm_primitive_eval (ly_symbol2scm ("make-safe-module")); + output_module_ = scm_call_0 (msm); + ly_import_module (output_module_, + scm_c_resolve_module (module_name.to_str0 ())); } - 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_str (); else - creator = gnu_lilypond_version_str (); + output_module_ = scm_c_resolve_module (module_name.to_str0 ()); - String generate; - if (no_timestamps_global_b) - generate = "."; - else - { - generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - generate = generate.left_str (generate.length_i () - 1); - } - - SCM args_scm = - gh_list (ly_str02scm (creator.ch_l ()), - ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); - - - 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 (flower_dstream) - { - output_comment (nm); - } + /* FIXME: output-lib should be module, that can be imported. */ +#define IMPORT_LESS 1 // only import the list of IMPORTS +#if IMPORT_LESS + scm_c_use_module ("lily"); + scm_c_use_module ("ice-9 regex"); + scm_c_use_module ("srfi srfi-1"); + scm_c_use_module ("srfi srfi-13"); +#endif + char const *imports[] = { + "lilypond-version", /* from lily */ + "ly:output-def-scope", + "ly:gulp-file", + "ly:number->string", + "ly:ragged-page-breaks", + "ly:optimal-page-breaks", + + "ly:number-pair->string", /* output-lib.scm */ + "ly:numbers->string", + "ly:inexact->string", + + "assoc-get", +#if IMPORT_LESS + "remove", /* from srfi srfi-1 */ + "string-index", /* from srfi srfi-13 */ + "string-join", + "regexp-substitute/global", /* from (ice9 regex) */ +#endif + 0, + }; - for (SCM ptr = gh_cdr (m->atom_list_); ptr != SCM_EOL; ptr = gh_cdr (ptr)) + for (int i = 0; imports[i]; i++) { - Atom * i = unsmob_atom (gh_car (ptr)); - - Offset a_off = i->off_; - a_off += o; - - if (!i->func_) - continue; - - Axis a = X_AXIS; - while (a < NO_AXES) - { - if (abs(a_off[a]) > 30 CM - || isinf (a_off[a]) || isnan (a_off[a])) - { - programming_error ("Improbable offset for object: setting to zero"); - a_off[a] = 0.0; - } - incr (a); - } - - - SCM box_scm - = gh_list (ly_symbol2scm ("placebox"), - gh_double2scm (a_off[X_AXIS]), - gh_double2scm (a_off[Y_AXIS]), - SCM(i->func_), - SCM_UNDEFINED); - - output_scheme (box_scm); + SCM s = ly_symbol2scm (imports[i]); + scm_module_define (output_module_, s, scm_primitive_eval (s)); } +#ifndef IMPORT_LESS // rather crude, esp for safe-mode let's not + SCM m = scm_set_current_module (output_module_); + /* not present in current module*/ + scm_c_use_module ("ice-9 regex"); + scm_c_use_module ("srfi srfi-13"); + /* Need only a few of these, see above + scm_c_use_module ("lily"); */ + scm_set_current_module (m); +#endif } -void -Paper_outputter::output_comment (String str) +Paper_outputter::~Paper_outputter () { - output_scheme (gh_list (ly_symbol2scm ("comment"), - ly_str02scm ((char*)str.ch_C()), - SCM_UNDEFINED) - ); + scm_close_port (file_); + file_ = SCM_EOL; } - 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; -} - - -int -count_cells (SCM s) -{ - if (Atom * a = unsmob_atom (s)) - { - return 2 + count_cells (a->func_); - } - else if (gh_pair_p (s)) - { - return 2 + count_cells (gh_car (s))+ count_cells (gh_cdr (s)); - } - else - return 1; + scm_display (scm_eval (scm, output_module_), file_); } void -Paper_outputter::dump_onto (Paper_stream *ps) +Paper_outputter::output_metadata (Paper_def *paper, SCM scopes) { - if (String (output_global_ch) == "scm") -#if 1 // both are fine - { - /* - 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)) - { - 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 - { - 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 -Paper_outputter::output_scope (Scope *scope, String prefix) -{ - for (Scope_iter i (*scope); i.ok (); i++) - { - 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); - } - } + SCM fields = SCM_EOL; + for (int i = dump_header_fieldnames_global.size (); i--; ) + fields + = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()), + fields); + + File_name file_name (filename_); + file_name.ext_ = ""; + String basename = file_name.to_string (); + output_scheme (scm_list_n (ly_symbol2scm ("output-scopes"), + paper->self_scm (), + ly_quote_scm (scopes), + ly_quote_scm (fields), + scm_makfrom0str (basename.to_str0 ()), + SCM_UNDEFINED)); } void -Paper_outputter::output_version () +Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count, + bool is_classic) { - 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 ()); + String creator = gnu_lilypond_version_string (); + creator += " (http://lilypond.org)"; + time_t t (time (0)); + String time_stamp = ctime (&t); + time_stamp = time_stamp.left_string (time_stamp.length () - 1) + + " " + *tzname; + output_scheme (scm_list_n (ly_symbol2scm ("header"), + scm_makfrom0str (creator.to_str0 ()), + scm_makfrom0str (time_stamp.to_str0 ()), + paper->self_scm (), + scm_int2num (page_count), + ly_bool2scm (is_classic), + SCM_UNDEFINED)); + + output_metadata (paper, scopes); + output_music_output_def (paper); + + output_scheme (scm_list_1 (ly_symbol2scm ("header-end"))); + + /* TODO: maybe have Scheme extract the fonts directly from \paper ? + + Alternatively, we could simply load the fonts on demand in the + output, and do away with this define-fonts step. */ + SCM fonts = paper->font_descriptions (); + output_scheme (scm_list_3 (ly_symbol2scm ("define-fonts"), + paper->self_scm (), + //FIXME: + ly_quote_scm (ly_list_qsort_uniq_x (fonts)))); } void -Paper_outputter::start_line (Real height) +Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) { - if (height > 50 CM) + Paper_line *p = unsmob_paper_line (line); + Offset dim = p->dim (); + if (dim[Y_AXIS] > 50 CM) { - programming_error ("Improbable system height"); - height = 50 CM; + programming_error (to_string ("Improbable line height: %f", + dim[Y_AXIS])); + dim[Y_AXIS] = 50 CM; } - SCM scm = gh_list (ly_symbol2scm ("start-line"), - gh_double2scm (height), - SCM_UNDEFINED); - output_scheme (scm); -} -void -Paper_outputter::output_font_def (int i, String str) -{ - SCM scm = gh_list (ly_symbol2scm ("font-def"), - gh_int2scm (i), - ly_str02scm (str.ch_l ()), - SCM_UNDEFINED); + output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), + ly_quote_scm (ly_offset2scm (*origin)), + ly_quote_scm (ly_offset2scm (dim)))); - output_scheme (scm); + output_stencil (unsmob_stencil (p->to_stencil ())); + + (*origin)[Y_AXIS] += dim[Y_AXIS]; + output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), + ly_bool2scm (is_last))); } void -Paper_outputter::output_Real_def (String k, Real v) +Paper_outputter::output_page (Page *p, bool is_last) { - - 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); + output_scheme (scm_list_1 (ly_symbol2scm ("start-page"))); - // gh_define (k.ch_l (), gh_double2scm (v)); -} + output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), + ly_quote_scm (ly_offset2scm (Offset (0, 0))), + ly_quote_scm (ly_offset2scm (Offset (0, 0))))); -void -Paper_outputter::output_String_def (String k, String v) -{ - - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (v.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); + output_stencil (unsmob_stencil (p->to_stencil ())); - // gh_define (k.ch_l (), ly_str02scm (v.ch_l ())); + output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), SCM_BOOL_T)); + output_scheme (scm_list_2 (ly_symbol2scm ("stop-page"), + ly_bool2scm (is_last + && !unsmob_stencil (p->footer_)))); } void -Paper_outputter::output_int_def (String k, int v) +Paper_outputter::output_music_output_def (Music_output_def *odef) { - 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)); + output_scheme (scm_list_2 (ly_symbol2scm ("output-paper-def"), + odef->self_scm ())); } - - void -Paper_outputter::stop_line () +Paper_outputter::output_stencil (Stencil *stil) { - SCM scm = gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED); - output_scheme (scm); + output_expr (stil->expr (), stil->origin ()); } +/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil */ void -Paper_outputter::stop_last_line () +Paper_outputter::output_expr (SCM expr, Offset o) { - 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); + while (1) + { + if (!ly_c_pair_p (expr)) + return; + + SCM head =ly_car (expr); + if (unsmob_input (head)) + { + Input *ip = unsmob_input (head); + output_scheme (scm_list_4 (ly_symbol2scm ("define-origin"), + scm_makfrom0str (ip->file_string () + .to_str0 ()), + scm_int2num (ip->line_number ()), + scm_int2num (ip->column_number ()))); + expr = ly_cadr (expr); + } + else if (head == ly_symbol2scm ("no-origin")) + { + output_scheme (scm_list_1 (head)); + expr = ly_cadr (expr); + } + else if (head == ly_symbol2scm ("translate-stencil")) + { + o += ly_scm2offset (ly_cadr (expr)); + expr = ly_caddr (expr); + } + else if (head == ly_symbol2scm ("combine-stencil")) + { + output_expr (ly_cadr (expr), o); + expr = ly_caddr (expr); + } + else + { + output_scheme (scm_list_4 (ly_symbol2scm ("placebox"), + scm_make_real (o[X_AXIS]), + scm_make_real (o[Y_AXIS]), + expr)); + return; + } + } } - -