Merge master into nested-bookparts

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

diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index 899659fc88c99d37a14c5d714485cf01984a081a..070ba64fcfb4a83468e38db97e8cb563ba01c8ee 100644 (file)
--- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,10 +1,9 @@
-\version "2.11.33"
+\version "2.11.61"
 \header {
-  doctitle = "Transposing music with minimum accidentals"
   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
@@ -25,11 +24,13 @@ F flat -> E
 @end itemize
 
 In this manner, the most natural enharmonic notes are chosen.
-"}
+"
+  doctitle = "Transposing music with minimum accidentals"
+}
 
 #(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
@@ -42,8 +43,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)
@@ -69,14 +70,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 { }
 }