X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter-scheme.cc;h=33b2645f212618dd50627bdfa4edddd21e08c664;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=2bfdde5bc4034b66c1d2b717c3c1a1c848d7f494;hpb=8a719f6eec1bd84269a55d1ec99adb3f17c04e64;p=lilypond.git diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc index 2bfdde5bc4..33b2645f21 100644 --- a/lily/paper-outputter-scheme.cc +++ b/lily/paper-outputter-scheme.cc @@ -1,35 +1,45 @@ /* - 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--2014 Han-Wen Nienhuys - (c) 2005--2006 Han-Wen Nienhuys + 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 . */ #include "paper-outputter.hh" -#include "warn.hh" + +#include "international.hh" #include "stencil.hh" +#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}.") { - SCM_ASSERT_TYPE (ly_is_port (port), port, SCM_ARG1, __FUNCTION__, - "port"); - SCM_ASSERT_TYPE (scm_is_string (format), format, SCM_ARG2, __FUNCTION__, - "String"); - - String f = ly_scm2string (format); + LY_ASSERT_TYPE (ly_is_port, port, 1); + LY_ASSERT_TYPE (ly_is_symbol, format, 2); - String output_name = ""; + string f = ly_symbol2string (format); + string output_name = ""; SCM port_name = scm_port_filename (port); if (scm_is_string (port_name)) 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); @@ -40,57 +50,71 @@ 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}.") { - Paper_outputter *po = unsmob_outputter (outputter); - Stencil *st = unsmob_stencil (stencil); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - SCM_ASSERT_TYPE (st, stencil, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + + LY_ASSERT_SMOB (Paper_outputter, outputter, 1); + LY_ASSERT_SMOB (Stencil, stencil, 2); + + Paper_outputter *po = Paper_outputter::unsmob (outputter); + Stencil *st = Stencil::unsmob (stencil); + po->output_stencil (*st); return SCM_UNSPECIFIED; } 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}.") { - Paper_outputter *po = unsmob_outputter (outputter); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); - SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + LY_ASSERT_SMOB (Paper_outputter, outputter, 1); + LY_ASSERT_TYPE (scm_is_string, str, 2); + + Paper_outputter *po = Paper_outputter::unsmob (outputter); return po->dump_string (str); } 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}.") { - Paper_outputter *po = unsmob_outputter (outputter); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + LY_ASSERT_SMOB (Paper_outputter, outputter, 1); + Paper_outputter *po = Paper_outputter::unsmob (outputter); return po->file (); } 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}.") { - Paper_outputter *po = unsmob_outputter (outputter); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + LY_ASSERT_SMOB (Paper_outputter, outputter, 1); + Paper_outputter *po = Paper_outputter::unsmob (outputter); po->close (); return SCM_UNSPECIFIED; } 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}.") { - Paper_outputter *po = unsmob_outputter (outputter); - SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter"); + LY_ASSERT_SMOB (Paper_outputter, outputter, 1); + Paper_outputter *po = Paper_outputter::unsmob (outputter); po->output_scheme (expr); 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 = Paper_outputter::unsmob (outputter); + return po->module (); +}