X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter-scheme.cc;h=bc89a86016711343b857dc19d0fefe8a4c6013f5;hb=6140c6eb657080939fa4aef3d00d717bd85b5028;hp=3c00d79308e40ec3f010349dd7da8d21ee968069;hpb=e9a308e9c6002900fc336733950a0175bcbcc333;p=lilypond.git diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc index 3c00d79308..bc89a86016 100644 --- a/lily/paper-outputter-scheme.cc +++ b/lily/paper-outputter-scheme.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2007 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ #include "paper-outputter.hh" @@ -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 = ""; 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);