X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=a4332703229cb10a05c286521394189cc8ce611f;hb=5547ff00446ba0ac2bdbd1fe3205c2fb8411bb2f;hp=92e5180e11546467c87e2cacab913dd27e3c70c4;hpb=ee7a5648ebcede3c2775d944dd91e8e33dfeabad;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 92e5180e11..a433270322 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,240 +3,266 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include -#include #include -#include #include "dimensions.hh" #include "virtual-methods.hh" #include "paper-outputter.hh" -#include "paper-stream.hh" -#include "molecule.hh" +#include "stencil.hh" #include "array.hh" #include "string-convert.hh" -#include "debug.hh" -#include "lookup.hh" +#include "warn.hh" +#include "font-metric.hh" #include "main.hh" -#include "scope.hh" -#include "identifier.hh" +#include "scm-hash.hh" #include "lily-version.hh" +#include "paper-def.hh" +#include "input-file-results.hh" +#include "ly-module.hh" +#include "paper-book.hh" +#include "paper-line.hh" +#include "input-smob.hh" // output_expr -/* - Ugh, this is messy. - */ - -Paper_outputter::Paper_outputter (Paper_stream * ps ) +Paper_outputter::Paper_outputter (String name) { - /* - lilypond -f scm x.ly - guile -s x.scm - */ - verbatim_scheme_b_ = output_global_ch == String ("scm"); + if (safe_global_b) + scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T); + + file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), + scm_makfrom0str ("w")); - if (verbatim_scheme_b_) + if (output_format_global == PAGE_LAYOUT) { - *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" - ; + output_func_ = SCM_EOL; + String name = "scm output-" + output_format_global; + if (safe_global_b) + { + /* 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 (name.to_str0 ())); + } + else + output_module_ = scm_c_resolve_module (name.to_str0 ()); + + /* 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-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 + "string-index", /* from srfi srfi-13 */ + "string-join", + "regexp-substitute/global", /* from (ice9 regex) */ +#endif + 0, + }; + + for (int i = 0; imports[i]; i++) + { + 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 + } + else + { + output_func_ + = scm_call_1 (ly_scheme_function ("find-dumper"), + scm_makfrom0str (output_format_global.to_str0 ())); + output_module_ = SCM_EOL; } - - stream_p_ = ps; } Paper_outputter::~Paper_outputter () { - if (verbatim_scheme_b_) - { - *stream_p_ << "))"; - } - delete stream_p_; + scm_close_port (file_); + file_ = SCM_EOL; } - void -Paper_outputter::output_header () +Paper_outputter::output_scheme (SCM scm) { - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } - - SCM exp = gh_list (ly_symbol2scm ((String (output_global_ch) + "-scm").ch_C()), - ly_quote_scm (ly_symbol2scm ("all-definitions")), - SCM_UNDEFINED); - exp = scm_eval (exp); - scm_eval (exp); - - String creator; - if (no_timestamps_global_b) - creator = gnu_lilypond_str (); + if (output_format_global == PAGE_LAYOUT) + scm_display (scm_eval (scm, output_module_), file_); else - creator = gnu_lilypond_version_str (); - - 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); + gh_call2 (output_func_, scm, file_); } - - void -Paper_outputter::output_comment (String str) +Paper_outputter::output_metadata (Paper_def *paper, SCM scopes) { - output_scheme (gh_list (ly_symbol2scm ("comment"), - ly_str02scm ((char*)str.ch_C()), - SCM_UNDEFINED) - ); + SCM fields = SCM_EOL; + for (int i = dump_header_fieldnames_global.size (); i--; ) + fields + = gh_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()), + fields); + 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_scheme (SCM scm) +Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count) { + 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_4 (ly_symbol2scm ("header"), + scm_makfrom0str (creator.to_str0 ()), + scm_makfrom0str (time_stamp.to_str0 ()), + scm_int2num (page_count))); + + output_metadata (paper, scopes); + output_music_output_def (paper); + + output_scheme (scm_list_1 (ly_symbol2scm ("header-end"))); + /* - we don't rename dump_scheme, because we might in the future want - to remember Scheme. We don't now, because it sucks up a lot of memory. - */ - dump_scheme (scm); + 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. + */ + output_scheme (scm_list_3 (ly_symbol2scm ("define-fonts"), + paper->self_scm (), + ly_quote_scm (paper->font_descriptions ()))); } - void -Paper_outputter::dump_scheme (SCM s) +Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) { - if (verbatim_scheme_b_) + Paper_line *pl = unsmob_paper_line (line); + Offset dim = pl->dim (); + if (dim[Y_AXIS] > 50 CM) { - SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"), - ly_quote_scm (gh_car (s)), SCM_UNDEFINED)); - - *stream_p_ << ly_scm2string (result); + programming_error ("Improbable system height."); + dim[Y_AXIS] = 50 CM; } + + if (output_format_global != PAGE_LAYOUT) + output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), + gh_double2scm (dim[X_AXIS]), + gh_double2scm (dim[Y_AXIS]))); else { - SCM result = scm_eval (s); - char *c=gh_scm2newstr (result, NULL); - - *stream_p_ << c; - free (c); + output_scheme (scm_list_3 (ly_symbol2scm ("new-start-system"), + ly_quote_scm (ly_offset2scm (*origin)), + ly_quote_scm (ly_offset2scm (dim)))); + (*origin)[Y_AXIS] += dim[Y_AXIS]; } -} -void -Paper_outputter::output_scope (Scope *scope, String prefix) -{ - SCM al = scope->to_alist (); - for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s)) - { - SCM k = gh_caar (s); - SCM v = gh_cdar (s); - Identifier * id = unsmob_identifier (v); - String s = ly_symbol2string (k); - - if (dynamic_cast (id)) - { - String val = *id->access_content_String (false); - - output_String_def (prefix + s, val); - } - else if(dynamic_cast (id)) - { - Real val = *id->access_content_Real (false); - - output_Real_def (prefix + s, val); - } - else if (dynamic_cast (id)) - { - int val = *id->access_content_int (false); - - output_int_def (prefix + s, val); - } + SCM between = SCM_EOL; + for (SCM s = pl->stencils (); gh_pair_p (s); s = ly_cdr (s)) + { + Stencil *stil = unsmob_stencil (ly_car (s)); + if (stil) + output_expr (stil->get_expr (), Offset (0,0)); + /* Only if !PAGE_LAYOUT */ + else if (ly_caar (s) == ly_symbol2scm ("between-system-string")) + between = ly_cdar (s); } -} -void -Paper_outputter::output_version () -{ - String id_str = "Lily was here"; - if (no_timestamps_global_b) - id_str += "."; + if (is_last) + output_scheme (scm_list_1 (ly_symbol2scm ("stop-last-system"))); else - id_str += String (", ") + version_str (); - - output_String_def ( "mudelatagline", id_str); - output_String_def ( "LilyPondVersion", version_str ()); -} - - - -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); + { + output_scheme (scm_list_1 (ly_symbol2scm ("stop-system"))); + if (output_format_global != PAGE_LAYOUT && between != SCM_EOL) + output_scheme (between); + } } void -Paper_outputter::output_Real_def (String k, Real 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); + output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"), + odef->self_scm (), SCM_UNDEFINED)); } +/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil */ void -Paper_outputter::output_String_def (String k, String v) +Paper_outputter::output_expr (SCM expr, Offset o) { + while (1) + { + if (!gh_pair_p (expr)) + return; - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (v.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); -} - -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); + SCM head =ly_car (expr); + if (unsmob_input (head)) + { + Input * ip = unsmob_input (head); + + output_scheme (scm_list_n (ly_symbol2scm ("define-origin"), + scm_makfrom0str (ip->file_string ().to_str0 ()), + gh_int2scm (ip->line_number ()), + gh_int2scm (ip->column_number ()), + SCM_UNDEFINED)); + expr = ly_cadr (expr); + } + else if (head == ly_symbol2scm ("no-origin")) + { + output_scheme (scm_list_n (head, SCM_UNDEFINED)); + 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_n (ly_symbol2scm ("placebox"), + gh_double2scm (o[X_AXIS]), + gh_double2scm (o[Y_AXIS]), + expr, + SCM_UNDEFINED)); + return; + } + } } - - - -