X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter-scheme.cc;h=0d6f11de6bbc71f5d0177063cd7e3015e3b08552;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=d482ad45f1be5e1d350affdc7fabd09bd0457d69;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index d482ad45f1..0d6f11de6b 100644
--- a/lily/paper-outputter-scheme.cc
+++ b/lily/paper-outputter-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 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
@@ -24,9 +24,9 @@
 #include "warn.hh"
 
 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}.")
+           2, 0, 0, (SCM port, SCM format),
+           "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 (ly_is_symbol, format, 2);
@@ -39,7 +39,7 @@ LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
     output_name = ly_scm2string (port_name);
 
   message (_f ("Layout output to `%s'...",
-	       output_name.c_str ()));
+               output_name.c_str ()));
 
   progress_indication ("\n");
   Paper_outputter *po = new Paper_outputter (port, f);
@@ -50,10 +50,10 @@ LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
 
 /* FIXME: why is output_* wrapper called dump?  */
 LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil",
-	   2, 0, 0, (SCM outputter, SCM stencil),
-	   "Dump stencil @var{expr} onto @var{outputter}.")
+           2, 0, 0, (SCM outputter, SCM stencil),
+           "Dump stencil @var{expr} onto @var{outputter}.")
 {
-  
+
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   LY_ASSERT_SMOB (Stencil, stencil, 2);
 
@@ -65,8 +65,8 @@ LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil",
 }
 
 LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string",
-	   2, 0, 0, (SCM outputter, SCM str),
-	   "Dump @var{str} onto @var{outputter}.")
+           2, 0, 0, (SCM outputter, SCM str),
+           "Dump @var{str} onto @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   LY_ASSERT_TYPE (scm_is_string, str, 2);
@@ -77,8 +77,8 @@ LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string",
 }
 
 LY_DEFINE (ly_outputter_port, "ly:outputter-port",
-	   1, 0, 0, (SCM outputter),
-	   "Return output port for @var{outputter}.")
+           1, 0, 0, (SCM outputter),
+           "Return output port for @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   Paper_outputter *po = unsmob_outputter (outputter);
@@ -87,8 +87,8 @@ LY_DEFINE (ly_outputter_port, "ly:outputter-port",
 }
 
 LY_DEFINE (ly_outputter_close, "ly:outputter-close",
-	   1, 0, 0, (SCM outputter),
-	   "Close port of @var{outputter}.")
+           1, 0, 0, (SCM outputter),
+           "Close port of @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   Paper_outputter *po = unsmob_outputter (outputter);
@@ -98,8 +98,8 @@ LY_DEFINE (ly_outputter_close, "ly:outputter-close",
 }
 
 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}.")
+           2, 0, 0, (SCM outputter, SCM expr),
+           "Eval @var{expr} in module of @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   Paper_outputter *po = unsmob_outputter (outputter);
@@ -108,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 ();
+}