X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=471a36a41a4572eb1941eb83ad4a27b244cb3c26;hb=905109ea0e90efa8d9c1ba02769e458a0707cc47;hp=4ec59b228fd29c9805f21fdfed9b6e00187c6ae3;hpb=0ccace80447d10fe0f52f9f189f01d60d60202e8;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 4ec59b228f..471a36a41a 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,184 +1,133 @@ /* - paper-outputter.cc -- implement Paper_outputter + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2004 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#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 "input-smob.hh" // output_expr - +#include "paper-system.hh" +#include "scm-hash.hh" +#include "string-convert.hh" +#include "warn.hh" +#include "lily-imports.hh" -Paper_outputter::Paper_outputter (String name) -{ - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } - - file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), - scm_makfrom0str ("w")); - static SCM find_dumper; - if (!find_dumper) - find_dumper = scm_c_eval_string ("find-dumper"); +const char * const Paper_outputter::type_p_name_ = 0; - - output_func_ = scm_call_1 (find_dumper,scm_makfrom0str (output_format_global.to_str0 ())); - output_scheme (gh_cons (ly_symbol2scm ("top-of-file"), SCM_EOL)); +Paper_outputter::Paper_outputter (SCM port, const string &format) +{ + file_ = port; + output_module_ = SCM_EOL; + smobify_self (); + + string module_name = "scm output-" + format; + output_module_ = scm_c_resolve_module (module_name.c_str ()); + + /* + Enable errors for undefined stencil routines if + -dwarning-as-error is specified; else enable warnings. + */ + Lily::backend_testing (output_module_); } Paper_outputter::~Paper_outputter () { - scm_close_port (file_); - file_ = SCM_EOL; } -void -Paper_outputter::output_scheme (SCM scm) + +SCM +Paper_outputter::mark_smob () const { - gh_call2 (output_func_, scm, file_); + scm_gc_mark (output_module_); + return file_; } -void -Paper_outputter::output_metadata (SCM scopes, Paper_def *paper) +SCM +Paper_outputter::file () const { - 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)); + return file_; } -void -Paper_outputter::output_header (Paper_def *paper) +SCM +Paper_outputter::dump_string (SCM scm) { - output_music_output_def (paper); - output_scheme (scm_list_1 (ly_symbol2scm ("header-end"))); - output_scheme (scm_list_2 (ly_symbol2scm ("define-fonts"), - ly_quote_scm (paper->font_descriptions ()))); + return scm_display (scm, file ()); } -void -Paper_outputter::output_line (SCM line, bool is_last) +SCM +Paper_outputter::scheme_to_string (SCM scm) { - Offset dim = ly_scm2offset (ly_car (line)); - Real width = dim[X_AXIS]; - Real height = dim[Y_AXIS]; - - if (height > 50 CM) - { - programming_error ("Improbable system height."); - height = 50 CM; - } + return scm_eval (scm, output_module_); +} - output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), - gh_double2scm (width), gh_double2scm (height))); +SCM +Paper_outputter::module () const +{ + return output_module_; +} - SCM between = SCM_EOL; - for (SCM s = ly_cdr (line); gh_pair_p (s); s = ly_cdr (s)) - { - Stencil *stil = unsmob_stencil (ly_cdar (s)); - SCM head = ly_caar (s); - - if (head == ly_symbol2scm ("between-system-string")) - { - between = stil->get_expr (); - continue; - } - - output_expr (stil->get_expr (), ly_scm2offset (head)); - } +SCM +Paper_outputter::output_scheme (SCM scm) +{ + SCM str = scheme_to_string (scm); + if (scm_is_string (str)) + dump_string (str); + return str; +} - 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); - } +SCM +paper_outputter_dump (void *po, SCM x) +{ + Paper_outputter *me = (Paper_outputter *) po; + return me->output_scheme (x); } void -Paper_outputter::output_music_output_def (Music_output_def* odef) +Paper_outputter::output_stencil (Stencil stil) { - output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"), - odef->self_scm (), SCM_UNDEFINED)); + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void *) this, Offset (0, 0)); } -/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil */ void -Paper_outputter::output_expr (SCM expr, Offset o) +Paper_outputter::close () { - while (1) + if (ly_is_port (file_)) { - 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; - } + scm_close_port (file_); + /* + Remove the "warning" definitions for missing stencil + expressions so that we start fresh with the next \book + block. --pmccarty + */ + Lily::remove_stencil_warnings (output_module_); } } -