X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Ftransposing-pitches-with-minimum-accidentals-smart-transpose.ly;h=88ccaff75e8a54b01fd259719df8866e386923b7;hb=b01ca49c05566b73d690ae84fda6040b24fcf73f;hp=7e9acaf9946f15e6332def74096c9a1baf514d53;hpb=f99ae4cae742b0ea3ab3c2ac5c9d8f7bf1fbdeff;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 7e9acaf994..88ccaff75e 100644
--- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,11 +1,15 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% 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.13.1"
+\version "2.14.0"
 
 \header {
   lsrtags = "pitches"
 
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
 doctitlees = "Transportar música con el menor número de alteraciones"
 texidoces = "
 Este ejemplo utiliza código de Scheme para forzar las
@@ -36,7 +40,8 @@ naturales.
 
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+
+%% 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
@@ -66,6 +71,36 @@ 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"
+
   texidoc = "
 This example uses some Scheme code to enforce enharmonic modifications
 for notes in order to have the minimum number of accidentals.  In this
@@ -86,54 +121,54 @@ C flat -> B
 F flat -> E
 
 
-In this manner, the most natural enharmonic notes are chosen. 
+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)))
-        ;; alteration, a, in quarter tone steps,
-        ;; for historical reasons
-        (n (ly:pitch-notename p)))
-    (cond
-     ((and (> a 1) (or (eq? n 6) (eq? n 2)))
-      (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))))
-    (cond
-     ((> 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 4))))
+   (let ((o (ly:pitch-octave p))
+         (a (* 4 (ly:pitch-alteration p)))
+         ;; alteration, a, in quarter tone steps,
+         ;; for historical reasons
+         (n (ly:pitch-notename p)))
+     (cond
+      ((and (> a 1) (or (eq? n 6) (eq? n 2)))
+       (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))))
+     (cond
+      ((> 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 4))))
 
 #(define (naturalize music)
-  (let ((es (ly:music-property music 'elements))
-        (e (ly:music-property music 'element))
-        (p (ly:music-property music 'pitch)))
-    (if (pair? es)
-       (ly:music-set-property!
-         music 'elements
-         (map (lambda (x) (naturalize x)) es)))
-    (if (ly:music? e)
-       (ly:music-set-property!
-         music 'element
-         (naturalize e)))
-    (if (ly:pitch? p)
-       (begin
-         (set! p (naturalize-pitch p))
-         (ly:music-set-property! music 'pitch p)))
-    music))
+   (let ((es (ly:music-property music 'elements))
+         (e (ly:music-property music 'element))
+         (p (ly:music-property music 'pitch)))
+     (if (pair? es)
+         (ly:music-set-property!
+          music 'elements
+          (map (lambda (x) (naturalize x)) es)))
+     (if (ly:music? e)
+         (ly:music-set-property!
+          music 'element
+          (naturalize e)))
+     (if (ly:pitch? p)
+         (begin
+           (set! p (naturalize-pitch p))
+           (ly:music-set-property! music 'pitch p)))
+     music))
 
 naturalizeMusic =
 #(define-music-function (parser location m)
-  (ly:music?)
-  (naturalize m))
+   (ly:music?)
+   (naturalize m))
 
 music = \relative c' { c4 d e g }
 
@@ -146,3 +181,4 @@ music = \relative c' { c4 d e g }
   }
   \layout { }
 }
+