load settings.ly with lilypond command.

18 files changed, 1 insertions, 19 deletions

diff --git a/01-song1/01-song1.ly b/01-song1/01-song1.ly
index d66b0da..6ace047 100644
--- a/01-song1/01-song1.ly
+++ b/01-song1/01-song1.ly
@@ -6,8 +6,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-
-\include "../settings.ly"
 \include "music/common.ly"
 \include "music/bass.ly"
 \include "music/keys.ly"
diff --git a/01-song1/parts/bass.ly b/01-song1/parts/bass.ly
index 6765712..6eb363b 100644
--- a/01-song1/parts/bass.ly
+++ b/01-song1/parts/bass.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/common.ly"
 \include "../music/bass.ly"
 
diff --git a/01-song1/parts/keys.ly b/01-song1/parts/keys.ly
index bab0550..a754b89 100644
--- a/01-song1/parts/keys.ly
+++ b/01-song1/parts/keys.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/common.ly"
 \include "../music/keys.ly"
 
diff --git a/01-song1/parts/stick.ly b/01-song1/parts/stick.ly
index 3659aa4..7d803f9 100644
--- a/01-song1/parts/stick.ly
+++ b/01-song1/parts/stick.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/common.ly"
 \include "../music/stick.ly"
 
diff --git a/02-song2/02-song2.ly b/02-song2/02-song2.ly
index b563088..b90fb30 100644
--- a/02-song2/02-song2.ly
+++ b/02-song2/02-song2.ly
@@ -6,7 +6,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../settings.ly"
 \include "music/bass.ly"
 \include "music/keys.ly"
 \include "music/stick.ly"
diff --git a/02-song2/parts/bass.ly b/02-song2/parts/bass.ly
index 25e90cb..7d97ba5 100644
--- a/02-song2/parts/bass.ly
+++ b/02-song2/parts/bass.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/bass.ly"
 
 \score {
diff --git a/02-song2/parts/guitar.ly b/02-song2/parts/guitar.ly
index 3da82f7..dc039db 100644
--- a/02-song2/parts/guitar.ly
+++ b/02-song2/parts/guitar.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../settings.ly"
 \include "music/guitar.ly"
 
 \score {
diff --git a/02-song2/parts/keys.ly b/02-song2/parts/keys.ly
index c966ef8..3c21f3c 100644
--- a/02-song2/parts/keys.ly
+++ b/02-song2/parts/keys.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/keys.ly"
 
 \score {
diff --git a/02-song2/parts/stick.ly b/02-song2/parts/stick.ly
index 1375af3..b4e9e5b 100644
--- a/02-song2/parts/stick.ly
+++ b/02-song2/parts/stick.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/stick.ly"
 
 \score {
diff --git a/03-circus/03-circus.ly b/03-circus/03-circus.ly
index c28f1b4..0f9d5de 100644
--- a/03-circus/03-circus.ly
+++ b/03-circus/03-circus.ly
@@ -6,7 +6,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../settings.ly"
 \include "music/bass.ly"
 \include "music/keys.ly"
 \include "music/stick.ly"
diff --git a/03-circus/parts/bass.ly b/03-circus/parts/bass.ly
index 3b4dc67..5369d6d 100644
--- a/03-circus/parts/bass.ly
+++ b/03-circus/parts/bass.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/bass.ly"
 
 \score {
diff --git a/03-circus/parts/keys.ly b/03-circus/parts/keys.ly
index 1af7bf2..e813ba2 100644
--- a/03-circus/parts/keys.ly
+++ b/03-circus/parts/keys.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/keys.ly"
 
 \score {
diff --git a/03-circus/parts/stick.ly b/03-circus/parts/stick.ly
index f3b72c5..cb60dd7 100644
--- a/03-circus/parts/stick.ly
+++ b/03-circus/parts/stick.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/stick.ly"
 
 \score {
diff --git a/04-white-noise/04-white-noise.ly b/04-white-noise/04-white-noise.ly
index 8073a56..2073b1f 100644
--- a/04-white-noise/04-white-noise.ly
+++ b/04-white-noise/04-white-noise.ly
@@ -7,7 +7,6 @@
 }
 
 
-\include "../settings.ly"
 \include "music/common.ly"
 \include "music/bass.ly"
 \include "music/keys.ly"
diff --git a/04-white-noise/parts/bass.ly b/04-white-noise/parts/bass.ly
index a56d445..7f2042a 100644
--- a/04-white-noise/parts/bass.ly
+++ b/04-white-noise/parts/bass.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/common.ly"
 \include "../music/bass.ly"
 
diff --git a/04-white-noise/parts/keys.ly b/04-white-noise/parts/keys.ly
index 1d79fab..711445d 100644
--- a/04-white-noise/parts/keys.ly
+++ b/04-white-noise/parts/keys.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/common.ly"
 \include "../music/keys.ly"
 
diff --git a/04-white-noise/parts/stick.ly b/04-white-noise/parts/stick.ly
index e70bce6..4ee35cc 100644
--- a/04-white-noise/parts/stick.ly
+++ b/04-white-noise/parts/stick.ly
@@ -7,7 +7,6 @@
   copyright = \markup { \char ##x00A9 "2002—2016 Ricardo Wurmus" }
 }
 
-\include "../../settings.ly"
 \include "../music/common.ly"
 \include "../music/stick.ly"
 
diff --git a/Makefile b/Makefile
index 18c9061..7d3199b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SOUNDFONT = $(HOME)/soundfonts/FluidR3GM.sf2
 # Determine how many processors are present
 CPU_CORES=`grep -m1 "cpu cores" /proc/cpuinfo | tr -cd '[:digit:]'`
 # The command to run lilypond
-LILY_CMD = lilypond -ddelete-intermediate-files -drelative-includes -djob-count=$(CPU_CORES)
+LILY_CMD = lilypond -dinclude-settings=settings.ly -ddelete-intermediate-files -drelative-includes -djob-count=$(CPU_CORES)
 
 SUBDIRS := 01-song1 02-song2 03-circus 04-white-noise