Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index 3c00d79308e40ec3f010349dd7da8d21ee968069..625494d6d94aa9a65b4242a26fc92be6f980942b 100644 (file)
--- a/lily/paper-outputter-scheme.cc
+++ b/lily/paper-outputter-scheme.cc
@@ -14,14 +14,13 @@
 
 LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
           2, 0, 0, (SCM port, SCM format),
-          "Create an outputter that evaluates within "
-          "@code{output-}@var{format}, writing to  @var{port}.")
+          "Create an outputter that evaluates within"
+          " @code{output-}@var{format}, writing to @var{port}.")
 {
   LY_ASSERT_TYPE (ly_is_port, port, 1);
-  LY_ASSERT_TYPE (scm_is_string, format, 2);
-
-  string f = ly_scm2string (format);
+  LY_ASSERT_TYPE (ly_is_symbol, format, 2);
 
+  string f = ly_symbol2string (format);
   string output_name = "<unknown>";
 
   SCM port_name = scm_port_filename (port);
@@ -45,7 +44,7 @@ LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil",
 {
   
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
-  LY_ASSERT_SMOB(Stencil, stencil, 2);
+  LY_ASSERT_SMOB (Stencil, stencil, 2);
 
   Paper_outputter *po = unsmob_outputter (outputter);
   Stencil *st = unsmob_stencil (stencil);
@@ -59,7 +58,7 @@ LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string",
           "Dump @var{str} onto @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
-  LY_ASSERT_TYPE(scm_is_string, str, 2);
+  LY_ASSERT_TYPE (scm_is_string, str, 2);
 
   Paper_outputter *po = unsmob_outputter (outputter);