Fix 1130.

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

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index 3e14781ab1bf9b181a1edf5e12e93fc881a38b92..dbf907b44141f9a7b93ee9c348e998b7c1de0309 100644 (file)
--- 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 {
@@ -40,11 +59,11 @@
   %% Note: these are not scaled; they are in staff-spaces.
   between-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1))
   between-scores-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1))
-  after-title-spacing = #'((space . 2) (padding . 0.5))
-  before-title-spacing = #'((space . 5) (padding . 0.5))
+  after-title-spacing = #'((space . 5) (padding . 0.5))
+  before-title-spacing = #'((space . 12) (padding . 0.5))
   between-title-spacing = #'((space . 1) (padding . 0.5))
   top-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0))
-  top-title-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
@@ -87,15 +100,26 @@
   \include "titling-init.ly"
 
   check-consistency = ##t
+  two-sided = ##f
 
-  top-margin = 5 \mm
-  bottom-margin = 6 \mm
+  % 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
 
-  head-separation = 4 \mm
-  foot-separation = 4 \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