* input/test/smart-transpose.ly: fix cases fes->e and similar.

	handle also quarter tones (not shown as tests). test also flats.

diff --git a/ChangeLog b/ChangeLog
index 98eeea67b0f90bd10e1941da825d541567017a5b..c1dba36a61cee8bf8d6833b54a27cc88cd2b6101 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-04  Heikki Junes <hjunes@cc.hut.fi>
+
+       * input/test/smart-transpose.ly: fix cases fes->e and similar.
+       handle also quarter tones (not shown as tests). test also flats.
+
 2004-03-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/regression/new-markup-scheme.ly: Typo.

diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly
index 1de5769f6d906ed545f48c32f0a14f4f9349a98b..8d44acd1c24aa55b248423e6bb28487c317c60b1 100644 (file)
--- a/input/test/smart-transpose.ly
+++ b/input/test/smart-transpose.ly
@@ -8,8 +8,7 @@ There is a way to enforce enharmonic modifications for notes in order
 to have the minimum number of accidentals. In that case, ``Double 
 accidentals should be removed, as well as E-sharp (-> F), bC (-> B),
 bF (-> E), B-sharp (-> C).'', as proposed by a request for a new feature.
-In this example, the double accidentals are removed after transposing
-C scale to Ais.
+In that manner, the most natural enharmonic notes are chosen in this example.
 
 "
 }
@@ -18,31 +17,32 @@ C scale to Ais.
 % how useful these enharmonic modifications are. Mats B.
 % 
 % Why not to have a function that minimizes the number of accidentals? -HJJ
+% Works also for quarter tones. -HJJ
 %
 
-#(define  (unhair-pitch p)
+#(define  (naturalise-pitch p)
   (let* ((o (ly:pitch-octave p))
          (a (ly:pitch-alteration p))
          (n (ly:pitch-notename p)))
 
     (cond
-     ((and (> a 2) (or (eq? n 6) (eq? n 2)))
+     ((and (> a 1) (or (eq? n 6) (eq? n 2)))
       (set! a (- a 2))
       (set! n (+ n 1)))
-     ((and (< a -2) (or (eq? n 0) (eq? n 3)))
+     ((and (< a -1) (or (eq? n 0) (eq? n 3)))
       (set! a (+ a 2))
       (set! n (- n 1))))
 
     (cond
-     ((eq? a 4) (set! a 0) (set! n (+ n 1)))
-     ((eq? a -4) (set! a 0) (set! n (- n 1))))
+     ((> a 2) (set! a (- a 4)) (set! n (+ n 1)))
+     ((< a -2) (set! a (+ a 4)) (set! n (- n 1))))
 
     (if (< n 0) (begin (set!  o (- o 1)) (set! n (+ n 7))))
     (if (> n 6) (begin (set!  o (+ o 1)) (set! n (- n 7))))
 
     (ly:make-pitch o n a)))
 
-#(define (simplify music)
+#(define (naturalise music)
   (let* ((es (ly:music-property music 'elements))
          (e (ly:music-property music 'element))
          (p (ly:music-property music 'pitch)))
@@ -50,16 +50,16 @@ C scale to Ais.
     (if (pair? es)
         (ly:music-set-property!
          music 'elements
-         (map (lambda (x) (simplify x)) es)))
+         (map (lambda (x) (naturalise x)) es)))
 
     (if (ly:music? e)
         (ly:music-set-property!
          music 'element
-         (simplify e)))
+         (naturalise e)))
 
     (if (ly:pitch? p)
         (begin
-          (set! p (unhair-pitch p))
+          (set! p (naturalise-pitch p))
           (ly:music-set-property! music 'pitch p)))
 
     music))
@@ -69,7 +69,9 @@ music = \notes \relative c' { c4 d  e f g a b  c }
 \score {
   \notes \context Staff {
     \transpose c ais \music
-    \apply #simplify \transpose c ais \music
+    \apply #naturalise \transpose c ais \music
+    \transpose c deses \music
+    \apply #naturalise \transpose c deses \music
   }
   \paper { raggedright = ##t}
 }