source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
#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 "main.hh"
#include "output-def.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 ());
}
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_;
}
}
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_;
}
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));
+ (void *) this, Offset (0, 0));
}
void