Re: Git conflicts

2008-06-19 Thread Graham Percival
On Fri, 20 Jun 2008 02:48:06 +0200 Rune Zedeler <[EMAIL PROTECTED]> wrote: > Rune Zedeler skrev: > > (I branched off from 7cfd1d6da86bf8c2eb6391592c84ea361c35ca6d. I > > have only changed 24 files. After pull master I had conflicts in > > almost all files.) > > More specifically: I had conflicts

Re: Git conflicts

2008-06-19 Thread Rune Zedeler
Rune Zedeler skrev: (I branched off from 7cfd1d6da86bf8c2eb6391592c84ea361c35ca6d. I have only changed 24 files. After pull master I had conflicts in almost all files.) More specifically: I had conflicts in 334 files. -Rune ___ lilypond-devel mail

Git conflicts

2008-06-19 Thread Rune Zedeler
As it has been 9 months since i branched off dev/rune I tried to merge master into dev/rune to test how it went. I did $ git checkout dev/rune $ git pull --no-commit . master And then I was flooded with conflicts. Many conflicts was in files that I did not even change. How could this happen, an

Re: MusicXML backend for lilypond?

2008-06-19 Thread Stuart Pullinger
Reinhold Kainhofer wrote: Am Mittwoch, 18. Juni 2008 schrieb Han-Wen Nienhuys: On Wed, Jun 18, 2008 at 3:18 AM, Reinhold Kainhofer <[EMAIL PROTECTED]> wrote: Now that musicxml2ly has been noticed as doing quite a good job, I'm thinking of adding a MusicXML backend to lilypond, so that

Re: Initial sectioning of translated docs

2008-06-19 Thread John Mandereau
On 2008/06/19 18:07 +0200, Francisco Vila wrote: > I have made an initial trial sectioning of Percussion in French and > German docs, as an example. Now the problem is the different snippet > count, what to do here? Ah, updating ly snippets should be a part of a real translation update, but there

Re: Macros in texidoc translations

2008-06-19 Thread John Mandereau
Le jeudi 19 juin 2008 à 13:06 +0200, Francisco Vila a écrit : > Answering to myself, from reading files still in input/lsr it appears > that one can write macros in descriptions, but backslashes have to be > backslashed themselves and double quotes have to be escaped as well, > right? Yes, because

Initial sectioning of translated docs

2008-06-19 Thread Francisco Vila
I have made an initial trial sectioning of Percussion in French and German docs, as an example. Now the problem is the different snippet count, what to do here? I could simply copy them with their rounding English text, this is easy, but it would appear much English text on so-called translated doc

Re: csorensen fork of lilypond

2008-06-19 Thread Han-Wen Nienhuys
On Wed, Jun 18, 2008 at 5:55 PM, Carl D. Sorensen <[EMAIL PROTECTED]> wrote: > Han-Wen, > > I've finally got the csorensen fork ready for cherry picking. It includes a > completely revised file input/regression/fret-diagrams.ly, along with > modifications to scm/define-grobs, scm/define-interfac

RE: csorensen fork of lilypond

2008-06-19 Thread Carl D. Sorensen
> -Original Message- > From: Wilbert Berendsen [mailto:[EMAIL PROTECTED] > Sent: Thursday, June 19, 2008 4:37 AM > To: lilypond-devel@gnu.org > Cc: Carl D. Sorensen > Subject: Re: csorensen fork of lilypond > > Op woensdag 18 juni 2008, schreef Carl D. Sorensen: > > > > for i in fret-pro

Re: [PATCH] Optionally add text to metronome marks (i.e. allow \tempo "Allegro" 4=120)

2008-06-19 Thread Reinhold Kainhofer
Am Freitag, 13. Juni 2008 schrieb Reinhold Kainhofer: > Am Freitag, 13. Juni 2008 schrieb Neil Puttock: > > 2008/6/12 Reinhold Kainhofer <[EMAIL PROTECTED]>: > > > Am Mittwoch, 11. Juni 2008 schrieb Neil Puttock: > > > > > > Here is an updated patch with all the issues resolved. I've also added > >

Re: MusicXML backend for lilypond?

2008-06-19 Thread Reinhold Kainhofer
Am Mittwoch, 18. Juni 2008 schrieb Han-Wen Nienhuys: > On Wed, Jun 18, 2008 at 3:18 AM, Reinhold Kainhofer > > <[EMAIL PROTECTED]> wrote: > > Now that musicxml2ly has been noticed as doing quite a good job, I'm > > thinking of adding a MusicXML backend to lilypond, so that we can also > > produce M

Re: Macros in texidoc translations

2008-06-19 Thread Francisco Vila
Answering to myself, from reading files still in input/lsr it appears that one can write macros in descriptions, but backslashes have to be backslashed themselves and double quotes have to be escaped as well, right? 2008/6/19 Francisco Vila <[EMAIL PROTECTED]>: > In-doc snippet descriptions have m

Macros in texidoc translations

2008-06-19 Thread Francisco Vila
In-doc snippet descriptions have macros into them, but when they get off the texinfo file and go to LSR they lose that macros and become plain text. For the translated strings in input/texidocs that are going to the docs, is it fine for them to have these macros restored? For example @code{} etc,

Re: csorensen fork of lilypond

2008-06-19 Thread Wilbert Berendsen
Op woensdag 18 juni 2008, schreef Carl D. Sorensen: > for i in fret-props: > if re.search (i, str): > stderr_write ('\n') When you only look for plain strings (as is the case), you could write: for i in fret_props: if i in str: stderr.write ... etc best regards, Wilbert Be