source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
- Ugh, this is messy.
+ TODO: this entire class should be implemented at Scheme level.
+
+
+
*/
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);
{
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));
}
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);
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 ... */