lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Update spacing for Keith Ohara's suggested defaults (issue3099041)


From: Carl . D . Sorensen
Subject: Update spacing for Keith Ohara's suggested defaults (issue3099041)
Date: Sat, 13 Nov 2010 21:28:04 +0000

Reviewers: ,

Message:
Here's the new default spacing patch with the new names.

Keith, can you check it out?

THanks,

Carl


Description:
Update spacing for Keith Ohara's suggested defaults

Please review this at http://codereview.appspot.com/3099041/

Affected files:
  M ly/engraver-init.ly
  M ly/paper-defaults-init.ly
  M scm/define-grobs.scm


Index: ly/engraver-init.ly
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index dbc5e024198a020d2b94eaca671cd0fb928911e7..f56145ec98dc2e3ea9589294fbb767f21af0d15c 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -299,6 +299,7 @@ contained staves are connected vertically."
   \consists "Span_arpeggio_engraver"
   \consists "System_start_delimiter_engraver"
   systemStartDelimiter = #'SystemStartBrace
+  topLevelAlignment = ##f

   \defaultchild "Staff"
   \accepts "Staff"
@@ -319,8 +320,6 @@ instrument names at the start of each system."
   \consists "Keep_alive_together_engraver"
   topLevelAlignment = ##f

-  \override StaffGrouper #'staff-staff-spacing #'stretchability = #5
-
   instrumentName = #'()
   shortInstrumentName = #'()
 }
Index: ly/paper-defaults-init.ly
diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index f8460ca12b775bce946435417cf41f821257e6c3..d9b637d360484b9a72b40b32569bf64170bf96c5 100644
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -57,14 +57,14 @@
        (is-book-title . #t)))

   %% Note: these are not scaled; they are in staff-spaces.
- system-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1)) - score-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1))
-  markup-system-spacing = #'((space . 5) (padding . 0.5))
-  score-markup-spacing = #'((space . 12) (padding . 0.5))
+ system-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1)(stretchability . 60)) + score-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1) (stretchability . 120)) + markup-system-spacing = #'((space . 5) (padding . 0.5) (stretchability . 30)) + score-markup-spacing = #'((space . 12) (padding . 0.5) (stretchability . 60))
   markup-markup-spacing = #'((space . 1) (padding . 0.5))
   top-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0))
   top-markup-spacing = #'((space . 0) (padding . 1) (minimum-distance . 0))
- last-bottom-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 5)) + last-bottom-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 30))

   ragged-bottom = ##f

Index: scm/define-grobs.scm
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5dfaa600307a0ead30d3b5e85f2732c5e3bd3527..d68a2452f0bdbcee4136bc56b39ed06182fbab9b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1690,9 +1690,11 @@
     (StaffGrouper
      . (
        (staff-staff-spacing . ((space . 9)
+                                (stretchability . 5)
                                (minimum-distance . 7)
                                (padding . 1)))
        (staffgroup-staff-spacing . ((space . 10.5)
+                                     (stretchability . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)))
        (meta . ((class . Spanner)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]