X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fpaper-defaults-init.ly;h=a106ba9a10b904773e3797da74e7863e489671a6;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=61750d2159db7a001024b406ea67db996ebb12c1;hpb=ba8eee4036ebb86c32f23c784adcf3bf2ef5fe3b;p=lilypond.git

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index 61750d2159..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--2011 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.13.42"
+\version "2.16.0"
 
 \paper {
   #(set-paper-dimension-variables (current-module))
@@ -60,14 +60,32 @@
   %% Flexible vertical spacing
   %%
   %% Note: these are not scaled; they are in staff-spaces.
-  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))
+  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))
 
 
   %%
@@ -97,18 +115,21 @@
   %%
   %% 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-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
@@ -116,6 +137,7 @@
   first-page-number = #1
   print-first-page-number = ##f
   print-page-number = ##t
+  page-number-type = #'arabic
 
   %%
   %% Headers, footers, and titles
@@ -145,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"
+
 }