Issue 4527086: Implements multiple-line non-cross-staff glissandi (Closed)
|
Created:
14 years, 1 month ago by MikeSol Modified:
13 years, 12 months ago CC:
lilypond-devel_gnu.org Visibility:
Public. |
DescriptionImplements multiple-line non-cross-staff glissandi
Patch Set 1 #Patch Set 2 : Adds proper property definition. #
Total comments: 1
Patch Set 3 : Allows for left-broken and right-broken bound info #
Total comments: 1
Patch Set 4 : Checks for default property in bound-details #
Total comments: 20
Patch Set 5 : Incorporate's Neil's suggestions. #
Total comments: 5
Patch Set 6 : Rewritten glissando::before-line-breaking function based on Neil's suggestions. #
Total comments: 1
Patch Set 7 : Tweak to regtest. #
Total comments: 2
MessagesTotal messages: 28
I believe this new version of the glissando line breaking patch responds to Keith's concern. Please let me know what you think! Cheers, MS
Sign in to reply to this message.
http://codereview.appspot.com/4527086/diff/3001/scm/output-lib.scm File scm/output-lib.scm (right): http://codereview.appspot.com/4527086/diff/3001/scm/output-lib.scm#newcode798 scm/output-lib.scm:798: (bd `((left . ,l) (right . ,r)))) This overwrites any user overrides for left-broken/right-broken.
Sign in to reply to this message.
On 2011/05/31 16:41:01, Neil Puttock wrote: > http://codereview.appspot.com/4527086/diff/3001/scm/output-lib.scm > File scm/output-lib.scm (right): > > http://codereview.appspot.com/4527086/diff/3001/scm/output-lib.scm#newcode798 > scm/output-lib.scm:798: (bd `((left . ,l) (right . ,r)))) > This overwrites any user overrides for left-broken/right-broken. Fixed. New patch set up.
Sign in to reply to this message.
http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm File scm/output-lib.scm (right): http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm#newcode795 scm/output-lib.scm:795: (define-public (glissando::before-line-breaking grob) Possibly silly question: can't you fold this into callbacks for left-bound-info/right-bound-info instead?
Sign in to reply to this message.
On Jun 2, 2011, at 9:00 PM, n.puttock@gmail.com wrote: > > http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm > File scm/output-lib.scm (right): > > http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm#newcode795 > scm/output-lib.scm:795: (define-public (glissando::before-line-breaking > grob) > Possibly silly question: can't you fold this into callbacks for > left-bound-info/right-bound-info instead? Sorry - I don't get what you mean :( Could you please elaborate? Cheers, MS
Sign in to reply to this message.
On 2011/06/05 10:18:18, mike_apollinemike.com wrote: > On Jun 2, 2011, at 9:00 PM, mailto:n.puttock@gmail.com wrote: > > > > > http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm > > File scm/output-lib.scm (right): > > > > http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm#newcode795 > > scm/output-lib.scm:795: (define-public (glissando::before-line-breaking > > grob) > > Possibly silly question: can't you fold this into callbacks for > > left-bound-info/right-bound-info instead? > > Sorry - I don't get what you mean :( Could you please elaborate? You're calculating a value for 'Y which you add back into bound-details. This bypasses the default calculation in calc_bound_info (). Why not caculate 'Y when left-bound-info/right-bound-info is requested, either directly in C++ or as glissando-specific scheme versions?
Sign in to reply to this message.
On Jun 12, 2011, at 5:49 PM, n.puttock@gmail.com wrote: > On 2011/06/05 10:18:18, mike_apollinemike.com wrote: >> On Jun 2, 2011, at 9:00 PM, mailto:n.puttock@gmail.com wrote: > >>> >>> http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm >>> File scm/output-lib.scm (right): >>> >>> > http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm#newcode795 >>> scm/output-lib.scm:795: (define-public > (glissando::before-line-breaking >>> grob) >>> Possibly silly question: can't you fold this into callbacks for >>> left-bound-info/right-bound-info instead? > >> Sorry - I don't get what you mean :( Could you please elaborate? > > You're calculating a value for 'Y which you add back into bound-details. > This bypasses the default calculation in calc_bound_info (). Why not > caculate 'Y when left-bound-info/right-bound-info is requested, either > directly in C++ or as glissando-specific scheme versions? > My goal is to bypass the default calculation and replace it with this one, and it is easier to harvest the information about Y placement relative to the staff before line breaking happens. Currently, there is no mechanism in Line_spanner::calc_bound_info that can outsource the Y calculation to another function, and I wouldn't want to code dup all of the parts of Line_spanner::calc_bound_info that are worth keeping into a glissando specific function. Taking that into account, does that seem like the right approach? Cheers, MS
Sign in to reply to this message.
On Jun 13, 2011, at 1:03 PM, mike@apollinemike.com wrote: > On Jun 12, 2011, at 5:49 PM, n.puttock@gmail.com wrote: > >> On 2011/06/05 10:18:18, mike_apollinemike.com wrote: >>> On Jun 2, 2011, at 9:00 PM, mailto:n.puttock@gmail.com wrote: >> >>>> >>>> http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm >>>> File scm/output-lib.scm (right): >>>> >>>> >> http://codereview.appspot.com/4527086/diff/7002/scm/output-lib.scm#newcode795 >>>> scm/output-lib.scm:795: (define-public >> (glissando::before-line-breaking >>>> grob) >>>> Possibly silly question: can't you fold this into callbacks for >>>> left-bound-info/right-bound-info instead? >> >>> Sorry - I don't get what you mean :( Could you please elaborate? >> >> You're calculating a value for 'Y which you add back into bound-details. >> This bypasses the default calculation in calc_bound_info (). Why not >> caculate 'Y when left-bound-info/right-bound-info is requested, either >> directly in C++ or as glissando-specific scheme versions? >> > > My goal is to bypass the default calculation and replace it with this one, and it is easier to harvest the information about Y placement relative to the staff before line breaking happens. Currently, there is no mechanism in Line_spanner::calc_bound_info that can outsource the Y calculation to another function, and I wouldn't want to code dup all of the parts of Line_spanner::calc_bound_info that are worth keeping into a glissando specific function. Taking that into account, does that seem like the right approach? > Just touching base on this thread to see if the explanation above makes sense and, if so, if it is push-ready. Cheers, MS
Sign in to reply to this message.
no problems in reg tests.
Sign in to reply to this message.
On 13 June 2011 12:03, <mike@apollinemike.com> wrote: > My goal is to bypass the default calculation and replace it with this one, and it is easier to harvest the information about Y placement relative to the staff before line breaking happens. Currently, there is no mechanism in Line_spanner::calc_bound_info that can outsource the Y calculation to another function, and I wouldn't want to code dup all of the parts of Line_spanner::calc_bound_info that are worth keeping into a glissando specific function. Taking that into account, does that seem like the right approach? Now I've thought about it a bit more, it seems to be the only approach that will work since the original grob no longer exists if you defer the calculation (I did say my question might be silly. :) BTW, I notice there's another (undocumented) key in bound-details which you're ignoring when the before-line-breaking callback is called: 'default Cheers, Neil
Sign in to reply to this message.
On Jun 26, 2011, at 4:57 PM, Neil Puttock wrote: > On 13 June 2011 12:03, <mike@apollinemike.com> wrote: > >> My goal is to bypass the default calculation and replace it with this one, and it is easier to harvest the information about Y placement relative to the staff before line breaking happens. Currently, there is no mechanism in Line_spanner::calc_bound_info that can outsource the Y calculation to another function, and I wouldn't want to code dup all of the parts of Line_spanner::calc_bound_info that are worth keeping into a glissando specific function. Taking that into account, does that seem like the right approach? > > Now I've thought about it a bit more, it seems to be the only approach > that will work since the original grob no longer exists if you defer > the calculation (I did say my question might be silly. :) > > BTW, I notice there's another (undocumented) key in bound-details > which you're ignoring when the before-line-breaking callback is > called: 'default > > Cheers, > Neil > Thanks Neil! New patch uploaded that looks for 'default and factors it into the bound details. Cheers, MS
Sign in to reply to this message.
http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... File input/regression/glissando-broken-multiple.ly (right): http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:7: ragged-right = ##T } ##t } http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:10: \override Glissando #'breakable = ##t you probably also want after-line-breaking = ##t to show the last glissando http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:11: d1 \glissando | d1\glissando http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:15: c,1^\ff\trill is the dynamic relevant? http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm File scm/output-lib.scm (right): http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode798 scm/output-lib.scm:798: (define-public (glissando::before-line-breaking grob) use assoc-set! to simplify this (i.e., just mutate bound-details instead of rebuilding it) http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode809 scm/output-lib.scm:809: (ly:grob-set-property! grob 'bound-details bd))) (set! (ly:grob-property grob 'bound-details) http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode811 scm/output-lib.scm:811: (define-public (glissando::internal-before-line-breaking grob dir) define inside callback as helper function http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode823 scm/output-lib.scm:823: (extra-dy (assoc-get 'extra-dy details 0.0)) extra-dy isn't a nested property http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode826 scm/output-lib.scm:826: (y (+ (interval-center (ly:grob-extent bound common-y Y)) this overwrites user override for 'Y http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode829 scm/output-lib.scm:829: (cons (cons 'Y y) details))) (acons 'Y y details)
Sign in to reply to this message.
http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... File input/regression/glissando-broken-multiple.ly (right): http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:7: ragged-right = ##T } On 2011/06/26 17:01:36, Neil Puttock wrote: > ##t > } Done. http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:10: \override Glissando #'breakable = ##t On 2011/06/26 17:01:36, Neil Puttock wrote: > you probably also want after-line-breaking = ##t to show the last glissando Done. http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:11: d1 \glissando | On 2011/06/26 17:01:36, Neil Puttock wrote: > d1\glissando Done. http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:15: c,1^\ff\trill On 2011/06/26 17:01:36, Neil Puttock wrote: > is the dynamic relevant? Done. http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm File scm/output-lib.scm (right): http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode798 scm/output-lib.scm:798: (define-public (glissando::before-line-breaking grob) On 2011/06/26 17:01:36, Neil Puttock wrote: > use assoc-set! to simplify this (i.e., just mutate bound-details instead of > rebuilding it) Done. http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode809 scm/output-lib.scm:809: (ly:grob-set-property! grob 'bound-details bd))) On 2011/06/26 17:01:36, Neil Puttock wrote: > (set! (ly:grob-property grob 'bound-details) Done. http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode811 scm/output-lib.scm:811: (define-public (glissando::internal-before-line-breaking grob dir) On 2011/06/26 17:01:36, Neil Puttock wrote: > define inside callback as helper function Done. http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode823 scm/output-lib.scm:823: (extra-dy (assoc-get 'extra-dy details 0.0)) On 2011/06/26 17:01:36, Neil Puttock wrote: > extra-dy isn't a nested property Done. http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode826 scm/output-lib.scm:826: (y (+ (interval-center (ly:grob-extent bound common-y Y)) On 2011/06/26 17:01:36, Neil Puttock wrote: > this overwrites user override for 'Y Fixed to allow for user Y offset. http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode829 scm/output-lib.scm:829: (cons (cons 'Y y) details))) On 2011/06/26 17:01:36, Neil Puttock wrote: > (acons 'Y y details) Done.
Sign in to reply to this message.
On 11-06-27 01:16 AM, mtsolo@gmail.com wrote: > > http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... > > File input/regression/glissando-broken-multiple.ly (right): > > http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... > > input/regression/glissando-broken-multiple.ly:7: ragged-right = ##T } > On 2011/06/26 17:01:36, Neil Puttock wrote: >> ##t >> } > > Done. > > http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... > > input/regression/glissando-broken-multiple.ly:10: \override Glissando > #'breakable = ##t > On 2011/06/26 17:01:36, Neil Puttock wrote: >> you probably also want after-line-breaking = ##t to show the last > glissando > > Done. > > http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... > > input/regression/glissando-broken-multiple.ly:11: d1 \glissando | > On 2011/06/26 17:01:36, Neil Puttock wrote: >> d1\glissando > > Done. > > http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... > > input/regression/glissando-broken-multiple.ly:15: c,1^\ff\trill > On 2011/06/26 17:01:36, Neil Puttock wrote: >> is the dynamic relevant? > > Done. > > http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm > File scm/output-lib.scm (right): > > http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode798 > > scm/output-lib.scm:798: (define-public (glissando::before-line-breaking > grob) > On 2011/06/26 17:01:36, Neil Puttock wrote: >> use assoc-set! to simplify this (i.e., just mutate bound-details > instead of >> rebuilding it) > > Done. > > http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode809 > > scm/output-lib.scm:809: (ly:grob-set-property! grob 'bound-details bd))) > On 2011/06/26 17:01:36, Neil Puttock wrote: >> (set! (ly:grob-property grob 'bound-details) > > Done. > > http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode811 > > scm/output-lib.scm:811: (define-public > (glissando::internal-before-line-breaking grob dir) > On 2011/06/26 17:01:36, Neil Puttock wrote: >> define inside callback as helper function > > Done. > > http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode823 > > scm/output-lib.scm:823: (extra-dy (assoc-get 'extra-dy details 0.0)) > On 2011/06/26 17:01:36, Neil Puttock wrote: >> extra-dy isn't a nested property > > Done. > > http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode826 > > scm/output-lib.scm:826: (y (+ (interval-center (ly:grob-extent bound > common-y Y)) > On 2011/06/26 17:01:36, Neil Puttock wrote: >> this overwrites user override for 'Y > > Fixed to allow for user Y offset. > > http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode829 > > scm/output-lib.scm:829: (cons (cons 'Y y) details))) > On 2011/06/26 17:01:36, Neil Puttock wrote: >> (acons 'Y y details) > > Done. > > http://codereview.appspot.com/4527086/ Would you (Mike and Neil) like me to re-start the countdown? Otherwise, Neil, if you're happy with Mike's changes, this can be pushed, marked closed on Reitveld and fixed on the tracker. Thanks, Mike and Neil Colin -- The human race has one really effective weapon, and that is laughter. -- Mark Twain
Sign in to reply to this message.
On Jun 27, 2011, at 3:14 PM, Colin Campbell wrote: > On 11-06-27 01:16 AM, mtsolo@gmail.com wrote: >> >> http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... >> File input/regression/glissando-broken-multiple.ly (right): >> >> http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... >> input/regression/glissando-broken-multiple.ly:7: ragged-right = ##T } >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> ##t >>> } >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... >> input/regression/glissando-broken-multiple.ly:10: \override Glissando >> #'breakable = ##t >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> you probably also want after-line-breaking = ##t to show the last >> glissando >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... >> input/regression/glissando-broken-multiple.ly:11: d1 \glissando | >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> d1\glissando >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/input/regression/glissando-b... >> input/regression/glissando-broken-multiple.ly:15: c,1^\ff\trill >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> is the dynamic relevant? >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm >> File scm/output-lib.scm (right): >> >> http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode798 >> scm/output-lib.scm:798: (define-public (glissando::before-line-breaking >> grob) >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> use assoc-set! to simplify this (i.e., just mutate bound-details >> instead of >>> rebuilding it) >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode809 >> scm/output-lib.scm:809: (ly:grob-set-property! grob 'bound-details bd))) >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> (set! (ly:grob-property grob 'bound-details) >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode811 >> scm/output-lib.scm:811: (define-public >> (glissando::internal-before-line-breaking grob dir) >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> define inside callback as helper function >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode823 >> scm/output-lib.scm:823: (extra-dy (assoc-get 'extra-dy details 0.0)) >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> extra-dy isn't a nested property >> >> Done. >> >> http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode826 >> scm/output-lib.scm:826: (y (+ (interval-center (ly:grob-extent bound >> common-y Y)) >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> this overwrites user override for 'Y >> >> Fixed to allow for user Y offset. >> >> http://codereview.appspot.com/4527086/diff/17001/scm/output-lib.scm#newcode829 >> scm/output-lib.scm:829: (cons (cons 'Y y) details))) >> On 2011/06/26 17:01:36, Neil Puttock wrote: >>> (acons 'Y y details) >> >> Done. >> >> http://codereview.appspot.com/4527086/ > > > > Would you (Mike and Neil) like me to re-start the countdown? Otherwise, Neil, if you're happy with Mike's changes, this can be pushed, marked closed on Reitveld and fixed on the tracker. > > Thanks, Mike and Neil Hey Colin, If you have time to run the regtests on the new patch, I'd appreciate it (I'm slammed for time today & tomorrow). Cheers, MS
Sign in to reply to this message.
On Mon, Jun 27, 2011 at 03:17:40PM +0200, mike@apollinemike.com wrote: > > Would you (Mike and Neil) like me to re-start the countdown? Otherwise, Neil, if you're happy with Mike's changes, this can be pushed, marked closed on Reitveld and fixed on the tracker. > > If you have time to run the regtests on the new patch, I'd appreciate it (I'm slammed for time today & tomorrow). This should absolutely be put on another countdown. Not necessary the countdown for Monday; there's 9 other patches waiting for review. Especially since it hasn't been checked with the regtests. I've marked this as patch-new to attract James' attention to do a regtest comparison. If he does that in the next 2 days, then maybe this could go on Wednesday's countdown? Cheers, - Graham
Sign in to reply to this message.
http://codereview.appspot.com/4527086/diff/23001/scm/output-lib.scm File scm/output-lib.scm (right): http://codereview.appspot.com/4527086/diff/23001/scm/output-lib.scm#newcode798 scm/output-lib.scm:798: (define-public (glissando::before-line-breaking grob) add docstring inside function http://codereview.appspot.com/4527086/diff/23001/scm/output-lib.scm#newcode799 scm/output-lib.scm:799: (define (glissando::internal-before-line-breaking grob dir) I think it would be nicer to junk this and use for-each, particularly since you're reading bound-details three times (and extra-dy twice): (define-public (glissando::before-line-breaking grob) (let ((bound-details (ly:grob-property grob 'bound-details)) (extra-dy (ly:grob-property grob 'extra-dy 0.0))) (for-each (lambda (dir-sym) (let* ((details (assoc-get dir-sym bound-details)) (dir (if (eq? dir-sym 'left) LEFT RIGHT)) (bound (ly:spanner-bound grob dir)) (common-y (ly:grob-common-refpoint grob bound Y)) (y (+ (interval-center (ly:grob-extent bound common-y Y)) (/ (* dir extra-dy) 2)))) (if (not (assoc-get 'Y details)) (set! bound-details (assoc-set! bound-details dir-sym (acons 'Y y details)))))) '(left right)) (set! (ly:grob-property grob 'bound-details) bound-details))) http://codereview.appspot.com/4527086/diff/23001/scm/output-lib.scm#newcode800 scm/output-lib.scm:800: (let* ((orig (ly:grob-original grob)) What's going on here? :) http://codereview.appspot.com/4527086/diff/23001/scm/output-lib.scm#newcode806 scm/output-lib.scm:806: (ly:spanner-broken-into orig))))) will always be empty since line breaking hasn't happened yet http://codereview.appspot.com/4527086/diff/23001/scm/output-lib.scm#newcode821 scm/output-lib.scm:821: (assoc-set! bound-details 'left l) (set! bound-details (assoc-set! bound-details 'left l)) is safer
Sign in to reply to this message.
Hello, I get a strange error when I apply this patch and then run 'make'. --make[2]: Entering directory `/home/james/lilypond-git/Documentation/topdocs' LILYPOND_VERSION=2.15.3 /usr/bin/python ../../scripts/lilypond-book.py -I ./ -I ./out -I ../../input -I /home/james/lilypond-git/Documentation -I /home/james/lilypond-git/Documentation/snippets -I ../../input/regression/ -I /home/james/lilypond-git/Documentation/included/ -I /home/james/lilypond-git/mf/out/ -I /home/james/lilypond-git/mf/out/ -I /home/james/lilypond-git/Documentation/pictures -I /home/james/lilypond-git/Documentation/pictures/./out --process='true -I ./ -I ./out -I ../../input -I /home/james/lilypond-git/Documentation -I /home/james/lilypond-git/Documentation/snippets -I ../../input/regression/ -I /home/james/lilypond-git/Documentation/included/ -I /home/james/lilypond-git/mf/out/ -I /home/james/lilypond-git/mf/out/ -I /home/james/lilypond-git/Documentation/pictures -I /home/james/lilypond-git/Documentation/pictures/./out -dbackend=eps --formats=ps,png,pdf -djob-count=7 -dinclude-eps-fonts -dgs-load-fonts --header=doctitle --header=doctitlecs --header=doctitlede --header=doctitlees --header=doctitlefr --header=doctitlehu --header=doctitleit --header=doctitleja --header=doctitlenl --header=doctitlezh --header=texidoc --header=texidoccs --header=texidocde --header=texidoces --header=texidocfr --header=texidochu --header=texidocit --header=texidocja --header=texidocnl --header=texidoczh -dcheck-internal-types -ddump-signatures -danti-alias-factor=2' --output=./out --format=texi --verbose --skip-lily-check --lily-output-dir /home/james/lilypond-git/out/lybook-db out/NEWS.tely then it continues on for a bit and I get Writing snippets... All snippets are up to date... Compiling /home/james/lilypond-git/Documentation/topdocs/out/common-macros.texi... /home/james/lilypond-git/Documentation/topdocs/out/common-macros.texi is up to date. rm out/NEWS.texi out/weblinks.itexi make[2]: Leaving directory `/home/james/lilypond-git/Documentation/topdocs' make[1]: *** [all] Error 2 rm out/weblinks.itexi make[1]: Leaving directory `/home/james/lilypond-git/Documentation' make: *** [all] Error 2 james@james-LilybuntuVM:~/lilypond-git$ --- I've tried it twice now and even just went through the regtest procedure without adding a patch just to make sure my build was ok (I did a git pull before I did this). No errors. Only when I apply the patch. James
Sign in to reply to this message.
Sorry, I didn't realise my clipboard buffer was as small as it was. The error was incomplete in the previous comment. I'll try again. > > --make[2]: Entering directory `/home/james/lilypond-git/Documentation/topdocs' > LILYPOND_VERSION=2.15.3 /usr/bin/python ../../scripts/lilypond-book.py -I ./ -I > ./out -I ../../input -I /home/james/lilypond-git/Documentation -I > /home/james/lilypond-git/Documentation/snippets -I ../../input/regression/ -I > /home/james/lilypond-git/Documentation/included/ -I > /home/james/lilypond-git/mf/out/ -I /home/james/lilypond-git/mf/out/ -I > /home/james/lilypond-git/Documentation/pictures -I > /home/james/lilypond-git/Documentation/pictures/./out --process='true -I ./ -I > ./out -I ../../input -I /home/james/lilypond-git/Documentation -I > /home/james/lilypond-git/Documentation/snippets -I ../../input/regression/ -I > /home/james/lilypond-git/Documentation/included/ -I > /home/james/lilypond-git/mf/out/ -I /home/james/lilypond-git/mf/out/ -I > /home/james/lilypond-git/Documentation/pictures -I > /home/james/lilypond-git/Documentation/pictures/./out -dbackend=eps > --formats=ps,png,pdf -djob-count=7 -dinclude-eps-fonts -dgs-load-fonts > --header=doctitle --header=doctitlecs --header=doctitlede --header=doctitlees > --header=doctitlefr --header=doctitlehu --header=doctitleit --header=doctitleja > --header=doctitlenl --header=doctitlezh --header=texidoc --header=texidoccs > --header=texidocde --header=texidoces --header=texidocfr --header=texidochu > --header=texidocit --header=texidocja --header=texidocnl --header=texidoczh > -dcheck-internal-types -ddump-signatures -danti-alias-factor=2' --output=./out > --format=texi --verbose --skip-lily-check --lily-output-dir > /home/james/lilypond-git/out/lybook-db out/NEWS.tely > then it continues... /usr/bin/python /home/james/lilypond-git/scripts/build/create-weblinks-itexi.py > out/weblinks.itexi LANG= makeinfo --enable-encoding -I /home/james/lilypond-git/Documentation -I /home/james/lilypond-git/Documentation/usage -I /home/james/lilypond-git/Documentation/contributor -I. -I./out --no-split --no-headers --output out/AUTHORS.txt out/AUTHORS.texi LANG= makeinfo --enable-encoding -I /home/james/lilypond-git/Documentation -I /home/james/lilypond-git/Documentation/usage -I /home/james/lilypond-git/Documentation/contributor -I. -I./out --no-split --no-headers --output out/INSTALL.txt out/INSTALL.texi out/AUTHORS.texi: No such file or directory make[2]: *** [out/AUTHORS.txt] Error 1 make[2]: *** Waiting for unfinished jobs.... out/INSTALL.texi: No such file or directory make[2]: *** [out/INSTALL.txt] Error 1 lilypond-book.py (GNU LilyPond) 2.15.3 Reading out/NEWS.tely... Dissecting... Writing snippets... --snip--- and THEN it finishes with the Error 2 above. James
Sign in to reply to this message.
On 2011/06/27 23:17:21, J_lowe wrote: > --no-headers --output out/INSTALL.txt out/INSTALL.texi > out/AUTHORS.texi: No such file or directory > make[2]: *** [out/AUTHORS.txt] Error 1 > make[2]: *** Waiting for unfinished jobs.... > out/INSTALL.texi: No such file or directory > make[2]: *** [out/INSTALL.txt] Error 1 > lilypond-book.py (GNU LilyPond) 2.15.3 > Reading out/NEWS.tely... > Dissecting... > Writing snippets... That looks like the normal problem when compiling with -j2 or -j3 (or -j8). There's something like a 10-20% random chance of the build dying. It never happens with a clean build dir, and I've never seen it three times in a row. If you do another make, it should be fine... if you're paranoid, then you could do a make without any -j options.
Sign in to reply to this message.
> > > That looks like the normal problem when compiling with -j2 or -j3 (or -j8). Thanks, I turned it off and had no problems. Oh well. Anyway, no problems with reg tests.
Sign in to reply to this message.
Thanks Neil! I copied and pasted your function into the code and it works well. I am not used to non-recursive looping functions in Scheme, as I often erroneously conceive of Scheme as a language that doesn't remember the values of variables outside of certain contexts (define, let, etc.). I'll get better at that, but for the meantime, thanks for your work! Cheers, MS
Sign in to reply to this message.
LGTM, but needs a rebase to remove the changes in Documentation/contributor/issues.itexi. http://codereview.appspot.com/4527086/diff/30001/input/regression/glissando-b... File input/regression/glissando-broken-multiple.ly (right): http://codereview.appspot.com/4527086/diff/30001/input/regression/glissando-b... input/regression/glissando-broken-multiple.ly:13: d1 \glissando d1\glissando
Sign in to reply to this message.
On Jun 30, 2011, at 5:07 PM, n.puttock@gmail.com wrote: > LGTM, but needs a rebase to remove the changes in > Documentation/contributor/issues.itexi. > > > http://codereview.appspot.com/4527086/diff/30001/input/regression/glissando-b... > File input/regression/glissando-broken-multiple.ly (right): > > http://codereview.appspot.com/4527086/diff/30001/input/regression/glissando-b... > input/regression/glissando-broken-multiple.ly:13: d1 \glissando > d1\glissando > Good deal. Could someone that's not working on the source pretty please run the regtests on this (it has changed a fair bit since the last regtests were run) - I've got my computer tied up in other development stuff for the night. Cheers, MS
Sign in to reply to this message.
On 2011/06/30 15:22:18, mike_apollinemike.com wrote: > On Jun 30, 2011, at 5:07 PM, mailto:n.puttock@gmail.com wrote: > > > LGTM, but needs a rebase to remove the changes in > > Documentation/contributor/issues.itexi. > > > > > > > http://codereview.appspot.com/4527086/diff/30001/input/regression/glissando-b... > > File input/regression/glissando-broken-multiple.ly (right): > > > > > http://codereview.appspot.com/4527086/diff/30001/input/regression/glissando-b... > > input/regression/glissando-broken-multiple.ly:13: d1 \glissando > > d1\glissando > > > > Good deal. Could someone that's not working on the source pretty please run the > regtests on this (it has changed a fair bit since the last regtests were run) - > I've got my computer tied up in other development stuff for the night. > > Cheers, > MS Reg test is fine. James
Sign in to reply to this message.
Added issue 1728 to tracker
Sign in to reply to this message.
On 2011/07/01 02:28:46, Colin Campbell wrote: > Added issue 1728 to tracker Thanks for the comments & regtest checking. Pushed as 4e55f40a1bf65633fedc62d09d91d8e3c0247efe. Cheers, MS
Sign in to reply to this message.
http://codereview.appspot.com/4527086/diff/31002/scm/output-lib.scm File scm/output-lib.scm (right): http://codereview.appspot.com/4527086/diff/31002/scm/output-lib.scm#newcode798 scm/output-lib.scm:798: (define-public (glissando::before-line-breaking grob) before/after-linebreaking methods should only be used for manipulating pointers between objects. this computation here can be done with properties. Can you adopt an action to change this? http://codereview.appspot.com/4527086/diff/31002/scm/output-lib.scm#newcode809 scm/output-lib.scm:809: (y (+ (interval-center (ly:grob-extent bound common-y Y)) this may trigger vertical staff positioning (which can only done after line breaks). before/after-linebreaking methods should only be used for manipulating pointers between objects, and everything else should use callbacks on properties. Can you adopt an action item to change this?
Sign in to reply to this message.
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
