/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
#include "scm-hash.hh"
#include "string-convert.hh"
#include "warn.hh"
+#include "lily-imports.hh"
-#include "ly-smobs.icc"
-Paper_outputter::Paper_outputter (SCM port, string format)
+Paper_outputter::Paper_outputter (SCM port, const string &format)
{
file_ = port;
output_module_ = SCM_EOL;
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_);
+ Lily::backend_testing (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::mark_smob () const
{
- 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 *)
-{
- scm_puts ("#<Paper_outputter>", p);
- return 1;
+ scm_gc_mark (output_module_);
+ return file_;
}
SCM
void
Paper_outputter::close ()
{
- if (scm_port_p (file_) == SCM_BOOL_T)
+ if (ly_is_port (file_))
{
scm_close_port (file_);
/*
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_);
+ Lily::remove_stencil_warnings (output_module_);
}
}