Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 612216d9cae7fd36946558400fdf982ccf94e063..41c846feaba445f170dfbea38b6d4bae1bd8084c 100644 (file)
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.7.39"
 
 \paper {
 
@@ -15,71 +15,98 @@
 
     %% 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))
-
+    #(define-public force-eps-font-include #f)
+    
     %%
     %% ugh. hard coded?
     %%
 
     #(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
+    %%
+    %% Small staves are aligned so they come out on the same place on
+    %% across different pages.
+    %%
+    page-top-space = #(* 12 mm)
+
+    
+    ragged-bottom = ##f
 
     %%
     %% looks best for shorter scores.
     %%
-    raggedlastbottom= ##t
-
-    %% ugh.  Should use /etc/papersize and set explicitely for
-    %% documentation.
-    papersizename = "a4"
+    ragged-last-bottom= ##t
 
     #(define font-defaults
       '((font-encoding . fetaMusic)))
 
     %% use lmodern in latin1 (cork) flavour if EC is not available.
     #(define text-font-defaults
-      `((font-encoding
-        . cork-lm)
-;       . ,(if (and  ;  (not (ly:kpathsea-find-file "ecrm10.pfa"))
-;               (ly:kpathsea-find-file "cork-lm.enc")) 'cork-lm 'Extended-TeX-Font-Encoding---Latin))
-       (baseline-skip . 2)
+      `((font-encoding .
+        ,(cond
+          (tex-backend? 'Extended-TeX-Font-Encoding---Latin)
+          (else 'latin1)))
+       ;; add to taste here.
+       
+       (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
+  }