X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=6dff3242439bcc0c16ea0d5eabbe2fc532570f46;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=bb9c3812cf8ed9138793f8a04dcc8f1efdaf3c48;hpb=334fe0d65dbcbb1cd69df39ca8bb8e422cf9d784;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index bb9c3812cf..6dff324243 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,77 +1,89 @@ /* - 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 "output-def.hh" #include "paper-book.hh" -#include "paper-outputter.hh" #include "paper-system.hh" #include "scm-hash.hh" -#include "stencil.hh" #include "string-convert.hh" #include "warn.hh" #include "ly-smobs.icc" - -Paper_outputter::Paper_outputter (String filename, String format) +Paper_outputter::Paper_outputter (SCM port, const string &format) { - file_ = SCM_EOL; + file_ = port; output_module_ = SCM_EOL; smobify_self (); - - filename_ = filename; - String module_name = "scm output-" + format; - output_module_ = scm_c_resolve_module (module_name.to_str0 ()); + + 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 () { } - IMPLEMENT_SMOBS (Paper_outputter); IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); SCM Paper_outputter::mark_smob (SCM x) { - Paper_outputter *p = (Paper_outputter*) SCM_CELL_WORD_1(x); + Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x); scm_gc_mark (p->output_module_); return p->file_; } int -Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) +Paper_outputter::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - (void) x; scm_puts ("#", p); return 1; } SCM -Paper_outputter::file () +Paper_outputter::file () const { - if (file_ == SCM_EOL) - file_ = scm_open_file (scm_makfrom0str (filename_.to_str0 ()), - scm_makfrom0str ("w")); return file_; } @@ -87,54 +99,47 @@ Paper_outputter::scheme_to_string (SCM scm) return scm_eval (scm, output_module_); } -void +SCM +Paper_outputter::module () const +{ + return output_module_; +} + +SCM Paper_outputter::output_scheme (SCM scm) { - dump_string (scheme_to_string (scm)); + SCM str = scheme_to_string (scm); + if (scm_is_string (str)) + dump_string (str); + return str; } -void +SCM paper_outputter_dump (void *po, SCM x) { - Paper_outputter *me = (Paper_outputter*) po; - me->output_scheme (x); + Paper_outputter *me = (Paper_outputter *) po; + return me->output_scheme (x); } void Paper_outputter::output_stencil (Stencil stil) { interpret_stencil_expression (stil.expr (), paper_outputter_dump, - (void*) this, Offset (0,0)); -} - -Paper_outputter * -get_paper_outputter (String outname, String f) -{ - progress_indication (_f ("paper output to `%s'...", - outname == "-" ? String ("") : outname)); - return new Paper_outputter (outname, f); -} - -/* FIXME: why is output_* wrapper called dump? */ -LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil", - 2, 0, 0, (SCM outputter, SCM stencil), - "Dump stencil @var{expr} onto @var{outputter}.") -{ - Paper_outputter *po = unsmob_outputter (outputter); - Stencil *st = unsmob_stencil (stencil); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - SCM_ASSERT_TYPE (st, stencil, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - po->output_stencil (*st); - return SCM_UNSPECIFIED; + (void *) this, Offset (0, 0)); } -LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string", - 2, 0, 0, (SCM outputter, SCM str), - "Dump @var{str} onto @var{outputter}.") +void +Paper_outputter::close () { - Paper_outputter *po = unsmob_outputter (outputter); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - - return po->dump_string (str); + 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_); + } }