From f0fbdbd14441baade7e044c094d8c620f73d8dda Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 28 Jan 2005 21:42:03 +0000 Subject: [PATCH] (LY_DEFINE): ly:outputter-port. New function. --- lily/include/paper-outputter.hh | 2 +- lily/paper-book.cc | 1 - lily/paper-outputter-scheme.cc | 10 ++++++++++ lily/spanner.cc | 1 - lily/system.cc | 1 - 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh index aa9e90d9e2..3cd13b2fd2 100644 --- 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 503fb02218..9b7c313a6f 100644 --- 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 2dd552889f..4c61c6df5e 100644 --- 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 134067150d..af0df1c764 100644 --- 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 6203abff70..108695a793 100644 --- 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" -- 2.39.5