From c634216cf3f43fce32f71a1f2f99d7da7b3bc3bb Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Fri, 2 Jun 2017 08:25:18 -0700
Subject: [PATCH] Normalize Star Spangled Banner

---
 src/clarinet-solo/star-spangled-banner.ly | 78 +++++++++--------------
 1 file changed, 29 insertions(+), 49 deletions(-)

diff --git a/src/clarinet-solo/star-spangled-banner.ly b/src/clarinet-solo/star-spangled-banner.ly
index 5310dff..fe45a24 100755
--- a/src/clarinet-solo/star-spangled-banner.ly
+++ b/src/clarinet-solo/star-spangled-banner.ly
@@ -1,38 +1,24 @@
 \include "globals.ly"
-\version "2.18.2"
 
 \header {
-  title = "The Star Spangled Banner"
-  composer = "John Stafford Smith"
-}
-
-tempoMark = {
-  \once \override Score.RehearsalMark #'self-alignment-X = #LEFT
-  \once \override Score.RehearsalMark #'break-align-symbols = #'(time-signature key-signature)
-  \once \override Staff.TimeSignature #'break-align-anchor-alignment = #LEFT
-  \mark \markup \bold "With Spirit"
-}
-
-global = {
-  \tempoMark
-  \key bf \major
-  \time 3/4
+    title = "The Star Spangled Banner"
+    composer = "John Stafford Smith"
 }
 
 melody = \relative c' {
-  \global
-  \dynamicUp
-  r2 f8. ( d16 )    | bf4 d f       | bf2 d8. c16           | bf4 d, e                  |
-  f2 f8 f           | d'4. c8 bf4   | a2 g8 a               | bf4 bf f                  |
-  \set melismaBusyProperties = #'()
-  d bf f'8. ( d16 )
-  \unset melismaBusyProperties
-  bf4 d f           | bf2 d8. c16   | bf4 d, e              | f2 f8 f                   |
-  d'4. c8 bf4       | a2 g8 a       | bf4 bf f              | d bf d'8 d                |
-  d4 ef f           | f2 ef8 d      | c4 d ef               | ef2 ef4                   |
-  d4. c8 bf4        | a2 g8 a       | bf4 d, e              | f2 f4                     |
-  bf4 bf bf8 ( a )  | g4 g g        | c4 ef8 ( d ) c ( bf ) | bf4 ( a ) \fermata f8 f   |
-  bf4. ( c8 ) d ef  | f2 bf,8 c     | d4. ef8 c4            | bf2.                      |
+    \tempo "With Spirit"
+    \key bf \major
+    \time 3/4
+  
+    r2 f8. ( d16 )              | bf4 d f               | bf2 d8. c16       | bf4 d, e                  |
+    f2 f8 f                     | d'4. c8 bf4           | a2 g8 a           | bf4 bf f                  |
+    d bf f'8. ( d16 )           | bf4 d f               | bf2 d8. c16       | bf4 d, e                  |
+    f2 f8 f                     | d'4. c8 bf4           | a2 g8 a           | bf4 bf f                  |
+    d bf d'8 d                  | d4 ef f               | f2 ef8 d          | c4 d ef                   |
+    ef2 ef4                     | d4. c8 bf4            | a2 g8 a           | bf4 d, e                  |
+    f2 f4                       | bf4 bf bf8 ( a )      | g4 g g            | c4 ef8 ( d ) c ( bf )     |
+    bf4 ( a ) \fermata f8 f     | bf4. ( c8 ) d ef      | f2 bf,8 c         | d4. ef8 c4                |
+    bf2.                        |
 }
 
 words = \lyricmode {
@@ -48,24 +34,18 @@ words = \lyricmode {
     o'er the land of the free and the home of the brave?
 }
 
-\score {
-  <<
-    \new Staff \with {
-      instrumentName = "Clarinet"
-    } {
-      \naturalizeMusic
-      \transpose c d
-      \melody
-      \addlyrics {
-          \set fontSize = #-2
-          \words
-      }
+\book {
+    \score {
+        \new Staff \with {
+            instrumentName = "Clarinet"
+        } {
+            \naturalizeMusic
+            \transpose bf c'
+            \melody
+            \addlyrics {
+                \set fontSize = #-2
+                \words
+            }
+        }
     }
-  >>
-  \layout {
-    \context {
-      \Score
-      proportionalNotationDuration = #(ly:make-moment 1/8)
-    }
-  }
-}
\ No newline at end of file
+}