X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fpaper-defaults-init.ly;h=a106ba9a10b904773e3797da74e7863e489671a6;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=e18e12019da5bf4a44a41c8546013e77ef2e91a8;hpb=b0a027f991bd417c46848bd8a5db5021dbf1881c;p=lilypond.git

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index e18e12019d..a106ba9a10 100644
--- 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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%                          Neil Puttock <n.puttock@gmail.com>
 %%%%
@@ -17,7 +17,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.12.0"
+\version "2.16.0"
 
 \paper {
   #(set-paper-dimension-variables (current-module))
@@ -56,19 +56,36 @@
   ragged-bottom = ##f
   ragged-last-bottom = ##t  % best for shorter scores
 
-
   %%
   %% Flexible vertical spacing
   %%
   %% Note: these are not scaled; they are in staff-spaces.
-  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 . 30))
+  system-system-spacing = #'((basic-distance . 12)
+                             (minimum-distance . 8)
+                             (padding . 1)
+                             (stretchability . 60))
+  score-system-spacing = #'((basic-distance . 14)
+                            (minimum-distance . 8)
+                            (padding . 1)
+                            (stretchability . 120))
+  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)
+                          (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))
 
 
   %%
@@ -98,19 +115,29 @@
   %%
   %% Page breaking
   %%
-  blank-after-score-page-force = 2
-  blank-last-page-force = 0
-  blank-page-force = 5
+  blank-after-score-page-penalty = 2
+  blank-last-page-penalty = 0
+  blank-page-penalty = 5
   page-breaking = #ly:optimal-breaking
 
 
+  %%
+  %% Footnotes
+  %%
+  footnote-separator-markup = \markup \fill-line { \override #'(span-factor . 1/2) \draw-hline }
+  footnote-padding = 0.5\mm
+  footnote-footer-padding = 0.5\mm
+  footnote-number-raise = 0.5\mm
+  footnote-numbering-function = #numbered-footnotes
+  reset-footnotes-on-new-page = ##t
+
   %%
   %% Page numbering
   %%
   first-page-number = #1
   print-first-page-number = ##f
   print-page-number = ##t
-
+  page-number-type = #'arabic
 
   %%
   %% Headers, footers, and titles
@@ -140,6 +167,9 @@
   #(define text-font-defaults
      `((font-encoding . latin1)
        (baseline-skip . 3)
+       (replacement-alist . ,default-string-replacement-alist)
        (word-space . 0.6)))
 
+  \include "text-replacements.ly"
+
 }