From 25a5b2bf70c4c0ecaa3dcbbf4f46138dd3ca3d24 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Thu, 23 Jun 2011 15:24:14 +0200
Subject: [PATCH] Vertical spacing variables update

---
 orchestrallily.ily | 104 +++++++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 47 deletions(-)

diff --git a/orchestrallily.ily b/orchestrallily.ily
index cebe7a5..25ddc7c 100644
--- a/orchestrallily.ily
+++ b/orchestrallily.ily
@@ -1828,55 +1828,65 @@ videEnd = \notemode {
 }
 
 \paper {
-%         markup-system-spacing = #'((space . 4) (padding . 2) (stretchability . 20))
-	markup-system-spacing #'minimum-distance = #0
-	markup-system-spacing #'space = #4
-	markup-system-spacing #'padding = #2
-	markup-system-spacing #'stretchability = #40
-% 	system-system-spacing = #'((space . 0) (padding . 20) (stretchability . 50))
-	system-system-spacing #'minimum-distance = #0
-	system-system-spacing #'space = #5
-	system-system-spacing #'padding = #2
-	system-system-spacing #'stretchability = #50
-	top-system-spacing #'minimum-distance = #0
-	top-system-spacing #'space = #5
-	top-system-spacing #'padding = #2
-	top-system-spacing #'stretchability = #20
-	last-bottom-spacing #'minimum-distance = #0
-	last-bottom-spacing #'space = #5
-	last-bottom-spacing #'padding = #2
-	last-bottom-spacing #'stretchability = #20
-
-	score-markup-spacing #'space = #5
-	score-markup-spacing #'stretchability = #50
-
-	markup-markup-spacing #'space = #5
-	markup-markup-spacing #'stretchability = #30
+%   annotate-spacing = ##t
+  ragged-bottom = ##f
+  ragged-last = ##f
+  ragged-last-bottom = ##f
+
+  top-markup-spacing #'minimum-distance = #5
+%   top-markup-spacing #'space = #4
+%   top-markup-spacing #'padding = #2
+  top-markup-spacing #'stretchability = #15
+
+  top-system-spacing #'minimum-distance = #0
+%   top-system-spacing #'space = #3
+  top-system-spacing #'padding = #2
+  top-system-spacing #'stretchability = #13
+  
+  markup-system-spacing #'minimum-distance = #5
+%   markup-system-spacing #'space = #4
+  markup-system-spacing #'padding = #3
+  markup-system-spacing #'stretchability = #25
+  
+  system-system-spacing #'minimum-distance = #0
+%   system-system-spacing #'space = #5
+  system-system-spacing #'padding = #2
+  system-system-spacing #'stretchability = #15
+  
+  last-bottom-spacing #'basic-distance = #3
+%   last-bottom-spacing #'space = #7
+  last-bottom-spacing #'padding = #4
+  last-bottom-spacing #'stretchability = #14
+
+%   score-markup-spacing #'space = #5
+%   score-markup-spacing #'stretchability = #15
+
+%   markup-markup-spacing #'space = #5
+%   markup-markup-spacing #'stretchability = #30
 }
+
 \layout {
-	\context { \StaffGroup
-% 		\override StaffGrouper #'staff-staff-spacing #'space = 5
-		\override StaffGrouper #'staff-staff-spacing #'stretchability = #4.5
-	}
-	\context { \GrandStaff
-% 		\override StaffGrouper #'staff-staff-spacing #'space = 5
-		\override StaffGrouper #'staff-staff-spacing #'stretchability = #4.5
-	}
-	\context { \ChoirStaff
-% 		\override StaffGrouper #'staff-staff-spacing #'space = 5
-		\override StaffGrouper #'staff-staff-spacing #'stretchability = #3
-	}
-	\context { \Staff
-% 		\override StaffGrouper #'staff-staff-spacing #'space = 1
-		\override StaffGrouper #'staff-staff-spacing #'stretchability = #4.9
-	}
-	\context { \Score
-% 		\override StaffGrouper #'staff-staff-spacing #'space = 5
-		\override StaffGrouper #'staff-staff-spacing #'stretchability = #5
-	}
-	\context { \Lyrics
-		\override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'minimum-distance = ##f
-	}
+  \context { \PianoStaff
+    \override StaffGrouper #'staff-staff-spacing #'stretchability = #1.5
+  }
+  \context { \StaffGroup
+    \override StaffGrouper #'staff-staff-spacing #'stretchability = #2.5
+    \override SystemStartBracket #'collapse-height = #1
+  }
+  \context { \GrandStaff
+    \override StaffGrouper #'staff-staff-spacing #'stretchability = #3
+    \override StaffGrouper #'staffgroup-staff-spacing #'stretchability = #3
+    \override StaffGrouper #'staff-staffgroup-spacing #'stretchability = #3
+   }
+  \context { \ChoirStaff
+    \override StaffGrouper #'staff-staff-spacing #'stretchability = #1
+  }
+  \context { \Staff
+    \override StaffGrouper #'staff-staff-spacing #'stretchability = #4.9
+  }
+  \context { \Score
+    \override StaffGrouper #'staff-staff-spacing #'stretchability = #5
+  }
 }
 
 
-- 
2.11.4.GIT