Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

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

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index 67839f9c6c5695869bc39438f08184b901e03416..33d8ee9a6baecaa05d2fbb7970908c85ffb1d8f1 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -1,22 +1,18 @@
-\version "2.11.11"
-#(use-modules (scm layout-page-layout))
-\paper {
+\version "2.12.0"
 
-    %%%% WARNING
+\paper {
 
-    %%% if you  add any new dimensions, don't forget to update
-    %%% the dimension-variables variable. see paper.scm
+    %%% WARNING
+    %%%
+    %%% If you add any new dimensions, don't forget to update
+    %%% the dimension-variables variable.  See paper.scm.
     
     unit = #(ly:unit)
     mm = 1.0
     in = 25.4
-    pt = #(/  in 72.27)
+    pt = #(/ in 72.27)
     cm = #(* 10 mm)
 
-    %% This is weird; `everyone' uses LATIN1?  How does I select TeX
-    %% input encoding in EMACS? -- jcn
-    %%%%input-encoding = #"TeX"
-    input-encoding = #"latin1"
     print-page-number = ##t
 
     %%
@@ -27,7 +23,6 @@
     
     #(define-public book-title (marked-up-title 'bookTitleMarkup))
     #(define-public score-title (marked-up-title 'scoreTitleMarkup))
-    #(define-public force-eps-font-include #f)
     
     %%
     %% ugh. hard coded?
@@ -45,30 +40,15 @@
        (is-book-title . #t)
        ))
     
-    %%
-    %% this dimension includes the extent of the
-    %% staves themselves.
-    %%
-    between-system-space = #(* 20 mm)
-    
-    
-    %%
-    %% fixed space between systems.
-    %%
-    between-system-padding = #(* 4 mm)
+    %% Note: these are not scaled; they are in staff-spaces.
+    between-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1))
+    after-title-spacing = #'((space . 2) (padding . 0.5))
+    before-title-spacing = #'((space . 5) (padding . 0.5))
+    between-title-spacing = #'((space . 1) (padding . 0.5))
+    first-system-spacing = #'((space . 1) (padding . 0) (min-distance . 0))
+    first-system-title-spacing = #'((space . 1) (padding . 1) (min-distance . 0))
+    last-system-spacing = #'((space . 1) (padding . 0) (min-distance . 0) (stretchability . 5))
 
-    after-title-space = 5 \mm
-    before-title-space = 10 \mm
-    between-title-space = 2 \mm
-
-
-    %%
-    %% Small staves are aligned so they come out on the same place on
-    %% across different pages.
-    %%
-    page-top-space = #(* 12 mm)
-
-    
     ragged-bottom = ##f
 
     %%
@@ -92,20 +72,15 @@
     #(define font-defaults
       '((font-encoding . fetaMusic)))
 
-    %% use lmodern in latin1 (cork) flavour if EC is not available.
+    %%
+    %% the font encoding `latin1' is a dummy value for Pango fonts
+    %%
     #(define text-font-defaults
-      `((font-encoding .
-        ,(cond
-          (tex-backend? 'Extended-TeX-Font-Encoding---Latin)
-          (else 'latin1)))
-       ;; add to taste here.
-       
+      `((font-encoding . latin1)
        (baseline-skip . 3)
        (word-space . 0.6)))
 
     #(define page-breaking ly:optimal-breaking)
-    #(define page-breaking-wrapper page-breaking-wrapper)
-    #(define page-post-process post-process-pages)
 
     #(define write-page-layout (ly:get-option 'dump-tweaks))
     #(define system-maximum-stretch-procedure