release: 1.3.118

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5d383c9f34d5cdd2af858abf594803aa55360001..1c55022e84f073e3aac2312b542050361da69c66 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -23,7 +23,7 @@
 #include "font-metric.hh"
 #include "main.hh"
 #include "scope.hh"
-#include "identifier.hh"
+
 #include "lily-version.hh"
 #include "paper-def.hh"
 #include "file-results.hh"
@@ -33,8 +33,10 @@
   Ugh, this is messy.
  */
 
-Paper_outputter::Paper_outputter (Paper_stream  * ps )
+Paper_outputter::Paper_outputter (String name)
 {
+  stream_p_ =  new Paper_stream (name);
+
  /*
    lilypond -f scm x.ly
    guile -s x.scm
@@ -43,7 +45,7 @@ Paper_outputter::Paper_outputter (Paper_stream  * ps )
 
   if (verbatim_scheme_b_)
     {
-       *ps << ""
+       *stream_p_ << ""
          ";;; Usage: guile -s x.scm > x.tex\n"
          "(primitive-load-path 'standalone.scm)\n"
          ";(scm-tex-output)\n"
@@ -52,7 +54,6 @@ Paper_outputter::Paper_outputter (Paper_stream  * ps )
        ;
     }
 
-  stream_p_ = ps;
 }
 
 Paper_outputter::~Paper_outputter ()
@@ -232,7 +233,7 @@ Paper_outputter::output_string (SCM str)
 }
 
 void
-Paper_outputter::output_score_header_field (String filename, String key, String value)
+Paper_outputter::write_header_field_to_file (String filename, String key, String value)
 {
   if (filename != "-")
     filename += String (".") + key;
@@ -247,21 +248,14 @@ Paper_outputter::output_score_header_field (String filename, String key, String
 }
 
 void
-Paper_outputter::output_score_header_fields (Paper_def *paper)
+Paper_outputter::write_header_fields_to_file (Scope * header)
 {
-  if (global_score_header_fields.size ())
+  if (global_dumped_header_fieldnames.size ())
     {
-      SCM fields;
-#if 0 // ugh, how to reach current Score or Paper_score?
-      if (paper->header_l_)
-       fields = paper->header_l_->to_alist ();
-      else
-#endif
-       fields = header_global_p->to_alist ();
-      String base = paper->current_output_base_;
-      for (int i = 0; i < global_score_header_fields.size (); i++)
+      SCM fields = header->to_alist ();
+      for (int i = 0; i < global_dumped_header_fieldnames.size (); i++)
        {
-         String key = global_score_header_fields[i];
+         String key = global_dumped_header_fieldnames[i];
          SCM val = gh_assoc (ly_symbol2scm (key.ch_C ()), fields);
          String s;
          /* Only write header field to file if it exists */
@@ -269,7 +263,7 @@ Paper_outputter::output_score_header_fields (Paper_def *paper)
            {
              s = ly_scm2string (gh_cdr (val));
              /* Always write header field file, even if string is empty ... */
-             output_score_header_field (base, key, s);
+             write_header_field_to_file (basename_, key, s);
            }
        }
     }