release: 1.3.146

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5317b7ada185ef110ebd770b8654a60e5407ef80..bfe92de4b87c164803bf84f4f7d60d6d15053235 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -47,10 +47,10 @@ Paper_outputter::Paper_outputter (String name)
     {
        *stream_p_ << ""
          ";;; Usage: guile -s x.scm > x.tex\n"
-         "(primitive-load-path 'standalone.scm)\n"
-         ";(scm-tex-output)\n"
-         "(scm-ps-output)\n"
-         "(map (lambda (x) (display (ly-eval x))) '(\n"
+         " (primitive-load-path 'standalone.scm)\n"
+         "; (scm-tex-output)\n"
+         " (scm-ps-output)\n"
+         " (map (lambda (x) (display (ly-eval x))) ' (\n"
        ;
     }
 
@@ -74,29 +74,24 @@ Paper_outputter::output_header ()
       gh_define ("security-paranoia", SCM_BOOL_T);      
     }
 
-  SCM exp = gh_list (ly_symbol2scm ((output_format_global + "-scm").ch_C()),
+  SCM exp = gh_list (ly_symbol2scm ((output_format_global + "-scm").ch_C ()),
                     ly_quote_scm (ly_symbol2scm ("all-definitions")),
                     SCM_UNDEFINED);
   exp = scm_eval2 (exp, SCM_EOL);
   scm_eval2 (exp, SCM_EOL);
   
-  String creator;
-  if (no_timestamps_global_b)
-    creator = gnu_lilypond_str ();
-  else
-    creator = gnu_lilypond_version_str ();
+  String creator = gnu_lilypond_version_str ();
+  
+  String       generate = _ (", at ");
+  time_t t (time (0));
+  generate += ctime (&t);
+  generate = generate.left_str (generate.length_i () - 1);
+  
+  /*
+    Make fixed length time stamps
+   */
+  generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0)  ;
   
-  String generate;
-  if (no_timestamps_global_b)
-    generate = ".";
-  else
-    {
-      generate = _ (", at ");
-      time_t t (time (0));
-      generate += ctime (&t);
-      generate = generate.left_str (generate.length_i () - 1);
-    }
-
   SCM args_scm = 
     gh_list (ly_str02scm (creator.ch_l ()),
             ly_str02scm (generate.ch_l ()), SCM_UNDEFINED);
@@ -112,7 +107,7 @@ void
 Paper_outputter::output_comment (String str)
 {
   output_scheme (gh_list (ly_symbol2scm ("comment"),
-                         ly_str02scm ((char*)str.ch_C()),
+                         ly_str02scm ((char*)str.ch_C ()),
                          SCM_UNDEFINED)
                 );
 }
@@ -132,13 +127,13 @@ Paper_outputter::output_scheme (SCM scm)
 /*
   UGH.
 
-  Should probably change interface to do less eval ( symbol ), and more
+  Should probably change interface to do less eval (symbol), and more
   apply (procedure, args)
  */
 void
 Paper_outputter::dump_scheme (SCM s)
 {
-  if  (verbatim_scheme_b_)
+  if (verbatim_scheme_b_)
     {
       *stream_p_ << ly_scm2string (ly_write2scm (s));
     }
@@ -182,13 +177,10 @@ void
 Paper_outputter::output_version ()
 {
   String id_str = "Lily was here";
-  if (no_timestamps_global_b)
-    id_str += ".";
-  else
-    id_str += String (", ") + version_str ();
+  id_str += String_convert::pad_to (String (", ") + version_str (), 40);
 
-  output_String_def ( "lilypondtagline", id_str);
-  output_String_def ( "LilyPondVersion", version_str ());
+  output_String_def ("lilypondtagline", id_str);
+  output_String_def ("LilyPondVersion", version_str ());
 }
 
 
@@ -200,7 +192,7 @@ Paper_outputter::output_Real_def (String k, Real v)
   
   SCM scm = gh_list (ly_symbol2scm ("lily-def"),
                     ly_str02scm (k.ch_l ()),
-                    ly_str02scm (to_str(v).ch_l ()),
+                    ly_str02scm (to_str (v).ch_l ()),
                     SCM_UNDEFINED);
   output_scheme (scm);
 }