From 4780926b09a413daf0d13562c37884abb217bb8a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 11 Apr 2004 00:34:44 +0000 Subject: [PATCH] (get_line): Initialise Paper_line with page-penalty's from original grobs. --- lily/system.cc | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lily/system.cc b/lily/system.cc index 1274508447..1e6a24446c 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -362,15 +362,27 @@ System::get_line () unsmob_stencil (my_stencil)->translate (o + extra); stencils = scm_cons (my_stencil, stencils); +#if 0 // FIXME: never original - if (1 || g->original_) + if (!penalty || g->original_) { - SCM s = g->get_property ("page-penalty"); - // FIXME: 'page-penalty is never set - // FIXME; page breaking is not discrete at +-10000 - if (is_number (s)) // && fabs (ly_scm2double (s)) < 10000) - penalty += ly_scm2double (s); + if (Item *it = dynamic_cast (g)) + { + Grob *col = it->get_column (); + SCM s = col->get_property ("page-penalty"); + // FIXME: 'page-penalty is never set + // FIXME; page breaking is not discrete at +-10000 + if (is_number (s)) // && fabs (ly_scm2double (s)) < 10000) + penalty += ly_scm2double (s); + } } +#else + SCM s = g->get_property ("page-penalty"); + // FIXME: 'page-penalty is never set + // FIXME; page breaking is not discrete at +-10000 + if (is_number (s)) // && fabs (ly_scm2double (s)) < 10000) + penalty += ly_scm2double (s); +#endif } Interval x (extent (this, X_AXIS)); -- 2.39.5