fix auto midi generation and other minor mods

[music.git] / victoria / missa-trahe-me-post-te / kyrie.ly

diff --git a/victoria/missa-trahe-me-post-te/kyrie.ly b/victoria/missa-trahe-me-post-te/kyrie.ly
index 718992e4856e0cd706792e829b8e74a2feb4c03e..3bd12d4d749b37e3b0dd6fdb044c71984b156ddb 100644 (file)
--- a/victoria/missa-trahe-me-post-te/kyrie.ly
+++ b/victoria/missa-trahe-me-post-te/kyrie.ly
@@ -1,8 +1,8 @@
-\version "2.12.0"
+\version "2.18.0"
 #(set-global-staff-size 16)
 
-italicas=\override LyricText   #'font-shape = #'italic
-rectas=\override LyricText   #'font-shape = #'upright
+italicas=\override LyricText.font-shape = #'italic
+rectas=\override LyricText.font-shape = #'upright
 
 
 \header{
@@ -10,7 +10,7 @@ rectas=\override LyricText   #'font-shape = #'upright
   title="1. KYRIE"
   subtitle="de la misa Trahe me post te"
   footer="Editado con LilyPond"
-  tagline="Copia: Nancho Alvarez"
+  tagline=""
   poet = "(original en claves altas)"
 }
 
@@ -18,8 +18,11 @@ rectas=\override LyricText   #'font-shape = #'upright
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
 
