patch::: 1.3.115.jcn2

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 781215c2002df99c6e0fe170a3716b53eb1cbf23..0bf6c9db9811a304153d23baa483a79288991c7b 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -273,12 +273,15 @@ Paper_outputter::output_score_header_fields (Paper_def *paper)
       for (int i = 0; i < global_score_header_fields.size (); i++)
        {
          String key = global_score_header_fields[i];
-         //      SCM val = gh_assoc (ly_str02scm (key.ch_C ()), fields);
          SCM val = gh_assoc (ly_symbol2scm (key.ch_C ()), fields);
          String s;
+         /* Only write header field to file if it exists */
          if (gh_pair_p (val))
-           s = ly_scm2string (gh_cdr (val));
-         output_score_header_field (base, key, s);
+           {
+             s = ly_scm2string (gh_cdr (val));
+             /* Always write header field file, even if string is empty ... */
+             output_score_header_field (base, key, s);
+           }
        }
     }
 }