source file of the GNU LilyPond music typesetter
- (c) 2004--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "paper-book.hh"
Paper_book::print_smob (SCM smob, SCM port, scm_print_state*)
{
Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
-
- scm_puts ("#<", port);
- scm_puts (classname (b), port);
- scm_puts (" ", port);
- scm_puts (">", port);
+ (void)b;
+ scm_puts ("#<Paper_book>", port);
return 1;
}
SCM fields = SCM_EOL;
for (int i = dump_header_fieldnames_global.size (); i--;)
fields
- = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
+ = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].c_str ()),
fields);
return fields;
}
String mod_nm = "scm framework-" + output_backend_global;
- SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+ SCM mod = scm_c_resolve_module (mod_nm.c_str ());
if (make_print)
{
SCM func = scm_c_module_lookup (mod, "output-framework");
String format = output_backend_global;
String mod_nm = "scm framework-" + format;
- SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+ SCM mod = scm_c_resolve_module (mod_nm.c_str ());
SCM func = scm_c_module_lookup (mod, "output-classic-framework");
func = scm_variable_ref (func);
}
void
-set_system_penalty (Paper_system *ps, SCM header)
+set_system_penalty (Prob *ps, SCM header)
{
if (ly_is_module (header))
{
title = score_title (header_);
if (!title.is_empty ())
{
- // TODO: init properties, from where?
- Paper_system *ps = new Paper_system (title, SCM_EOL);
- ps->set_property ("is-title", SCM_BOOL_T);
+ /*
+ TODO: this should come from the \layout {} block, which should
+ override settings from \paper {}
+ */
+ SCM props = paper_->lookup_variable (ly_symbol2scm ("score-title-properties"));
+ Prob *ps = make_paper_system (props);
+ paper_system_set_stencil (ps, title);
+
systems_ = scm_cons (ps->self_scm (), systems_);
ps->unprotect ();
set_system_penalty (ps, header);
if (!title.is_empty ())
{
- Paper_system *ps = new Paper_system (title, SCM_EOL);
- ps->set_property ("is-title", SCM_BOOL_T);
+ SCM props = paper_->lookup_variable (ly_symbol2scm ("book-title-properties"));
+ Prob *ps = make_paper_system (props);
+ paper_system_set_stencil (ps, title);
set_system_penalty (ps, header_);
systems_ = scm_cons (ps->self_scm (), systems_);
scm_car (s));
// TODO: init props
- Paper_system *ps = new Paper_system (*unsmob_stencil (t), SCM_EOL);
+ Prob *ps = make_paper_system (SCM_EOL);
+ paper_system_set_stencil (ps, *unsmob_stencil (t));
ps->set_property ("is-title", SCM_BOOL_T);
systems_ = scm_cons (ps->self_scm (), systems_);
ps->unprotect ();
systems_ = scm_reverse (systems_);
int i = 0;
- Paper_system *last = 0;
+ Prob *last = 0;
for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s))
{
- Paper_system *ps = unsmob_paper_system (scm_car (s));
+ Prob *ps = unsmob_prob (scm_car (s));
ps->set_property ("number", scm_from_int (++i));
if (last