X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Fpaper-defaults.ly;h=925f1c3ffa2cad8c85386b98e2b7232ac2ac9df8;hb=e140cea9660981e1fb23f96bae1029ed11d653e5;hp=9c546b85df193af9da2ac722774376b8d1f4fa7d;hpb=e3fdf4b5bdd907f66b6918baf6755dc88e488a0b;p=lilypond.git

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 9c546b85df..925f1c3ffa 100644
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -1,4 +1,4 @@
-\version "2.3.22"
+\version "2.4.0"
 
 \paper {
 
@@ -25,10 +25,10 @@
 
     outputscale = #1.7573
     
-    #(define-public score-title default-score-title)
-    #(define-public user-title default-user-title)
-    #(define-public book-title default-book-title)
-
+    #(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?
     %%
@@ -50,7 +50,6 @@
     beforetitlespace = 10 \mm
     betweentitlespace = 2 \mm
 
-
     raggedbottom = ##f
 
     %%
@@ -58,23 +57,31 @@
     %%
     raggedlastbottom= ##t
 
-    %% ugh.  Should use /etc/papersize and set explicitely for
+    %% ugh.  Should use /etc/papersize and set explicitly for
     %% documentation.
     papersizename = "a4"
 
     #(define font-defaults
       '((font-encoding . fetaMusic)))
 
+    %% use lmodern in latin1 (cork) flavour if EC is not available.
     #(define text-font-defaults
-      '((font-encoding . ec)
-	(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 make-header plain-header)
-    #(define make-footer plain-footer)
+    #(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"
 }