* input/test/dpncnt.ly: Transpose example to match new

default \chords octave.  Add comment.

* scm/chord-name.scm (sequential-music-to-chord-exceptions): Add
comment about octave change.

diff --git a/ChangeLog b/ChangeLog
index 2d71cdf8f2daef7fd9787682b7a8cc934b7840b1..ec3fc914b3b4f20863c2a3bb405b16cbe8043659 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-04  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/test/dpncnt.ly: Transpose example to match new
+       default \chords octave.  Add comment.
+       
+       * scm/chord-name.scm (sequential-music-to-chord-exceptions): Add
+       comment about octave change.
+
 2003-06-04  Graham Percival  <gperlist@shaw.ca>
 
        * input/test/[d,e]: added texinfo index tags.

diff --git a/input/test/dpncnt.ly b/input/test/dpncnt.ly
index 6f85c5e808bde5ebe4ca85fe104db72f78f3d54b..4af4c9ae34aad6e81ea25e73cd8966de8b5c6a64 100644 (file)
--- a/input/test/dpncnt.ly
+++ b/input/test/dpncnt.ly
@@ -40,8 +40,9 @@ epartialmusic = \notes {
 
 epartial = #(sequential-music-to-chord-exceptions epartialmusic #f)
 
-
-ch = \notes \transpose c' c' 
+% ugh FIXME?
+% default octave \chord mode has changed to c'
+ch = \notes \transpose c c' 
 {
        <<c e g>>1
        <<c es g>>

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index e43123cd6713c908748f40d5df0782652fd3efba..1160c0f9f1c9ab2b939ef663061efccbe56d2920 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -91,7 +91,13 @@ FOOBAR-MARKUP) if OMIT-ROOT.
                          elts)))
           (sorted (sort pitches ly:pitch<?))
           (root (car sorted))
-          (normalized (map (lambda (x) (ly:pitch-diff x root)) sorted))
+          ;; ugh?
+          ;;(diff (ly:pitch-diff root (ly:make-pitch -1 0 0)))
+          ;; FIXME.  This results in #<Pitch c> ...,
+          ;; but that is what we need because default octave for
+          ;; \chords has changed to c' too?
+          (diff (ly:pitch-diff root (ly:make-pitch 0 0 0)))
+          (normalized (map (lambda (x) (ly:pitch-diff x diff)) sorted))
           (texts (map (lambda (x) (ly:get-mus-property x 'text))
                       (filter-list
                        (lambda (y) (memq 'text-script-event