MIDI 47: orchestral strings -> orchestral harp

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index a2b055025fad47c2a9bc7291586c99c0980a1175..94ece246e61edee5351735a9a537d0d4036c27b9 100644 (file)
--- 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 574e64b5a378053e9d594b7a346d0aed0a951bd1..010bf3d656e62a0277d11403ab8e3fc76dd52ca3 100644 (file)
--- 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 cb0c0e6262259bc2f3d873b309ac65ab3e09fbed..5e956d17eddf8e831cf17534b56ebbc14f1f7e78 100644 (file)
--- 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)