X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2Ftransposing-pitches-with-minimum-accidentals-smart-transpose.ly;h=138606c341d3fcd015ea860adddcab01fb32da31;hb=2459c66ea8366f6541be25728973975ee0bc4d62;hp=00d44c82d4848ded405bad3c804c270ea60d32b3;hpb=eeb973b4126dad28bd9f60ab2af772c919401e23;p=lilypond.git

diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index 00d44c82d4..138606c341 100644
--- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,11 +1,16 @@
-%% Do not edit this file; it is auto-generated from input/new
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.12.3"
+
 \header {
   lsrtags = "pitches"
-  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:
+
+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
@@ -25,41 +30,73 @@ Fa bemol -> Mi
 
 @end itemize
 
-De esta forma se selecciona el mayor número de notas enarmónicas naturales.
+De esta forma se selecciona el mayor número de notas enarmónicas
+naturales.
+
 "
 
-  texidoc = "This example uses some Scheme code to enforce enharmonic modifications for
-notes in order to have the minimum number of accidentals. In this
-case, the following rules apply:
+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
-Double accidentals should be removed
+Doppelte Versetzungszeichen sollen entfernt werden
 
 @item
-B sharp -> C
+His -> C
 
 @item
-E sharp -> F
+Eis -> F
 
 @item
-C flat -> B
+Ces -> B
 
 @item
-F flat -> E
+Fes -> E
 
 @end itemize
 
-In this manner, the most natural enharmonic notes are chosen.
+Auf diese Art werden am meisten natürliche Tonhöhen als enharmonische
+Variante gewählt.
+"
+
+
+  texidoc = "
+This example uses some Scheme code to enforce enharmonic modifications
+for notes in order to have the minimum number of accidentals.  In this
+case, the following rules apply:
+
+Double accidentals should be removed
+
+
+B sharp -> C
+
+
+E sharp -> F
+
+
+C flat -> B
+
+
+F flat -> E
+
+
+In this manner, the most natural enharmonic notes are chosen. 
+
 "
-  doctitle = "Transposing music with minimum accidentals"
+  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)))
+#(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))
@@ -70,41 +107,41 @@ In this manner, the most natural enharmonic notes are chosen.
     (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))))
+    (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)))
+  (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!
+       (ly:music-set-property!
          music 'elements
          (map (lambda (x) (naturalize x)) es)))
     (if (ly:music? e)
-        (ly:music-set-property!
+       (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)))
+       (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 }
+music = \relative c' { c4 d e g }
 
 \score {
   \new Staff {
-    \transpose c ais \music
-    \naturalizeMusic \transpose c ais \music
-    \transpose c deses \music
-    \naturalizeMusic \transpose c deses \music
+    \transpose c ais { \music }
+    \naturalizeMusic \transpose c ais { \music }
+    \transpose c deses { \music }
+    \naturalizeMusic \transpose c deses { \music }
   }
-  \layout { ragged-right = ##t }
+  \layout { }
 }