instrument name fixup.

diff --git a/ChangeLog b/ChangeLog
index e6d69670a8897cc0d38d4e87ab1e50a7ee36bbe6..349164c4881092672c09c5820182f55e74f15f00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-08-08  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * ly/performer-init.ly: instrument name fixup.
+
        * input/manual/chord-names-jazz.ly (banterProperties):
        instrumentName update
 

diff --git a/input/manual/chord-names-languages.ly b/input/manual/chord-names-languages.ly
index 3a22642e1a4953810bbdee4634c2a78d882b9594..4af777d565318a0293663d9c36da063344b945b5 100644 (file)
--- a/input/manual/chord-names-languages.ly
+++ b/input/manual/chord-names-languages.ly
@@ -27,20 +27,20 @@ scm = \chordmode {
 
 <<
     \new ChordNames {
-       \set instrument = #"default"
+       \set instrumentName = #"default"
        \scm
     }
     \new ChordNames {
-       \set instrument = #"german"
+       \set instrumentName = #"german"
        \germanChords \scm }
     \new ChordNames {
-       \set instrument = #"semi-german"
+       \set instrumentName = #"semi-german"
        \semiGermanChords \scm }
     \new ChordNames {
-       \set instrument = #"italian"
+       \set instrumentName = #"italian"
        \italianChords \scm }
     \new ChordNames {
-       \set instrument = #"french"
+       \set instrumentName = #"french"
        \frenchChords \scm }
 
     \context Voice { \scm }

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index ed79c1a58902e546a0bd9f3d7b3eddd8f0f8a3a0..af0f289f2592342639a285ebbc2e631e1f1e5998 100644 (file)
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -65,8 +65,8 @@ MyStaff =\context {
        % weird effects when doing instrument names for
        % piano staves
 
-       instrument = #'()
-       instr = #'()
+       instrumentName = #'()
+       shortInstrumentName = #'()
          
        \accepts "Voice"
 }

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index ed1cb875ddcd4ec65bc9cab4e3de37ce1f1d4e59..76ea46221d8b24cbaaef67e7c5db6bb23932721d 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -116,7 +116,7 @@
     \name Score
     
     melismaBusyProperties = #default-melisma-properties
-    instrument = #"bright acoustic"
+    instrumentName = #"bright acoustic"
     \accepts Staff
     \accepts DrumStaff
     \accepts GrandStaff