On Wed, 10 May 2006 00:13, Han-Wen Nienhuys wrote:
> Joe Neeman schreef:
> > On Tue, 9 May 2006 18:07, Han-Wen Nienhuys wrote:
> >> Han-Wen Nienhuys schreef:
> >>> Joe Neeman wrote:
> >>>> OK, here's another try
> >>>
> >>> (and I made web successfully).
> >>
> >> how is this possible? Did you do "make web-clean" in between?
> >
> > I did, but I didn't notice this because it didn't cause the build to
> > fail. Sorry.
> >
> > Attached is a quick fix (not properly tested yet, I haven't had time but
> > I'll do that now).
> >
> >> + p1->set_property ("line-break-permission", ly_symbol2scm ("allow"));
>
> it's customary to add such changes to define-grobs.scm
OK, here's a patch. (I've just modified my previous ChangeLog entry. Is that
OK or should I make a new entry?)
Index: ChangeLog
===================================================================
RCS file: /sources/lilypond/lilypond/ChangeLog,v
retrieving revision 1.4943
diff -u -r1.4943 ChangeLog
--- ChangeLog 9 May 2006 14:11:11 -0000 1.4943
+++ ChangeLog 9 May 2006 22:12:16 -0000
@@ -4,8 +4,8 @@
2006-05-09 Joe Neeman <[EMAIL PROTECTED]>
- * lily/paper-column-engraver.cc (make_columns): By default, a column
- needs to be breakable.
+ * scm/define-grobs.scm: By default, a NonMusicalPaperColumn needs to
+ be breakable.
2006-05-09 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Index: lily/paper-column-engraver.cc
===================================================================
RCS file: /sources/lilypond/lilypond/lily/paper-column-engraver.cc,v
retrieving revision 1.16
diff -u -r1.16 paper-column-engraver.cc
--- lily/paper-column-engraver.cc 9 May 2006 10:14:47 -0000 1.16
+++ lily/paper-column-engraver.cc 9 May 2006 22:12:17 -0000
@@ -57,7 +57,6 @@
SCM m = now_mom ().smobbed_copy ();
p1->set_property ("when", m);
p2->set_property ("when", m);
- p1->set_property ("line-break-permission", ly_symbol2scm ("allow"));
set_columns (p1, p2);
}
@@ -187,7 +186,7 @@
if (to_boolean (get_property ("forbidBreak")))
command_column_->set_property ("line-break-permission", SCM_EOL);
- else
+ else if (Paper_column::is_breakable (command_column_))
{
breaks_++;
last_breakable_column_ = command_column_;
Index: scm/define-grobs.scm
===================================================================
RCS file: /sources/lilypond/lilypond/scm/define-grobs.scm,v
retrieving revision 1.331
diff -u -r1.331 define-grobs.scm
--- scm/define-grobs.scm 9 May 2006 02:15:57 -0000 1.331
+++ scm/define-grobs.scm 9 May 2006 22:12:17 -0000
@@ -1102,6 +1102,7 @@
;; (stencil . ,ly:paper-column::print)
(non-musical . #t)
+ (line-break-permission . allow)
;; debugging stuff: print column number.
;; (font-size . -6) (font-name . "sans") (Y-extent . #f)
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
