Factorize layout

6 files changed, 16 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index 137444d..73f5625 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 SOURCES=$(wildcard *.ly)
+INCLUDES=$(wildcard *.tly)
 PARTS=$(SOURCES:.ly=.pdf)
 TDIR=out
 
@@ -6,11 +7,11 @@ book: book.pdf
 
 parts: $(PARTS)
 
-%.pdf: %.ly
+%.pdf: %.ly $(INCLUDES)
 	lilypond --pdf $<
 
-$(TDIR)/book.tex: book.lytex *.ly
-	lilypond-book --output=$(TDIR) --pdf $<
+$(TDIR)/book.tex: book.lytex $(SOURCES) $(INCLUDES)
+	lilypond-book --output=$(TDIR) -I ../ --pdf $<
 
 %.pdf: %.tex
 	cd $(@D); pdflatex $(<F)
diff --git a/agnus.ly b/agnus.ly
index 8d0c47e..22e152f 100644
--- a/agnus.ly
+++ b/agnus.ly
@@ -36,11 +36,4 @@ lyr = \lyricmode {
   >>
 }
 
-\score{
-  <<
-    \new Voice = "melody" { \melody }
-    \new Lyrics \lyricsto "melody" { \lyr }
-  >>
-  \layout {}
-  \midi {}
-}
+\include "layout.tly"
diff --git a/alleluia.ly b/alleluia.ly
index fa90fdc..43ba35d 100644
--- a/alleluia.ly
+++ b/alleluia.ly
@@ -25,11 +25,4 @@ lyr = \lyricmode {
   lu __ ia!
 }
 
-\score{
-  <<
-    \new Voice = "melody" { \melody }
-    \new Lyrics \lyricsto "melody" { \lyr }
-  >>
-  \layout {}
-  \midi {}
-}
+\include "layout.tly"
diff --git a/kyrie.ly b/kyrie.ly
index 52b71a6..4c3f3ba 100644
--- a/kyrie.ly
+++ b/kyrie.ly
@@ -27,11 +27,4 @@ lyr = \lyricmode {
   le -- i -- son.
 }
 
-\score{
-  <<
-    \new Voice = "melody" { \melody }
-    \new Lyrics \lyricsto "melody" { \lyr }
-  >>
-  \layout {}
-  \midi {}
-}
+\include "layout.tly"
diff --git a/layout.tly b/layout.tly
new file mode 100644
index 0000000..a5fffb1
--- /dev/null
+++ b/layout.tly
@@ -0,0 +1,8 @@
+\score{
+  <<
+    \new Voice = "melody" { \melody }
+    \new Lyrics \lyricsto "melody" { \lyr }
+  >>
+  \layout {}
+  \midi {}
+}
diff --git a/sanctus.ly b/sanctus.ly
index ac159b8..e8b2315 100644
--- a/sanctus.ly
+++ b/sanctus.ly
@@ -47,11 +47,4 @@ lyr = \lyricmode {
   Do -- mi -- ni.
 }
 
-\score{
-  <<
-    \new Voice = "melody" { \melody }
-    \new Lyrics \lyricsto "melody" { \lyr }
-  >>
-  \layout {}
-  \midi {}
-}
+\include "layout.tly"