#include "lily-version.hh"
-Paper_outputter::Paper_outputter ()
+/*
+ Ugh, this is messy.
+ */
+
+Paper_outputter::Paper_outputter (Paper_stream * ps )
{
+#if 0
molecules_ = gh_cons (SCM_EOL, SCM_EOL);
last_cons_ = molecules_;
+#endif
+
+ /*
+ lilypond -f scm x.ly
+ guile -s x.scm
+ */
+ verbatim_scheme_b_ = output_global_ch == String ("scm");
+
+ if (verbatim_scheme_b_)
+ {
+ *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"
+ ;
+ }
+
+ stream_p_ = ps;
+}
+
+Paper_outputter::~Paper_outputter ()
+{
+ if (verbatim_scheme_b_)
+ {
+ *stream_p_ << "))";
+ }
+ delete stream_p_;
}
{
if (safe_global_b)
{
-
gh_define ("security-paranoia", SCM_BOOL_T);
}
- String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))";
- ly_eval_str (s.ch_C ());
+
+ SCM exp = gh_list (ly_symbol2scm ((String (output_global_ch) + "-scm").ch_C()),
+ ly_quote_scm (ly_symbol2scm ("all-definitions")),
+ SCM_UNDEFINED);
+ exp = scm_eval (exp);
+ scm_eval (exp);
String creator;
if (no_timestamps_global_b)
output_scheme (scm);
}
-void
-Paper_outputter::output_molecule (SCM expr, Offset o, char const *nm)
-{
-#if 0
- if (flower_dstream)
- {
- output_comment (nm);
- }
-#endif
-
- SCM offset_sym = ly_symbol2scm ("translate-molecule");
- SCM combine_sym = ly_symbol2scm ("combine-molecule");
-enter:
-
- 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));
- }
-}
void
Paper_outputter::output_comment (String str)
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
+
+ dump_scheme (scm);
}
+#if 0
void
-Paper_outputter::dump_onto (Paper_stream *ps)
+Paper_outputter::dump ()
{
- if (String (output_global_ch) == "scm")
-#if 1 // both are fine
+
+ for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s))
{
- /*
- 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);
+ dump_scheme (gh_car (s));
}
-#else
+}
+#endif
+
+void
+Paper_outputter::dump_scheme (SCM s)
+{
+ if (verbatim_scheme_b_)
{
- /*
- 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));
+ SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"),
+ ly_quote_scm (gh_car (s)), SCM_UNDEFINED));
- *ps << ly_scm2string (result);
- }
- *ps << "))";
+ *stream_p_ << ly_scm2string (result);
}
-#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);
-
- *ps << c;
- free (c);
- }
- }
+ SCM result = scm_eval (s);
+ char *c=gh_scm2newstr (result, NULL);
+
+ *stream_p_ << c;
+ free (c);
+ }
}
-
void
Paper_outputter::output_scope (Scope *scope, String prefix)
{
output_String_def ( "LilyPondVersion", version_str ());
}
-void
-Paper_outputter::start_line (Real height)
-{
- if (height > 50 CM)
- {
- programming_error ("Improbable system height");
- height = 50 CM;
- }
- SCM scm = gh_list (ly_symbol2scm ("start-line"),
- gh_double2scm (height),
- SCM_UNDEFINED);
- output_scheme (scm);
-}
+
void
Paper_outputter::output_font_def (int i, String str)
ly_str02scm (to_str(v).ch_l ()),
SCM_UNDEFINED);
output_scheme (scm);
-
- // gh_define (k.ch_l (), gh_double2scm (v));
}
void
ly_str02scm (v.ch_l ()),
SCM_UNDEFINED);
output_scheme (scm);
-
- // gh_define (k.ch_l (), ly_str02scm (v.ch_l ()));
}
void
ly_str02scm (to_str (v).ch_l ()),
SCM_UNDEFINED);
output_scheme (scm);
-
- // gh_define (k.ch_l (), gh_int2scm (v));
}
-void
-Paper_outputter::stop_line ()
-{
- SCM scm = gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED);
- output_scheme (scm);
-}
-
-void
-Paper_outputter::stop_last_line ()
-{
- SCM scm = gh_list (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED);
- output_scheme (scm);
- scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
- output_scheme (scm);
-}
projects / lilypond.git / blobdiff