Update for violin

build.sh

@@ -6,9 +6,6 @@ read -d  USAGE <<-END
 USAGE: $0 <clean|compile|help|watch> (--view)
 END
 
-FSWATCH="fswatch"
-LILYPOND_APP="/Applications/LilyPond.app"
-LILYPOND="$LILYPOND_APP/Contents/Resources/bin/lilypond"
 
 # Helper Functions #####################################################################################################
 
@@ -18,16 +15,12 @@ function cancel {
 }
 
 function check-dependencies {
-    if ! which -s "$FSWATCH"; then
-        echo "Could not find \"fswatch\"! Try installing using: brew install fswatch"
-        echo
-        exit 1
+    if ! which -s "fswatch"; then
+        brew install fswatch
     fi
 
-    if [[ ! -d "$LILYPOND_APP" ]]; then
-        echo "Could not find LilyPond! Please install it from http://lilypond.org/download.html."
-        echo
-        exit 1
+    if ! which -s "lilypond"; then
+        brew install lilypond
     fi
 }
 
@@ -36,7 +29,7 @@ function compile-ly {
     DIR_NAME=$(dirname $1 | sed "s@./src/scores/@@")
 
     mkdir -p "dist/$DIR_NAME"
-    $LILYPOND -I "$PWD/src/includes" -I "$PWD/src/pieces" -o "dist/$DIR_NAME/$BASE_NAME" $1
+    lilypond -I "$PWD/src/includes" -I "$PWD/src/pieces" -o "dist/$DIR_NAME/$BASE_NAME" $1
 
     if [[ "$VIEW" == "YES" ]]; then
         open -a "/Applications/Safari.app" -g "dist/$DIR_NAME/$BASE_NAME.pdf"
@@ -70,7 +63,7 @@ function command-compile {
 
 function command-watch {
     CURRENT_DIR=$(dirname $0)
-    $FSWATCH -r src/scores | egrep '\.ly$' --line-buffered | grep -v 'includes' --line-buffered | while read FILE; do
+    fswatch -r src/scores | egrep '\.ly$' --line-buffered | grep -v 'includes' --line-buffered | while read FILE; do
         FILE=$(echo $FILE | sed 's@.*/src/scores/\(.*\)$@./src/scores/\1@')
         compile-ly $FILE
     done

src/includes/globals.ly

@@ -1,40 +1,40 @@
-\version "2.18.2"
+\version "2.24.4"
 \language english
 
 \include "functions.ly"
 
 \header {
-	subtitle = \markup { \vspace #1 }
-	tagline = ""
+    subtitle = \markup { \vspace #1 }
+    tagline = ""
 }
 
 \layout {
     indent = 0.5 \in
-    
+
     \context {
         \Score
         proportionalNotationDuration = #(ly:make-moment 1/8)
-	}
+    }
 }
 
 \paper {
-	#(set-paper-size "letter")
-	top-margin = 0.5 \in
-	right-margin = 1.0 \in
-	left-margin = 1.0 \in
-	bottom-margin = 0.5 \in
+    #(set-paper-size "letter")
+    top-margin = 0.5 \in
+    right-margin = 1.0 \in
+    left-margin = 1.0 \in
+    bottom-margin = 0.5 \in
 
-	system-system-spacing = #'(
+    system-system-spacing = #'(
         (basic-distance . 12)
-		(minimum-distance . 6)
-		(padding . 3)
-		(stretchability . 24)
+        (minimum-distance . 6)
+        (padding . 3)
+        (stretchability . 24)
     )
 
-	markup-system-spacing = #'(
+    markup-system-spacing = #'(
         (basic-distance . 6)
-		(minimum-distance . 3)
-		(padding . 3)
-		(stretchability . 12)
+        (minimum-distance . 3)
+        (padding . 3)
+        (stretchability . 12)
     )
 }

src/pieces/as-time-goes-by.ly

@@ -0,0 +1,31 @@
+\include "globals.ly"
+
+\header {
+    title = "As Time Goes By"
+    subtitle = "From Casablanca"
+    composer = "Herman Hupfeld"
+}
+
+melody = \relative c'' {
+    \tempo Andante
+    \numericTimeSignature \time 4/4
+    \key ef \major
+
+    s2. r8 g
+
+    \repeat volta 2 {
+        af8 g f ef f4. g8 | bf8 af g f af4. bf8 | ef8 d c bf c2 | r2 r4 d4 |
+        f8 ef d c d4 ef | bf4 bf ef, f |
+    }
+
+    \alternative {{
+        g1( | g2) r4 r8 g |
+    } {
+        g1( | g2) r2
+    }}
+
+    ef8 f ef c'( c4) c | c8 df c b c2 | f,8 g f c'( c4) c | c8 df c b c2 |
+    g8 af g ef'( ef4) ef | ef8 d ef d f4 d | c4 c g g | bf2. r8 g \bar "||" |
+    af8 g f ef f4. g8 | bf8 af g f af4. bf8 | ef8 d c bf c2 | r2 r4 d |
+    f8 ef d c d4 ef | bf4 bf2 g4 | bf2 bf | ef1 \bar "|." |
+}

src/scores/clarinet-solo/greensleeves.ly

@@ -1,4 +1,4 @@
-\include "greensleeves.ly"
+\include "greensleeves-base.ly"
 
 \book {
     \score {

src/scores/clarinet-solo/song-of-the-volga-boatmen.ly

@@ -1,7 +1,7 @@
 % Copied from First Book of Clarinet Solos by John Davies and Paul Reade
 % pg 2
 
-\include "song-of-the-volga-boatmen.ly"
+\include "song-of-the-volga-boatmen-base.ly"
 
 \book {
     \score {

src/scores/sax-tenor-solo/greensleeves.ly

@@ -1,4 +1,4 @@
-\include "greensleeves.ly"
+\include "greensleeves-base.ly"
 
 \book {
     \score {

src/scores/sax-tenor-solo/song-of-the-volga-boatmen.ly

@@ -1,4 +1,4 @@
-\include "song-of-the-volga-boatmen.ly"
+\include "song-of-the-volga-boatmen-base.ly"
 
 \book {
     \score {

src/scores/violin-solo/violin-as-time-goes-by.ly

@@ -0,0 +1,11 @@
+\include "as-time-goes-by.ly"
+
+\book {
+    \score {
+        \new Staff \with {
+            instrumentName = "Violin"
+        } {
+            \melody
+        }
+    }
+}