source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "font-metric.hh"
#include "main.hh"
#include "scope.hh"
-#include "identifier.hh"
+
#include "lily-version.hh"
+#include "paper-def.hh"
+#include "file-results.hh"
/*
Ugh, this is messy.
*/
-Paper_outputter::Paper_outputter (Paper_stream * ps )
+Paper_outputter::Paper_outputter (String name)
{
+ stream_p_ = new Paper_stream (name);
+
/*
lilypond -f scm x.ly
guile -s x.scm
*/
- verbatim_scheme_b_ = output_global_ch == String ("scm");
+ verbatim_scheme_b_ = output_format_global == "scm";
if (verbatim_scheme_b_)
{
- *ps << ""
+ *stream_p_ << ""
";;; Usage: guile -s x.scm > x.tex\n"
- "(primitive-load-path 'lily.scm)\n"
- "(scm-tex-output)\n"
- ";(scm-ps-output)\n"
- "(map (lambda (x) (display (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"
;
}
- stream_p_ = ps;
}
Paper_outputter::~Paper_outputter ()
gh_define ("security-paranoia", SCM_BOOL_T);
}
- SCM exp = gh_list (ly_symbol2scm ((String (output_global_ch) + "-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);
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)
);
}
/*
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_)
{
- SCM p;
-
- p = scm_mkstrport (SCM_INUM0,
- scm_make_string (SCM_INUM0, SCM_UNDEFINED),
- SCM_OPN | SCM_WRTNG,
- "Paper_outputter::dump_scheme()");
-
- SCM wr =scm_eval2 (ly_symbol2scm ("write"), SCM_EOL);
- scm_apply (wr, s, gh_list (p, SCM_UNDEFINED));
-
- SCM result = scm_strport_to_string (p);
- *stream_p_ << ly_scm2string (result);
+ *stream_p_ << ly_scm2string (ly_write2scm (s));
}
else
{
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 ());
}
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);
}
}
void
-Paper_outputter::output_score_header_field (String filename, String key, String value)
+Paper_outputter::write_header_field_to_file (String filename, String key, String value)
{
if (filename != "-")
filename += String (".") + key;
key,
filename == "-" ? String ("<stdout>") : filename));
- ostream* os = open_file_stream (filename);
+ ostream *os = open_file_stream (filename);
*os << value;
close_file_stream (os);
progress_indication ("\n");
}
void
-Paper_outputter::output_score_header_fields (Paper_def *paper)
+Paper_outputter::write_header_fields_to_file (Scope * header)
{
- if (global_score_header_fields.size ())
+ if (dump_header_fieldnames_global.size ())
{
- SCM fields = paper->scope_p_->to_alist ();
- String base = paper->base_output_str ();
- for (int i = 0; i < global_score_header_fields.size (); i++)
+ SCM fields = header->to_alist ();
+ for (int i = 0; i < dump_header_fieldnames_global.size (); i++)
{
- String key = paper->global_score_header_fields[i];
- SCM val = gh_assoc (ly_str02scm (key), fields);
- String s
- if (val != SCM_BOOL_F)
- s = ly_scm2string (val);
- output_score_header_field (base, key, s);
+ String key = dump_header_fieldnames_global[i];
+ 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));
+ /* Always write header field file, even if string is empty ... */
+ write_header_field_to_file (basename_, key, s);
+ }
}
}
}
projects / lilypond.git / blobdiff