X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fpaper-defaults-init.ly;h=1f0a6089a1ffe31d9d9c935a2145a0a30d70339a;hb=d2f1fdc35a9764f749a99a54db7bb988f455c3ed;hp=1ee92ed19736f2c35e5a4c73eec4c99772358a6f;hpb=81f5263fa1b6adf642b06970cd34e10d4635495d;p=lilypond.git

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index 1ee92ed197..1f0a6089a1 100644
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -1,3 +1,22 @@
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
+%%%%                          Neil Puttock <n.puttock@gmail.com>
+%%%%
+%%%% LilyPond is free software: you can redistribute it and/or modify
+%%%% it under the terms of the GNU General Public License as published by
+%%%% the Free Software Foundation, either version 3 of the License, or
+%%%% (at your option) any later version.
+%%%%
+%%%% LilyPond is distributed in the hope that it will be useful,
+%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%%% GNU General Public License for more details.
+%%%%
+%%%% 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"
 
 \paper {
@@ -43,9 +62,9 @@
   after-title-spacing = #'((space . 2) (padding . 0.5))
   before-title-spacing = #'((space . 5) (padding . 0.5))
   between-title-spacing = #'((space . 1) (padding . 0.5))
-  top-system-spacing = #'((space . 1) (padding . 1) (min-distance . 0))
-  top-title-spacing = #'((space . 1) (padding . 1) (min-distance . 0))
-  bottom-system-spacing = #'((space . 1) (padding . 1) (min-distance . 0) (stretchability . 5))
+  top-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0))
+  top-title-spacing = #'((space . 0) (padding . 1) (minimum-distance . 0))
+  bottom-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 5))
 
   ragged-bottom = ##f
 
@@ -61,14 +80,8 @@
   blank-after-score-page-force = 2
   blank-page-force = 5
 
-  %%
-  %% To limit space between systems on a page with a lot of space left
-  %%
-  page-limit-inter-system-space = ##f
-  page-limit-inter-system-space-factor = 1.4
-
   #(define font-defaults
-     '((font-encoding . fetaMusic)))
+    '((font-family . feta) (font-encoding . fetaMusic)))
 
   %%
   %% the font encoding `latin1' is a dummy value for Pango fonts
@@ -86,11 +99,28 @@
 
   \include "titling-init.ly"
 
-  top-margin = 5 \mm
-  bottom-margin = 6 \mm
-  head-separation = 4 \mm
-  foot-separation = 4 \mm
+  check-consistency = ##t
+  two-sided = ##f
+
+  % These margins apply to the default paper format given by (ly:get-option 'paper-size)
+  % and are scaled accordingly for other formats
+
+  top-margin-default = 5 \mm
+  bottom-margin-default = 6 \mm
+
+  left-margin-default = 10 \mm
+  right-margin-default = 10 \mm
+
+  inner-margin-default = 10 \mm
+  outer-margin-default = 20 \mm
+  binding-offset-default = 0 \mm
+
+  head-separation-default = 4 \mm
+  foot-separation-default = 4 \mm
+
+  indent-default = 15 \mm
+  short-indent-default = 0 \mm
 
   first-page-number = #1
-  print-first-page-number =##f
+  print-first-page-number = ##f
 }