Revert "Apply scripts/auxiliar/fixscm.sh"

[lilypond.git] / scm / flag-styles.scm

diff --git a/scm/flag-styles.scm b/scm/flag-styles.scm
index 0b5750280f1bc66c975936b3963b3cdaf71a15e3..6027161995cb2268f535f975fc7ac9a24fe77334 100644 (file)
--- a/scm/flag-styles.scm
+++ b/scm/flag-styles.scm
@@ -90,22 +90,22 @@ All lengths are scaled according to the font size of the note."
            (points (if stem-up (list start flag-end
                                      (offset-add flag-end thickness-offset)
                                      (offset-add start thickness-offset))
-                       (list start
-                             (offset-add start thickness-offset)
-                             (offset-add flag-end thickness-offset)
-                             flag-end)))
+                               (list start
+                                     (offset-add start thickness-offset)
+                                     (offset-add flag-end thickness-offset)
+                                     flag-end)))
            (stencil (ly:round-filled-polygon points half-stem-thickness))
            ;; Log for 1/8 is 3, so we need to subtract 3
            (flag-stencil (buildflag stencil (- log 3) stencil spacing))
            (stroke-style (ly:grob-property grob 'stroke-style)))
-      (if (equal? stroke-style "grace")
-          (add-stroke-straight flag-stencil grob
-                               dir log
-                               stroke-style
-                               flag-end flag-length
-                               thickness
-                               (* half-stem-thickness 2))
-          flag-stencil))))
+    (if (equal? stroke-style "grace")
+      (add-stroke-straight flag-stencil grob
+                           dir log
+                           stroke-style
+                           flag-end flag-length
+                           thickness
+                           (* half-stem-thickness 2))
+      flag-stencil))))
 
 (define-public (modern-straight-flag grob)
   "Modern straight flag style (for composers like Stockhausen, Boulez, etc.).
@@ -136,21 +136,21 @@ flags are both 45 degrees."
   "Load and add a stroke (represented by a glyph in the font) to the given
 flag stencil."
   (if (not (string? stroke-style))
-      stencil
-      ;; Otherwise: look up the stroke glyph and combine it with the flag
-      (let* ((stem-grob (ly:grob-parent grob X))
-             (font-char (string-append "flags." flag-style dir stroke-style))
-             (alt-font-char (string-append "flags." dir stroke-style))
-             (font (ly:grob-default-font grob))
-             (tmpstencil (ly:font-get-glyph font font-char))
-             (stroke-stencil (if (ly:stencil-empty? tmpstencil)
-                                 (ly:font-get-glyph font alt-font-char)
-                                 tmpstencil)))
-        (if (ly:stencil-empty? stroke-stencil)
-            (begin
-              (ly:warning (_ "flag stroke `~a' or `~a' not found") font-char alt-font-char)
-              stencil)
-            (ly:stencil-add stencil stroke-stencil)))))
+    stencil
+    ;; Otherwise: look up the stroke glyph and combine it with the flag
+    (let* ((stem-grob (ly:grob-parent grob X))
+           (font-char (string-append "flags." flag-style dir stroke-style))
+           (alt-font-char (string-append "flags." dir stroke-style))
+           (font (ly:grob-default-font grob))
+           (tmpstencil (ly:font-get-glyph font font-char))
+           (stroke-stencil (if (ly:stencil-empty? tmpstencil)
+                               (ly:font-get-glyph font alt-font-char)
+                               tmpstencil)))
+      (if (ly:stencil-empty? stroke-stencil)
+        (begin
+          (ly:warning (_ "flag stroke `~a' or `~a' not found") font-char alt-font-char)
+          stencil)
+        (ly:stencil-add stencil stroke-stencil)))))
 
 
 (define-public (retrieve-glyph-flag flag-style dir dir-modifier grob)
@@ -161,7 +161,7 @@ flag stencil."
          (font-char (string-append "flags." flag-style dir dir-modifier (number->string log)))
          (flag (ly:font-get-glyph font font-char)))
     (if (ly:stencil-empty? flag)
-        (ly:warning "flag ~a not found" font-char))
+      (ly:warning "flag ~a not found" font-char))
     flag))
 
 
@@ -172,8 +172,8 @@ flag stencil."
          (flag (retrieve-glyph-flag flag-style dir dir-modifier grob))
          (stroke-style (ly:grob-property grob 'stroke-style)))
     (if (null? stroke-style)
-        flag
-        (add-stroke-glyph flag grob dir stroke-style flag-style))))
+      flag
+      (add-stroke-glyph flag grob dir stroke-style flag-style))))
 
 
 
@@ -191,10 +191,10 @@ a flag always touches a staff line."
          (d (ly:grob-property stem-grob 'direction))
          (ss (ly:staff-symbol-staff-space stem-grob))
          (stem-end (inexact->exact (round (* (index-cell
-                                              (ly:grob-extent stem-grob
-                                                              stem-grob
-                                                              Y)
-                                              d)
+                                               (ly:grob-extent stem-grob
+                                                               stem-grob
+                                                               Y)
+                                               d)
                                              (/ 2 ss)))))
          ;; For some reason the stem-end is a real instead of an integer...
          (dir-modifier (if (ly:position-on-line? stem-grob stem-end) "1" "0"))
@@ -236,7 +236,7 @@ at will.  The correct way to do this is:
                          (symbol->string flag-style-symbol)
                          "")))
     (cond
-     ((equal? flag-style "") (normal-flag grob))
-     ((equal? flag-style "mensural") (mensural-flag grob))
-     ((equal? flag-style "no-flag") (no-flag grob))
-     (else ((glyph-flag flag-style) grob)))))
+        ((equal? flag-style "") (normal-flag grob))
+        ((equal? flag-style "mensural") (mensural-flag grob))
+        ((equal? flag-style "no-flag") (no-flag grob))
+        (else ((glyph-flag flag-style) grob)))))