From e0d5f31fa636acb8440f0e5a6c3f16d7ffdbb197 Mon Sep 17 00:00:00 2001
From: janneke <janneke>
Date: Wed, 4 Jun 2003 13:55:52 +0000
Subject: [PATCH] * 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.
---
 ChangeLog            | 8 ++++++++
 input/test/dpncnt.ly | 5 +++--
 scm/chord-name.scm   | 8 +++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d71cdf8f2..ec3fc914b3 100644
--- 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 6f85c5e808..4af4c9ae34 100644
--- 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 e43123cd67..1160c0f9f1 100644
--- 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
-- 
2.39.5