From a3e8e2496e7488def52b7589cbd305bc003cf11a Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 8 Aug 2006 20:11:12 +0000
Subject: [PATCH 1/1] * input/manual/chord-names-jazz.ly (banterProperties):
 instrumentName update

* scm/define-event-classes.scm (lambda): use ly:is-listened-event-class
---
 ChangeLog                        | 3 +++
 input/manual/chord-names-jazz.ly | 8 ++++----
 scm/define-event-classes.scm     | 5 +----
 scm/lily-library.scm             | 3 +++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6620907913..e6d69670a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-08  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* input/manual/chord-names-jazz.ly (banterProperties):
+	instrumentName update
+
 	* scm/define-event-classes.scm (lambda): use ly:is-listened-event-class
 
 	* lily/ly-module.cc (ly_module_symbols): use ly_hash_table_keys
diff --git a/input/manual/chord-names-jazz.ly b/input/manual/chord-names-jazz.ly
index babe35ec65..6307111dcc 100644
--- a/input/manual/chord-names-jazz.ly
+++ b/input/manual/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.9.13"
 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The
@@ -109,14 +109,14 @@ banterProperties = \sequential {
 \score{
     <<
 	\new ChordNames {
-	    \set instrument = #"Ignatzek (default)"
+	    \set shortInstrumentName = #"Ignatzek (default)"
 	    \set instr = #"Def"
 	    \chs
 	}
 	
 	\new ChordNames {
 	    \jazzAltProperties
-	    \set instrument = #"Alternative"
+	    \set shortInstrumentName = #"Alternative"
 	    \set instr = #"Alt"
 	    \chs
 	}
@@ -133,7 +133,7 @@ banterProperties = \sequential {
 	
 	\new ChordNames {
 	    \banterProperties
-	    \set instrument = #"Banter"
+	    \set shortInstrumentName = #"Banter"
 	    \set instr = #"Ban"
 	    \chs
 	}
diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm
index c98d603cf6..c7f28846dd 100644
--- a/scm/define-event-classes.scm
+++ b/scm/define-event-classes.scm
@@ -154,8 +154,5 @@
    (#t e)))
 
 (define-public (ly:simplify-scheme e)
-  (list 'quasiquote (simplify e))
-)
+  (list 'quasiquote (simplify e)))
 
-; used by lily/dispatcher.cc
-(define-public (car< a b) (< (car a) (car b)))
diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index bb7e7a32a8..fca7748bb8 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -452,6 +452,9 @@ possibly turned off."
       0
       (if (< x 0) -1 1)))
 
+(define-public (car< a b) (< (car a) (car b)))
+
+
 (define-public (symbol<? lst r)
   (string<? (symbol->string lst) (symbol->string r)))
 
-- 
2.39.2