X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fpaper-defaults.ly;h=31248eaa1a87d9d5729188b91abbaa8ecbab5e52;hb=8ee72795e81c227359ae720d8fac7fc3e68d170f;hp=925f1c3ffa2cad8c85386b98e2b7232ac2ac9df8;hpb=c1dcc83ffe9c356e9ab3df20c4fde22f9c1aab8d;p=lilypond.git

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 925f1c3ffa..31248eaa1a 100644
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.7.32"
 
 \paper {
 
@@ -15,15 +15,15 @@
 
     %% This is weird; `everyone' uses LATIN1?  How does I select TeX
     %% input encoding in EMACS? -- jcn
-    %%%%inputencoding = #"TeX"
-    inputencoding = #"latin1"
-    printpagenumber = ##t
+    %%%%input-encoding = #"TeX"
+    input-encoding = #"latin1"
+    print-page-number = ##t
 
     %%
     %% 20pt staff, 5 pt = 1.75 mm
     %%
 
-    outputscale = #1.7573
+    output-scale = #1.7573
     
     #(define-public book-title (marked-up-title 'bookTitleMarkup))
     #(define-public score-title (marked-up-title 'scoreTitleMarkup))
@@ -35,31 +35,46 @@
 
     #(layout-set-staff-size (* 20.0 pt))
 
+
+    #(define-public score-title-properties
+      '((is-title . #t)
+	(is-book-title . #f)
+	))
+    #(define-public book-title-properties
+      '((is-title . #t)
+	(is-book-title . #t)
+	))
+    
     %%
     %% this dimension includes the extent of the
     %% staves themselves.
     %%
-    betweensystemspace = #(* 20 mm)
-
+    between-system-space = #(* 20 mm)
+    
+    
     %%
     %% fixed space between systems.
     %%
-    betweensystempadding = #(* 4 mm)
+    between-system-padding = #(* 4 mm)
 
-    aftertitlespace = 5 \mm
-    beforetitlespace = 10 \mm
-    betweentitlespace = 2 \mm
+    after-title-space = 5 \mm
+    before-title-space = 10 \mm
+    between-title-space = 2 \mm
 
-    raggedbottom = ##f
 
     %%
-    %% looks best for shorter scores.
+    %% Small staves are aligned so they come out on the same place on
+    %% across different pages.
     %%
-    raggedlastbottom= ##t
+    page-top-space = #(* 12 mm)
 
-    %% ugh.  Should use /etc/papersize and set explicitly for
-    %% documentation.
-    papersizename = "a4"
+    
+    ragged-bottom = ##f
+
+    %%
+    %% looks best for shorter scores.
+    %%
+    ragged-last-bottom= ##t
 
     #(define font-defaults
       '((font-encoding . fetaMusic)))
@@ -75,13 +90,23 @@
 	(baseline-skip . 3)
 	(word-space . 0.6)))
 
-    #(define page-breaking ly:optimal-page-breaks)
-    #(define page-music-height default-page-music-height )
-    #(define page-make-stencil default-page-make-stencil )
+    #(define page-breaking optimal-page-breaks)
+%    #(define page-music-height default-page-music-height )
+%    #(define page-make-stencil default-page-make-stencil )
 
     #(define make-header (marked-up-headfoot 'oddHeaderMarkup 'evenHeaderMarkup))
     #(define make-footer (marked-up-headfoot 'oddFooterMarkup 'evenFooterMarkup))
     #(set-paper-dimension-variables (current-module))
 
     \include "titling-init.ly"
-}
+
+    top-margin = 5 \mm
+    bottom-margin = 6 \mm
+    head-separation = 4 \mm
+    foot-separation = 4 \mm
+    right-margin = 10 \mm
+
+    left-margin = ##f
+    first-page-number = #1
+    print-first-page-number =##f
+  }