X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;fp=lily%2Fpaper-outputter.cc;h=34110554dc3b6b2514d5bbcb1ddaa195e07bab92;hb=0ac07f31e0f95fc18e5916ce756b9c746af7cc58;hp=57efb2fb35be2c547ab963c8ab0726ee62c296b0;hpb=2f1263e2ccdddcac2eb9f7d8ce2ed92867d3d160;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 57efb2fb35..34110554dc 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -40,7 +40,7 @@ using namespace std;
 
 #include "ly-smobs.icc"
 
-Paper_outputter::Paper_outputter (SCM port, string format)
+Paper_outputter::Paper_outputter (SCM port, const string &format)
 {
   file_ = port;
   output_module_ = SCM_EOL;
@@ -105,17 +105,20 @@ Paper_outputter::module () const
   return output_module_;
 }
 
-void
+SCM
 Paper_outputter::output_scheme (SCM scm)
 {
-  dump_string (scheme_to_string (scm));
+  SCM str = scheme_to_string (scm);
+  if (scm_is_string (str))
+    dump_string (str);
+  return str;
 }
 
-void
+SCM
 paper_outputter_dump (void *po, SCM x)
 {
   Paper_outputter *me = (Paper_outputter *) po;
-  me->output_scheme (x);
+  return me->output_scheme (x);
 }
 
 void