release commit

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index e914793377f41f66f38123d3a76938d8aec8baf1..44b9b671156db9794d8a4f4041b32ef2dbe67352 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 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)
 {
@@ -39,7 +42,10 @@ Paper_outputter::Paper_outputter (String name)
   
   file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()),
                            scm_makfrom0str ("w"));
-  
+
+  /*
+    ugh.
+   */
   SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"),
                        scm_makfrom0str (output_format_global.to_str0 ()),
                        SCM_UNDEFINED);
@@ -49,26 +55,29 @@ Paper_outputter::Paper_outputter (String name)
 
 Paper_outputter::~Paper_outputter ()
 {
-  
+  scm_close_port (file_);
+  file_ = SCM_EOL;
 }
 
 
 void
 Paper_outputter::output_header ()
 {
-  String       generate = _ (", at ");
   time_t t (time (0));
-  generate += ctime (&t);
-  generate = generate.left_string (generate.length () - 1);
+  String generate = ctime (&t);
+  generate = generate.left_string (generate.length () - 1) + " " + *tzname;
   
-  /*
-    Make fixed length time stamps
-   */
-  generate = generate + to_string (' ' * (120 - generate.length ())>? 0)  ;
-  String creator = "lelie";
+  /* Fixed length time stamp */
+  generate = generate + to_string (' ', (50 - generate.length ()) >? 0);
+  
+  /* Fixed length creator string */
+  String creator = gnu_lilypond_version_string ();
+  creator += " (http://lilypond.org)";
+  creator = creator + to_string (' ', (50 - creator.length ()) >? 0);
   
   SCM args_scm = scm_list_n (scm_makfrom0str (creator.to_str0 ()),
-                            scm_makfrom0str (generate.to_str0 ()), SCM_UNDEFINED);
+                            scm_makfrom0str (generate.to_str0 ()),
+                            SCM_UNDEFINED);
 
 
   SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm);
@@ -124,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);
@@ -177,8 +186,8 @@ Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value
 void
 Paper_outputter::write_header_fields_to_file (SCM mod)
 {
-  
-  if (dump_header_fieldnames_global.size ())
+  if (ly_module_p (mod)&&
+      dump_header_fieldnames_global.size ())
     {
       SCM fields = ly_module_to_alist (mod);
       for (int i = 0; i < dump_header_fieldnames_global.size (); i++)
@@ -187,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 ... */