Array<String> output_formats = split_string (output_format_global, ',');
SCM lst = SCM_EOL;
- for (int i = 0; i < output_formats.size (); i ++)
+ int output_formats_count = output_formats.size ();
+ for (int i = 0; i < output_formats_count; i ++)
lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst);
return lst;
if (!score_lines_.size ())
return;
-
/* Generate all stencils to trigger font loads. */
pages ();
-
- SCM formats = ly_output_formats();
+ SCM formats = ly_output_formats ();
for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s))
{
String format = ly_scm2string (ly_car (s));
-
- Paper_outputter *out = get_paper_outputter (outname + "." + format, format);
+ Paper_outputter *out = get_paper_outputter (outname + "." + format,
+ format);
SCM scopes = SCM_EOL;
if (ly_c_module_p (header_))
scopes = scm_cons (header_, scopes);
- String func_nm = format;
- func_nm = "output-framework-" + func_nm;
-
- SCM func = ly_scheme_function (func_nm.to_str0 ());
+ String mod_nm = "scm framework-" + format;
+
+ SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+ SCM func = scm_c_module_lookup (mod, "output-framework");
+
+ func = scm_variable_ref (func);
scm_apply_0 (func, scm_list_n (out->self_scm (),
self_scm (),
scopes,
dump_fields (),
scm_makfrom0str (outname.to_str0 ()),
- SCM_UNDEFINED
- )) ;
+ SCM_UNDEFINED));
scm_gc_unprotect_object (out->self_scm ());
+ progress_indication ("\n");
}
}
-
void
Paper_book::classic_output (String outname)
{
-
/* Generate all stencils to trigger font loads. */
lines ();
-
// ugh code dup
SCM scopes = SCM_EOL;
if (ly_c_module_p (header_))
scopes = scm_cons (score_lines_[0].header_, scopes);
//end ugh
-
Array<String> output_formats = split_string (output_format_global, ',');
for (int i = 0; i < output_formats.size (); i++)
{
String format = output_formats[i];
- String func_nm = format;
- func_nm = "output-classic-framework-" + func_nm;
+ String mod_nm = "scm framework-" + format;
- SCM func = ly_scheme_function (func_nm.to_str0 ());
+ SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+ SCM func = scm_c_module_lookup (mod, "output-classic-framework");
- Paper_outputter *out = get_paper_outputter (outname + "." + format, format);
+ func = scm_variable_ref (func);
+
+ Paper_outputter *out = get_paper_outputter (outname + "." + format,
+ format);
- scm_apply_0 (func, scm_list_n (out->self_scm (),
- self_scm (),
- scopes,
+ scm_apply_0 (func, scm_list_5 (out->self_scm (), self_scm (), scopes,
dump_fields (),
- scm_makfrom0str (outname.to_str0 ()),
- SCM_UNDEFINED
- )) ;
+ scm_makfrom0str (outname.to_str0 ())));
scm_gc_unprotect_object (out->self_scm ());
+ progress_indication ("\n");
}
-
- progress_indication ("\n");
}
-
-
-
-LY_DEFINE(ly_paper_book_pages, "ly:paper-book-pages",
- 1,0,0,
- (SCM pb),
+LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
+ 1, 0, 0, (SCM pb),
"Return pages in book PB.")
{
return unsmob_paper_book(pb)->pages ();
}
-
-LY_DEFINE(ly_paper_book_scopes, "ly:paper-book-scopes",
- 1,0,0,
- (SCM book),
+LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
+ 1, 0, 0, (SCM book),
"Return pages in paper book @var{book}.")
{
- Paper_book * pb = unsmob_paper_book(book);
+ Paper_book *pb = unsmob_paper_book(book);
SCM_ASSERT_TYPE(pb, book, SCM_ARG1, __FUNCTION__, "Paper_book");
SCM scopes = SCM_EOL;
return scopes;
}
-
-LY_DEFINE(ly_paper_book_lines, "ly:paper-book-lines",
- 1,0,0,
- (SCM pb),
- "Return lines in book PB.")
+LY_DEFINE (ly_paper_book_lines, "ly:paper-book-lines",
+ 1, 0, 0, (SCM pb),
+ "Return lines in book PB.")
{
return unsmob_paper_book (pb)->lines ();
}
-
-LY_DEFINE(ly_paper_book_book_paper, "ly:paper-book-book-paper",
- 1,0,0,
- (SCM pb),
+LY_DEFINE (ly_paper_book_book_paper, "ly:paper-book-book-paper",
+ 1, 0, 0, (SCM pb),
"Return pages in book PB.")
{
- return unsmob_paper_book(pb)->bookpaper_->self_scm ();
+ return unsmob_paper_book (pb)->bookpaper_->self_scm ();
}
-/*
-
-TODO: resurrect more complex user-tweaks for titling?
-
-*/
+/* TODO: resurrect more complex user-tweaks for titling? */
Stencil
Paper_book::book_title ()
{
return title;
}
-
-
Stencil
Paper_book::score_title (int i)
{
if (unsmob_stencil (tit))
title = *unsmob_stencil (tit);
-
if (!title.is_empty ())
title.align_to (Y_AXIS, UP);
return title;
}
-
SCM
Paper_book::lines ()
{
- if (SCM_BOOL_F != lines_)
+ if (lines_ != SCM_BOOL_F)
return lines_;
lines_ = SCM_EOL;
if (!title.is_empty ())
{
Paper_system *pl = new Paper_system (title, true);
-
lines_ = scm_cons (pl->self_scm (), lines_);
scm_gc_unprotect_object (pl->self_scm ());
}
if (scm_vector_p (score_lines_[i].lines_) == SCM_BOOL_T)
{
- SCM line_list = scm_vector_to_list (score_lines_[i].lines_); // guh.
+ // guh.
+ SCM line_list = scm_vector_to_list (score_lines_[i].lines_);
line_list = scm_reverse (line_list);
lines_ = scm_append (scm_list_2 (line_list, lines_));
lines_ = scm_reverse (lines_);
int i = 0;
- Paper_system * last = 0;
+ Paper_system *last = 0;
for (SCM s = lines_; s != SCM_EOL; s = ly_cdr (s))
{
Paper_system * p = unsmob_paper_line (ly_car (s));
p->number_ = ++i;
if (last && last->is_title ())
- {
- p->penalty_ = 10000; // ugh, hardcoded.
- }
+ // ugh, hardcoded.
+ p->penalty_ = 10000;
last = p;
}
-
return lines_;
}
-
SCM
Paper_book::pages ()
{
return pages_;
pages_ = SCM_EOL;
-
Output_def *paper = bookpaper_;
-
SCM proc = paper->c_variable ("page-breaking");
- pages_ = scm_apply_0 (proc, scm_list_n (lines (),
- self_scm (),
- SCM_UNDEFINED));
-
+ pages_ = scm_apply_0 (proc, scm_list_2 (lines (), self_scm ()));
return pages_;
}
-
-
/****************************************************************/
Score_lines::Score_lines ()
projects / lilypond.git / blobdiff