source file of the GNU LilyPond music typesetter
(c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include <time.h>
#include <math.h>
+#include <time.h>
-#include "dimensions.hh"
-#include "virtual-methods.hh"
-#include "paper-outputter.hh"
-#include "stencil.hh"
#include "array.hh"
-#include "string-convert.hh"
-#include "warn.hh"
+#include "dimensions.hh"
#include "font-metric.hh"
-#include "main.hh"
-#include "scm-hash.hh"
+#include "input-smob.hh"
+#include "lily-guile.hh"
#include "lily-version.hh"
-#include "paper-def.hh"
-#include "input-file-results.hh"
#include "ly-module.hh"
+#include "main.hh"
#include "paper-book.hh"
-#include "input-smob.hh" // output_expr
+#include "paper-def.hh"
+#include "paper-line.hh"
+#include "paper-outputter.hh"
+#include "file-name.hh"
+#include "scm-hash.hh"
+#include "stencil.hh"
+#include "string-convert.hh"
+#include "warn.hh"
-Paper_outputter::Paper_outputter (String name)
+Paper_outputter::Paper_outputter (String filename)
{
+ filename_ = filename;
+ file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()),
+ scm_makfrom0str ("w"));
+
if (safe_global_b)
scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T);
-
- file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()),
- scm_makfrom0str ("w"));
- if (output_format_global == PAGE_LAYOUT)
+ String module_name = "scm output-" + output_format_global;
+ if (safe_global_b)
{
- output_func_ = SCM_UNDEFINED;
- output_module_
- = scm_call_1 (scm_primitive_eval (ly_symbol2scm ("get-output-module")),
- scm_makfrom0str (output_format_global.to_str0 ()));
- if (safe_global_b)
- {
- SCM safe_module = scm_primitive_eval (ly_symbol2scm ("safe-module"));
- SCM m = scm_set_current_module (safe_module);
- scm_c_use_module (("output-" + output_format_global).to_str0 ());
- output_module_ = scm_set_current_module (m);
- }
+ /* 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 (module_name.to_str0 ()));
}
else
- {
- static SCM find_dumper;
- if (!find_dumper)
- find_dumper = scm_c_eval_string ("find-dumper");
+ output_module_ = scm_c_resolve_module (module_name.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-1");
+ 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",
+ "ly:ragged-page-breaks",
+ "ly:optimal-page-breaks",
+
+ "ly:number-pair->string", /* output-lib.scm */
+ "ly:numbers->string",
+ "ly:inexact->string",
+
+ "assoc-get",
+#if IMPORT_LESS
+ "remove", /* from srfi srfi-1 */
+ "string-index", /* from srfi srfi-13 */
+ "string-join",
+ "regexp-substitute/global", /* from (ice9 regex) */
+#endif
+ 0,
+ };
- output_func_
- = scm_call_1 (find_dumper,
- scm_makfrom0str (output_format_global.to_str0 ()));
- output_module_ = SCM_UNDEFINED;
+ 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
}
Paper_outputter::~Paper_outputter ()
void
Paper_outputter::output_scheme (SCM scm)
{
- if (output_format_global == PAGE_LAYOUT)
- scm_display (scm_eval (scm, output_module_), file_);
- else
- gh_call2 (output_func_, scm, file_);
+ scm_display (scm_eval (scm, output_module_), file_);
}
void
SCM fields = SCM_EOL;
for (int i = dump_header_fieldnames_global.size (); i--; )
fields
- = gh_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
+ = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
fields);
+
+ File_name file_name (filename_);
+ file_name.ext_ = "";
+ String basename = file_name.to_string ();
output_scheme (scm_list_n (ly_symbol2scm ("output-scopes"),
paper->self_scm (),
- scm_list_n (ly_symbol2scm ("quote"),
- scopes, SCM_UNDEFINED),
- scm_list_n (ly_symbol2scm ("quote"),
- fields, SCM_UNDEFINED),
- scm_makfrom0str (basename_.to_str0 ()),
+ ly_quote_scm (scopes),
+ ly_quote_scm (fields),
+ scm_makfrom0str (basename.to_str0 ()),
SCM_UNDEFINED));
}
void
-Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count)
+Paper_outputter::output_header (Paper_def *paper, SCM scopes, int page_count,
+ bool is_classic)
{
String creator = gnu_lilypond_version_string ();
creator += " (http://lilypond.org)";
String time_stamp = ctime (&t);
time_stamp = time_stamp.left_string (time_stamp.length () - 1)
+ " " + *tzname;
- output_scheme (scm_list_4 (ly_symbol2scm ("header"),
+ output_scheme (scm_list_n (ly_symbol2scm ("header"),
scm_makfrom0str (creator.to_str0 ()),
scm_makfrom0str (time_stamp.to_str0 ()),
- scm_int2num (page_count)));
+ paper->self_scm (),
+ scm_int2num (page_count),
+ ly_bool2scm (is_classic),
+ SCM_UNDEFINED));
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 ())));
+
+ /* TODO: maybe have Scheme extract the fonts directly from \paper ?
+
+ Alternatively, we could simply load the fonts on demand in the
+ output, and do away with this define-fonts step. */
+ SCM fonts = paper->font_descriptions ();
+ output_scheme (scm_list_3 (ly_symbol2scm ("define-fonts"),
+ paper->self_scm (),
+ //FIXME:
+ ly_quote_scm (ly_list_qsort_uniq_x (fonts))));
}
void
Paper_outputter::output_line (SCM line, Offset *origin, bool is_last)
{
- Offset dim = ly_scm2offset (ly_car (line));
+ Paper_line *pl = unsmob_paper_line (line);
+ Offset dim = pl->dim ();
if (dim[Y_AXIS] > 50 CM)
{
programming_error ("Improbable system height.");
dim[Y_AXIS] = 50 CM;
}
- 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];
- }
+ output_scheme (scm_list_3 (ly_symbol2scm ("start-system"),
+ ly_quote_scm (ly_offset2scm (*origin)),
+ ly_quote_scm (ly_offset2scm (dim))));
- SCM between = SCM_EOL;
- for (SCM s = ly_cdr (line); 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;
- }
+ for (SCM s = pl->stencils (); ly_c_pair_p (s); s = ly_cdr (s))
+ output_expr (unsmob_stencil (ly_car (s))->get_expr (), Offset (0, 0));
- if (stil)
- output_expr (stil->get_expr (), ly_scm2offset (head));
- }
+ output_scheme (scm_list_2 (ly_symbol2scm ("stop-system"),
+ ly_bool2scm (is_last)));
- if (is_last)
- output_scheme (scm_list_1 (ly_symbol2scm ("stop-last-system")));
- else
- {
- output_scheme (scm_list_1 (ly_symbol2scm ("stop-system")));
- if (output_format_global != PAGE_LAYOUT && between != SCM_EOL)
- output_scheme (between);
- }
+ (*origin)[Y_AXIS] += dim[Y_AXIS];
}
void
-Paper_outputter::output_music_output_def (Music_output_def* odef)
+Paper_outputter::output_music_output_def (Music_output_def *odef)
{
- output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"),
- odef->self_scm (), SCM_UNDEFINED));
+ output_scheme (scm_list_2 (ly_symbol2scm ("output-paper-def"),
+ odef->self_scm ()));
+}
+
+void
+Paper_outputter::output_stencil (Stencil *stil)
+{
+ output_expr (stil->get_expr (), stil->origin ());
}
/* TODO: replaceme/rewriteme, see output-ps.scm: output-stencil */
{
while (1)
{
- if (!gh_pair_p (expr))
+ if (!ly_c_pair_p (expr))
return;
SCM head =ly_car (expr);
if (unsmob_input (head))
{
- Input * ip = unsmob_input (head);
-
- output_scheme (scm_list_n (ly_symbol2scm ("define-origin"),
- scm_makfrom0str (ip->file_string ().to_str0 ()),
- gh_int2scm (ip->line_number ()),
- gh_int2scm (ip->column_number ()),
- SCM_UNDEFINED));
+ Input *ip = unsmob_input (head);
+ output_scheme (scm_list_4 (ly_symbol2scm ("define-origin"),
+ scm_makfrom0str (ip->file_string ()
+ .to_str0 ()),
+ scm_int2num (ip->line_number ()),
+ scm_int2num (ip->column_number ())));
expr = ly_cadr (expr);
}
else if (head == ly_symbol2scm ("no-origin"))
{
- output_scheme (scm_list_n (head, SCM_UNDEFINED));
+ output_scheme (scm_list_1 (head));
expr = ly_cadr (expr);
}
else if (head == ly_symbol2scm ("translate-stencil"))
}
else
{
- output_scheme (scm_list_n (ly_symbol2scm ("placebox"),
- gh_double2scm (o[X_AXIS]),
- gh_double2scm (o[Y_AXIS]),
- expr,
- SCM_UNDEFINED));
+ output_scheme (scm_list_4 (ly_symbol2scm ("placebox"),
+ scm_make_real (o[X_AXIS]),
+ scm_make_real (o[Y_AXIS]),
+ expr));
return;
}
}
}
-
projects / lilypond.git / blobdiff