source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "paper-outputter.hh"
-#include "warn.hh"
+
+#include "international.hh"
#include "stencil.hh"
+#include "warn.hh"
LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
- 2, 0, 0, (SCM outname, SCM format),
+ 2, 0, 0, (SCM port, SCM format),
"Create an outputter that evaluates within "
- "@code{output-}@var{format}, writing to file @var{outname}.")
+ "@code{output-}@var{format}, writing to @var{port}.")
{
- 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));
+ LY_ASSERT_TYPE (ly_is_port, port, 1);
+ LY_ASSERT_TYPE (scm_is_string, format, 2);
+
+ string f = ly_scm2string (format);
+
+ string output_name = "<unknown>";
+
+ SCM port_name = scm_port_filename (port);
+ if (scm_is_string (port_name))
+ output_name = ly_scm2string (port_name);
+
+ message (_f ("Layout output to `%s'...",
+ output_name.c_str ()));
+
progress_indication ("\n");
- Paper_outputter *po = new Paper_outputter (outname_str, f);
+ Paper_outputter *po = new Paper_outputter (port, f);
- scm_gc_unprotect_object (po->self_scm ());
+ po->unprotect ();
return po->self_scm ();
}
2, 0, 0, (SCM outputter, SCM stencil),
"Dump stencil @var{expr} onto @var{outputter}.")
{
+
+ LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
+ LY_ASSERT_SMOB(Stencil, stencil, 2);
+
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;
}
2, 0, 0, (SCM outputter, SCM str),
"Dump @var{str} onto @var{outputter}.")
{
+ LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
+ LY_ASSERT_TYPE(scm_is_string, str, 2);
+
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);
}
1, 0, 0, (SCM outputter),
"Return output port for @var{outputter}.")
{
+ LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
Paper_outputter *po = unsmob_outputter (outputter);
- SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
return po->file ();
}
1, 0, 0, (SCM outputter),
"Close port of @var{outputter}.")
{
+ LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
Paper_outputter *po = unsmob_outputter (outputter);
- SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
po->close ();
return SCM_UNSPECIFIED;
}
+
+LY_DEFINE (ly_outputter_output_scheme, "ly:outputter-output-scheme",
+ 2, 0, 0, (SCM outputter, SCM expr),
+ "Eval @var{expr} in module of @var{outputter}.")
+{
+ LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
+ Paper_outputter *po = unsmob_outputter (outputter);
+
+ po->output_scheme (expr);
+
+ return SCM_UNSPECIFIED;
+}