X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=5f02a7654923572f7e05aafc808a70495a0ceda5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a5a4205530f34de48c7bd357dedcafc120575c25;hpb=6eef288ea512e1d437aab40736ea056743e4ea02;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index a5a4205530..5f02a76549 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,257 +3,106 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys Jan Nieuwenhuizen */ -#include -#include +#include "paper-outputter.hh" + +#include +#include + +using namespace std; #include "dimensions.hh" -#include "virtual-methods.hh" -#include "paper-outputter.hh" -#include "stencil.hh" -#include "array.hh" -#include "string-convert.hh" -#include "warn.hh" +#include "file-name.hh" #include "font-metric.hh" -#include "main.hh" -#include "scm-hash.hh" +#include "input.hh" #include "lily-version.hh" -#include "paper-def.hh" -#include "input-file-results.hh" -#include "ly-module.hh" +#include "main.hh" +#include "output-def.hh" #include "paper-book.hh" -#include "paper-line.hh" -#include "input-smob.hh" // output_expr +#include "paper-system.hh" +#include "scm-hash.hh" +#include "string-convert.hh" +#include "warn.hh" +#include "ly-smobs.icc" -Paper_outputter::Paper_outputter (String name) +Paper_outputter::Paper_outputter (SCM port, string format) { - 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")); + file_ = port; + output_module_ = SCM_EOL; + smobify_self (); - if (output_format_global == PAGE_LAYOUT) - { - 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", - - "number-pair->string", /* output-lib.scm */ - "numbers->string", - - "assoc-get", - "inexact->string", /* insecure guile? */ -#if IMPORT_LESS - "string-index", /* from srfi srfi-13 */ - "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; - } + string module_name = "scm output-" + format; + output_module_ = scm_c_resolve_module (module_name.c_str ()); } Paper_outputter::~Paper_outputter () { - scm_close_port (file_); - file_ = SCM_EOL; } -void -Paper_outputter::output_scheme (SCM scm) +IMPLEMENT_SMOBS (Paper_outputter); +IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); + +SCM +Paper_outputter::mark_smob (SCM x) { - if (output_format_global == PAGE_LAYOUT) - scm_display (scm_eval (scm, output_module_), file_); - else - gh_call2 (output_func_, scm, file_); + Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x); + scm_gc_mark (p->output_module_); + return p->file_; } -void -Paper_outputter::output_metadata (Paper_def *paper, SCM scopes) +int +Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) { - 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 (), - scm_list_n (ly_symbol2scm ("quote"), - scopes, SCM_UNDEFINED), - scm_list_n (ly_symbol2scm ("quote"), - fields, SCM_UNDEFINED), - scm_makfrom0str (basename_.to_str0 ()), - SCM_UNDEFINED)); + (void) x; + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count) +SCM +Paper_outputter::file () const { - 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))); + return file_; +} - output_metadata (paper, scopes); - output_music_output_def (paper); +SCM +Paper_outputter::dump_string (SCM scm) +{ + return scm_display (scm, file ()); +} - output_scheme (scm_list_1 (ly_symbol2scm ("header-end"))); - output_scheme (scm_list_2 (ly_symbol2scm ("define-fonts"), - ly_quote_scm (paper->font_descriptions ()))); +SCM +Paper_outputter::scheme_to_string (SCM scm) +{ + return scm_eval (scm, output_module_); } void -Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) +Paper_outputter::output_scheme (SCM scm) { - Paper_line *pl = unsmob_paper_line (line); - Offset dim = pl->dim (); - if (dim[Y_AXIS] > 50 CM) - { - 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 - { - 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]; - } - - 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 (), stil->origin ()); - /* Only if !PAGE_LAYOUT */ - else if (ly_caar (s) == ly_symbol2scm ("between-system-string")) - between = ly_cdar (s); - } - - if (is_last) - output_scheme (scm_list_1 (ly_symbol2scm ("stop-last-system"))); - else - { - output_scheme (scm_list_1 (ly_symbol2scm ("stop-system"))); - if (output_format_global != PAGE_LAYOUT && between != SCM_EOL) - output_scheme (between); - } + dump_string (scheme_to_string (scm)); } void -Paper_outputter::output_music_output_def (Music_output_def* odef) +paper_outputter_dump (void *po, SCM x) { - output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"), - odef->self_scm (), SCM_UNDEFINED)); + Paper_outputter *me = (Paper_outputter *) po; + me->output_scheme (x); } -/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil */ void -Paper_outputter::output_expr (SCM expr, Offset o) +Paper_outputter::output_stencil (Stencil stil) { - while (1) - { - if (!gh_pair_p (expr)) - return; - - 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; - } - } + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void *) this, Offset (0, 0)); } +void +Paper_outputter::close () +{ + if (scm_port_p (file_) == SCM_BOOL_T) + scm_close_port (file_); +}