lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Latest commit breaks master


From: David Kastrup
Subject: Re: Latest commit breaks master
Date: Wed, 19 Dec 2012 12:14:21 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)

James <address@hidden> writes:

> On 19 December 2012 08:11, James <address@hidden> wrote:
>> Hello,
>>
>> author  Jean-Charles Malahieude <address@hidden>
>> Mon, 17 Dec 2012 18:23:13 +0000 (19:23 +0100)
>> committer       Jean-Charles Malahieude <address@hidden>
>> Mon, 17 Dec 2012 18:23:13 +0000 (19:23 +0100)
>> commit  12c6693055728e69dce5c4e5a4a2b5f71180a5e2
>>
>> Any specific reason this wasn't
>>
>> 1. Put up for reivew
>> 2. Pushed to staging first
>>
>> This breaks master because, I am guessing as I haven't done much
>> analysis, the file name contains commas?
>>
>> I'm running patchy merge again (just in case it was something
>> anomolous - I have time, no problem retesting) but could someone
>> revert this or make sure it isn't something else?
>>
>
> Yep this is broken now.
>
> The logs are not that clear in that I get two potential files where
> the problem could have occurred and have attached them, but they look
> innocuous so something more deeper than I can figure out is at hand
> here.

Bah.  After the reverting did not lead to an improvement of the staging
merge, I looked more closely.  Jean-Charles is likely innocent with
regard to the non-compilability.  The real issue more likely is

commit c6e05bf787239140e0e847770c4f8a448ea460d5
Author: David Kastrup <address@hidden>
Date:   Tue Dec 11 10:20:20 2012 +0100

    Issue 3012: Flag an error for isolated post-events occuring in music lists
    
    These can happen when writing things like
    
    c \tweak #'color #red -3
    
    since at the current point of time a tweaked post-event is not
    syntactically recognized as a post-event without leading -, like
    
    c -\tweak #'color #red -3
    
    While this restriction will at some time be removed, in the mean time
    we want to have this problem flagged.

Here is the first of the two problems you listed:

> inst =
> #(define-music-function
>      (parser location string)
>      (string?)
>    #{ ^\markup \bold \box #string #})

A _music_ function returning a _postevent_.

>   b4 bes a2 |
>   \inst "Clarinet"

But used without preceding with - or ^.  Either the above should be an
event function and used as <>-\inst ..., or it should be <>^\markup
inside on its own.  This is exactly the kind of error the above commit
was intended to flag, but it would have been prudent to first check
against the docs before committing.  So I'll take both this my commit as
well as the revert of Jean-Charles' commit out of staging, and we'll see
how happy Patchy will be with that.  And then, of course, we need to
clean the docs of the code that my commit quite correctly feels offended
by.

-- 
David Kastrup




reply via email to

[Prev in Thread] Current Thread [Next in Thread]