X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fpaper-defaults-init.ly;h=a106ba9a10b904773e3797da74e7863e489671a6;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=ef7419312271c1de3f975c10be5d375c6889ab56;hpb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;p=lilypond.git diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly index ef74193122..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--2014 Han-Wen Nienhuys +%%%% Copyright (C) 2004--2015 Han-Wen Nienhuys %%%% Jan Nieuwenhuizen %%%% Neil Puttock %%%% @@ -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)) %% @@ -119,6 +137,7 @@ first-page-number = #1 print-first-page-number = ##f print-page-number = ##t + page-number-type = #'arabic %% %% Headers, footers, and titles