From 635b882b57c9140a784192a57e8ea88268e417e9 Mon Sep 17 00:00:00 2001
From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Mon, 4 Aug 2014 23:03:20 +0200
Subject: [PATCH] Les Horaces : compress 1-5

---
 Salieri/LesHoraces/AAFcamilleChoeur/bassi.ily | 25 ++++++++++++++++++++-----
 Salieri/LesHoraces/AAFcamilleChoeur/score.ily | 27 ++++++++++-----------------
 Salieri/LesHoraces/main.ly                    |  1 +
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/Salieri/LesHoraces/AAFcamilleChoeur/bassi.ily b/Salieri/LesHoraces/AAFcamilleChoeur/bassi.ily
index 153c6087..66090d6c 100644
--- a/Salieri/LesHoraces/AAFcamilleChoeur/bassi.ily
+++ b/Salieri/LesHoraces/AAFcamilleChoeur/bassi.ily
@@ -18,16 +18,31 @@ fa4 fa,8 fa([_\markup\dynamic rmf sol la]) |
 sib4 sib, sib, |
 \rt#6 do8 |
 fa,4 r r |
+\tag #'bassi <>^\markup\right-align [Vc.] _\markup\right-align [Cb.]
 r8 <<
-  \tag #'cello { do'8( mib' do' sib do') | sib re' re' re' re' re' | }
-  \tag #'cb { fa8 fa fa fa fa | fad fad re fad re fad | }
+  \tag #'(cello bassi) \new Voice {
+    \tag #'bassi \voiceOne
+    do'8( mib' do' sib do') | sib re' re' re' re' re' |
+  }
+  \tag #'(cb bassi) \new Voice {
+    \tag #'bassi \voiceTwo
+    fa8 fa fa fa fa | fad fad re fad re fad |
+  }
 >>
+\tag #'bassi <>^"[Tutti]"
 re2 fad4 |
-sol sol, r |
+sol sol,
+\tag #'bassi <>^\markup [Vc.] _\markup [Cb.] r |
 <<
-  \tag #'cello { do'~ do'8 re' mi' re' | do'2 do'4 }
-  \tag #'cb { R2.*2 }
+  \tag #'(cello bassi) \new Voice {
+    \tag #'bassi \voiceOne
+    do'4. re'8 mi' re' | do'2 do'4
+  }
+  \tag #'(cb bassi) \new Voice {
+    \tag #'bassi \voiceTwo R2.*2
+  }
 >>
+\tag #'bassi <>^"[Tutti]"
 fa4\p fa sib, |
 \rt#6 do8 |
 fa4 fa, r |
diff --git a/Salieri/LesHoraces/AAFcamilleChoeur/score.ily b/Salieri/LesHoraces/AAFcamilleChoeur/score.ily
index ca7719b3..1f48172e 100644
--- a/Salieri/LesHoraces/AAFcamilleChoeur/score.ily
+++ b/Salieri/LesHoraces/AAFcamilleChoeur/score.ily
@@ -38,23 +38,16 @@
     } \withLyrics <<
       \global \includeNotes "camille"
     >> \keepWithTag #'camille \includeLyrics "paroles"
-    \new StaffGroupNoBracket <<
-      \new Staff \with {
-        instrumentName = "Violoncelli"
-        shortInstrumentName = "Vc."
-        \consists "Metronome_mark_engraver"
-      } << \global \keepWithTag #'cello \includeNotes "bassi" >>
-      \new Staff \with {
-        instrumentName = "Contrabasso"
-        shortInstrumentName = "Cb."
-      } <<
-        \global \keepWithTag #'cb \includeNotes "bassi"
-        \origLayout {
-          s8 s2.*3\pageBreak s2.*4\pageBreak s2.*4\pageBreak
-          s2.*4\pageBreak \grace s4 s2.*4\pageBreak s2.*4\pageBreak
-          s2.*4\pageBreak \grace s8
-        }
-      >>
+    \new Staff \with {
+      \vccbInstr
+      \consists "Metronome_mark_engraver"
+    } <<
+      \global \keepWithTag #'bassi \includeNotes "bassi"
+      \origLayout {
+        s8 s2.*3\pageBreak s2.*4\pageBreak s2.*4\pageBreak
+        s2.*4\pageBreak \grace s4 s2.*4\pageBreak s2.*4\pageBreak
+        s2.*4\pageBreak \grace s8
+      }
     >>
   >>
   \layout {
diff --git a/Salieri/LesHoraces/main.ly b/Salieri/LesHoraces/main.ly
index 47f2aae0..9b615711 100644
--- a/Salieri/LesHoraces/main.ly
+++ b/Salieri/LesHoraces/main.ly
@@ -66,6 +66,7 @@
 }
 %% 1-5
 \bookpart {
+  \paper { systems-per-page = 2 }
   \pieceToc\markup\wordwrap {
     Camille, chœur : \italic { Déesse secourable }
   }
-- 
2.11.4.GIT