Revert "Apply scripts/auxiliar/fixscm.sh"

[lilypond.git] / scm / define-music-callbacks.scm

diff --git a/scm/define-music-callbacks.scm b/scm/define-music-callbacks.scm
index 42aaf58ace30842dc9029a51c40cf3b21911f8b9..723ed130ec49b00912fe045a00d6006e65d8856a 100644 (file)
--- a/scm/define-music-callbacks.scm
+++ b/scm/define-music-callbacks.scm
@@ -1,7 +1,7 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
 ;;;; Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
-;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Neil Puttock <n.puttock@gmail.com>
 ;;;;                 Carl Sorensen <c_sorensen@byu.edu>
 ;;;;
@@ -24,15 +24,15 @@
   "Generate events for multimeasure rests,
 to be used by the sequential-iterator"
   (let ((location (ly:music-property music 'origin))
-        (duration (ly:music-property music 'duration)))
+       (duration (ly:music-property music 'duration)))
     (list (make-music 'BarCheck
-                      'origin location)
-          (make-event-chord (cons (make-music 'MultiMeasureRestEvent
-                                              'origin location
-                                              'duration duration)
-                                  (ly:music-property music 'articulations)))
-          (make-music 'BarCheck
-                      'origin location))))
+                     'origin location)
+         (make-event-chord (cons (make-music 'MultiMeasureRestEvent
+                                             'origin location
+                                             'duration duration)
+                                 (ly:music-property music 'articulations)))
+         (make-music 'BarCheck
+                     'origin location))))
 
 (define (make-volta-set music)
   (let* ((alts (ly:music-property music 'elements))
@@ -40,25 +40,25 @@ to be used by the sequential-iterator"
          (times (ly:music-property music 'repeat-count)))
     (map (lambda (x y)
            (make-music
-            'SequentialMusic
-            'elements
-            ;; set properties for proper bar numbering
-            (append
-             (list (make-music 'AlternativeEvent
-                               'alternative-dir (if (= y 0)
-                                                    -1
-                                                    0)
-                               'alternative-increment
-                               (if (= 0 y)
-                                   (1+ (- times
-                                          lalts))
-                                   1)))
-             (list x)
-             (if (= y (1- lalts))
+             'SequentialMusic
+             'elements
+               ;; set properties for proper bar numbering
+               (append
                  (list (make-music 'AlternativeEvent
-                                   'alternative-dir 1
-                                   'alternative-increment 0))
-                 '()))))
+                                   'alternative-dir (if (= y 0)
+                                                        -1
+                                                        0)
+                                   'alternative-increment
+                                     (if (= 0 y)
+                                         (1+ (- times
+                                                lalts))
+                                             1)))
+                       (list x)
+                       (if (= y (1- lalts))
+                           (list (make-music 'AlternativeEvent
+                                             'alternative-dir 1
+                                             'alternative-increment 0))
+                           '()))))
          alts
          (iota lalts))))
 
@@ -67,18 +67,18 @@ to be used by the sequential-iterator"
   (let ((octavation (ly:music-property music 'ottava-number)))
 
     (list (context-spec-music
-           (make-apply-context
-            (lambda (context)
-              (let ((offset (* -7 octavation))
-                    (string (assoc-get octavation '((2 . "15ma")
-                                                    (1 . "8va")
-                                                    (0 . #f)
-                                                    (-1 . "8vb")
-                                                    (-2 . "15mb")))))
-                (set! (ly:context-property context 'middleCOffset) offset)
-                (set! (ly:context-property context 'ottavation) string)
-                (ly:set-middle-C! context))))
-           'Staff))))
+          (make-apply-context
+           (lambda (context)
+             (let ((offset (* -7 octavation))
+                   (string (assoc-get octavation '((2 . "15ma")
+                                                   (1 . "8va")
+                                                   (0 . #f)
+                                                   (-1 . "8vb")
+                                                   (-2 . "15mb")))))
+               (set! (ly:context-property context 'middleCOffset) offset)
+               (set! (ly:context-property context 'ottavation) string)
+               (ly:set-middle-C! context))))
+          'Staff))))
 
 (define (make-time-signature-set music)
   "Set context properties for a time signature."
@@ -87,31 +87,31 @@ to be used by the sequential-iterator"
          (structure (ly:music-property music 'beat-structure))
          (fraction (cons num den)))
     (list (descend-to-context
-           (context-spec-music
-            (make-apply-context
-             (lambda (context)
-               (let* ((time-signature-settings
-                       (ly:context-property context 'timeSignatureSettings))
-                      (my-base-length
-                       (base-length fraction time-signature-settings))
-                      (my-beat-structure
-                       (if (null? structure)
-                           (beat-structure my-base-length
-                                           fraction
-                                           time-signature-settings)
-                           structure))
-                      (beaming-exception
-                       (beam-exceptions fraction time-signature-settings))
-                      (new-measure-length (ly:make-moment num den)))
-                 (ly:context-set-property!
-                  context 'timeSignatureFraction fraction)
-                 (ly:context-set-property!
-                  context 'baseMoment (ly:make-moment my-base-length))
-                 (ly:context-set-property!
-                  context 'beatStructure my-beat-structure)
-                 (ly:context-set-property!
-                  context 'beamExceptions beaming-exception)
-                 (ly:context-set-property!
-                  context 'measureLength new-measure-length))))
-            'Timing)
-           'Score))))
+            (context-spec-music
+              (make-apply-context
+                (lambda (context)
+                  (let* ((time-signature-settings
+                          (ly:context-property context 'timeSignatureSettings))
+                         (my-base-length
+                           (base-length fraction time-signature-settings))
+                         (my-beat-structure
+                           (if (null? structure)
+                               (beat-structure my-base-length
+                                               fraction
+                                               time-signature-settings)
+                               structure))
+                         (beaming-exception
+                           (beam-exceptions fraction time-signature-settings))
+                         (new-measure-length (ly:make-moment num den)))
+                     (ly:context-set-property!
+                       context 'timeSignatureFraction fraction)
+                     (ly:context-set-property!
+                       context 'baseMoment (ly:make-moment my-base-length))
+                     (ly:context-set-property!
+                       context 'beatStructure my-beat-structure)
+                     (ly:context-set-property!
+                       context 'beamExceptions beaming-exception)
+                     (ly:context-set-property!
+                       context 'measureLength new-measure-length))))
+                'Timing)
+            'Score))))