source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <time.h>
-#include <fstream.h>
#include <math.h>
-#include <iostream.h>
#include "dimensions.hh"
#include "virtual-methods.hh"
#include "paper-outputter.hh"
-#include "paper-stream.hh"
#include "molecule.hh"
#include "array.hh"
#include "string-convert.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "font-metric.hh"
#include "main.hh"
-#include "scope.hh"
-
+#include "scm-hash.hh"
#include "lily-version.hh"
#include "paper-def.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
+#include "ly-modules.hh"
+
/*
- Ugh, this is messy.
- */
+ TODO: this entire class should be implemented at Scheme level.
+
+
+ */
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_format_global == "scm";
-
- if (verbatim_scheme_b_)
+ if (safe_global_b)
{
- *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"
- ;
+ gh_define ("security-paranoia", SCM_BOOL_T);
}
+
+ 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);
+
+ output_func_ = scm_primitive_eval (exp);
}
Paper_outputter::~Paper_outputter ()
{
- if (verbatim_scheme_b_)
- {
- *stream_p_ << "))";
- }
- delete stream_p_;
+ scm_close_port (file_);
+ file_ = SCM_EOL;
}
void
Paper_outputter::output_header ()
{
- if (safe_global_b)
- {
- gh_define ("security-paranoia", SCM_BOOL_T);
- }
-
- SCM exp = scm_list_n (ly_symbol2scm ((output_format_global + "-scm").ch_C ()),
- ly_quote_scm (ly_symbol2scm ("all-definitions")),
- SCM_UNDEFINED);
- exp = scm_primitive_eval (exp);
- scm_primitive_eval (exp);
-
- 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);
+ String generate = ctime (&t);
+ generate = generate.left_string (generate.length () - 1) + " " + *tzname;
- /*
- Make fixed length time stamps
- */
- generate = generate + to_str (' ' * (120 - generate.length_i ())>? 0) ;
+ /* 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 (ly_str02scm (creator.ch_l ()),
- ly_str02scm (generate.ch_l ()), SCM_UNDEFINED);
+ SCM args_scm = scm_list_n (scm_makfrom0str (creator.to_str0 ()),
+ scm_makfrom0str (generate.to_str0 ()),
+ SCM_UNDEFINED);
SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm);
+
output_scheme (scm);
}
Paper_outputter::output_comment (String str)
{
output_scheme (scm_list_n (ly_symbol2scm ("comment"),
- ly_str02scm ((char*)str.ch_C ()),
+ scm_makfrom0str ((char*)str.to_str0 ()),
SCM_UNDEFINED)
);
}
-
void
Paper_outputter::output_scheme (SCM scm)
{
- /*
- 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);
+ gh_call2 (output_func_, scm, file_);
}
-void flatten_write (SCM x, Paper_stream*ps)
-{
- if (ly_pair_p (x))
- {
- flatten_write (ly_car (x),ps);
- flatten_write (ly_cdr (x),ps);
- }
- else if (gh_string_p (x))
- {
- *ps << String ( SCM_STRING_CHARS(x)) ;
- }
-}
-
-
-/*
- UGH.
-
- Should probably change interface to do less eval (symbol), and more
- apply (procedure, args)
- */
void
-Paper_outputter::dump_scheme (SCM s)
+Paper_outputter::output_scope (SCM mod, String prefix)
{
- if (verbatim_scheme_b_)
- {
- *stream_p_ << ly_scm2string (ly_write2scm (s));
- }
- else
- {
- SCM result = scm_primitive_eval (s);
- flatten_write (result, stream_p_);
- }
-}
-
-void
-Paper_outputter::output_scope (Scope *scope, String prefix)
-{
- SCM al = scope->to_alist ();
+ if (!SCM_MODULEP (mod))
+ return ;
+
+ SCM al = ly_module_to_alist (mod);
for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
{
SCM k = ly_caar (s);
SCM v = ly_cdar (s);
String s = ly_symbol2string (k);
-
if (gh_string_p (v))
{
output_String_def (prefix + s, ly_scm2string (v));
}
- else if (scm_integer_p (v) == SCM_BOOL_T)
+ else if (scm_exact_p (v) == SCM_BOOL_T)
{
output_int_def (prefix + s, gh_scm2int (v));
}
else if (gh_number_p (v))
{
- output_Real_def (prefix + s, gh_scm2double (v));
+ output_Real_def (prefix + s, gh_scm2double (v));
}
}
}
void
Paper_outputter::output_version ()
{
- String id_str = "Lily was here";
- id_str += String_convert::pad_to (String (", ") + version_str (), 40);
+ String id_string = "Engraved by LilyPond";
+ id_string += String_convert::pad_to (String (", ") + version_string (), 40);
- output_String_def ("lilypondtagline", id_str);
- output_String_def ("LilyPondVersion", version_str ());
+ output_String_def ("lilypondtagline", id_string);
+ output_String_def ("LilyPondVersion", version_string ());
+ output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT));
}
-
-
void
Paper_outputter::output_Real_def (String k, Real v)
{
SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
- ly_str02scm (k.ch_l ()),
- ly_str02scm (to_str (v).ch_l ()),
- SCM_UNDEFINED);
+ scm_makfrom0str (k.get_str0 ()),
+ scm_makfrom0str (to_string (v).get_str0 ()),
+ SCM_UNDEFINED);
output_scheme (scm);
}
{
SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
- ly_str02scm (k.ch_l ()),
- ly_str02scm (v.ch_l ()),
+ scm_makfrom0str (k.get_str0 ()),
+ scm_makfrom0str (v.get_str0 ()),
SCM_UNDEFINED);
output_scheme (scm);
}
Paper_outputter::output_int_def (String k, int v)
{
SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
- ly_str02scm (k.ch_l ()),
- ly_str02scm (to_str (v).ch_l ()),
+ scm_makfrom0str (k.get_str0 ()),
+ scm_makfrom0str (to_string (v).get_str0 ()),
SCM_UNDEFINED);
output_scheme (scm);
}
void
-Paper_outputter::output_string (SCM str)
+Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value)
{
- *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");
+ output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"),
+ scm_makfrom0str (filename.to_str0 ()),
+ ly_quote_scm (key), value,
+ SCM_UNDEFINED));
}
void
-Paper_outputter::write_header_fields_to_file (Scope * header)
+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 = header->to_alist ();
+ SCM fields = ly_module_to_alist (mod);
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);
+ 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 ... */
- write_header_field_to_file (basename_, key, s);
+ write_header_field_to_file (basename_ , ly_car (val), ly_cdr (val));
}
}
}
projects / lilypond.git / blobdiff