#include "input-file-results.hh"
#include "ly-module.hh"
#include "paper-book.hh"
+#include "paper-line.hh"
#include "input-smob.hh" // output_expr
file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()),
scm_makfrom0str ("w"));
- static SCM find_dumper;
- if (!find_dumper)
- find_dumper = scm_c_eval_string ("find-dumper");
-
- output_func_
- = scm_call_1 (find_dumper,
- scm_makfrom0str (output_format_global.to_str0 ()));
+ if (output_format_global == PAGE_LAYOUT)
+ {
+ output_func_ = SCM_UNDEFINED;
+ String name = "scm output-" + output_format_global;
+ if (safe_global_b)
+ {
+ /* In safe mode, start from a GUILE safe-module and import
+ all symbols from the output module. */
+ scm_c_use_module ("ice-9 safe");
+ SCM msm = scm_primitive_eval (ly_symbol2scm ("make-safe-module"));
+ output_module_ = scm_call_0 (msm);
+ ly_import_module (output_module_,
+ scm_c_resolve_module (name.to_str0 ()));
+ }
+ else
+ output_module_ = scm_c_resolve_module (name.to_str0 ());
- String creator = gnu_lilypond_version_string ();
- creator += " (http://lilypond.org)";
- time_t t (time (0));
- String time_stamp = ctime (&t);
- time_stamp = time_stamp.left_string (time_stamp.length () - 1)
- + " " + *tzname;
- output_scheme (scm_list_3 (ly_symbol2scm ("header"),
- scm_makfrom0str (creator.to_str0 ()),
- scm_makfrom0str (time_stamp.to_str0 ())));
+ /* FIXME: output-lib should be module, that can be imported. */
+#define IMPORT_LESS 1 // only import the list of IMPORTS
+#if IMPORT_LESS
+ scm_c_use_module ("lily");
+ scm_c_use_module ("ice-9 regex");
+ scm_c_use_module ("srfi srfi-13");
+#endif
+ char const *imports[] = {
+ "lilypond-version", /* from lily */
+ "ly:output-def-scope",
+ "ly:gulp-file",
+ "ly:number->string",
+
+ "number-pair->string", /* output-lib.scm */
+ "numbers->string",
+
+ "assoc-get",
+ "inexact->string", /* insecure guile? */
+#if IMPORT_LESS
+ "string-index", /* from srfi srfi-13 */
+ "regexp-substitute/global", /* from (ice9 regex) */
+#endif
+ 0,
+ };
+
+ for (int i = 0; imports[i]; i++)
+ {
+ SCM s = ly_symbol2scm (imports[i]);
+ scm_module_define (output_module_, s, scm_primitive_eval (s));
+ }
+#ifndef IMPORT_LESS // rather crude, esp for safe-mode let's not
+ SCM m = scm_set_current_module (output_module_);
+ /* not present in current module*/
+ scm_c_use_module ("ice-9 regex");
+ scm_c_use_module ("srfi srfi-13");
+ /* Need only a few of these, see above
+ scm_c_use_module ("lily"); */
+ scm_set_current_module (m);
+#endif
+ }
+ else
+ {
+ static SCM find_dumper;
+ if (!find_dumper)
+ find_dumper = scm_c_eval_string ("find-dumper");
+
+ output_func_
+ = scm_call_1 (find_dumper,
+ scm_makfrom0str (output_format_global.to_str0 ()));
+ output_module_ = SCM_UNDEFINED;
+ }
}
Paper_outputter::~Paper_outputter ()
void
Paper_outputter::output_scheme (SCM scm)
{
- gh_call2 (output_func_, scm, file_);
+ if (output_format_global == PAGE_LAYOUT)
+ scm_display (scm_eval (scm, output_module_), file_);
+ else
+ gh_call2 (output_func_, scm, file_);
}
void
-Paper_outputter::output_metadata (SCM scopes, Paper_def *paper)
+Paper_outputter::output_metadata (Paper_def *paper, SCM scopes)
{
SCM fields = SCM_EOL;
for (int i = dump_header_fieldnames_global.size (); i--; )
}
void
-Paper_outputter::output_header (Paper_def *paper)
+Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count)
{
+ String creator = gnu_lilypond_version_string ();
+ creator += " (http://lilypond.org)";
+ time_t t (time (0));
+ String time_stamp = ctime (&t);
+ time_stamp = time_stamp.left_string (time_stamp.length () - 1)
+ + " " + *tzname;
+ output_scheme (scm_list_4 (ly_symbol2scm ("header"),
+ scm_makfrom0str (creator.to_str0 ()),
+ scm_makfrom0str (time_stamp.to_str0 ()),
+ scm_int2num (page_count)));
+
+ output_metadata (paper, scopes);
output_music_output_def (paper);
+
output_scheme (scm_list_1 (ly_symbol2scm ("header-end")));
output_scheme (scm_list_2 (ly_symbol2scm ("define-fonts"),
ly_quote_scm (paper->font_descriptions ())));
}
void
-Paper_outputter::output_line (SCM line, bool is_last)
+Paper_outputter::output_line (SCM line, Offset *origin, bool is_last)
{
- Offset dim = ly_scm2offset (ly_car (line));
- Real width = dim[X_AXIS];
- Real height = dim[Y_AXIS];
-
- if (height > 50 CM)
+ Paper_line *pl = unsmob_paper_line (line);
+ Offset dim = pl->dim ();
+ if (dim[Y_AXIS] > 50 CM)
{
programming_error ("Improbable system height.");
- height = 50 CM;
+ dim[Y_AXIS] = 50 CM;
}
- output_scheme (scm_list_3 (ly_symbol2scm ("start-system"),
- gh_double2scm (width), gh_double2scm (height)));
+ if (output_format_global != PAGE_LAYOUT)
+ output_scheme (scm_list_3 (ly_symbol2scm ("start-system"),
+ gh_double2scm (dim[X_AXIS]),
+ gh_double2scm (dim[Y_AXIS])));
+ else
+ {
+ output_scheme (scm_list_3 (ly_symbol2scm ("new-start-system"),
+ ly_quote_scm (ly_offset2scm (*origin)),
+ ly_quote_scm (ly_offset2scm (dim))));
+ (*origin)[Y_AXIS] += dim[Y_AXIS];
+ }
SCM between = SCM_EOL;
- for (SCM s = ly_cdr (line); gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = pl->stencils (); gh_pair_p (s); s = ly_cdr (s))
{
- Stencil *stil = unsmob_stencil (ly_cdar (s));
- SCM head = ly_caar (s);
-
- if (head == ly_symbol2scm ("between-system-string"))
- {
- between = stil->get_expr ();
- continue;
- }
-
+ Stencil *stil = unsmob_stencil (ly_car (s));
if (stil)
- output_expr (stil->get_expr (), ly_scm2offset (head));
+ output_expr (stil->get_expr (), stil->origin ());
+ /* Only if !PAGE_LAYOUT */
+ else if (ly_caar (s) == ly_symbol2scm ("between-system-string"))
+ between = ly_cdar (s);
}
if (is_last)
projects / lilypond.git / blobdiff