+2004-08-18 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * lily/include/paper-book.hh
+ * lily/include/paper-system.hh: Finish renaming of paper-line to
+ system. Fix users.
+
2004-08-18 Han-Wen Nienhuys <hanwen@xs4all.nl>
* lily/output-def.cc (assign_context_def): use set_variable().
do titling? */
if (SCM_NFALSEP(scm_vector_p (systems)))
{
- Score_lines sc;
- sc.lines_ = systems;
+ Score_systems sc;
+ sc.systems_ = systems;
sc.header_ = scores_[i]->header_;
- paper_book->score_lines_.push (sc);
+ paper_book->score_systems_.push (sc);
}
}
#include "protected-scm.hh"
#include "smobs.hh"
-struct Score_lines
+struct Score_systems
{
- SCM lines_;
+ SCM systems_;
SCM header_;
- Score_lines () ;
+ Score_systems () ;
void gc_mark ();
};
{
DECLARE_SMOBS (Paper_book, );
- SCM lines_;
+ SCM systems_;
SCM pages_;
public:
SCM header_;
- Array<Score_lines> score_lines_;
+ Array<Score_systems> score_systems_;
Output_def *bookpaper_;
Paper_book ();
- SCM lines ();
+ SCM systems ();
SCM pages ();
Stencil book_title ();
Stencil score_title (int);
(c) 2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#ifndef PAPER_LINE_HH
-#define PAPER_LINE_HH
+#ifndef PAPER_SYSTEM_HH
+#define PAPER_SYSTEM_HH
#include "lily-proto.hh"
#include "smobs.hh"
Real penalty () const;
};
-DECLARE_UNSMOB (Paper_system, paper_line);
+DECLARE_UNSMOB (Paper_system, paper_system);
-#endif /* PAPER_LINE_HH */
+#endif /* PAPER_SYSTEM_HH */
Paper_book::Paper_book ()
{
pages_ = SCM_BOOL_F;
- lines_ = SCM_BOOL_F;
+ systems_ = SCM_BOOL_F;
header_ = SCM_EOL;
bookpaper_ = 0;
Paper_book::mark_smob (SCM smob)
{
Paper_book *b = (Paper_book*) SCM_CELL_WORD_1 (smob);
- for (int i = 0; i < b->score_lines_.size (); i++)
- b->score_lines_[i].gc_mark ();
+ for (int i = 0; i < b->score_systems_.size (); i++)
+ b->score_systems_[i].gc_mark ();
if (b->bookpaper_)
scm_gc_mark (b->bookpaper_->self_scm ());
scm_gc_mark (b->header_);
scm_gc_mark (b->pages_);
- return b->lines_;
+ return b->systems_;
}
int
void
Paper_book::output (String outname)
{
- if (!score_lines_.size ())
+ if (!score_systems_.size ())
return;
/* Generate all stencils to trigger font loads. */
Paper_book::classic_output (String outname)
{
/* Generate all stencils to trigger font loads. */
- lines ();
+ systems ();
// ugh code dup
SCM scopes = SCM_EOL;
if (ly_c_module_p (header_))
scopes = scm_cons (header_, scopes);
- if (ly_c_module_p (score_lines_[0].header_))
- scopes = scm_cons (score_lines_[0].header_, scopes);
+ if (ly_c_module_p (score_systems_[0].header_))
+ scopes = scm_cons (score_systems_[0].header_, scopes);
//end ugh
Array<String> output_formats = split_string (output_format_global, ',');
return scopes;
}
-LY_DEFINE (ly_paper_book_lines, "ly:paper-book-lines",
+LY_DEFINE (ly_paper_book_systems, "ly:paper-book-systems",
1, 0, 0, (SCM pb),
- "Return lines in book PB.")
+ "Return systems in book PB.")
{
- return unsmob_paper_book (pb)->lines ();
+ return unsmob_paper_book (pb)->systems ();
}
LY_DEFINE (ly_paper_book_book_paper, "ly:paper-book-book-paper",
if (ly_c_module_p (header_))
scopes = scm_cons (header_, scopes);
- if (ly_c_module_p (score_lines_[i].header_))
- scopes = scm_cons (score_lines_[i].header_, scopes);
+ if (ly_c_module_p (score_systems_[i].header_))
+ scopes = scm_cons (score_systems_[i].header_, scopes);
//end ugh
SCM tit = SCM_EOL;
}
SCM
-Paper_book::lines ()
+Paper_book::systems ()
{
- if (lines_ != SCM_BOOL_F)
- return lines_;
+ if (systems_ != SCM_BOOL_F)
+ return systems_;
- lines_ = SCM_EOL;
+ systems_ = SCM_EOL;
Stencil title = book_title ();
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 ());
+ Paper_system *ps = new Paper_system (title, true);
+ systems_ = scm_cons (ps->self_scm (), systems_);
+ scm_gc_unprotect_object (ps->self_scm ());
}
- int score_count = score_lines_.size ();
+ int score_count = score_systems_.size ();
for (int i = 0; i < score_count; i++)
{
Stencil title = score_title (i);
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 ());
+ Paper_system *ps = new Paper_system (title, true);
+ systems_ = scm_cons (ps->self_scm (), systems_);
+ scm_gc_unprotect_object (ps->self_scm ());
}
- if (scm_vector_p (score_lines_[i].lines_) == SCM_BOOL_T)
+ if (scm_vector_p (score_systems_[i].systems_) == SCM_BOOL_T)
{
// guh.
- SCM line_list = scm_vector_to_list (score_lines_[i].lines_);
+ SCM system_list = scm_vector_to_list (score_systems_[i].systems_);
- line_list = scm_reverse (line_list);
- lines_ = scm_append (scm_list_2 (line_list, lines_));
+ system_list = scm_reverse (system_list);
+ systems_ = scm_append (scm_list_2 (system_list, systems_));
}
}
- lines_ = scm_reverse (lines_);
+ systems_ = scm_reverse (systems_);
int i = 0;
Paper_system *last = 0;
- for (SCM s = lines_; s != SCM_EOL; s = ly_cdr (s))
+ for (SCM s = systems_; s != SCM_EOL; s = ly_cdr (s))
{
- Paper_system * p = unsmob_paper_line (ly_car (s));
- p->number_ = ++i;
+ Paper_system *ps = unsmob_paper_system (ly_car (s));
+ ps->number_ = ++i;
if (last && last->is_title ())
// ugh, hardcoded.
- p->penalty_ = 10000;
- last = p;
+ ps->penalty_ = 10000;
+ last = ps;
}
- return lines_;
+ return systems_;
}
SCM
pages_ = SCM_EOL;
SCM proc = bookpaper_->c_variable ("page-breaking");
- pages_ = scm_apply_0 (proc, scm_list_2 (lines (), self_scm ()));
+ pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ()));
return pages_;
}
/****************************************************************/
-Score_lines::Score_lines ()
+Score_systems::Score_systems ()
{
- lines_ = SCM_EOL;
+ systems_ = SCM_EOL;
header_ = SCM_EOL;
}
void
-Score_lines::gc_mark ()
+Score_systems::gc_mark ()
{
- scm_gc_mark (lines_);
+ scm_gc_mark (systems_);
scm_gc_mark (header_);
}
SCM
Paper_system::mark_smob (SCM smob)
{
- Paper_system *line = (Paper_system*) ly_cdr (smob);
- return line-> stencil_.expr ();
+ Paper_system *system = (Paper_system*) ly_cdr (smob);
+ return system-> stencil_.expr ();
}
int
return stencil_;
}
-LY_DEFINE (ly_paper_line_height, "ly:paper-system-extent",
- 2, 0, 0, (SCM line, SCM axis),
- "Return the extent of @var{line}.")
+LY_DEFINE (ly_paper_system_height, "ly:paper-system-extent",
+ 2, 0, 0, (SCM system, SCM axis),
+ "Return the extent of @var{system}.")
{
- Paper_system *pl = unsmob_paper_line (line);
- SCM_ASSERT_TYPE (pl, line, SCM_ARG1, __FUNCTION__, "paper-system");
+ Paper_system *ps = unsmob_paper_system (system);
+ SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
Axis ax = (Axis)ly_scm2int (axis);
- return scm_make_real (pl->dim ()[ax]);
+ return scm_make_real (ps->dim ()[ax]);
}
-
-
-LY_DEFINE (ly_paper_line_title_p, "ly:paper-system-title?",
- 1, 0, 0, (SCM line),
- "Is @var{line} a title line?")
+LY_DEFINE (ly_paper_system_title_p, "ly:paper-system-title?",
+ 1, 0, 0, (SCM system),
+ "Is @var{system} a title system?")
{
- Paper_system *pl = unsmob_paper_line (line);
- SCM_ASSERT_TYPE (pl, line, SCM_ARG1, __FUNCTION__, "paper-system");
- return SCM_BOOL (pl->is_title ());
+ Paper_system *ps = unsmob_paper_system (system);
+ SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
+ return SCM_BOOL (ps->is_title ());
}
-LY_DEFINE (ly_paper_line_number, "ly:paper-system-number",
- 1, 0, 0, (SCM line),
- "Return the number of @var{line}.")
+LY_DEFINE (ly_paper_system_number, "ly:paper-system-number",
+ 1, 0, 0, (SCM system),
+ "Return the number of @var{system}.")
{
- Paper_system *pl = unsmob_paper_line (line);
- SCM_ASSERT_TYPE (pl, line, SCM_ARG1, __FUNCTION__, "paper-system");
- return scm_int2num (pl->number_);
+ Paper_system *ps = unsmob_paper_system (system);
+ SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
+ return scm_int2num (ps->number_);
}
-LY_DEFINE (ly_paper_line_break_score, "ly:paper-system-break-penalty",
- 1, 0, 0, (SCM line),
- "Return the score for page break after @var{line}.")
+LY_DEFINE (ly_paper_system_break_score, "ly:paper-system-break-penalty",
+ 1, 0, 0, (SCM system),
+ "Return the score for page break after @var{system}.")
{
- Paper_system *pl = unsmob_paper_line (line);
- SCM_ASSERT_TYPE (pl, line, SCM_ARG1, __FUNCTION__, "paper-system");
- return scm_int2num (int (pl->penalty ()));
+ Paper_system *ps = unsmob_paper_system (system);
+ SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
+ return scm_int2num (int (ps->penalty ()));
}
-LY_DEFINE (ly_paper_line_stencil, "ly:paper-system-stencil",
- 1, 0, 0, (SCM line),
- "Return the height of @var{line}.")
+LY_DEFINE (ly_paper_system_stencil, "ly:paper-system-stencil",
+ 1, 0, 0, (SCM system),
+ "Return the height of @var{system}.")
{
- Paper_system *pl = unsmob_paper_line (line);
- SCM_ASSERT_TYPE (pl, line, SCM_ARG1, __FUNCTION__, "paper-system");
- return pl->to_stencil ().smobbed_copy ();
+ Paper_system *ps = unsmob_paper_system (system);
+ SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
+ return ps->to_stencil ().smobbed_copy ();
}
paper_book->header_ = header;
paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef);
- Score_lines sc;
- sc.lines_ = systems;
+ Score_systems sc;
+ sc.systems_ = systems;
sc.header_ = header;
- paper_book->score_lines_.push (sc);
+ paper_book->score_systems_.push (sc);
paper_book->classic_output (ly_scm2string (outname));
scm_gc_unprotect_object (paper_book->self_scm ());
projects / lilypond.git / commitdiff