/*
- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "paper-outputter.hh"
-#include <math.h>
+#include <cmath>
#include <ctime>
+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"
#include "ly-smobs.icc"
-Paper_outputter::Paper_outputter (String file_name, String format)
+Paper_outputter::Paper_outputter (SCM port, 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.
+ */
+ 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 ("#<Paper_outputter>", p);
return 1;
}
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_;
}
return scm_eval (scm, output_module_);
}
+SCM
+Paper_outputter::module () const
+{
+ return output_module_;
+}
+
void
Paper_outputter::output_scheme (SCM scm)
{
void
paper_outputter_dump (void *po, SCM x)
{
- Paper_outputter *me = (Paper_outputter*) po;
+ Paper_outputter *me = (Paper_outputter *) po;
me->output_scheme (x);
}
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 ("<stdout>")
- : 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_);
+ {
+ 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_);
+ }
}