Merge master into nested-bookparts

[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 c799d7c9e89a53db48e79f37da9b6e4a4a227b07..5aa1f3470b5ccff4a734b7dc52c8c68c5ab6a126 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,22 +1,67 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.11.62"
 \header {
-  doctitle = "Transposing music with minimum accidentals"
+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.
+
+"
   lsrtags = "pitches"
- texidoc = "There is a way 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
 
-\"Double accidentals should be removed, as well as E sharp (-> F),
-C flat (-> B), F flat (-> E) and B sharp (-> C)\".
+@item
+C flat -> B
+
+@item
+F flat -> E
+
+@end itemize
 
 In this manner, the most natural enharmonic notes are chosen.
-"} % begin verbatim
+"
+  doctitle = "Transposing music with minimum accidentals"
+} % begin verbatim
 
 #(define  (naturalize-pitch p)
   (let* ((o (ly:pitch-octave p))
-         (a (* 4 (ly:pitch-alteration p))) 
+         (a (* 4 (ly:pitch-alteration p)))
     ; alteration, a, in quarter tone steps, for historical reasons
          (n (ly:pitch-notename p)))
     (cond
@@ -29,8 +74,8 @@ 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)
@@ -56,14 +101,14 @@ naturalizeMusic =
                                        (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 { }
 }