|
|
Created:
9 years, 3 months ago by Peter Chubb Modified:
9 years, 3 months ago CC:
peter.chubb_nicta.com.au, lilypond-devel_gnu.org Visibility:
Public. |
DescriptionArticulate.ly: Fix trill-span errors
The last change introduced a bug: ac:twiddletime returns a moment, and it was changed to return a duration. This causes a lilypond error when using trillspan
and articulate.
---
ly/articulate.ly | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Patch Set 1 #Patch Set 2 : articulate.ly: fix \trillSpan problem #Patch Set 3 : articulate.ly: fix \trillSpan problem #Patch Set 4 : articulate.ly: fix \trillSpan problem #Patch Set 5 : articulate.ly: Fix \trillSpan problem #MessagesTotal messages: 24
Note this includes (because it was based on) the issue that fixed the trill timing, issue https://codereview.appspot.com/173750043/
Sign in to reply to this message.
Patch on countdown for Jan 10th
Sign in to reply to this message.
Peter this patch has been counted down - if you don't have push permissions, then send me a git-formatted patch and I can push it for you. Regards James
Sign in to reply to this message.
>>>>> "pkx166h" == pkx166h <pkx166h@gmail.com> writes: pkx166h> Peter this patch has been counted down - if you don't have pkx166h> push permissions, then send me a git-formatted patch and I pkx166h> can push it for you. I don't have push permissions. Attached is the patch. Note it relies on a previous patch, the `Fix Trill Timing' patch by Tristan which I've also included.
Sign in to reply to this message.
Peter, On 11/01/15 18:43, peter@chubb.wattle.id.au wrote: >>>>>> "pkx166h" == pkx166h <pkx166h@gmail.com> writes: > > pkx166h> Peter this patch has been counted down - if you don't have > pkx166h> push permissions, then send me a git-formatted patch and I > pkx166h> can push it for you. > > I don't have push permissions. > OK no problem. > Attached is the patch. Note it relies on a previous patch, the `Fix > Trill Timing' patch by Tristan which I've also included. That patch didn't get approval yet. Please see https://codereview.appspot.com/173750043 (This is tracker issus https://code.google.com/p/lilypond/issues/detail?id=4190) Dan Eble had some comments and it wasn't clear to me that they were something that needed some 'fix' or 'improvement' to the patch that Tristan did. So if yours requires Tristans, I cannot yet apply either. Please can you (and Tristan) take a look at the link above and answer whatever needs to be answered. Thanks James
Sign in to reply to this message.
If Dr. Chubb likes Tristan's patch, please don't let my comments prevent progress.
Sign in to reply to this message.
On 2015/01/12 00:57:47, Dan Eble wrote: > If Dr. Chubb likes Tristan's patch, please don't let my comments prevent > progress. Peter can you just confirm that Tristan's patch is OK https://codereview.appspot.com/173750043 Then I can push what you sent me yesterday. James
Sign in to reply to this message.
>>>>> "pkx166h" == pkx166h <pkx166h@gmail.com> writes: pkx166h> On 2015/01/12 00:57:47, Dan Eble wrote: >> If Dr. Chubb likes Tristan's patch, please don't let my comments pkx166h> prevent >> progress. pkx166h> Peter can you just confirm that Tristan's patch is OK Yes it's OK. pkx166h> https://codereview.appspot.com/173750043 pkx166h> Then I can push what you sent me yesterday. pkx166h> James pkx166h> https://codereview.appspot.com/190530043/
Sign in to reply to this message.
This has been pushed: author Peter Chubb <peter.chubb@nicta.com.au> Mon, 12 Jan 2015 18:45:55 +0000 (18:45 +0000) committer James Lowe <pkx166h@gmail.com> Mon, 12 Jan 2015 19:11:12 +0000 (19:11 +0000) commit 88e1d22cbd8dc37a886b1733ee95c48da1b0f06d thanks for your help Peter.
Sign in to reply to this message.
articulate.ly: fix \trillSpan problem
Sign in to reply to this message.
articulate.ly: fix \trillSpan problem
Sign in to reply to this message.
articulate.ly: fix \trillSpan problem
Sign in to reply to this message.
articulate.ly: Fix \trillSpan problem
Sign in to reply to this message.
On 2015/01/20 22:08:16, Peter Chubb wrote: > articulate.ly: Fix \trillSpan problem Peter, I can see 4 patches uploaded here but it looks like from the time stamps that this was some git-cl error or something similar? Can you confirm in case you need anything testing James
Sign in to reply to this message.
>>>>> "pkx166h" == pkx166h <pkx166h@gmail.com> writes: pkx166h> On 2015/01/20 22:08:16, Peter Chubb wrote: >> articulate.ly: Fix \trillSpan problem pkx166h> Peter, I can see 4 patches uploaded here but it looks like pkx166h> from the time stamps that this was some git-cl error or pkx166h> something similar? There was supposed to be only one. git format-patch origin yields: From 47e8cd08748e2d1d00a725148511f8290eed8f8e Mon Sep 17 00:00:00 2001 From: Peter Chubb <peter.chubb@nicta.com.au> Date: Wed, 21 Jan 2015 08:18:19 +1100 Subject: [PATCH] Fix trill-span errors The last change introduced a bug: ac:twiddletime returns a moment, and it was changed to return a duration. This causes a lilypond error when using trillspan and articulate. --- ly/articulate.ly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ly/articulate.ly b/ly/articulate.ly index 706c57c..bbfea19 100644 --- a/ly/articulate.ly +++ b/ly/articulate.ly @@ -347,11 +347,11 @@ (ly:music-property music 'elements))) (pre-t (if (pair? tr) (ly:music-property (car tr) 'twiddle) '())) - (hemisemidur (ly:make-duration 5 0 1/1)) + (hemisemimom (ly:make-moment 1/64)) (t (ac:targetTwiddleTime))) (if (ly:moment? pre-t) pre-t - hemisemidur))) + hemisemimom))) -- 2.1.4
Sign in to reply to this message.
On 2015/01/21 22:04:27, peter_chubb.wattle.id.au wrote: > >>>>> "pkx166h" == pkx166h <mailto:pkx166h@gmail.com> writes: > > pkx166h> On 2015/01/20 22:08:16, Peter Chubb wrote: > >> articulate.ly: Fix \trillSpan problem > > pkx166h> Peter, I can see 4 patches uploaded here but it looks like > pkx166h> from the time stamps that this was some git-cl error or > pkx166h> something similar? > > There was supposed to be only one. > git format-patch origin > yields: > > From 47e8cd08748e2d1d00a725148511f8290eed8f8e Mon Sep 17 00:00:00 2001 > From: Peter Chubb <mailto:peter.chubb@nicta.com.au> > Date: Wed, 21 Jan 2015 08:18:19 +1100 > Subject: [PATCH] Fix trill-span errors > > The last change introduced a bug: ac:twiddletime returns a moment, and it > was changed to return a duration. This causes a lilypond error when > using trillspan and articulate. > --- > ly/articulate.ly | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/ly/articulate.ly b/ly/articulate.ly > index 706c57c..bbfea19 100644 > --- a/ly/articulate.ly > +++ b/ly/articulate.ly > @@ -347,11 +347,11 @@ > (ly:music-property music 'elements))) > (pre-t (if (pair? tr) (ly:music-property (car tr) 'twiddle) > '())) > - (hemisemidur (ly:make-duration 5 0 1/1)) > + (hemisemimom (ly:make-moment 1/64)) > (t (ac:targetTwiddleTime))) > (if (ly:moment? pre-t) > pre-t > - hemisemidur))) > + hemisemimom))) > > > > -- > 2.1.4 > OK thanks. I have created a new tracker for this and will test/manage the fix using it: https://code.google.com/p/lilypond/issues/detail?id=4270&thanks=4270 so we have coherent issue history (at least from my point of view when trying to manage the patches for testing). As and when this is ready to push, could you change the commit message accordingly? Again just so that everyone can follow this in git from an historical perspective and we don't have two checkins that have identical commit messages for different 'fixes'. Thanks James I'll re-use this
Sign in to reply to this message.
Patchy the autobot says: passes tests. Includes a full make doc
Sign in to reply to this message.
>>>>> "pkx166h" == pkx166h <pkx166h@gmail.com> writes: pkx166h> On 2015/01/21 22:04:27, peter_chubb.wattle.id.au wrote: >> >>>>> "pkx166h" == pkx166h <mailto:pkx166h@gmail.com> writes: pkx166h> As and when this is ready to push, could you change the pkx166h> commit message accordingly? Again just so that everyone can pkx166h> follow this in git from an historical perspective and we pkx166h> don't have two checkins that have identical commit messages pkx166h> for different 'fixes'. Would it be easier if I made my git repo available so you can just pull from it? Then you'd get the history and proper commit message. Peter C
Sign in to reply to this message.
On 23/01/15 22:08, peter@chubb.wattle.id.au wrote: >>>>>> "pkx166h" == pkx166h <pkx166h@gmail.com> writes: > > pkx166h> On 2015/01/21 22:04:27, peter_chubb.wattle.id.au wrote: >>>>>>>> "pkx166h" == pkx166h <mailto:pkx166h@gmail.com> writes: > > pkx166h> As and when this is ready to push, could you change the > pkx166h> commit message accordingly? Again just so that everyone can > pkx166h> follow this in git from an historical perspective and we > pkx166h> don't have two checkins that have identical commit messages > pkx166h> for different 'fixes'. > > > Would it be easier if I made my git repo available so you can just > pull from it? Then you'd get the history and proper commit message. Not really :) It's hard enough for me to keep track of all the normal tracker items and tracker-less Rietveld issues from those random/irregular contributors as it is. Thanks for the offer though. If you do submit something and you don't see it tested or commented on, feel free to ping me and I can follow it up. James
Sign in to reply to this message.
Patch on countdown for Jan 29th
Sign in to reply to this message.
As requested I've changed the issue description. Peter C
Sign in to reply to this message.
On 2015/01/26 21:02:56, peter_chubb.wattle.id.au wrote: > As requested I've changed the issue description. > > Peter C Peter this has been counted down now - can you send me a git formatted patch and I can push it for you. Thanks James
Sign in to reply to this message.
>>>>> "/pkx166h" == pkx166h <pkx166h@gmail.com> writes: /pkx166h> On 2015/01/26 21:02:56, peter_chubb.wattle.id.au wrote: /pkx166h> Peter this has been counted down now - can you send me a git /pkx166h> formatted patch and I can push it for you. Attached.
Sign in to reply to this message.
On 2015/01/29 21:51:15, peter_chubb.wattle.id.au wrote: > >>>>> "/pkx166h" == pkx166h <mailto:pkx166h@gmail.com> writes: > > /pkx166h> On 2015/01/26 21:02:56, peter_chubb.wattle.id.au wrote: > /pkx166h> Peter this has been counted down now - can you send me a git > /pkx166h> formatted patch and I can push it for you. > > Attached. > author Peter Chubb <peter.chubb@nicta.com.au> Tue, 20 Jan 2015 21:18:19 +0000 (08:18 +1100) committer James Lowe <pkx166h@gmail.com> Fri, 30 Jan 2015 12:52:56 +0000 (12:52 +0000) commit 78d61618c8216cb9199dd2be288afd0cedf15aaa Thank you again Peter. James
Sign in to reply to this message.
|