Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / input / test / smart-transpose.ly

diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly
index 94603ec5d484e78d76ce133513cddc57dfc8de0e..b1296b394849412215ab3a0875bff7320bfd2c82 100644 (file)
--- a/input/test/smart-transpose.ly
+++ b/input/test/smart-transpose.ly
@@ -1,75 +1,79 @@
 
-\version "1.9.4"
+\version "2.7.39"
 
 \header {
 texidoc="@cindex Smart Transpose
-@example
-       Here's a copy of my feature request :
-@quotation
-        Your task, if you accept it is to implement a \smarttranspose
-        command>> that would translate such oddities into more natural
-        notations. Double accidentals should be removed, as well as E-sharp
-        (-> F), bC (-> B), bF (-> E), B-sharp (-> C).
-@end quotation
-
-You mean like this. (Sorry 'bout the nuked indentation.)
-
-Modified to use the standard transpose mechanism. The question is
-how useful these enharmonic modifications are. Mats B.
-@end example
+
+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 manner, the most natural enharmonic notes are chosen in this example.
+
 "
 }
-
-#(define  (unhair-pitch p)
+%
+% Modified to use the standard transpose mechanism. The question is
+% 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  (naturalise-pitch p)
   (let* ((o (ly:pitch-octave p))
          (a (ly:pitch-alteration p))
          (n (ly:pitch-notename p)))
 
     (cond
      ((and (> a 1) (or (eq? n 6) (eq? n 2)))
-      (set! a (- a 2)) (set! n (+ n 1)))
+      (set! a (- a 2))
+      (set! n (+ n 1)))
      ((and (< a -1) (or (eq? n 0) (eq? n 3)))
-      (set! a (+ a 2)) (set! n (- n 1))))
+      (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)
-  (let* ((es (ly:get-mus-property music 'elements))
-         (e (ly:get-mus-property music 'element))
-         (p (ly:get-mus-property music 'pitch)))
+#(define (naturalise music)
+  (let* ((es (ly:music-property music 'elements))
+         (e (ly:music-property music 'element))
+         (p (ly:music-property music 'pitch)))
 
     (if (pair? es)
-        (ly:set-mus-property!
+        (ly:music-set-property!
          music 'elements
-         (map (lambda (x) (simplify x)) es)))
+         (map (lambda (x) (naturalise x)) es)))
 
     (if (ly:music? e)
-        (ly:set-mus-property!
+        (ly:music-set-property!
          music 'element
-         (simplify e)))
+         (naturalise e)))
 
     (if (ly:pitch? p)
         (begin
-          (set! p (unhair-pitch p))
-          (ly:set-mus-property! music 'pitch p)))
+          (set! p (naturalise-pitch p))
+          (ly:music-set-property! music 'pitch p)))
 
     music))
 
-music = \notes \relative c' { c4 d  e f g a b  c }
+music =  \relative c' { c4 d  e f g a b  c }
 
 \score {
-  \notes \context Staff {
+   \context Staff {
     \transpose c ais \music
-    \apply #simplify \transpose c ais \music
+    \applyMusic #naturalise \transpose c ais \music
+    \transpose c deses \music
+    \applyMusic #naturalise \transpose c deses \music
   }
-  \paper { raggedright = ##t}
+  \layout { ragged-right = ##t}
 }