Jerusalem: layout makro neu

1 files changed, 40 insertions, 202 deletions

diff --git a/Jerusalem/Jerusalem.ly b/Jerusalem/Jerusalem.ly
index 15445b2..73653d7 100644
--- a/Jerusalem/Jerusalem.ly
+++ b/Jerusalem/Jerusalem.ly
@@ -12,7 +12,19 @@
     tagline = ""
   }
 
-  % I % {{{
+define(`layout_makro',`
+  \layout {
+    indent = #0
+    ragged-last = ##f
+    \context {
+      \Staff
+      \RemoveEmptyStaves
+      \override VerticalAxisGroup #''`remove-first = ##t
+      ifelse($1,`no-time',`\remove "Time_signature_engraver"')
+    }
+  }
+')
+
 \include "parts/I.ly"
   \bookpart {
     \score {
@@ -20,39 +32,21 @@
       \header {
         piece = \markup { \bold "Jerusalem-Ruf" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IEinleitung
       \header {
         piece = \markup { \bold "Einleitung" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IWallfahrt
       \header {
         piece = \markup { \bold "Wallfahrt nach Jerusalem" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IEinzugAI
@@ -60,50 +54,19 @@
         piece = \markup { \bold "Der Einzug in den Tempel" }
         opus = \markup { \bold "a) Die Freude am Heiligtum" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-          \remove "Time_signature_engraver"
-        }
-      }
+      layout_makro(`no-time')
     }
     \score {
       \IEinzugAII
-      \layout {
-        indent = #0
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-          \remove "Time_signature_engraver"
-        }
-      }
+      layout_makro(`no-time')
     }
     \score {
       \IEinzugAIII
-      \layout {
-        indent = #0
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-          \remove "Time_signature_engraver"
-        }
-      }
+      layout_makro(`no-time')
     }
     \score {
       \IEinzugAIV
-      \layout {
-        indent = #0
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-          \remove "Time_signature_engraver"
-        }
-      }
+      layout_makro(`no-time')
     }
     \score {
       \IEinzugB
@@ -111,13 +74,7 @@
         piece = \markup { \bold "Der Einzug in den Tempel" }
         opus = \markup { \bold "b) Lobgesang des Volkes beim Einzug ins Heiligtum" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IEinzugC
@@ -125,48 +82,28 @@
         piece = \markup { \bold "Der Einzug in den Tempel" }
         opus = \markup { \bold "c) Gesang im Tempel" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IPilgerlied
       \header {
         piece = \markup { \bold "Pilgerlied I" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IInstrumental
       \header {
         piece = \markup { \bold "Instrumental (I)" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \header {
       title = "Teil I"
       subtitle = "Das Jerusalem des Alten Testaments"
     }
   }
-    % }}}
 
-  % II % {{{
 \include "parts/II.ly"
   \bookpart {
     \score {
@@ -174,117 +111,63 @@
       \header {
         piece = \markup { \bold "Jerusalem-Ruf" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIPilgerzuege
       \header {
         piece = \markup { \bold "Wann werden wieder Pilgerzüge singen?" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIReligionen
       \header {
         piece = \markup { \bold "Die drei Religionen" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIPilgerlied
       \header {
         piece = \markup { \bold "Pilgerlied II" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIShalom
       \header {
         piece = \markup { \bold "Shalom sagt sich leicht" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIWuensche
       \header {
         piece = \markup { \bold "Ich wünsche dir, Jerusalem" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIHava
       \header {
         piece = \markup { \bold "Hava Nagila" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIHevenu
       \header {
         piece = \markup { \bold "Hevenu Shalom Alejchem" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIInstrumental
       \header {
         piece = \markup { \bold "Instrumental (II)" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \header {
       title = "Teil II"
@@ -292,9 +175,7 @@
       composer = ##f
     }
   }
-    % }}}
 
-  % III % {{{
 \include "parts/III.ly"
   \bookpart {
     \score {
@@ -302,39 +183,21 @@
       \header {
         piece = \markup { \bold "Jerusalem-Ruf" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIIDann
       \header {
         piece = \markup { \bold "Dann such ich nach einem Land" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIIGott
       \header {
         piece = \markup { \bold "Gott macht alles neu" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIIChoral
@@ -342,13 +205,7 @@
         piece = \markup { \bold "Choralbearbeitung" }
         opus = \markup {  über \bold "„Jerusalem, du hochgebaute Stadt“" (Johann M. Meyfart, 1626) }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIIKommt
@@ -356,39 +213,21 @@
         piece = \markup { \bold "Die neue Stadt" }
         opus = \markup { \bold "„Kommt, kommt, ich zeige euch die neue Stadt“" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIIAlso
       \header {
         piece = \markup { \bold "Also fangen wir an" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \score {
       \IIIJerusalemRufII
       \header {
         piece = \markup { \bold "Jerusalem-Ruf" }
       }
-      \layout {
-        \context {
-          \Staff
-          \RemoveEmptyStaves
-          \override VerticalAxisGroup #'remove-first = ##t
-        }
-      }
+      layout_makro
     }
     \header {
       title = "Teil III"
@@ -396,4 +235,3 @@
       composer = ##f
     }
   }
-    % }}}