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 <iostream.h>
#include "dimensions.hh"
-#include "dictionary-iter.hh"
#include "virtual-methods.hh"
#include "paper-outputter.hh"
#include "paper-stream.hh"
#include "array.hh"
#include "string-convert.hh"
#include "debug.hh"
-#include "lookup.hh"
+#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)
{
-#if 0
- molecules_ = gh_cons (SCM_EOL, SCM_EOL);
- last_cons_ = molecules_;
-#endif
+ 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_eval (exp);
- scm_eval (exp);
+ 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)
);
}
void
Paper_outputter::output_scheme (SCM scm)
{
-#if 0
- SCM c = gh_cons (scm,gh_cdr (last_cons_));
- gh_set_cdr_x(last_cons_, c);
- last_cons_ = c;
-#endif
-
+ /*
+ we don't rename dump_scheme, because we might in the future want
+ to remember Scheme. We don't now, because it sucks up a lot of memory.
+ */
dump_scheme (scm);
}
-#if 0
-void
-Paper_outputter::dump ()
-{
-
- for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s))
- {
- dump_scheme (gh_car (s));
- }
-}
-#endif
+/*
+ UGH.
+ 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 result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"),
- ly_quote_scm (gh_car (s)), SCM_UNDEFINED));
-
- *stream_p_ << ly_scm2string (result);
+ *stream_p_ << ly_scm2string (ly_write2scm (s));
}
else
{
- SCM result = scm_eval (s);
+ SCM result = scm_eval2 (s, SCM_EOL);
char *c=gh_scm2newstr (result, NULL);
*stream_p_ << c;
free (c);
}
}
+
void
Paper_outputter::output_scope (Scope *scope, String prefix)
{
- for (Scope_iter i (*scope); i.ok (); i++)
+ SCM al = scope->to_alist ();
+ for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s))
{
- if (dynamic_cast<String_identifier*> (i.val ()))
- {
- String val = *i.val()->access_content_String (false);
+ SCM k = gh_caar (s);
+ SCM v = gh_cdar (s);
+ String s = ly_symbol2string (k);
- output_String_def (prefix + i.key (), val);
+
+ if (gh_string_p (v))
+ {
+ output_String_def (prefix + s, ly_scm2string (v));
}
- else if(dynamic_cast<Real_identifier*> (i.val ()))
+ else if (scm_integer_p (v) == SCM_BOOL_T)
{
- Real val = *i.val ()->access_content_Real (false);
-
- output_Real_def (prefix + i.key (), val);
+ output_int_def (prefix + s, gh_scm2int (v));
}
- else if (dynamic_cast<int_identifier*> (i.val ()))
+ else if (gh_number_p (v))
{
- int val = *i.val ()->access_content_int (false);
-
- output_int_def (prefix + i.key (), val);
+ output_Real_def (prefix + s, gh_scm2double (v));
}
}
}
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 ( "mudelatagline", id_str);
- output_String_def ( "LilyPondVersion", version_str ());
+ output_String_def ("lilypondtagline", id_str);
+ output_String_def ("LilyPondVersion", version_str ());
}
-void
-Paper_outputter::output_font_def (int i, String str)
-{
- SCM scm = gh_list (ly_symbol2scm ("font-def"),
- gh_int2scm (i),
- ly_str02scm (str.ch_l ()),
- SCM_UNDEFINED);
-
- output_scheme (scm);
-}
void
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);
}
output_scheme (scm);
}
+void
+Paper_outputter::output_string (SCM str)
+{
+ *stream_p_ << ly_scm2string (str);
+}
+void
+Paper_outputter::write_header_field_to_file (String filename, String key, String value)
+{
+ if (filename != "-")
+ filename += String (".") + key;
+ progress_indication (_f ("writing header field %s to %s...",
+ key,
+ filename == "-" ? String ("<stdout>") : filename));
+
+ ostream *os = open_file_stream (filename);
+ *os << value;
+ close_file_stream (os);
+ progress_indication ("\n");
+}
-
-
+void
+Paper_outputter::write_header_fields_to_file (Scope * header)
+{
+ if (dump_header_fieldnames_global.size ())
+ {
+ SCM fields = header->to_alist ();
+ for (int i = 0; i < dump_header_fieldnames_global.size (); i++)
+ {
+ 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);
+ }
+ }
+ }
+}