X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=6dff3242439bcc0c16ea0d5eabbe2fc532570f46;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=7b93840f124eae255380ad9047a923089111b3e9;hpb=25b213ce648ba00918e97d94ce3e022d90f38c46;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 7b93840f12..6dff324243 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,173 +1,145 @@ /* - paper-outputter.cc -- implement Paper_outputter + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2014 Han-Wen Nienhuys + Jan Nieuwenhuizen - (c) 1997--2004 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 "array.hh" #include "dimensions.hh" +#include "file-name.hh" #include "font-metric.hh" -#include "input-smob.hh" -#include "lily-guile.hh" +#include "input.hh" #include "lily-version.hh" -#include "ly-module.hh" #include "main.hh" -#include "page.hh" +#include "output-def.hh" #include "paper-book.hh" -#include "paper-def.hh" -#include "paper-line.hh" -#include "paper-outputter.hh" -#include "file-name.hh" +#include "paper-system.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); +#include "ly-smobs.icc" -Paper_outputter::Paper_outputter (String filename) +Paper_outputter::Paper_outputter (SCM port, const string &format) { - filename_ = filename; - file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()), - scm_makfrom0str ("w")); - - String module_name = "scm output-" + output_format_global; - output_module_ = scm_c_resolve_module (module_name.to_str0 ()); + 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. + */ + SCM proc = ly_lily_module_constant ("backend-testing"); + scm_call_1 (proc, output_module_); } 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) { - scm_display (scm_eval (scm, output_module_), 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 - = 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)); + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count, - bool is_classic) +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_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)))); + return file_; } -void -Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) +SCM +Paper_outputter::dump_string (SCM scm) { - Paper_line *p = unsmob_paper_line (line); - Offset dim = p->dim (); - if (dim[Y_AXIS] > 50 CM) - { - programming_error (to_string ("Improbable line height: %f", - dim[Y_AXIS])); - dim[Y_AXIS] = 50 CM; - } - - 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 ())); - - (*origin)[Y_AXIS] += dim[Y_AXIS]; - output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"), - ly_bool2scm (is_last))); + return scm_display (scm, file ()); } -void -Paper_outputter::output_page (Page *p, bool is_last) +SCM +Paper_outputter::scheme_to_string (SCM 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_)))); + return scm_eval (scm, output_module_); } -void -Paper_outputter::output_music_output_def (Music_output_def *odef) +SCM +Paper_outputter::module () const { - output_scheme (scm_list_2 (ly_symbol2scm ("output-paper-def"), - odef->self_scm ())); + return output_module_; } - -void -paper_outputter_dump (void * po, SCM x) +SCM +Paper_outputter::output_scheme (SCM scm) { - Paper_outputter * me = (Paper_outputter*) po; - me->output_scheme (x); + SCM str = scheme_to_string (scm); + if (scm_is_string (str)) + dump_string (str); + return str; } +SCM +paper_outputter_dump (void *po, SCM x) +{ + Paper_outputter *me = (Paper_outputter *) po; + return me->output_scheme (x); +} void Paper_outputter::output_stencil (Stencil stil) { - interpret_stencil_expr (stil.expr (), paper_outputter_dump, - (void*) this, Offset (0,0)); + 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_); + /* + Remove the "warning" definitions for missing stencil + expressions so that we start fresh with the next \book + block. --pmccarty + */ + SCM proc = ly_lily_module_constant ("remove-stencil-warnings"); + scm_call_1 (proc, output_module_); + } +}