#include "paper-book.hh"
#include "paper-def.hh"
#include "paper-outputter.hh"
+#include "paper-line.hh"
#include "paper-score.hh"
#include "stencil.hh"
static Real const MIN_COVERAGE = 0.66;
-static Real const MAX_CRAMP = 0.05;
static SCM
-stencil2line (Stencil* stil)
+stencil2line (Stencil* stil, bool is_title = false)
{
static SCM z;
if (!z)
z = scm_permanent_object (ly_offset2scm (Offset (0, 0)));
Offset dim = Offset (stil->extent (X_AXIS).length (),
stil->extent (Y_AXIS).length ());
- return scm_cons (ly_offset2scm (dim),
- scm_list_1 (scm_cons (z, stil->smobbed_copy ())));
-}
+ Paper_line *pl = new Paper_line (dim, scm_cons (stil->smobbed_copy (),
+ SCM_EOL),
+ -10001 * is_title, is_title);
-static SCM
-title2line (Stencil* stil)
-{
- SCM s = stencil2line (stil);
- /* whugh, add marker recognise titles. */
- return scm_cons (scm_cons (ly_symbol2scm ("title"), ly_car (s)), ly_cdr (s));
+ return scm_gc_unprotect_object (pl->self_scm ());
}
/* Simplistic page interface */
lines_ = SCM_EOL;
line_count_ = 0;
- hsize_ = paper->get_realvar (ly_symbol2scm ("hsize"));
- vsize_ = paper->get_realvar (ly_symbol2scm ("vsize"));
- top_margin_ = paper->get_realvar (ly_symbol2scm ("top-margin"));
- bottom_margin_ = paper->get_realvar (ly_symbol2scm ("bottom-margin"));
- head_sep_ = paper->get_realvar (ly_symbol2scm ("head-sep"));
- foot_sep_ = paper->get_realvar (ly_symbol2scm ("foot-sep"));
- text_width_ = paper->get_realvar (ly_symbol2scm ("linewidth"));
+ hsize_ = paper->get_dimension (ly_symbol2scm ("hsize"));
+ vsize_ = paper->get_dimension (ly_symbol2scm ("vsize"));
+ top_margin_ = paper->get_dimension (ly_symbol2scm ("top-margin"));
+ bottom_margin_ = paper->get_dimension (ly_symbol2scm ("bottom-margin"));
+ head_sep_ = paper->get_dimension (ly_symbol2scm ("head-sep"));
+ foot_sep_ = paper->get_dimension (ly_symbol2scm ("foot-sep"));
+ text_width_ = paper->get_dimension (ly_symbol2scm ("linewidth"));
left_margin_ = (hsize_ - text_width_) / 2;
copyright_ = SCM_EOL;
tagline_ = SCM_EOL;
- SCM make_header = scm_primitive_eval (ly_symbol2scm ("make-header"));
- SCM make_footer = scm_primitive_eval (ly_symbol2scm ("make-footer"));
+ SCM make_header = ly_scheme_function ("make-header");
+ SCM make_footer = ly_scheme_function ("make-footer");
- header_ = scm_call_2 (make_header, paper_->smobbed_copy (),
+ header_ = scm_call_2 (make_header, paper_->self_scm (),
scm_int2num (number_));
- // FIXME: why does this (generates Stencil) not trigger font load?
if (get_header ())
get_header ()->align_to (Y_AXIS, UP);
- footer_ = scm_call_2 (make_footer, paper_->smobbed_copy (),
+ footer_ = scm_call_2 (make_footer, paper_->self_scm (),
scm_int2num (number_));
if (get_footer ())
get_footer ()->align_to (Y_AXIS, UP);
out->output_line (stencil2line (get_header ()), &o, false);
o[Y_AXIS] += head_sep_;
}
- for (SCM s = lines_; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = lines_; s != SCM_EOL; s = ly_cdr (s))
{
SCM line = ly_car (s);
- SCM offset = ly_car (line);
- if (ly_car (offset) == ly_symbol2scm ("title"))
- line = scm_cons (ly_cdr (offset), ly_cdr (line));
out->output_line (line, &o,
- is_last && gh_pair_p (ly_cdr (s)) && !get_copyright ()
+ is_last && ly_cdr (s) != SCM_EOL && !get_copyright ()
&& !get_tagline () && !get_footer ());
- if (gh_pair_p (ly_cdr (s)) && ly_car (offset) != ly_symbol2scm ("title"))
- o[Y_AXIS] += vfill;
+
+ /* Do not put vfill between title and its music, */
+ if (scm_pair_p (ly_cdr (s))
+ && (!unsmob_paper_line (line)->is_title () || vfill < 0))
+ o[Y_AXIS] += vfill;
+ /* rather put extra just before the title. */
+ if (ly_cdr (s) != SCM_EOL
+ && (unsmob_paper_line (ly_cadr (s))->is_title () && vfill > 0))
+ o[Y_AXIS] += vfill;
}
-#if 0
- if (get_copyright () || get_tagline () || get_footer ())
- o[Y_AXIS] += foot_sep_;
-#else
o[Y_AXIS] = vsize_ - bottom_margin_;
if (get_copyright ())
o[Y_AXIS] -= get_copyright ()->extent (Y_AXIS).length ();
o[Y_AXIS] -= get_tagline ()->extent (Y_AXIS).length ();
if (get_footer ())
o[Y_AXIS] -= get_footer ()->extent (Y_AXIS).length ();
-#endif
if (get_copyright ())
out->output_line (stencil2line (get_copyright ()), &o,
if (get_footer ())
out->output_line (stencil2line (get_footer ()), &o, is_last);
out->output_scheme (scm_list_2 (ly_symbol2scm ("stop-page"),
- gh_bool2scm (is_last && !get_footer ())));
+ ly_bool2scm (is_last && !get_footer ())));
progress_indication ("]");
}
/****************************************************************/
-/* Current global paper book. Gives default_rendering access from
- input-file-results. */
-Paper_book *paper_book;
-
Paper_book::Paper_book ()
{
copyright_ = SCM_EOL;
{
}
+#include "ly-smobs.icc"
+
+IMPLEMENT_DEFAULT_EQUAL_P (Paper_book);
+IMPLEMENT_SMOBS (Paper_book)
+IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?")
+
+SCM
+Paper_book::mark_smob (SCM smob)
+{
+ Paper_book *pb = (Paper_book*) SCM_CELL_WORD_1 (smob);
+ for (int i = 0; i < pb->headers_.size (); i++)
+ scm_gc_mark (pb->headers_[i]);
+ for (int i = 0; i < pb->global_headers_.size (); i++)
+ scm_gc_mark (pb->global_headers_[i]);
+ for (int i = 0; i < pb->papers_.size (); i++)
+ scm_gc_mark (pb->papers_[i]->self_scm ());
+ for (int i = 0; i < pb->scores_.size (); i++)
+ scm_gc_mark (pb->scores_[i]);
+
+ scm_gc_mark (pb->copyright_);
+
+ return pb->tagline_;
+}
+
+int
+Paper_book::print_smob (SCM smob, SCM port, scm_print_state*)
+{
+ Paper_book *b = (Paper_book*) ly_cdr (smob);
+
+ scm_puts ("#<", port);
+ scm_puts (classname (b), port);
+ scm_puts (" ", port);
+ //scm_puts (b->, port);
+ scm_puts (">", port);
+ return 1;
+}
+
void
Paper_book::output (String outname)
{
return;
/* Generate all stencils to trigger font loads. */
- Link_array<Page> *pages = get_pages ();
+ Link_array<Page> *pages = this->pages ();
Paper_def *paper = papers_[0];
Paper_outputter *out = paper->get_paper_outputter (outname);
- out->output_header (paper, get_scopes (0), pages->size ());
+ out->output_header (paper, scopes (0), pages->size (), false);
int page_count = pages->size ();
for (int i = 0; i < page_count; i++)
(*pages)[i]->output (out, i + 1 == page_count);
out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output")));
+
+ /* Ugh. */
+ for (int i = pages->size (); i--;)
+ delete pages->elem (i);
+ delete pages;
+
progress_indication ("\n");
}
SCM
-Paper_book::get_scopes (int i)
+Paper_book::scopes (int i)
{
SCM scopes = SCM_EOL;
if (headers_[i])
scopes = scm_cons (headers_[i], scopes);
- if (global_headers_[i] && global_headers_[i] != headers_[i])
+ if (global_headers_.size ()
+ && global_headers_[i] && global_headers_[i] != headers_[i])
scopes = scm_cons (global_headers_[i], scopes);
return scopes;
}
Stencil*
-Paper_book::get_title (int i)
+Paper_book::title (int i)
{
- SCM user_title = scm_primitive_eval (ly_symbol2scm ("user-title"));
- SCM book_title = scm_primitive_eval (ly_symbol2scm ("book-title"));
- SCM score_title = scm_primitive_eval (ly_symbol2scm ("score-title"));
+ SCM user_title = ly_scheme_function ("user-title");
+ SCM book_title = ly_scheme_function ("book-title");
+ SCM score_title = ly_scheme_function ("score-title");
SCM field = (i == 0 ? ly_symbol2scm ("bookTitle")
: ly_symbol2scm ("scoreTitle"));
Stencil *title = 0;
- SCM scopes = get_scopes (i);
+ SCM scopes = this->scopes (i);
SCM s = ly_modules_lookup (scopes, field);
if (s != SCM_UNDEFINED && scm_variable_bound_p (s) == SCM_BOOL_T)
title = unsmob_stencil (scm_call_2 (user_title,
return title;
}
+void
+Paper_book::classic_output (String outname)
+{
+ int count = scores_.size ();
+ Paper_outputter *out = papers_.top ()->get_paper_outputter (outname);
+ out->output_header (papers_.top (), scopes (count - 1), 0, true);
+
+ Paper_line *first = unsmob_paper_line (scm_vector_ref (scores_.top (),
+ scm_int2num (0)));
+ Offset o (0, -0.5 * first->dim ()[Y_AXIS]);
+ int line_count = SCM_VECTOR_LENGTH ((SCM) scores_.top ());
+ for (int i = 0; i < line_count; i++)
+ out->output_line (scm_vector_ref ((SCM) scores_.top (), scm_int2num (i)),
+ &o, i == line_count - 1);
+
+ out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output")));
+ progress_indication ("\n");
+}
+
+
/* calculate book height, #lines, stencils. */
void
Paper_book::init ()
height_ = 0;
for (int i = 0; i < score_count; i++)
{
- Stencil *title = get_title (i);
+ Stencil *title = this->title (i);
if (title)
height_ += title->extent (Y_AXIS).length ();
int line_count = SCM_VECTOR_LENGTH ((SCM) scores_[i]);
for (int j = 0; j < line_count; j++)
{
- SCM line = scm_vector_ref ((SCM) scores_[i], scm_int2num (j));
- height_ += ly_scm2offset (ly_car (line))[Y_AXIS];
+ SCM s = scm_vector_ref ((SCM) scores_[i], scm_int2num (j));
+ height_ += unsmob_paper_line (s)->dim ()[Y_AXIS];
}
}
Paper_def *paper = papers_[0];
- SCM scopes = get_scopes (0);
+ SCM scopes = this->scopes (0);
- SCM make_tagline = scm_primitive_eval (ly_symbol2scm ("make-tagline"));
- tagline_ = scm_call_2 (make_tagline, paper->smobbed_copy (), scopes);
+ SCM make_tagline = ly_scheme_function ("make-tagline");
+ tagline_ = scm_call_2 (make_tagline, paper->self_scm (), scopes);
Real tag_height = 0;
if (Stencil *s = unsmob_stencil (tagline_))
tag_height = s->extent (Y_AXIS).length ();
height_ += tag_height;
- SCM make_copyright = scm_primitive_eval (ly_symbol2scm ("make-copyright"));
- copyright_ = scm_call_2 (make_copyright, paper->smobbed_copy (), scopes);
+ SCM make_copyright = ly_scheme_function ("make-copyright");
+ copyright_ = scm_call_2 (make_copyright, paper->self_scm (), scopes);
Real copy_height = 0;
if (Stencil *s = unsmob_stencil (copyright_))
copy_height = s->extent (Y_AXIS).length ();
height_ += copy_height;
}
-/* Ideas:
- - real page breaking algorithm (Gourlay?)
- Hmmughr, Gourlay uses Grobs, columns etc -- looks like it needs serious
- refactoring before it can be applied to Page breaking...
- - override: # pages, or pageBreakLines= #'(3 3 4), ? */
+SCM
+Paper_book::lines ()
+{
+ int score_count = scores_.size ();
+ SCM lines = SCM_EOL;
+ for (int i = 0; i < score_count; i++)
+ {
+ if (Stencil *title = this->title (i))
+ lines = ly_snoc (stencil2line (title, true), lines);
+ lines = scm_append (scm_list_2 (lines, scm_vector_to_list (scores_[i])));
+ }
+ //debug helper; ughr
+ int i = 0;
+ for (SCM s = lines; s != SCM_EOL; s = ly_cdr (s))
+ unsmob_paper_line (ly_car (s))->number_ = ++i;
+ return lines;
+}
+
Link_array<Page>*
-Paper_book::get_pages ()
+Paper_book::pages ()
{
init ();
Page::page_count_ = 0;
Page *page = new Page (paper, 1);
Real text_height = page->text_height ();
- Real page_frac = height_ / text_height;
- int page_count = (int) ceil (page_frac);
+
+ Real copy_height = 0;
+ if (Stencil *s = unsmob_stencil (copyright_))
+ copy_height = s->extent (Y_AXIS).length ();
+
+ Real tag_height = 0;
+ if (Stencil *s = unsmob_stencil (tagline_))
+ tag_height = s->extent (Y_AXIS).length ();
+
+ SCM all = lines ();
+ SCM proc = paper->get_scmvar ("page-breaking");
+ SCM breaks = scm_apply_0 (proc, scm_list_n (all, scm_make_real (height_),
+ scm_make_real (text_height),
+ scm_make_real (-copy_height),
+ scm_make_real (-tag_height),
+ SCM_UNDEFINED));
+
+ /* Copyright on first page. */
if (unsmob_stencil (copyright_))
page->copyright_ = copyright_;
- if (unsmob_stencil (tagline_) && page_count == 1)
- page->tagline_ = tagline_;
- /* Attempt to fill pages better using FUDGE kludge. */
- Real r = page_frac - (int) page_frac;
- Real cramp_fudge = page_count > 1 ? (r / (page_count - 1)) * text_height : 0;
- Real expand_fudge = - ((1 - r) / page_count) * text_height;
-
- Link_array<Page>* pages = 0;
- if ((page_count > 1 && (r / (page_count - 1)) < MAX_CRAMP))
- {
- /* Just a little more space (<MAX_CRAMP) per page is needed,
- cramp onto one page less. */
- pages = fill_pages (page, page_count - 1, cramp_fudge);
- if (pages->size () != page_count - 1)
- {
- /* Cramping failed. */
- page = pages->get (0);
- delete pages;
- pages = 0;
- }
- }
- if (!pages && ((1 - r) / page_count) < 1 - MIN_COVERAGE)
+ Link_array<Page> *pages = new Link_array<Page>;
+ int page_count = SCM_VECTOR_LENGTH ((SCM) breaks);
+ int line = 1;
+ for (int i = 0; i < page_count; i++)
{
- /* There is space left, but not so much that paged would have too
- little blackness (< MIN_COVERAGE), distribute evenly. */
- pages = fill_pages (page, page_count, expand_fudge);
- bool badly_covered = false;
- if (pages->size () == page_count)
- for (int i = 0; i < page_count; i++)
- {
- Page *p = (*pages)[i];
- Real coverage = p ->height_ / p->text_height ();
- if (coverage < MIN_COVERAGE)
- {
- badly_covered = true;
- break;
- }
- }
- if (pages->size () != page_count || badly_covered)
+ if (i)
+ page = new Page (paper, i+1);
+ int next = i + 1 < page_count
+ ? ly_scm2int (scm_vector_ref (breaks, scm_int2num (i))) : 0;
+ while ((!next && all != SCM_EOL) || line <= next)
{
- /* expanding failed. */
- page = pages->get (0);
- delete pages;
- pages = 0;
+ SCM s = ly_car (all);
+ page->lines_ = ly_snoc (s, page->lines_);
+ page->height_ += unsmob_paper_line (s)->dim ()[Y_AXIS];
+ page->line_count_++;
+ all = ly_cdr (all);
+ line++;
}
+ pages->push (page);
}
-
- if (!pages)
- /* Fudging failed; just fill pages. */
- pages = fill_pages (page, page_count, 0);
+
+ /* Tagline on last page. */
+ if (unsmob_stencil (tagline_))
+ page->tagline_ = tagline_;
+
return pages;
}
-/* Simplistic page breaking:
- add lines until HEIGHT > PAGE.TEXT_HEIGHT_ + FUDGE */
-Link_array<Page>*
-Paper_book::fill_pages (Page *page, int page_count, Real fudge)
+static SCM
+c_ragged_page_breaks (SCM lines, Real book_height, Real text_height,
+ Real first, Real last)
{
- int page_number = 1;
- int score_count = scores_.size ();
- Paper_def *paper = papers_[0];
- Link_array<Page> *pages = new Link_array<Page>;
- page->lines_ = SCM_EOL;
- page->height_ = 0;
- page->line_count_ = 0;
- Real text_height = page->text_height ();
- for (int i = 0; i < score_count; i++)
+ int page_number = 0;
+ int page_count = int (book_height / text_height + 0.5);
+ SCM breaks = SCM_EOL;
+ Real page_height = text_height + first;
+ Real h = 0;
+ int number = 0;
+ for (SCM s = lines; s != SCM_EOL; s = ly_cdr (s))
{
- Real h = 0;
- Stencil *title = get_title (i);
- if (title)
- h = title->extent (Y_AXIS).length ();
-
- int line_count = SCM_VECTOR_LENGTH ((SCM) scores_[i]);
- for (int j = 0; j < line_count; j++)
+ Paper_line *pl = unsmob_paper_line (ly_car (s));
+ if (!pl->is_title () && h < page_height)
+ number++;
+ h += pl->dim ()[Y_AXIS];
+ if (!pl->is_title () && h > page_height)
{
- SCM line = scm_vector_ref ((SCM) scores_[i], scm_int2num (j));
- h += ly_scm2offset (ly_car (line))[Y_AXIS];
- Real fill = (page->height_ - text_height) / text_height;
- // Real fill_h = (page->height_ + h - text_height) / text_height;
- Real fudged_fill = (page->height_ - (text_height + fudge))
- / (text_height + fudge);
- Real fudged_fill_h = ((page->height_ + h) - (text_height + fudge))
- / (text_height + fudge);
- if (fill > -MAX_CRAMP
- || (fudged_fill > -MAX_CRAMP
- && (fudge < 0
- || !(fudged_fill_h > 0
- && abs (fudged_fill_h) < 4 * abs (fudged_fill)))))
- {
- pages->push (page);
- page = new Page (paper, ++page_number);
- if (unsmob_stencil (tagline_) && page_number == page_count)
- page->tagline_ = tagline_;
- text_height = page->text_height ();
- }
- if (j == 0 && title)
- page->lines_ = ly_snoc (title2line (title), page->lines_);
- page->lines_ = ly_snoc (line, page->lines_);
- page->line_count_++;
- page->height_ += h;
+ breaks = ly_snoc (scm_int2num (number), breaks);
+ page_number++;
+ page_height = text_height + (page_number == page_count) * last;
h = 0;
}
+ if (ly_cdr (s) == SCM_EOL)
+ breaks = ly_snoc (scm_int2num (pl->number_), breaks);
}
- pages->push (page);
- return pages;
-}
-
-void
-Paper_book::classic_output (String outname)
-{
- int count = scores_.size ();
- Paper_outputter *out = papers_.top ()->get_paper_outputter (outname);
- out->output_header (papers_.top (), get_scopes (count - 1), 0);
-
- int line_count = SCM_VECTOR_LENGTH ((SCM) scores_.top ());
- for (int i = 0; i < line_count; i++)
- out->output_line (scm_vector_ref ((SCM) scores_.top (), scm_int2num (i)),
- 0, i == line_count - 1);
-
- out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output")));
- progress_indication ("\n");
-}
-
-
-#include "ly-smobs.icc"
-
-IMPLEMENT_DEFAULT_EQUAL_P (Paper_book);
-IMPLEMENT_SMOBS (Paper_book)
-IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?")
-
-SCM
-Paper_book::mark_smob (SCM smob)
-{
- Paper_book *pb = (Paper_book*) SCM_CELL_WORD_1 (smob);
- for (int i = 0; i < pb->headers_.size (); i++)
- scm_gc_mark (pb->headers_[i]);
- for (int i = 0; i < pb->global_headers_.size (); i++)
- scm_gc_mark (pb->global_headers_[i]);
- for (int i = 0; i < pb->papers_.size (); i++)
- scm_gc_mark (pb->papers_[i]->self_scm ());
- for (int i = 0; i < pb->scores_.size (); i++)
- scm_gc_mark (pb->scores_[i]);
-
- scm_gc_mark (pb->copyright_);
-
-
- return pb->tagline_;
+ return scm_vector (breaks);
}
-int
-Paper_book::print_smob (SCM smob, SCM port, scm_print_state*)
+LY_DEFINE (ly_ragged_page_breaks, "ly:ragged-page-breaks",
+ 5, 0, 0, (SCM lines, SCM book, SCM text, SCM first, SCM last),
+ "Return a vector with line numbers of page breaks.")
{
- Paper_book *b = (Paper_book*) ly_cdr (smob);
-
- scm_puts ("#<", port);
- scm_puts (classname (b), port);
- scm_puts (" ", port);
- //scm_puts (b->, port);
- scm_puts (">", port);
- return 1;
+ SCM_ASSERT_TYPE (scm_pair_p (lines), lines, SCM_ARG1, __FUNCTION__, "list");
+ SCM_ASSERT_TYPE (is_number (book), book, SCM_ARG2, __FUNCTION__, "real");
+ SCM_ASSERT_TYPE (is_number (text), text, SCM_ARG2, __FUNCTION__, "real");
+ SCM_ASSERT_TYPE (is_number (first), first, SCM_ARG2, __FUNCTION__, "real");
+ SCM_ASSERT_TYPE (is_number (last), last, SCM_ARG2, __FUNCTION__, "real");
+
+ return c_ragged_page_breaks (lines,
+ ly_scm2double (book), ly_scm2double (text),
+ ly_scm2double (first), ly_scm2double (last));
}