X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter-scheme.cc;h=be3d315cf1c81b0b4f7470fb6ca369a3b7e944d2;hb=e5380f29f23e204a603f8398368d2a7dc0260aa0;hp=672eab7ce72c07838c780ede3ad5030d9ffac913;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index 672eab7ce7..be3d315cf1 100644
--- a/lily/paper-outputter-scheme.cc
+++ b/lily/paper-outputter-scheme.cc
@@ -1,9 +1,20 @@
 /*
-  paper-outputter-scheme.cc -- implement Paper_outputter bindings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "paper-outputter.hh"
@@ -14,14 +25,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);
@@ -98,3 +108,13 @@ LY_DEFINE (ly_outputter_output_scheme, "ly:outputter-output-scheme",
 
   return SCM_UNSPECIFIED;
 }
+
+LY_DEFINE (ly_outputter_module, "ly:outputter-module",
+	   1, 0, 0, (SCM outputter),
+	   "Return output module of @var{outputter}.")
+{
+  LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
+
+  Paper_outputter *po = unsmob_outputter (outputter);
+  return po->module ();
+}