-global={ \key bes \major \time 2/2  }
-
+global={
+  \key bes \major \time 2/2 
+  \override Score.BarNumber.font-size = #2
+  \override Score.BarNumber.self-alignment-X = #LEFT
+}
 
 cantus={
   \transpose c' bes {
@@ -37,7 +40,7 @@ cantus={
     r4 g''2 f''4 |
     e'' d'' f'' e'' |
     d'' c'' d''2 ~ |
-    d'' e'' \bar "||" 
+    d'' e'' \bar "||" \break
     g'' e''4 g'' |
     %15
     f''8[ e'']  e''[ d''16 c''] d''4 e'' |
@@ -53,7 +56,7 @@ cantus={
     b' c''2 b'4 |
     %25
     c''2. b'8 a' |
-    b'1 \bar "||"
+    b'1 \bar "||" \break
     r2 e'' ~ |
     e''4 e'' f'' e'' |
     d'' e''4. d''8 c'' b' |
@@ -292,6 +295,7 @@ bassus= {
   }
 }
 
+
 textocantus=\lyricmode{
   Ky -- ri -- e e -- lei -- _ _ _ son,
   Ky -- ri -- e e -- lei -- _ _ _ _ son.
@@ -352,8 +356,8 @@ textobassus=\lyricmode{
   Ky -- ri -- e __ e -- _ _ lei -- _ _ son,
   Ky -- ri -- e e -- _ _ lei -- _ _ son,
   e -- lei -- son.
-  Chri -- ste e -- lei -- _ _ _ son,
   Chri -- ste e -- lei -- _ _ son,
+  Chri -- ste e -- lei -- _ _ _ son,
   Chri -- ste e -- lei -- _ _ _ _ _ _ _ son. __
   Ky -- ri -- e e -- lei -- son, __ _ _
   Ky -- ri -- e e -- lei -- _ _ _ _ _ _ _ son,
@@ -364,7 +368,8 @@ textobassus=\lyricmode{
 \score {
   \new ChoirStaff <<
     \new Staff = "v1" {
-      \set Staff.instrumentName = "Cantus  "
+      \set Staff.instrumentName = "Cantus"
+      \set Staff.shortInstrumentName = "C"
       \clef treble
       \new Voice = "v1" {
         \global
@@ -379,40 +384,45 @@ textobassus=\lyricmode{
       }
     }
 
-    \new Staff = "v2" {
-      \set Staff.instrumentName = "Altus I  "
-      \clef treble
-      \new Voice = "v2" {
-        \global
-        \altus
+    \new ChoirStaff \with { systemStartDelimiter=#'SystemStartBrace } <<
+      \new Staff = "v2" {
+        \set Staff.instrumentName = "Altus 1"
+        \set Staff.shortInstrumentName = "A1"
+        \clef treble
+        \new Voice = "v2" {
+          \global
+          \altus
+        }
       }
-    }
-    \new Lyrics = "v2"
+      \new Lyrics = "v2"
 
-    \context Lyrics="v2" {
-      \lyricsto "v2" {
-        \textoaltus
+      \context Lyrics="v2" {
+        \lyricsto "v2" {
+          \textoaltus
+        }
       }
-    }
 
-    \new Staff = "v3" {
-      \set Staff.instrumentName = "Altus II  "
-      \clef treble
-      \new Voice = "v3" {
-        \global
-        \altusdos
+      \new Staff = "v3" {
+        \set Staff.instrumentName = "Altus 2"
+        \set Staff.shortInstrumentName = "A2"
+        \clef treble
+        \new Voice = "v3" {
+          \global
+          \altusdos
+        }
       }
-    }
-    \new Lyrics = "v3"
+      \new Lyrics = "v3"
 
-    \context Lyrics="v3" {
-      \lyricsto "v3" {
-        \textoaltusdos
+      \context Lyrics="v3" {
+        \lyricsto "v3" {
+          \textoaltusdos
+        }
       }
-    }
+    >>
 
     \new Staff = "v4" {
-      \set Staff.instrumentName = "Tenor  "
+      \set Staff.instrumentName = "Tenor"
+      \set Staff.shortInstrumentName = "T"
       \clef "G_8"
       \new Voice = "v4" {
         \global
@@ -428,7 +438,8 @@ textobassus=\lyricmode{
     }
 
     \new Staff = "v5" {
-      \set Staff.instrumentName = "Bassus  "
+      \set Staff.instrumentName = "Bassus"
+      \set Staff.shortInstrumentName = "B"
       \clef bass
       \new Voice = "v5" {
         \global
@@ -442,31 +453,57 @@ textobassus=\lyricmode{
       }
     }
   >>
-}
+  
+  \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"
+    }
+  }
 
 
-\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 { \RemoveEmptyStaffContext }
-  \context { \Score \override BarNumber #'padding = #2 }
 
 }
 
 
 
-%
-\midi {
-  \context {
-    \Score
-    tempoWholesPerMinute = #(ly:make-moment 120 4)
-  }
+\paper {
+  % system-count = #4
+  % bottom-margin = #50
+  ragged-last-bottom = ##f
+  % ragged-bottom = ##f
+
+  print-page-number = ##f
+  system-system-spacing =
+  #'((basic-distance . 20) (minimum-distance . 0) (padding . 5))
+  top-system-spacing = % header
+  #'((basic-distance . 20) (minimum-distance . 0) (padding . 0))
+  last-bottom-spacing = % footer
+  #'((basic-distance . 25) (minimum-distance . 0) (padding . 0))
+  %
 }
 
 
 
 
+
+%{
+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,
+2.13.18, 2.13.20, 2.13.27, 2.13.29, 2.13.31, 2.13.36, 2.13.39,
+2.13.40, 2.13.42, 2.13.44, 2.13.46, 2.13.48, 2.13.51, 2.14.0, 2.15.7,
+2.15.9, 2.15.10, 2.15.16, 2.15.17, 2.15.18, 2.15.19, 2.15.20, 2.15.25,
+2.15.32, 2.15.39, 2.15.40, 2.15.42, 2.15.43, 2.16.0, 2.17.0, 2.17.4,
+2.17.5, 2.17.6, 2.17.11, 2.17.14, 2.17.15, 2.17.18, 2.17.19, 2.17.20,
+2.17.25, 2.17.27, 2.17.29, 2.17.97, 2.18.0
+%}