source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 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 "dictionary-iter.hh"
#include "scope.hh"
#include "identifier.hh"
#include "lily-version.hh"
-#include "atom.hh"
+
Paper_outputter::Paper_outputter ()
{
{
if (safe_global_b)
{
- // ly_set_x ("security-paranoia", SCM_BOOL_T);
+
gh_define ("security-paranoia", SCM_BOOL_T);
}
String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))";
String generate;
if (no_timestamps_global_b)
- generate = ".\n";
+ generate = ".";
else
{
generate = _ (", at ");
time_t t (time (0));
generate += ctime (&t);
- //urg
+ generate = generate.left_str (generate.length_i () - 1);
}
SCM args_scm =
}
void
-Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
+Paper_outputter::output_molecule (SCM expr, Offset o, char const *nm)
{
+#if 0
if (flower_dstream)
{
output_comment (nm);
}
-
- for (Cons<Atom> *ptr = m->atom_list_; ptr; ptr = ptr->next_)
- {
- Atom * i = ptr->car_;
-
- Offset a_off = i->off_;
- a_off += o;
+#endif
+
+ SCM offset_sym = ly_symbol2scm ("translate-molecule");
+ SCM combine_sym = ly_symbol2scm ("combine-molecule");
+enter:
- if (!i->func_)
- continue;
+ if (!gh_pair_p (expr))
+ return;
+
+ SCM head =gh_car (expr);
+ if (head == offset_sym)
+ {
+ o += scm_to (gh_cadr (expr), &o);
+ expr = gh_caddr (expr);
+ goto enter;
+ }
+ else if (head == combine_sym)
+ {
+ output_molecule (gh_cadr (expr), o, nm);
+ expr = gh_caddr (expr);
+ goto enter; // tail recursion
+ }
+ else
+ {
+ output_scheme (gh_list (ly_symbol2scm ("placebox"),
+ gh_double2scm (o[X_AXIS]),
+ gh_double2scm (o[Y_AXIS]),
+ expr,
+ SCM_UNDEFINED));
- if (a_off.length () > 100 CM)
- {
- programming_error ("improbable offset for object");
- Axis a =X_AXIS;
- while (a < NO_AXES)
- {
- if (abs(a_off[a]) > 30 CM)
- a_off[a] = 30 CM;
- incr (a);
- }
- }
-
- SCM box_scm
- = gh_list (ly_symbol2scm ("placebox"),
- gh_double2scm (a_off.x ()),
- gh_double2scm (a_off.y ()),
- SCM(i->func_),
- SCM_UNDEFINED);
-
- output_scheme (box_scm);
}
}
void
-Paper_outputter::dump_onto (Paper_stream *os)
+Paper_outputter::dump_onto (Paper_stream *ps)
{
-
- if (output_global_ch == String ("scm"))
- *os << ""
- "(primitive-load-path 'lily.scm)\n"
- "(eval (tex-scm 'all-definitions))\n"
- ";(eval (ps-scm 'all-definitions))\n"
- "(display (map (lambda (x) (string-append (eval x) \"\\n\")) '(\n"
- ;
-
- for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s))
+ if (String (output_global_ch) == "scm")
+#if 1 // both are fine
+ {
+ /*
+ default to stdin
+ */
+ int fd = 1;
+ if (ofstream* of = dynamic_cast<ofstream*> (ps->os))
+ fd = of->rdbuf ()->fd ();
+ SCM port = scm_fdes_to_port (fd, "a", SCM_EOL);
+
+ /*
+ lilypond -f scm x.ly
+ guile -s x.scm
+ */
+ scm_display (gh_str02scm (
+ ";;; Usage: guile -s x.scm > x.tex\n"
+ "(primitive-load-path 'lily.scm)\n"
+ "(scm-as-output)\n"
+ ";(scm-tex-output)\n"
+ ";(scm-ps-output)\n"
+ "(map (lambda (x) (display (eval x))) '(\n"
+ ), port);
+
+ SCM newline = gh_str02scm ("\n");
+ for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s))
+ {
+ scm_write (gh_car (s), port);
+ scm_display (newline, port);
+ scm_flush (port);
+ }
+ scm_display (gh_str02scm ("))"), port);
+ scm_display (newline, port);
+ scm_flush (port);
+ scm_close_port (port);
+ }
+#else
{
- if (String (output_global_ch) == "scm")
+ /*
+ lilypond -f scm x.ly
+ guile -s x.scm
+ */
+ if (output_global_ch == String ("scm"))
+ *ps << ""
+ ";;; 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"
+ ;
+ for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s))
{
SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"),
ly_quote_scm (gh_car (s)), SCM_UNDEFINED));
- *os << ly_scm2string (result);
+ *ps << ly_scm2string (result);
}
- else
+ *ps << "))";
+ }
+#endif
+
+ else
+ {
+ for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s))
{
SCM result = scm_eval (gh_car (s));
char *c=gh_scm2newstr (result, NULL);
- *os << c;
+ *ps << c;
free (c);
}
-
- }
-
-
- if (String (output_global_ch) == "scm")
- {
- *os << ")))";
- }
+ }
}
void
SCM_UNDEFINED);
output_scheme (scm);
- gh_define (k.ch_l (), gh_double2scm (v));
+ // gh_define (k.ch_l (), gh_double2scm (v));
}
void
SCM_UNDEFINED);
output_scheme (scm);
- gh_define (k.ch_l (), ly_str02scm (v.ch_l ()));
+ // gh_define (k.ch_l (), ly_str02scm (v.ch_l ()));
}
void
SCM_UNDEFINED);
output_scheme (scm);
- gh_define (k.ch_l (), gh_int2scm (v));
+ // gh_define (k.ch_l (), gh_int2scm (v));
}
projects / lilypond.git / blobdiff