2003 -> 2004

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5f681a6bfff7231d67d7c0d8a4ca2f9985d35726..e31c61b4a99b35b5c25a327dd644ec5b48c64dc7 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -28,7 +28,10 @@
 
 
 /*
-  Ugh, this is messy.
+  TODO: this entire class should be implemented at Scheme level.
+
+
+  
  */
 Paper_outputter::Paper_outputter (String name)
 {
@@ -116,7 +119,7 @@ Paper_outputter::output_scope (SCM mod, String prefix)
        {
          output_String_def (prefix + s, ly_scm2string (v));
        }
-      else if (scm_exact_p (v) == SCM_BOOL_T)
+      else if (scm_integer_p (v) == SCM_BOOL_T && scm_exact_p (v) == SCM_BOOL_T)
        {
          output_int_def (prefix + s, gh_scm2int (v));    
        }
@@ -130,7 +133,7 @@ Paper_outputter::output_scope (SCM mod, String prefix)
 void
 Paper_outputter::output_version ()
 {
-  String id_string = "Lily was here";
+  String id_string = "Engraved by LilyPond";
   id_string += String_convert::pad_to (String (", ") + version_string (), 40);
 
   output_String_def ("lilypondtagline", id_string);
@@ -193,7 +196,7 @@ Paper_outputter::write_header_fields_to_file (SCM mod)
          SCM val = gh_assoc (ly_symbol2scm (key.to_str0 ()), fields);
          String s;
          /* Only write header field to file if it exists */
-         if (gh_pair_p (val))
+         if (gh_pair_p (val) && gh_string_p (ly_cdr (val)))
            {
              s = ly_scm2string (ly_cdr (val));
              /* Always write header field file, even if string is empty ... */