[frogs] Re: patch for bug 729

[Andrew Hawryluk <ahawryluk@xxxxxxxxx>]

On Fri, Feb 27, 2009 at 1:17 PM, Carl D. Sorensen <c_sorensen@xxxxxxx> wrote:
>
>
>
> On 2/27/09 9:52 AM, "Mats Bengtsson" <mats.bengtsson@xxxxxxxxx> wrote:
>
>> Not to mention the following example:
>> input/lsr/demo-midiinstruments.ly
>> Hmm, there's some special procedure to update the LSR related stuff, so
>> check out how to
>> get this file updated the proper way.
>
> Don't modify the snippets.  That's handled by running convert-ly on the
> those files.  That's why we try to keep as much syntax as possible in the
> snippets; they're automatically fixed.
>
>
> You only need to modify text in the body of the documentation, including any
> examples that are inline in the docs.
>
> Carl
>
>

Here's the new version with the documentation change.

Andrew

From 404d16892a75df797f0f5c4f893ccbf3fd5b08ec Mon Sep 17 00:00:00 2001
From: Andrew Hawryluk <ahawryluk@xxxxxxxxx>
Date: Fri, 27 Feb 2009 15:29:39 -0700
Subject: [PATCH] MIDI 47: orchestral strings -> orchestral harp

---
 Documentation/user/notation-appendices.itely |    2 +-
 python/convertrules.py                       |    4 +++-
 scm/midi.scm                                 |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index a2b0550..94ece24 100644
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -421,7 +421,7 @@ The following is a list of names that can be used for the
 acoustic grand            contrabass           lead 7 (fifths)
 bright acoustic           tremolo strings      lead 8 (bass+lead)
 electric grand            pizzicato strings    pad 1 (new age)
-honky-tonk                orchestral strings   pad 2 (warm)
+honky-tonk                orchestral harp      pad 2 (warm)
 electric piano 1          timpani              pad 3 (polysynth)
 electric piano 2          string ensemble 1    pad 4 (choir)
 harpsichord               string ensemble 2    pad 5 (bowed)
diff --git a/python/convertrules.py b/python/convertrules.py
index 574e64b..010bf3d 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2874,12 +2874,14 @@ def conv(str):
         raise FatalConversionError ()
     return str
 
-@rule ((2, 13, 0), _ ("keySignature property not reversed any more"))
+@rule ((2, 13, 0), _ ("keySignature property not reversed any more\n\
+MIDI 47: orchestral strings -> orchestral harp"))
 def conv(str):
     if re.search(r'\set Staff.keySignature', str):
         stderr_write ("\n")
         stderr_write (NOT_SMART % _("The alist for Staff.keySignature is no \
 longer in reversed order.\n"))
+    str = str.replace('#"orchestral strings"', '#"orchestral harp"')
     return str
 
 # Guidelines to write rules (please keep this at the end of this file)
diff --git a/scm/midi.scm b/scm/midi.scm
index cb0c0e6..5e956d1 100644
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -122,7 +122,7 @@
 	  ("contrabass" . ,(- 44 1))
 	  ("tremolo strings" . ,(- 45 1))
 	  ("pizzicato strings" . ,(- 46 1))
-	  ("orchestral strings" . ,(- 47 1))
+	  ("orchestral harp" . ,(- 47 1))
 	  ("timpani" . ,(- 48 1))
 
 	  ; (49-56 ensemble)
-- 
1.5.6.3