(LY_DEFINE):

ly:outputter-port. New function.

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index aa9e90d9e2c34e47d7d9bc0a2e940e875402f949..3cd13b2fd2401251b7857fdc0eeed81028c5a85d 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -26,12 +26,12 @@ class Paper_outputter
   String file_name_;
   SCM file_;
 
-  SCM file ();
 
 public:
   DECLARE_SMOBS (Paper_outputter,);
 
 public:
+  SCM file ();
   SCM dump_string (SCM);
   void output_scheme (SCM scm);
   Paper_outputter (String nm, String format);

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 503fb02218faf298399fb76419de122f8f95ddf3..9b7c313a6f6953470f4b8c8e6896c6e8924ba6da 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -10,7 +10,6 @@
 
 #include "main.hh"
 #include "output-def.hh"
-#include "paper-outputter.hh"
 #include "paper-score.hh"
 #include "paper-system.hh"
 #include "warn.hh"

diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index 2dd552889fd480db7940a29b2829c8d1e1f0abc8..4c61c6df5e8324f841d0c1d7086e480ef8b7f104 100644 (file)
--- a/lily/paper-outputter-scheme.cc
+++ b/lily/paper-outputter-scheme.cc
@@ -60,6 +60,16 @@ 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}.")
+{
+  Paper_outputter *po = unsmob_outputter (outputter);
+  SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
+  
+  return po->file ();
+}
+
 LY_DEFINE (ly_outputter_close, "ly:outputter-close",
           1, 0, 0, (SCM outputter),
           "Close port of @var{outputter}.")

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 134067150d66adf2b4124efcb1199a3463edade3..af0df1c76451f1b75e689a600e9a6871c09b7325 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -16,7 +16,6 @@
 #include "paper-column.hh"
 #include "paper-score.hh"
 #include "stencil.hh"
-#include "paper-outputter.hh"
 #include "paper-column.hh"
 #include "system.hh"
 #include "group-interface.hh"

diff --git a/lily/system.cc b/lily/system.cc
index 6203abff7023eb0a8d0f245ec56c765ec42f0d59..108695a79312d01bd7b5ff11177f8ca202d41464 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -16,7 +16,6 @@
 #include "main.hh"
 #include "paper-column.hh"
 #include "output-def.hh"
-#include "paper-outputter.hh"
 #include "paper-score.hh"
 #include "warn.hh"
 #include "all-font-metrics.hh"