X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-outputter.cc;h=8540ae1efbd1cf83514eb6acb61f4855db91d83b;hb=4e288c484bb01fcfba0e191fe0cd2fc161308836;hp=796f94079c2db0f6193f6c069ba5facd98fdd8ab;hpb=5df02e6bebe82a9da8ae4576bdbc08733161d636;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 796f94079c..8540ae1efb 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,191 +3,238 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 1997--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -#include #include +#include -#include "dimensions.hh" -#include "virtual-methods.hh" -#include "paper-outputter.hh" -#include "molecule.hh" #include "array.hh" -#include "string-convert.hh" -#include "warn.hh" +#include "dimensions.hh" #include "font-metric.hh" -#include "main.hh" -#include "scm-hash.hh" +#include "input-smob.hh" +#include "lily-guile.hh" #include "lily-version.hh" +#include "ly-module.hh" +#include "main.hh" +#include "paper-book.hh" #include "paper-def.hh" -#include "input-file-results.hh" +#include "paper-line.hh" +#include "paper-outputter.hh" +#include "scm-hash.hh" +#include "stencil.hh" +#include "string-convert.hh" +#include "warn.hh" -/* - Ugh, this is messy. - */ -Paper_outputter::Paper_outputter (String name) +Paper_outputter::Paper_outputter (String filename) { + if (safe_global_b) + scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T); + + file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()), + scm_makfrom0str ("w")); + + 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 ())); } + else + output_module_ = scm_c_resolve_module (module_name.to_str0 ()); - file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), - scm_makfrom0str ("w")); - - SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"), - scm_makfrom0str (output_format_global.to_str0 ()), - SCM_UNDEFINED); - - output_func_ = scm_primitive_eval (exp); + /* 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 (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 } Paper_outputter::~Paper_outputter () { - + scm_close_port (file_); + file_ = SCM_EOL; } - void -Paper_outputter::output_header () +Paper_outputter::output_scheme (SCM scm) { - String generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - generate = generate.left_string (generate.length () - 1); - - /* - Make fixed length time stamps - */ - generate = generate + to_string (' ' * (120 - generate.length ())>? 0) ; - String creator = "lelie"; - - SCM args_scm = scm_list_n (scm_makfrom0str (creator.to_str0 ()), - scm_makfrom0str (generate.to_str0 ()), SCM_UNDEFINED); - - - SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm); - - output_scheme (scm); + scm_display (scm_eval (scm, output_module_), file_); } - - void -Paper_outputter::output_comment (String str) +Paper_outputter::output_metadata (Paper_def *paper, SCM scopes) { - output_scheme (scm_list_n (ly_symbol2scm ("comment"), - scm_makfrom0str ((char*)str.to_str0 ()), - SCM_UNDEFINED) - ); + 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); + 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, + bool is_classic) { - gh_call2 (output_func_, scm, file_); + 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::output_scope (SCM mod, String prefix) +Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) { - SCM al = ly_module_to_alist (mod); - for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) + Paper_line *pl = unsmob_paper_line (line); + Offset dim = pl->dim (); + if (dim[Y_AXIS] > 50 CM) { - SCM k = ly_caar (s); - SCM v = ly_cdar (s); - String s = ly_symbol2string (k); - - if (gh_string_p (v)) - { - output_String_def (prefix + s, ly_scm2string (v)); - } - else if (scm_exact_p (v) == SCM_BOOL_T) - { - output_int_def (prefix + s, gh_scm2int (v)); - } - else if (gh_number_p (v)) - { - output_Real_def (prefix + s, gh_scm2double (v)); - } + programming_error ("Improbable system height."); + dim[Y_AXIS] = 50 CM; } -} -void -Paper_outputter::output_version () -{ - String id_string = "Lily was here"; - id_string += String_convert::pad_to (String (", ") + version_string (), 40); - - output_String_def ("lilypondtagline", id_string); - output_String_def ("LilyPondVersion", version_string ()); - output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT)); -} + output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), + ly_quote_scm (ly_offset2scm (*origin)), + ly_quote_scm (ly_offset2scm (dim)))); + for (SCM s = pl->stencils (); is_pair (s); s = ly_cdr (s)) + output_expr (unsmob_stencil (ly_car (s))->get_expr (), Offset (0, 0)); -void -Paper_outputter::output_Real_def (String k, Real v) -{ - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); -} + output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), + ly_bool2scm (is_last))); -void -Paper_outputter::output_String_def (String k, String v) -{ - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (v.get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); + (*origin)[Y_AXIS] += dim[Y_AXIS]; } -void -Paper_outputter::output_int_def (String k, int v) -{ - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); -} void -Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) +Paper_outputter::output_music_output_def (Music_output_def* odef) { - output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), - scm_makfrom0str (filename.to_str0 ()), - ly_quote_scm (key), value, - SCM_UNDEFINED)); + 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::write_header_fields_to_file (SCM mod) +Paper_outputter::output_expr (SCM expr, Offset o) { - - if (dump_header_fieldnames_global.size ()) + while (1) { - SCM fields = ly_module_to_alist (mod); - for (int i = 0; i < dump_header_fieldnames_global.size (); i++) + if (!is_pair (expr)) + return; + + SCM head =ly_car (expr); + if (unsmob_input (head)) { - String key = dump_header_fieldnames_global[i]; - SCM val = gh_assoc (ly_symbol2scm (key.to_str0 ()), fields); - String s; - /* Only write header field to file if it exists */ - if (gh_pair_p (val)) - { - s = ly_scm2string (ly_cdr (val)); - /* Always write header field file, even if string is empty ... */ - write_header_field_to_file (basename_ , ly_car (val), ly_cdr (val)); - } + Input * ip = unsmob_input (head); + + output_scheme (scm_list_n (ly_symbol2scm ("define-origin"), + scm_makfrom0str (ip->file_string ().to_str0 ()), + scm_int2num (ip->line_number ()), + scm_int2num (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"), + scm_make_real (o[X_AXIS]), + scm_make_real (o[Y_AXIS]), + expr, + SCM_UNDEFINED)); + return; } } } +