From a0fd9560437aa5828fcd3df3d840bb4ff48948da Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 18 May 2017 08:44:23 +0200
Subject: Tanzen_und_Springen: Korrekturen

---
 Tanzen_und_Springen/Makefile               | 23 +++++++++++++++++++++++
 Tanzen_und_Springen/Tanzen_und_Springen.ly | 13 ++++++++-----
 Tanzen_und_Springen/stimmen.ly             |  4 ++--
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 Tanzen_und_Springen/Makefile

(limited to 'Tanzen_und_Springen')

diff --git a/Tanzen_und_Springen/Makefile b/Tanzen_und_Springen/Makefile
new file mode 100644
index 0000000..ef6dedf
--- /dev/null
+++ b/Tanzen_und_Springen/Makefile
@@ -0,0 +1,23 @@
+CURDOC=$(shell basename "$(CURDIR)")
+
+ifeq ($(FUER),ewe)
+  SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\")
+else
+  SPEZIFISCH=
+  # \#(set-global-staff-size 14)
+endif
+
+all: $(CURDOC).pdf
+
+clean:
+	rm -f *.pre
+
+Clean: clean
+	rm -f *.pdf *.midi
+
+%.pre: %.ly
+	sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@"
+
+%.pdf: %.pre *.ly
+	lilypond $<
+
diff --git a/Tanzen_und_Springen/Tanzen_und_Springen.ly b/Tanzen_und_Springen/Tanzen_und_Springen.ly
index a2f9a1b..3b6449c 100644
--- a/Tanzen_und_Springen/Tanzen_und_Springen.ly
+++ b/Tanzen_und_Springen/Tanzen_und_Springen.ly
@@ -1,20 +1,19 @@
 \include "deutsch.ly"
+#(ly:set-option 'relative-includes #t)
 \include "stimmen.ly"
 \include "texte.ly"
+#(ly:set-option 'relative-includes #f)
 
-#(set! paper-alist (cons '("kindle" . (cons (* 210 mm) (* 130 mm))) paper-alist))
-#(set-default-paper-size "kindle")
+%spezifisch%
 
 \pointAndClickOff
 
 \header {
-  title = "An hellen Tagen"
-  composer = "Giovanni Gastodi (um 1550-1622)"
   tagline = ""
 }
-
 \paper {
   top-margin = 5
+  print-all-headers = ##t
 }
 
 inhalt = {
@@ -43,6 +42,10 @@ inhalt = {
 }
 
 \score {
+  \header {
+    title = "Tanzen und Springen"
+    composer = "Hans Leo Haßler (1564-1612)" % "Giovanni Gastodi (um 1550-1622)"
+  }
   \inhalt
   \layout {
     indent = #0
diff --git a/Tanzen_und_Springen/stimmen.ly b/Tanzen_und_Springen/stimmen.ly
index 48bb1fe..d81fef5 100644
--- a/Tanzen_und_Springen/stimmen.ly
+++ b/Tanzen_und_Springen/stimmen.ly
@@ -154,8 +154,8 @@ bassMelodie = \relative c {
     c,2 c4 |
     g' a d, |
     g4. e8 f g |
-    a4 g g |
-    c,2 s4 |
+    a4 g g, |
+    c2 s4 |
   }
   c g' a |
   g2 g4 |
-- 
cgit v1.2.3-70-g09d2