X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Ftransposing-pitches-with-minimum-accidentals-smart-transpose.ly;h=3b209f08e2465aef6cf510c4feb954c1907bc3a2;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=8df3d5b840173e2f476a4b904d0b90eb0c6dd262;hpb=4e8f3c896223d20f0504d480e04fa764a565fd81;p=lilypond.git

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 8df3d5b840..3b209f08e2 100644
--- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,102 +1,14 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.13.29"
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.19.22
+\version "2.19.22"
 
 \header {
-  lsrtags = "pitches"
-
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
-doctitlees = "Transportar música con el menor número de alteraciones"
-texidoces = "
-Este ejemplo utiliza código de Scheme para forzar las
-modificaciones enarmónicas de las notas, y así tener el menor
-número de alteraciones accidentales. En este caso se aplican las
-siguientes reglas:
-
-@itemize
-@item
-Se quitan las dobles alteraciones
-
-@item
-Si sostenido -> Do
-
-@item
-Mi sistenido -> Fa
-
-@item
-Do bemol -> Si
-
-@item
-Fa bemol -> Mi
-
-@end itemize
-
-De esta forma se selecciona el mayor número de notas enarmónicas
-naturales.
-
-"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  doctitlede = "Noten mit minimaler Anzahl an Versetzungszeichen transponieren."
-  texidocde = "Dieses Beispiel benutzt Scheme-Code, um enharmonische
-Verwechslungen für Noten zu erzwingen, damit nur eine minimale Anzahl
-an Versetzungszeichen ausgegeben wird.  In diesem Fall gelten die
-folgenden Regeln:
-
-@itemize
-@item
-Doppelte Versetzungszeichen sollen entfernt werden
-
-@item
-His -> C
-
-@item
-Eis -> F
-
-@item
-Ces -> B
-
-@item
-Fes -> E
-
-@end itemize
-
-Auf diese Art werden am meisten natürliche Tonhöhen als enharmonische
-Variante gewählt.
-"
-
-
-%% Translation of GIT committish: 4ab2514496ac3d88a9f3121a76f890c97cedcf4e
-  texidocfr = "
-Cet exemple, grâce à un peu de code Scheme, donne la priorité aux
-enharmoniques  afin de limiter le nombre d'altérations supplémentaires.
-La règle appliquable est :
-
-@itemize
-@item
-Les altérations doubles sont supprimées
-
-@item
-Si dièse -> Do
-
-@item
-Mi dièse -> Fa
-
-@item
-Do bémol -> Si
-
-@item
-Fa bémol -> Mi
-
-@end itemize
-
-Cette façon de procéder aboutit à plus d'enharmoniques naturelles.
-
-"
-
-  doctitlefr = "Transposition et réduction du nombrer d'altérations accidentelles"
+  lsrtags = "pitches, scheme-language, workaround"
 
   texidoc = "
 This example uses some Scheme code to enforce enharmonic modifications
@@ -131,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 (eqv? n 6) (eqv? n 2)))
        (set! a (- a 2))
        (set! n (+ n 1)))
-      ((and (< a -1) (or (eq? n 0) (eq? n 3)))
+      ((and (< a -1) (or (eqv? n 0) (eqv? n 3)))
        (set! a (+ a 2))
        (set! n (- n 1))))
      (cond
@@ -151,7 +63,7 @@ In this manner, the most natural enharmonic notes are chosen.
      (if (pair? es)
          (ly:music-set-property!
           music 'elements
-          (map (lambda (x) (naturalize x)) es)))
+          (map naturalize es)))
      (if (ly:music? e)
          (ly:music-set-property!
           music 'element
@@ -163,7 +75,7 @@ In this manner, the most natural enharmonic notes are chosen.
      music))
 
 naturalizeMusic =
-#(define-music-function (parser location m)
+#(define-music-function (m)
    (ly:music?)
    (naturalize m))
 
@@ -178,4 +90,3 @@ music = \relative c' { c4 d e g }
   }
   \layout { }
 }
-