* input/manual/chord-names-jazz.ly (banterProperties):

instrumentName update

* scm/define-event-classes.scm (lambda): use ly:is-listened-event-class

diff --git a/ChangeLog b/ChangeLog
index 6620907913e71ba27cd317544cbcd47027a1f2a0..e6d69670a8897cc0d38d4e87ab1e50a7ee36bbe6 100644 (file)
--- 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 babe35ec657156bbaea190909c9ea0e2cbefb4e1..6307111dccc6418c90a372cc38c3e8dbe21f0b31 100644 (file)
--- 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 c98d603cf646ccbde41ae09a230e3dcc7064bd0b..c7f28846dde79b59e3e29eb0f6cef005c8145751 100644 (file)
--- 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 bb7e7a32a82028ba18cc2bcb37f6571bba6ef682..fca7748bb8f88e384d511949eea24c30d9b3c210 100644 (file)
--- 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)))