X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=a72ea59ccdef770d8f70c32f942a42ee4fe8a6d9;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=74b2a5b2d05faf053b259f30d789d5e8cad6ad71;hpb=a0c5f43a69fc72f878d7b3f635030f67f1a535db;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 74b2a5b2d0..a72ea59ccd 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,23 +1,35 @@ /* - 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--2015 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 "paper-outputter.hh" -#include +#include #include +using namespace std; + #include "dimensions.hh" #include "file-name.hh" #include "font-metric.hh" -#include "input-smob.hh" +#include "input.hh" #include "lily-version.hh" -#include "ly-module.hh" #include "main.hh" #include "output-def.hh" #include "paper-book.hh" @@ -25,18 +37,23 @@ #include "scm-hash.hh" #include "string-convert.hh" #include "warn.hh" +#include "lily-imports.hh" -#include "ly-smobs.icc" -Paper_outputter::Paper_outputter (String file_name, String format) +Paper_outputter::Paper_outputter (SCM port, const string &format) { - file_ = SCM_EOL; + file_ = port; output_module_ = SCM_EOL; smobify_self (); - - file_name_ = file_name; - 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. + */ + Lily::backend_testing (output_module_); } Paper_outputter::~Paper_outputter () @@ -44,34 +61,16 @@ 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); - scm_gc_mark (p->output_module_); - return p->file_; -} - -int -Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) +Paper_outputter::mark_smob () const { - (void) x; - scm_puts ("#", p); - return 1; + scm_gc_mark (output_module_); + return file_; } SCM -Paper_outputter::file () +Paper_outputter::file () const { - if (file_ == SCM_EOL) - if (file_name_ == "-") - file_ = scm_current_output_port(); - else - file_ = scm_open_file (scm_makfrom0str (file_name_.to_str0 ()), - scm_makfrom0str ("w")); return file_; } @@ -87,89 +86,46 @@ 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)); -} - -LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter", - 2, 0, 0, (SCM outname, SCM format), - "Create an outputter that evaluates within " - "@code{output-}@var{format}, writing to file @var{outname}.") -{ - SCM_ASSERT_TYPE(scm_is_string (outname), outname, SCM_ARG1, __FUNCTION__, - "String"); - SCM_ASSERT_TYPE(scm_is_string (format), format, SCM_ARG2, __FUNCTION__, - "String"); - - String outname_str = ly_scm2string (outname); - String f = ly_scm2string (format); - - progress_indication (_f ("Layout output to `%s'...", - outname_str == "-" - ? String ("") - : outname_str)); - progress_indication ("\n"); - Paper_outputter *po = new Paper_outputter (outname_str, f); - - scm_gc_unprotect_object (po->self_scm ()); - return po->self_scm (); -} - -/* 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; -} - -LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string", - 2, 0, 0, (SCM outputter, SCM str), - "Dump @var{str} onto @var{outputter}.") -{ - Paper_outputter *po = unsmob_outputter (outputter); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - - return po->dump_string (str); -} - - -LY_DEFINE (ly_outputter_close, "ly:outputter-close", - 1, 0, 0, (SCM outputter), - "Close port of @var{outputter}.") -{ - Paper_outputter *po = unsmob_outputter (outputter); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - - po->close (); - return SCM_UNSPECIFIED; + (void *) this, Offset (0, 0)); } void Paper_outputter::close () { - if (scm_port_p (file_) == SCM_BOOL_T) - scm_close_port (file_); + if (ly_is_port (file_)) + { + 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_); + } }