Issue 4131/3: Remove definitions of \partcombine*Once

[lilypond.git] / lily / paper-outputter-scheme.cc

diff --git a/lily/paper-outputter-scheme.cc b/lily/paper-outputter-scheme.cc
index 0d6f11de6bbc71f5d0177063cd7e3015e3b08552..bedd02f8caf60b6d69ba8f019c0ad4855f0f4dc7 100644 (file)
--- 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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
@@ -23,6 +23,8 @@
 #include "stencil.hh"
 #include "warn.hh"
 
+using std::string;
+
 LY_DEFINE (ly_make_paper_outputter, "ly:make-paper-outputter",
            2, 0, 0, (SCM port, SCM format),
            "Create an outputter that evaluates within"
@@ -57,8 +59,8 @@ LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil",
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   LY_ASSERT_SMOB (Stencil, stencil, 2);
 
-  Paper_outputter *po = unsmob_outputter (outputter);
-  Stencil *st = unsmob_stencil (stencil);
+  Paper_outputter *po = unsmob<Paper_outputter> (outputter);
+  Stencil *st = unsmob<Stencil> (stencil);
 
   po->output_stencil (*st);
   return SCM_UNSPECIFIED;
@@ -71,7 +73,7 @@ LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string",
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
   LY_ASSERT_TYPE (scm_is_string, str, 2);
 
-  Paper_outputter *po = unsmob_outputter (outputter);
+  Paper_outputter *po = unsmob<Paper_outputter> (outputter);
 
   return po->dump_string (str);
 }
@@ -81,7 +83,7 @@ LY_DEFINE (ly_outputter_port, "ly:outputter-port",
            "Return output port for @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
-  Paper_outputter *po = unsmob_outputter (outputter);
+  Paper_outputter *po = unsmob<Paper_outputter> (outputter);
 
   return po->file ();
 }
@@ -91,7 +93,7 @@ LY_DEFINE (ly_outputter_close, "ly:outputter-close",
            "Close port of @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
-  Paper_outputter *po = unsmob_outputter (outputter);
+  Paper_outputter *po = unsmob<Paper_outputter> (outputter);
 
   po->close ();
   return SCM_UNSPECIFIED;
@@ -102,7 +104,7 @@ LY_DEFINE (ly_outputter_output_scheme, "ly:outputter-output-scheme",
            "Eval @var{expr} in module of @var{outputter}.")
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
-  Paper_outputter *po = unsmob_outputter (outputter);
+  Paper_outputter *po = unsmob<Paper_outputter> (outputter);
 
   po->output_scheme (expr);
 
@@ -115,6 +117,6 @@ LY_DEFINE (ly_outputter_module, "ly:outputter-module",
 {
   LY_ASSERT_SMOB (Paper_outputter, outputter, 1);
 
-  Paper_outputter *po = unsmob_outputter (outputter);
+  Paper_outputter *po = unsmob<Paper_outputter> (outputter);
   return po->module ();
 }