Merge branch 'master' into lilypond/translation

[lilypond.git] / ly / paper-defaults-init.ly

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index e3ff4ee04d2426686364201741022671f96b9fd8..61750d2159db7a001024b406ea67db996ebb12c1 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%                          Neil Puttock <n.puttock@gmail.com>
 %%%%
@@ -56,7 +56,6 @@
   ragged-bottom = ##f
   ragged-last-bottom = ##t  % best for shorter scores
 
-
   %%
   %% Flexible vertical spacing
   %%
@@ -66,9 +65,9 @@
   markup-system-spacing = #'((basic-distance . 5) (padding . 0.5) (stretchability . 30))
   score-markup-spacing = #'((basic-distance . 12) (padding . 0.5) (stretchability . 60))
   markup-markup-spacing = #'((basic-distance . 1) (padding . 0.5))
-  top-system-spacing = #'((basic-distance . 1) (padding . 1) (minimum-distance . 0))
-  top-markup-spacing = #'((basic-distance . 0) (padding . 1) (minimum-distance . 0))
-  last-bottom-spacing = #'((basic-distance . 1) (padding . 1) (minimum-distance . 0) (stretchability . 30))
+  top-system-spacing = #'((basic-distance . 1) (minimum-distance . 0) (padding . 1))
+  top-markup-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 1))
+  last-bottom-spacing = #'((basic-distance . 1) (minimum-distance . 0) (padding . 1) (stretchability . 30))
 
 
   %%
@@ -104,6 +103,13 @@
   page-breaking = #ly:optimal-breaking
 
 
+  %%
+  %% Footnotes
+  %%
+  footnote-separator-markup = \markup { \fill-line \override #`(span-factor . 1/2) { \draw-hline } }
+  footnote-padding = 0.5\mm
+
+
   %%
   %% Page numbering
   %%
@@ -111,7 +117,6 @@
   print-first-page-number = ##f
   print-page-number = ##t
 
-
   %%
   %% Headers, footers, and titles
   %%