From 288ff19aa8fd87fa926796186d928ee79b8c2bcc Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@nulda.ch>
Date: Wed, 17 Apr 2013 16:32:28 +0200
Subject: [PATCH] Staffsize is now centralised in 'lilysettings.ly'.

Caveat: you need to run 'make clean' first for a new staffsize to be
picked up.
---
 Makefile            |  3 ++-
 lilysettings.ly     |  1 +
 music_booklet.lytex | 44 ++++++++++++++++++++++----------------------
 3 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 lilysettings.ly

diff --git a/Makefile b/Makefile
index 463b410..cc3f1da 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ OUTDIR=out
 PDFDIR=pdf
 FILE = music_booklet
 GITINFO=revision.tex
-LILY_PDF = lilypond-book --pdf -o $(OUTDIR)
+LILY_PDF = lilypond-book --process="lilypond -dinclude-settings=lilysettings.ly" --pdf -o $(OUTDIR)
 PDF=cd $(OUTDIR) && pdflatex --enable-pipes --shell-escape $(FILE).tex
 INDEX=cd $(OUTDIR) && makeindex $(FILE).tex
 REVISIONINFO = `git log -1 --format="%h"`
@@ -17,6 +17,7 @@ VPATH = \
 all: book
 
 book: $(OUTDIR) $(PDFDIR) $(GITINFO)
+	cp lilysettings.ly  $(OUTDIR)/
 	cp headfoot.tex $(OUTDIR)/
 	cp settings.tex $(OUTDIR)/
 	cp -r license/ $(OUTDIR)/
diff --git a/lilysettings.ly b/lilysettings.ly
new file mode 100644
index 0000000..fbad0ca
--- /dev/null
+++ b/lilysettings.ly
@@ -0,0 +1 @@
+#(set-global-staff-size 20)
diff --git a/music_booklet.lytex b/music_booklet.lytex
index 1e378d4..2e2989f 100644
--- a/music_booklet.lytex
+++ b/music_booklet.lytex
@@ -19,7 +19,7 @@
   \pagenumbering{roman}   
   
   \input{title.tex}
-
+    
   \chapter*{Contributors}
     \begin{itemize}
         \item Matias Hugentobler
@@ -31,104 +31,104 @@
   \clearpage
   
   \pagenumbering{arabic}  
-  
+
   \chapter{All for Me Grog}
-    \lilypondfile[staffsize=18]{notes/AllForMeGrog.ly}
+    \lilypondfile{notes/AllForMeGrog.ly}
     ~\\ ~\\
     \input{lyrics/AllForMeGrog.tex} 
 
   \chapter{Auld Lang Syne}    
-    \lilypondfile[staffsize=18]{notes/AuldLangSyne.ly}
+    \lilypondfile{notes/AuldLangSyne.ly}
     ~\\ ~\\
     \input{lyrics/AuldLangSyne.tex}    
     
   \chapter{The Black Velvet Band}    
-    \lilypondfile[staffsize=18]{notes/BlackVelvetBand.ly}
+    \lilypondfile{notes/BlackVelvetBand.ly}
     ~\\ ~\\
     \input{lyrics/BlackVelvetBand.tex}
     
   \chapter{Bürgerlied}    
-    \lilypondfile[staffsize=18]{notes/Buergerlied.ly}
+    \lilypondfile{notes/Buergerlied.ly}
     ~\\ ~\\
     \input{lyrics/Buergerlied.tex}
 
   \chapter {Drunken Sailor}    
