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 72719f78587418922f0bc7d8afc96d416a1f8c67..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
@@ -1,102 +1,13 @@
-%% Do not edit this file; it is automatically
+%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.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.12.2"
+\version "2.16.0"
 
 \header {
-  lsrtags = "pitches"
-
-%% Translation of GIT committish: a874fda3641c9e02f61be5c41b215b8304b8ed00
-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
@@ -124,6 +35,7 @@ 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)))
@@ -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 (= 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
@@ -178,4 +90,3 @@ music = \relative c' { c4 d e g }
   }
   \layout { }
 }
-