From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 8 Aug 2006 20:32:57 +0000 (+0000)
Subject: instrument name fixup.
X-Git-Tag: cvs/HEAD~170
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a067c17f1883996a25c866e6b86d387fc989cf68;p=lilypond.git

instrument name fixup.
---

diff --git a/ChangeLog b/ChangeLog
index e6d69670a8..349164c488 100644
--- 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 3a22642e1a..4af777d565 100644
--- 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 ed79c1a589..af0f289f25 100644
--- 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 ed1cb875dd..76ea46221d 100644
--- 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