source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "paper-outputter.hh"
-#include "warn.hh"
-#include "stencil.hh"
-
+#include "international.hh"
+#include "stencil.hh"
+#include "warn.hh"
LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
2, 0, 0, (SCM port, SCM format),
SCM_ASSERT_TYPE (scm_is_string (format), format, SCM_ARG2, __FUNCTION__,
"String");
- String f = ly_scm2string (format);
+ 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'...",
- ly_scm2string (scm_port_filename (port)).to_str0 ()));
+ output_name.c_str ()));
progress_indication ("\n");
Paper_outputter *po = new Paper_outputter (port, f);
- scm_gc_unprotect_object (po->self_scm ());
+ po->unprotect ();
return po->self_scm ();
}