Re: bookOutputName broken

2011-09-21 Thread Benkő Pál
Neil, David,

>>> I don't know what to do, could you help me?
>>
>> The attached patch works for me (haven't run make check on it though).
>
> I have taken the liberty of pushing it after looking it through

thanks to both of you: the patch works and I've learnt something
about LilyPond again.

p

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: bookOutputName broken

2011-09-21 Thread David Kastrup
Neil Puttock  writes:

> On 20 September 2011 21:50, Benkő Pál  wrote:
>
>> I don't know what to do, could you help me?
>
> The attached patch works for me (haven't run make check on it though).

I have taken the liberty of pushing it after looking it through (I don't
quite like relying on the implicit $$ = $1 action, but then the whole
other book_body and bookpart_body rules do exactly that, so there is
little point in making the new rules different).  It definitely is a
better solution than reverting the patch exhibiting the problem.  Which
does not mean that there is a guarantee no other commands from my patch
might lead to similar surprises.

-- 
David Kastrup


___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: bookOutputName broken

2011-09-20 Thread David Kastrup
Neil Puttock  writes:

> On 20 September 2011 21:50, Benkő Pál  wrote:
>
>> I don't know what to do, could you help me?
>
> The attached patch works for me (haven't run make check on it though).

That would pretty much be what I would consider a proper fix and making
Lilypond behave more like the user (not just
David-on-a-code-wrangling-spree) would expect.

-- 
David Kastrup

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: bookOutputName broken

2011-09-20 Thread David Kastrup
Benkő Pál  writes:

> hi David,
>
> LilyPond barfs at
>
> \book
> {
>   \bookOutputName "foo"
>
>   { a' }
> }
>
> git bisect gave me commit
> 24fdf0d37cec73564162324ab74ed5e3a6824e8c
> to blame.
>
> I don't know what to do, could you help me?

The easiest thing to do is to revert the patch.  After all, we are
shortly before release.

The patch replaces music functions returning void music with Scheme
functions that make much more sense in this context.  However, a book
block strangely does not even permit Scheme expressions inside, but has
no problem with void music.

This is rather braindead and probably an oversight.  But doing a proper
and thorough testing of all music functions I replaced is going to be
work, and as one can see, more important than checking that the function
does the same work as before (that's rather obvious) will be that its
usual mode of employment is in locations where Scheme functions can be
called just as well as music functions.  This was a bulk replacement,
and going through with a finer comb than the regtests is
time-consuming.  So reverting the commit and registering it as
"patch-needs-work" would likely be the prudent thing to do.

-- 
David Kastrup


___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


Re: bookOutputName broken

2011-09-20 Thread Neil Puttock
On 20 September 2011 21:50, Benkő Pál  wrote:

> I don't know what to do, could you help me?

The attached patch works for me (haven't run make check on it though).

Cheers,
Neil
From f6f1ad62263b4dfb5f518da71891d3a0b30c89a3 Mon Sep 17 00:00:00 2001
From: Neil Puttock 
Date: Tue, 20 Sep 2011 22:18:55 +0100
Subject: [PATCH] parser.yy: Allow embedded_scm inside \book & and \bookpart

---
 lily/parser.yy |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lily/parser.yy b/lily/parser.yy
index 02c99e2..df3067b 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -791,6 +791,7 @@ book_body:
 	| book_body lilypond_header {
 		$$->header_ = $2;
 	}
+	| book_body embedded_scm { }
 	| book_body error {
 		$$->paper_ = 0;
 		$$->scores_ = SCM_EOL;
@@ -843,6 +844,7 @@ bookpart_body:
 	| bookpart_body lilypond_header {
 		$$->header_ = $2;
 	}
+	| bookpart_body embedded_scm { }
 	| bookpart_body error {
 		$$->paper_ = 0;
 		$$->scores_ = SCM_EOL;
-- 
1.7.4.1

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel


bookOutputName broken

2011-09-20 Thread Benkő Pál
hi David,

LilyPond barfs at

\book
{
  \bookOutputName "foo"

  { a' }
}

git bisect gave me commit
24fdf0d37cec73564162324ab74ed5e3a6824e8c
to blame.

I don't know what to do, could you help me?

p

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel