From f5677d7e96afa04a5d1da4c02d5ba1f3aa9c6929 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Mon, 29 May 2017 14:02:50 +0100
Subject: [PATCH] fix auto midi generation and other minor mods

---
 victoria/missa-trahe-me-post-te/agnus.ly      | 40 ++++++++++---------
 victoria/missa-trahe-me-post-te/benedictus.ly | 31 +++++++-------
 victoria/missa-trahe-me-post-te/gloria.ly     | 34 ++++++++--------
 victoria/missa-trahe-me-post-te/kyrie.ly      | 33 ++++++++-------
 victoria/missa-trahe-me-post-te/sanctus.ly    | 29 ++++++++------
 5 files changed, 91 insertions(+), 76 deletions(-)

diff --git a/victoria/missa-trahe-me-post-te/agnus.ly b/victoria/missa-trahe-me-post-te/agnus.ly
index 2c510ed..5f14483 100644
--- a/victoria/missa-trahe-me-post-te/agnus.ly
+++ b/victoria/missa-trahe-me-post-te/agnus.ly
@@ -418,8 +418,8 @@ txtaltusdos=\lyricmode{
 txtaltusdosb=\lyricmode{
   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-%   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _  
- \italicas do -- na no -- bis pa -- cem,
+  %   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _  
+  \italicas do -- na no -- bis pa -- cem,
   do -- na no -- bis pa -- cem. __ _ 
 }
 
@@ -441,7 +441,7 @@ txttenorb=\lyricmode {
   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
   _ _ _ _  _ _ _ 
- \italicas do -- na no -- bis pa -- cem,
+  \italicas do -- na no -- bis pa -- cem,
   do -- na no -- _ _ bis pa -- cem,
   do -- na no -- bis pa -- cem,
   do -- na no -- bis pa -- cem,
@@ -463,8 +463,8 @@ txttenordos=\lyricmode{
 txttenordosb=\lyricmode{
   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
   _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-   _ _ _ _ _ _ _
- \italicas do -- na no -- bis pa -- cem,
+  _ _ _ _ _ _ _
+  \italicas do -- na no -- bis pa -- cem,
   do -- na no -- _ _  bis pa -- cem. __ 
 }
 
@@ -583,24 +583,28 @@ txtbassusb=\lyricmode{
   
   >>
 
-  %\midi { \tempo 4 = 120 }
+  \midi { \tempo 4 = 120 }
 
-}
 
+  \layout {
+    line-width=19.0 \cm
+    interscoreline= 3.0 \cm
+    %	interscorelinefill= 1.0
+    textheight= 26.0 \cm
+    %	first-page-number = no
+    \context { \Lyrics \override LyricText.font-size = #2 }
+    %	\context { \Staff \RemoveEmptyStaves }
+    \context { \Score \override BarNumber.padding = #2 }
 
+    \context {
+      \Voice
+      \consists "Ambitus_engraver"
+    }
+  }
+}
 
 
-\layout {
-  line-width=19.0 \cm
-  interscoreline= 3.0 \cm
-  %	interscorelinefill= 1.0
-  textheight= 26.0 \cm
-  %	first-page-number = no
-  \context { \Lyrics \override LyricText.font-size = #2 }
-  %	\context { \Staff \RemoveEmptyStaves }
-  \context { \Score \override BarNumber.padding = #2 }
 
-}
 
 \paper {
   % system-count = #4
@@ -608,7 +612,7 @@ txtbassusb=\lyricmode{
   ragged-last-bottom = ##f
   % ragged-bottom = ##f
 
- print-page-number = ##f
+  print-page-number = ##f
   system-system-spacing =
   #'((basic-distance . 20) (minimum-distance . 0) (padding . 5))
   top-system-spacing = % header
diff --git a/victoria/missa-trahe-me-post-te/benedictus.ly b/victoria/missa-trahe-me-post-te/benedictus.ly
index 533bba7..e681a05 100644
--- a/victoria/missa-trahe-me-post-te/benedictus.ly
+++ b/victoria/missa-trahe-me-post-te/benedictus.ly
@@ -225,30 +225,33 @@ textobassus=\lyricmode{
     }
   >>
  
-  %\midi { \tempo 4 = 120 }
-
+  \midi { \tempo 4 = 120 }
+
+  \layout {
+    line-width=19.0 \cm
+    interscoreline= 0.0 \cm
+    interscorelinefill= 1.0
+    textheight= 26.2 \cm
+    first-page-number = no
+    \context { \Lyrics \override LyricText.font-size = #2 }
+    %	\context { \Staff \RemoveEmptyStaves }
+    \context { \Score \override BarNumber.padding = #2 }
+    \context {
+      \Voice
+      \consists "Ambitus_engraver"
+    }
+  }
 
 }
 
 
-\layout {
-  line-width=19.0 \cm
-  interscoreline= 0.0 \cm
-  interscorelinefill= 1.0
-  textheight= 26.2 \cm
-  first-page-number = no
-  \context { \Lyrics \override LyricText.font-size = #2 }
-  %	\context { \Staff \RemoveEmptyStaves }
-  \context { \Score \override BarNumber.padding = #2 }
-
-}
 
 \paper {
   % system-count = #4
   % bottom-margin = #50
   ragged-last-bottom = ##f
   % ragged-bottom = ##f
- print-page-number = ##f
+  print-page-number = ##f
 
   system-system-spacing =
   #'((basic-distance . 11) (minimum-distance . 0) (padding . 5))
diff --git a/victoria/missa-trahe-me-post-te/gloria.ly b/victoria/missa-trahe-me-post-te/gloria.ly
index 3bae90f..999a3f0 100644
--- a/victoria/missa-trahe-me-post-te/gloria.ly
+++ b/victoria/missa-trahe-me-post-te/gloria.ly
@@ -663,7 +663,7 @@ textobassus=\lyricmode{
 
 \score {
   
-     
+  
   \new ChoirStaff <<
     \new Staff = "v1" {
       \set Staff.instrumentName = "Cantus"
@@ -753,33 +753,33 @@ textobassus=\lyricmode{
   >>
   %
 
-% \midi { \tempo 4 = 120 }
+  \midi { \tempo 4 = 120 }
 
+  \layout {
+    line-width=19.2 \cm
+    interscoreline= 0.0 \cm
+    interscorelinefill= 1.0
+    textheight= 26.8 \cm
+    %	first-page-number = no
+    \context { \Lyrics \override LyricText.font-size = #2 }
+    \context { \Staff \RemoveEmptyStaves }
+    \context { \Score \override BarNumber.padding = #2 }
+    \context {
+      \Voice
+      \consists "Ambitus_engraver"
+    }
+ %  \set Score.defaultBarType = #"'"
+  }
 }
 
 
 
-\layout {
-  line-width=19.2 \cm
-  interscoreline= 0.0 \cm
-  interscorelinefill= 1.0
-  textheight= 26.8 \cm
-  %	first-page-number = no
-  \context { \Lyrics \override LyricText.font-size = #2 }
-  \context { \Staff \RemoveEmptyStaves }
-  \context { \Score \override BarNumber.padding = #2 }
 
-}
 
 \paper {
   print-page-number = ##f
 }
 %
-\midi {
-  \tempo 4 = 120
-}
-
-
 
 
 
diff --git a/victoria/missa-trahe-me-post-te/kyrie.ly b/victoria/missa-trahe-me-post-te/kyrie.ly
index 67f80ae..3bd12d4 100644
--- a/victoria/missa-trahe-me-post-te/kyrie.ly
+++ b/victoria/missa-trahe-me-post-te/kyrie.ly
@@ -454,24 +454,28 @@ textobassus=\lyricmode{
     }
   >>
   
- % \midi { \tempo 4 = 120 }
+  \midi { \tempo 4 = 120 }
+  
+  \layout {
+    line-width=19.0 \cm
+    interscoreline= 0.0 \cm
+    interscorelinefill= 1.0
+    textheight= 26.8 \cm
+    %	first-page-number = no
+    \context { \Lyrics \override LyricText.font-size = #2 }
+    %	\context { \Staff \RemoveEmptyStaves }
+    \context { \Score \override BarNumber.padding = #2 }
+    \context {
+      \Voice
+      \consists "Ambitus_engraver"
+    }
+  }
 
 
-}
 
-\midi { \tempo 4 = 120 }
+}
 
-\layout {
-  line-width=19.0 \cm
-  interscoreline= 0.0 \cm
-  interscorelinefill= 1.0
-  textheight= 26.8 \cm
-  %	first-page-number = no
-  \context { \Lyrics \override LyricText.font-size = #2 }
-  %	\context { \Staff \RemoveEmptyStaves }
-  \context { \Score \override BarNumber.padding = #2 }
 
-}
 
 \paper {
   % system-count = #4
@@ -479,7 +483,7 @@ textobassus=\lyricmode{
   ragged-last-bottom = ##f
   % ragged-bottom = ##f
 
- print-page-number = ##f
+  print-page-number = ##f
   system-system-spacing =
   #'((basic-distance . 20) (minimum-distance . 0) (padding . 5))
   top-system-spacing = % header
@@ -493,7 +497,6 @@ textobassus=\lyricmode{
 
 
 
-
 %{
 convert-ly (GNU LilyPond) 2.18.2  convert-ly: Processing `'...
 Applying conversion: 2.12.3, 2.13.0, 2.13.1, 2.13.4, 2.13.10, 2.13.16,
diff --git a/victoria/missa-trahe-me-post-te/sanctus.ly b/victoria/missa-trahe-me-post-te/sanctus.ly
index 88d10eb..2674b6d 100644
--- a/victoria/missa-trahe-me-post-te/sanctus.ly
+++ b/victoria/missa-trahe-me-post-te/sanctus.ly
@@ -557,24 +557,29 @@ textobassus=\lyricmode{
     }
   >>
   
-%  \midi {  \tempo 4 = 120 }
+  \midi {  \tempo 4 = 120 }
+  
+  \layout {
+    line-width=19.0 \cm
+    interscoreline= 0.0 \cm
+    interscorelinefill= 1.0
+    textheight= 26.3 \cm
+    %	first-page-number = no
+    \context { \Lyrics \override LyricText.font-size = #2 }
+    %	\context { \Staff \RemoveEmptyStaves }
+    \context { \Score \override BarNumber.padding = #2 }
+    \context {
+      \Voice
+      \consists "Ambitus_engraver"
+    }
+  }
 }
 
 
-\layout {
-  line-width=19.0 \cm
-  interscoreline= 0.0 \cm
-  interscorelinefill= 1.0
-  textheight= 26.3 \cm
-  %	first-page-number = no
-  \context { \Lyrics \override LyricText.font-size = #2 }
-  %	\context { \Staff \RemoveEmptyStaves }
-  \context { \Score \override BarNumber.padding = #2 }
 
-}
 
 \paper {
-   print-page-number = ##f
+  print-page-number = ##f
 }
 
 
-- 
2.43.0