-    \lilypondfile[staffsize=18]{notes/DrunkenSailor.ly}
+    \lilypondfile{notes/DrunkenSailor.ly}
     ~\\ ~\\
     \input{lyrics/DrunkenSailor.tex} 
 
   \chapter{Finnegan's Wake}    
-    \lilypondfile[staffsize=18]{notes/FinnegansWake.ly}
+    \lilypondfile{notes/FinnegansWake.ly}
     ~\\ ~\\
     \input{lyrics/FinnegansWake.tex}
 
   \chapter{The Foggy Dew}    
-    \lilypondfile[staffsize=18]{notes/FoggyDew.ly}
+    \lilypondfile{notes/FoggyDew.ly}
     ~\\ ~\\
     \input{lyrics/FoggyDew.tex}  
 
   \chapter{I'm a Rover Seldom Sober}    
-    \lilypondfile[staffsize=18]{notes/ImARoverSeldomSober.ly}
+    \lilypondfile{notes/ImARoverSeldomSober.ly}
     ~\\ ~\\
     \input{lyrics/ImARoverSeldomSober.tex}
 
   \chapter{The Irish Rover}    
-    \lilypondfile[staffsize=18]{notes/IrishRover.ly}
+    \lilypondfile{notes/IrishRover.ly}
     ~\\ ~\\
     \input{lyrics/IrishRover.tex}
     
   \chapter{Johnny I Hardly Knew Ye}    
-    \lilypondfile[staffsize=18]{notes/JohnnyIHardlyKnewYe.ly}
+    \lilypondfile{notes/JohnnyIHardlyKnewYe.ly}
     ~\\ ~\\
     \input{lyrics/JohnnyIHardlyKnewYe.tex}
 
   \chapter{The Kerry Recruit}    
-    \lilypondfile[staffsize=18]{notes/KerryRecruit.ly}
+    \lilypondfile{notes/KerryRecruit.ly}
     ~\\ ~\\
     \input{lyrics/KerryRecruit.tex}
     
   \chapter{MacPherson's Farewell}    
-    \lilypondfile[staffsize=18]{notes/MacPhersonsFarewell.ly}
+    \lilypondfile{notes/MacPhersonsFarewell.ly}
     ~\\ ~\\
     \input{lyrics/MacPhersonsFarewell.tex}
 
   \chapter{Molly Malone}    
-    \lilypondfile[staffsize=18]{notes/MollyMalone.ly}
+    \lilypondfile{notes/MollyMalone.ly}
     ~\\ ~\\
     \input{lyrics/MollyMalone.tex}
 
   \chapter{Muirsheen Durkin}    
-    \lilypondfile[staffsize=18]{notes/MuirsheenDurkin.ly}
+    \lilypondfile{notes/MuirsheenDurkin.ly}
     ~\\ ~\\
     \input{lyrics/MuirsheenDurkin.tex}
 
   \chapter {A Nation Once Again}    
-    \lilypondfile[staffsize=18]{notes/NationOnceAgain.ly}
+    \lilypondfile{notes/NationOnceAgain.ly}
     ~\\ ~\\
     \input{lyrics/NationOnceAgain.tex}    
     
   \chapter{The Parting Glass}    
-    \lilypondfile[staffsize=18]{notes/PartingGlass.ly}
+    \lilypondfile{notes/PartingGlass.ly}
     ~\\ ~\\
     \input{lyrics/PartingGlass.tex}  
         
   \chapter {The Rising of the Moon}          
-    \lilypondfile[staffsize=18]{notes/RisingOfTheMoon.ly}
+    \lilypondfile{notes/RisingOfTheMoon.ly}
     ~\\ ~\\
     \input{lyrics/RisingOfTheMoon.tex}
         
   \chapter{The Star of the County Down}    
-    \lilypondfile[staffsize=18]{notes/StarOfTheCountyDown.ly}
+    \lilypondfile{notes/StarOfTheCountyDown.ly}
     ~\\ ~\\
     \input{lyrics/StarOfTheCountyDown.tex}   
        
   \chapter{Whiskey in the Jar}    
-    \lilypondfile[staffsize=18]{notes/WhiskeyInTheJar.ly}
+    \lilypondfile{notes/WhiskeyInTheJar.ly}
     ~\\ ~\\
     \input{lyrics/WhiskeyInTheJar.tex}
        
   \chapter{The Wild Rover}    
-    \lilypondfile[staffsize=18]{notes/WildRover.ly}
+    \lilypondfile{notes/WildRover.ly}
     ~\\ ~\\
     \input{lyrics/WildRover.tex}