Merge branch 'master' 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 9d1e274ff5ef6ffdf99faa68a95b3c57bfcda25c..ca5b7f24f6ec6f23e7ad9ab3c2083d52e744b4b9 100644 (file)
--- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, scheme-language, workaround"
@@ -35,7 +35,6 @@ In this manner, the most natural enharmonic notes are chosen.
   doctitle = "Transposing pitches with minimum accidentals (\"Smart\" transpose)"
 } % begin verbatim
 
-
 #(define (naturalize-pitch p)
    (let ((o (ly:pitch-octave p))
          (a (* 4 (ly:pitch-alteration p)))
@@ -43,10 +42,10 @@ In this manner, the most natural enharmonic notes are chosen.
          ;; for historical reasons
          (n (ly:pitch-notename p)))
      (cond
-      ((and (> a 1) (or (= n 6) (= n 2)))
+      ((and (> a 1) (or (eq? n 6) (eq? n 2)))
        (set! a (- a 2))
        (set! n (+ n 1)))
-      ((and (< a -1) (or (= n 0) (= n 3)))
+      ((and (< a -1) (or (eq? n 0) (eq? n 3)))
        (set! a (+ a 2))
        (set! n (- n 1))))
      (cond