Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / snippets / transposing-pitches-with-minimum-accidentals-smart-transpose.ly

diff --git a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index afc18dfc95ef3a40a51033e57e42032a3b895c38..9d1e274ff5ef6ffdf99faa68a95b3c57bfcda25c 100644 (file)
--- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.2"
+\version "2.16.0"
 
 \header {
   lsrtags = "pitches, scheme-language, workaround"
@@ -43,10 +43,10 @@ In this manner, the most natural enharmonic notes are chosen.
          ;; for historical reasons
          (n (ly:pitch-notename p)))
      (cond
-      ((and (> a 1) (or (eq? n 6) (eq? n 2)))
+      ((and (> a 1) (or (= n 6) (= n 2)))
        (set! a (- a 2))
        (set! n (+ n 1)))
-      ((and (< a -1) (or (eq? n 0) (eq? n 3)))
+      ((and (< a -1) (or (= n 0) (= n 3)))
        (set! a (+ a 2))
        (set! n (- n 1))))
      (cond