Fixes from mailist.

[lilypond.git] / lily / paper-outputter-scheme.cc

diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index 9c753f9b493eed6b00175557b275068078f012e2..e4906f4a9bda4fb34eda3c90f85cfef9482723fd 100644 (file)
--- a/lily/paper-outputter-scheme.cc
+++ b/lily/paper-outputter-scheme.cc
@@ -3,14 +3,14 @@
 
   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 "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),
@@ -22,16 +22,16 @@ LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
   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>";
 
-  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.to_str0 ()));
+              output_name.c_str ()));
 
   progress_indication ("\n");
   Paper_outputter *po = new Paper_outputter (port, f);