Merge branch 'master' into lilypond/translation

[lilypond.git] / input / lsr / transposing-pitches-with-minimum-accidentals-smart-transpose.ly

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 58cd7573ea30bbdc941575efb4a35405a83c44b9..44af17bbf7b9ef11e324d946d308893cfe73e249 100644 (file)
--- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,9 +1,11 @@
-%% 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.
-%% Note: this file works from version 2.12.0
-\version "2.12.0"
+\version "2.13.1"
+
 \header {
-%% Translation of GIT committish: 740b9a6c16eb30a84b216d23aeb848aa1b632be6
+  lsrtags = "pitches"
+
+%% Translation of GIT committish: 4866dfd58d5c3a8cab4c6c06d5c4fca8e05a3cd7
 doctitlees = "Transportar música con el menor número de alteraciones"
 texidoces = "
 Este ejemplo utiliza código de Scheme para forzar las
@@ -64,41 +66,38 @@ Variante gewählt.
 "
 
 
-  lsrtags = "pitches"
-  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:
+  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:
 
-@itemize
-@item
 Double accidentals should be removed
 
-@item
+
 B sharp -> C
 
-@item
+
 E sharp -> F
 
-@item
+
 C flat -> B
 
-@item
+
 F flat -> E
 
-@end itemize
 
-In this manner, the most natural enharmonic notes are chosen.
+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))
@@ -114,9 +113,9 @@ In this manner, the most natural enharmonic notes are chosen.
     (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!
          music 'elements