X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter-scheme.cc;h=bc89a86016711343b857dc19d0fefe8a4c6013f5;hb=e8b9253c5405efaf70cdc473d80eb9764ebc0149;hp=36c77a43f266ffa0942276ac1a34e580122b9cee;hpb=92918346012f79ef9109ef0c391947af2d3165ca;p=lilypond.git

diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index 36c77a43f2..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 <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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_FIRST_TYPE(ly_is_port, port);
-  LY_ASSERT_TYPE (scm_is_string, 2);
-
-  string f = ly_scm2string (format);
+  LY_ASSERT_TYPE (ly_is_port, port, 1);
+  LY_ASSERT_TYPE (ly_is_symbol, format, 2);
 
+  string f = ly_symbol2string (format);
   string output_name = "<unknown>";
 
   SCM port_name = scm_port_filename (port);
@@ -44,8 +43,8 @@ LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil",
 	   "Dump stencil @var{expr} onto @var{outputter}.")
 {
   
-  LY_ASSERT_FIRST_SMOB (Paper_outputter, outputter);
-  LY_ASSERT_SMOB(Stencil, 2);
+  LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
+  LY_ASSERT_SMOB (Stencil, stencil, 2);
 
   Paper_outputter *po = unsmob_outputter (outputter);
   Stencil *st = unsmob_stencil (stencil);
@@ -58,8 +57,8 @@ LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string",
 	   2, 0, 0, (SCM outputter, SCM str),
 	   "Dump @var{str} onto @var{outputter}.")
 {
-  LY_ASSERT_FIRST_SMOB (Paper_outputter, outputter);
-  LY_ASSERT_TYPE(scm_is_string, 2);
+  LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
+  LY_ASSERT_TYPE (scm_is_string, str, 2);
 
   Paper_outputter *po = unsmob_outputter (outputter);
 
@@ -70,7 +69,7 @@ LY_DEFINE (ly_outputter_port, "ly:outputter-port",
 	   1, 0, 0, (SCM outputter),
 	   "Return output port for @var{outputter}.")
 {
-  LY_ASSERT_FIRST_SMOB (Paper_outputter, outputter);
+  LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   Paper_outputter *po = unsmob_outputter (outputter);
 
   return po->file ();
@@ -80,7 +79,7 @@ LY_DEFINE (ly_outputter_close, "ly:outputter-close",
 	   1, 0, 0, (SCM outputter),
 	   "Close port of @var{outputter}.")
 {
-  LY_ASSERT_FIRST_SMOB (Paper_outputter, outputter);
+  LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   Paper_outputter *po = unsmob_outputter (outputter);
 
   po->close ();
@@ -91,7 +90,7 @@ 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_FIRST_SMOB (Paper_outputter, outputter);
+  LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   Paper_outputter *po = unsmob_outputter (outputter);
 
   po->output_scheme (expr);