(set-chord-name-style): remove

set-chord-name-style. Use \property chordNameFunction.

diff --git a/ChangeLog b/ChangeLog
index 841ca088be609affd1421b30d1cd7b35d1baf8d3..766b812a61ccf722aefe2be3ed5fd61ba6690444 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,10 +8,10 @@
        * Documentation/user/refman.itely (Vocal music): update documentation.
 
        * scm/define-translator-properties.scm (chordNoteNamer): remove
-       chordNameStyle
+       chordNameStyle, use chordNameFunction
 
        * scm/chord-name.scm (set-chord-name-style): remove
-       set-chord-name-style.
+       set-chord-name-style. Use \property chordNameFunction.
 
 2003-06-12  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
@@ -226,10 +226,12 @@
        aid in future changes to input/test/ files.
 
 2003-05-28  Graham Percival  <gperlist@shaw.ca>
+       
        * Documentation/user/refman.itely: fixed build problem (missing
        file) caused by previous renaming.
 
 2003-05-28  Graham Percival  <gperlist@shaw.ca>
+       
        * input/test/[a,b]*.ly: added texinfo index and added comments to
        aid in future changes to input/test/ files.
        * input/test/bar-number-every-5-reset.ly: renamed to
@@ -243,9 +245,8 @@
        to Voice.
 
        * lily/glissando-engraver.cc (acknowledge_grob): new file: split
-       out note-line and glissando functionality. 
+       out note-line and glissando functionality.
        
-
        * lily/line-spanner.cc (brew_molecule): cleanup.
 
 2003-05-27  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely
index 86c0a5fe29dc9de920fb620176c44b7948958d82..753c719c857d81262682a17882e68d4d2ef3f893 100644 (file)
--- a/Documentation/user/appendices.itely
+++ b/Documentation/user/appendices.itely
@@ -2,16 +2,12 @@
 @appendix Reference manual details
 
 @menu
-* Lyrics mode definition::      
 * American Chords ::            
 * Jazz chords::                 
 * MIDI instruments::            
 * The Feta font::
 @end menu
 
-@node Lyrics mode definition
-@section Lyrics mode definition
-
 
 @node American Chords 
 @section American Chords

diff --git a/VERSION b/VERSION
index aeaa3315deef4cc20992374b1bbe4be9d8a50d54..3b850fc6dc9dc1508195cd27a910b3467c57d545 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=7
-PATCH_LEVEL=20
+PATCH_LEVEL=21
 MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index 48f51523807b7d8c88ba52e1c2bd31f6a56bae5f..120bd68127da6e99ed6690cc429683fa3ce8ccf5 100644 (file)
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -3,7 +3,7 @@
 ;;;
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c)  2000--2003  Han-Wen Nienhuys
+;;; (c)  2000--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 1e308e0a2aec2700efdb2f242964ad4b3fd4d9de..790f20c88209b5b6ebcf6a52d78f955e9985fa08 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -4,7 +4,8 @@
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
 ;;; (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Han-Wen Nienhuys
+;;;
+;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define (natural-chord-alteration p)
   "Return the natural alteration for step P."
@@ -77,13 +78,17 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 
-(define-public (sequential-music-to-chord-exceptions seq omit-root)
+;; fixme we should standardize on omit-root (or the other one.)
+;; perhaps the  default should also be reversed --hwn
+(define-public (sequential-music-to-chord-exceptions seq . rest)
   "Transform sequential music SEQ of type <<c d e>>-\markup{ foobar }
 to (cons CDE-PITCHES FOOBAR-MARKUP), or to (cons DE-PITCHES
-FOOBAR-MARKUP) if OMIT-ROOT.
+FOOBAR-MARKUP) if OMIT-ROOT is given and non-false.
 "
+
   (define (chord-to-exception-entry m)
     (let* ((elts (ly:get-mus-property m 'elements))
+          (omit-root (and (pair? rest) (car rest)))
           (pitches (map (lambda (x) (ly:get-mus-property x 'pitch))
                         (filter-list
                          (lambda (y) (memq 'note-event
@@ -91,6 +96,7 @@ FOOBAR-MARKUP) if OMIT-ROOT.
                          elts)))
           (sorted (sort pitches ly:pitch<?))
           (root (car sorted))
+          
           ;; ugh?
           ;;(diff (ly:pitch-diff root (ly:make-pitch -1 0 0)))
           ;; FIXME.  This results in #<Pitch c> ...,
@@ -103,8 +109,7 @@ FOOBAR-MARKUP) if OMIT-ROOT.
                        (lambda (y) (memq 'text-script-event
                                          (ly:get-mus-property y 'types)))
                        elts)))
-          ;;(text (if (null? texts) #f (if (= length texts) 1)
-          ;;        (car texts) (reverse texts))))
+
           (text (if (null? texts) #f (if omit-root (car texts) texts))))
       (cons (if omit-root (cdr normalized) normalized) text)))