X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=8de4a29e167e20525238a5edc7ae5abfa3ceb3bf;hb=e2a4be3b72b1c473658436e4f82234b401dd7b60;hp=6dc512510761995328c8fb05d37e5a5c20f92b51;hpb=8aa7d17c7264f95f21a68cb3f51a0a3d5a87ab22;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 6dc5125107..8de4a29e16 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,51 +3,102 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 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 "page.hh" +#include "paper-book.hh" #include "paper-def.hh" -#include "input-file-results.hh" -#include "ly-modules.hh" - +#include "paper-line.hh" +#include "paper-outputter.hh" +#include "file-name.hh" +#include "scm-hash.hh" +#include "stencil.hh" +#include "string-convert.hh" +#include "warn.hh" +// JUNKME +extern SCM stencil2line (Stencil* stil, bool is_title = false); -/* - Ugh, this is messy. - */ -Paper_outputter::Paper_outputter (String name) +Paper_outputter::Paper_outputter (String filename) { + 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); + + 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")); - - /* - ugh. - */ - 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 () @@ -56,149 +107,161 @@ Paper_outputter::~Paper_outputter () file_ = SCM_EOL; } - void -Paper_outputter::output_header () +Paper_outputter::output_scheme (SCM scm) { - time_t t (time (0)); - String generate = ctime (&t); - generate = generate.left_string (generate.length () - 1) + " " + *tzname; - - /* Fixed length time stamp */ - generate = generate + to_string (' ', (50 - generate.length ()) >? 0); - - /* Fixed length creator string */ - String creator = gnu_lilypond_version_string (); - creator += " (http://lilypond.org)"; - creator = creator + to_string (' ', (50 - creator.length ()) >? 0); - - 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); + + 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_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) { - if (!SCM_MODULEP (mod)) - return ; - - SCM al = ly_module_to_alist (mod); - for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) + Paper_line *p = unsmob_paper_line (line); + Offset dim = p->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 (to_string ("Improbable line height: %f", + dim[Y_AXIS])); + dim[Y_AXIS] = 50 CM; } -} - -void -Paper_outputter::output_version () -{ - String id_string = "Engraved by LilyPond"; - 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)))); + output_stencil (unsmob_stencil (p->to_stencil ())); -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); + (*origin)[Y_AXIS] += dim[Y_AXIS]; + output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), + ly_bool2scm (is_last))); } void -Paper_outputter::output_String_def (String k, String v) +Paper_outputter::output_page (Page *p, bool is_last) { - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (v.get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); + output_scheme (scm_list_1 (ly_symbol2scm ("start-page"))); + + 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))))); + + output_stencil (unsmob_stencil (p->to_stencil ())); + + 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 = 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 ("output-paper-def"), + odef->self_scm ())); } void -Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) +Paper_outputter::output_stencil (Stencil *stil) { - output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), - scm_makfrom0str (filename.to_str0 ()), - ly_quote_scm (key), value, - SCM_UNDEFINED)); + output_expr (stil->expr (), stil->origin ()); } +/* 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 (ly_module_p (mod)&& - 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 (!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 { - 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) && gh_string_p (ly_cdr (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)); - } + output_scheme (scm_list_4 (ly_symbol2scm ("placebox"), + scm_make_real (o[X_AXIS]), + scm_make_real (o[Y_AXIS]), + expr)); + return; } } }