From d5e990236bc4da776af7ef646d8ebba6b730ae22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20N=C3=A9e?= <guillaume.nee@gmail.com>
Date: Fri, 23 Jul 2010 18:44:44 +0200
Subject: [PATCH 01/33] pop up warning box and stop progress bar on build error

---
 makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefile b/makefile
index c0eaafeb..d93f6dd1 100644
--- a/makefile
+++ b/makefile
@@ -79,7 +79,7 @@ $(PSF): %.ps.gz: %.ps
 %.dvi: %.tex %.aux
 	$(LATEX) $<
 
-$(PDF): LATEX = pdflatex
+$(PDF): LATEX = pdflatex -halt-on-error
 $(PDF): %.pdf: %.tex %.aux
 
 %.aux: %.tex

From 54991dbac6b5d59d241643fe65eacd0cc17e26c4 Mon Sep 17 00:00:00 2001
From: crep <romain.goffe@gmail.com>
Date: Fri, 23 Jul 2010 21:58:23 +0200
Subject: [PATCH 03/33] Utils: add spelling rule for New York

---
 utils/latex-preprocessing.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/latex-preprocessing.py b/utils/latex-preprocessing.py
index fb3aadf8..36bef169 100755
--- a/utils/latex-preprocessing.py
+++ b/utils/latex-preprocessing.py
@@ -23,6 +23,8 @@ word_dic = {
 "Ca ": "Ça ",
 "...": "\\dots ",
 "…": "\\dots",
+##: Typo
+"New-York": "New York",
 ##: Conversion from anglo-saxon conventions
 "\\[A": "\\[La",
 "\\[B": "\\[Si",

From bb463081f06851722f7886ed24f1d6cbae0776d5 Mon Sep 17 00:00:00 2001
From: crep <romain.goffe@gmail.com>
Date: Fri, 23 Jul 2010 21:58:23 +0200
Subject: [PATCH 05/33] Utils: add spelling rule for New York

---
 utils/latex-preprocessing.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/latex-preprocessing.py b/utils/latex-preprocessing.py
index fb3aadf8..36bef169 100755
--- a/utils/latex-preprocessing.py
+++ b/utils/latex-preprocessing.py
@@ -23,6 +23,8 @@ word_dic = {
 "Ca ": "Ça ",
 "...": "\\dots ",
 "…": "\\dots",
+##: Typo
+"New-York": "New York",
 ##: Conversion from anglo-saxon conventions
 "\\[A": "\\[La",
 "\\[B": "\\[Si",

From 3b15e8f213dce9fd3896977635159ef3d3599f86 Mon Sep 17 00:00:00 2001
From: Alexandre Dupas <alexandre.dupas@gmail.com>
Date: Mon, 26 Jul 2010 15:03:50 +0200
Subject: [PATCH 06/33] Remove options to generate ps files and add a
 LATEX_OPIONS env variable

---
 makefile | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/makefile b/makefile
index c0eaafeb..e8864bb4 100644
--- a/makefile
+++ b/makefile
@@ -19,7 +19,6 @@ SONGBOOKS := $(wildcard *.sb)
 TARGETS = $(SONGBOOKS:%.sb=%)
 
 PDF = $(TARGETS:%=%.pdf)
-PSF = $(TARGETS:%=%.ps.gz)
 
 CHORDS = chords.tex
 CHORDS_SRC = $(shell ls songs/*/*.sg)
@@ -47,9 +46,6 @@ default: songbook.pdf
 
 all: $(PDF)
 
-ps: $(PSF)
-	gv $<
-
 pdf: $(PDF)
 	xpdf $<
 
@@ -58,28 +54,18 @@ lilypond: $(LILYFILE)
 clean:
 	@rm -f $(TARGETS:%=%.d)   $(TARGETS:%=%.tex) $(TARGETS:%=%.aux) \
 	       $(TARGETS:%=%.toc) $(TARGETS:%=%.out) $(TARGETS:%=%.log) \
-	       $(TARGETS:%=%.nav) $(TARGETS:%=%.snm) $(TARGETS:%=%.dvi)
+	       $(TARGETS:%=%.nav) $(TARGETS:%=%.snm)
 	@rm -f *.sbx *.sxd
 
 cleanall: clean
-	@rm -f $(PDF) $(PSF)
+	@rm -f $(PDF)
 	@rm -f $(LILYFILE)
 
 depend:
 
 ############################################################
 
-$(PSF): LATEX = latex
-$(PSF): %.ps.gz: %.ps
-	gzip -f $<
-
-%.ps: %.dvi
-	dvips -o $@ $<
-
-%.dvi: %.tex %.aux
-	$(LATEX) $<
-
-$(PDF): LATEX = pdflatex
+$(PDF): LATEX = pdflatex $(LATEX_OPTIONS)
 $(PDF): %.pdf: %.tex %.aux
 
 %.aux: %.tex
@@ -102,4 +88,3 @@ include $(SONGBOOKS:%.sb=%.d)
 
 $(CHORDS): $(CHORDS_SRC)
 	$(MAKE_CHORDS) -o $@
-

From e014c16dfd0f355b9d9e119ba9a2d9ccaa34bf97 Mon Sep 17 00:00:00 2001
From: Alexandre Dupas <alexandre.dupas@gmail.com>
Date: Mon, 26 Jul 2010 17:47:03 +0200
Subject: [PATCH 07/33] Conditionnal include of depend files depending on the
 current goal.

---
 makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index e8864bb4..b16de2e1 100644
--- a/makefile
+++ b/makefile
@@ -80,11 +80,18 @@ $(PDF): %.pdf: %.tex %.aux
 %.d: %.sb
 	$(MAKE_SONGBOOK) -s $< -d -o $@
 
-include $(SONGBOOKS:%.sb=%.d)
-
 %.pdf: %.ly
 	@$(LILYPOND) --output=$(@:%.pdf=%) $<
 	@rm $(@:%.pdf=%.ps)
 
 $(CHORDS): $(CHORDS_SRC)
 	$(MAKE_CHORDS) -o $@
+
+
+ifeq (.pdf,$(suffix $(MAKECMDGOALS)))
+include $(MAKECMDGOALS:%.pdf=%.d)
+else ifneq ($(MAKECMDGOALS),clean)
+  ifneq ($(MAKECMDGOALS),cleanall)
+  include $(TARGETS:%=%.d)
+  endif
+endif

From b9ae12d8cc785c3a6a89ffbb2f02c1931c22d9cc Mon Sep 17 00:00:00 2001
From: Alexandre Dupas <alexandre.dupas@gmail.com>
Date: Thu, 5 Aug 2010 19:05:02 +0200
Subject: [PATCH 32/33] Support for color template parameter.

---
 songbook.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/songbook.py b/songbook.py
index 68b4cb2d..ca3489db 100755
--- a/songbook.py
+++ b/songbook.py
@@ -36,6 +36,8 @@ def toValue(parameter, data):
         else:
             joinText = ''
         return joinText.join(data)
+    elif parameter["type"] == "color":
+        return data[1:]
 
 def formatDeclaration(name, parameter):
     value = ""